summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/target/mame/arcade.lua2
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp14
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp6
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp4
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp4
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp2
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp2
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp2
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp10
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp54
-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.cpp2
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp4
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp16
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp4
-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/agat7ports.cpp8
-rw-r--r--src/devices/bus/a2bus/agat840k_hle.cpp16
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp4
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp4
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp6
-rw-r--r--src/devices/bus/a2bus/mouse.cpp20
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp94
-rw-r--r--src/devices/bus/a2bus/ssbapple.cpp2
-rw-r--r--src/devices/bus/a2bus/ssprite.cpp6
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp8
-rw-r--r--src/devices/bus/a2bus/transwarp.cpp4
-rw-r--r--src/devices/bus/a7800/cpuwiz.cpp2
-rw-r--r--src/devices/bus/a7800/rom.cpp14
-rw-r--r--src/devices/bus/a7800/xboard.cpp6
-rw-r--r--src/devices/bus/abcbus/cadmouse.cpp6
-rw-r--r--src/devices/bus/abcbus/db411223.cpp6
-rw-r--r--src/devices/bus/abcbus/fd2.cpp20
-rw-r--r--src/devices/bus/abcbus/hdc.cpp6
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp18
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp20
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp24
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp8
-rw-r--r--src/devices/bus/abckb/abc77.cpp16
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp10
-rw-r--r--src/devices/bus/abckb/abc99.cpp26
-rw-r--r--src/devices/bus/adamnet/ddp.cpp6
-rw-r--r--src/devices/bus/adamnet/fdc.cpp6
-rw-r--r--src/devices/bus/adamnet/kb.cpp6
-rw-r--r--src/devices/bus/adamnet/printer.cpp6
-rw-r--r--src/devices/bus/adamnet/spi.cpp8
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.cpp12
-rw-r--r--src/devices/bus/amiga/keyboard/a500.cpp4
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp122
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp10
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp4
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.h4
-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.cpp10
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp12
-rw-r--r--src/devices/bus/bbc/fdc/cv1797.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp12
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp8
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.cpp4
-rw-r--r--src/devices/bus/bbc/tube/tube_65c102.cpp4
-rw-r--r--src/devices/bus/bbc/tube/tube_80186.cpp12
-rw-r--r--src/devices/bus/bbc/tube/tube_80286.cpp8
-rw-r--r--src/devices/bus/bbc/tube/tube_arm.cpp6
-rw-r--r--src/devices/bus/bbc/tube/tube_casper.cpp18
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.cpp14
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.cpp20
-rw-r--r--src/devices/bus/bbc/userport/beebspch.cpp6
-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/cpm.cpp6
-rw-r--r--src/devices/bus/c64/currah_speech.cpp2
-rw-r--r--src/devices/bus/c64/exp.h12
-rw-r--r--src/devices/bus/c64/fcc.cpp4
-rw-r--r--src/devices/bus/c64/geocable.cpp2
-rw-r--r--src/devices/bus/c64/ieee488.cpp12
-rw-r--r--src/devices/bus/c64/magic_formel.cpp6
-rw-r--r--src/devices/bus/c64/magic_voice.cpp26
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp8
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp8
-rw-r--r--src/devices/bus/c64/midi_passport.cpp10
-rw-r--r--src/devices/bus/c64/midi_sci.cpp8
-rw-r--r--src/devices/bus/c64/midi_siel.cpp8
-rw-r--r--src/devices/bus/c64/multiscreen.cpp4
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp4
-rw-r--r--src/devices/bus/c64/speakeasy.cpp2
-rw-r--r--src/devices/bus/c64/supercpu.cpp4
-rw-r--r--src/devices/bus/c64/swiftlink.cpp16
-rw-r--r--src/devices/bus/c64/turbo232.cpp16
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp8
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp56
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp158
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp16
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp4
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp24
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp4
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp4
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp6
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp4
-rw-r--r--src/devices/bus/cbus/mpu_pc98.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_118.cpp12
-rw-r--r--src/devices/bus/cbus/pc9801_26.cpp12
-rw-r--r--src/devices/bus/cbus/pc9801_86.cpp16
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.cpp10
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp4
-rw-r--r--src/devices/bus/centronics/covox.cpp6
-rw-r--r--src/devices/bus/centronics/ctronics.h32
-rw-r--r--src/devices/bus/centronics/digiblst.cpp2
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp18
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp34
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp56
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp4
-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.cpp8
-rw-r--r--src/devices/bus/coco/coco_dcmodem.cpp16
-rw-r--r--src/devices/bus/coco/coco_fdc.cpp4
-rw-r--r--src/devices/bus/coco/coco_gmc.cpp2
-rw-r--r--src/devices/bus/coco/coco_multi.cpp28
-rw-r--r--src/devices/bus/coco/coco_orch90.cpp4
-rw-r--r--src/devices/bus/coco/coco_rs232.cpp16
-rw-r--r--src/devices/bus/coco/coco_ssc.cpp18
-rw-r--r--src/devices/bus/coco/coco_t4426.cpp30
-rw-r--r--src/devices/bus/coco/cococart.cpp1
-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/comx35/expbox.cpp8
-rw-r--r--src/devices/bus/comx35/printer.cpp8
-rw-r--r--src/devices/bus/cpc/amdrum.cpp2
-rw-r--r--src/devices/bus/cpc/cpc_rom.cpp6
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp28
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.cpp24
-rw-r--r--src/devices/bus/cpc/ddi1.cpp6
-rw-r--r--src/devices/bus/cpc/hd20.cpp2
-rw-r--r--src/devices/bus/cpc/magicsound.cpp34
-rw-r--r--src/devices/bus/cpc/mface2.cpp6
-rw-r--r--src/devices/bus/cpc/playcity.cpp16
-rw-r--r--src/devices/bus/dmv/k210.cpp26
-rw-r--r--src/devices/bus/dmv/k220.cpp10
-rw-r--r--src/devices/bus/dmv/k230.cpp18
-rw-r--r--src/devices/bus/dmv/k801.cpp22
-rw-r--r--src/devices/bus/dmv/k803.cpp2
-rw-r--r--src/devices/bus/dmv/k806.cpp8
-rw-r--r--src/devices/bus/ecbbus/grip.cpp32
-rw-r--r--src/devices/bus/econet/e01.cpp30
-rw-r--r--src/devices/bus/einstein/pipe/speculator.cpp6
-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/cart/click.cpp2
-rw-r--r--src/devices/bus/electron/cart/peg400.cpp2
-rw-r--r--src/devices/bus/electron/cart/sndexp.cpp2
-rw-r--r--src/devices/bus/electron/cart/sndexp3.cpp2
-rw-r--r--src/devices/bus/electron/cart/stlefs.cpp4
-rw-r--r--src/devices/bus/electron/exp.h4
-rw-r--r--src/devices/bus/electron/m2105.cpp36
-rw-r--r--src/devices/bus/electron/plus1.cpp12
-rw-r--r--src/devices/bus/electron/romboxp.cpp10
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp12
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp16
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp4
-rw-r--r--src/devices/bus/hexbus/hx5102.cpp18
-rw-r--r--src/devices/bus/hp80_io/82937.cpp30
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp16
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp8
-rw-r--r--src/devices/bus/hp_dio/hp98644.cpp20
-rw-r--r--src/devices/bus/ieee488/c2031.cpp30
-rw-r--r--src/devices/bus/ieee488/c2040.cpp132
-rw-r--r--src/devices/bus/ieee488/c8050.cpp180
-rw-r--r--src/devices/bus/ieee488/c8280.cpp20
-rw-r--r--src/devices/bus/ieee488/d9060.cpp54
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp20
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp28
-rw-r--r--src/devices/bus/ieee488/shark.cpp8
-rw-r--r--src/devices/bus/ieee488/softbox.cpp34
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp46
-rw-r--r--src/devices/bus/intellec4/intellec4.h28
-rw-r--r--src/devices/bus/interpro/keyboard/hle.cpp2
-rw-r--r--src/devices/bus/interpro/keyboard/lle.cpp4
-rw-r--r--src/devices/bus/intv/ecs.cpp8
-rw-r--r--src/devices/bus/intv/voice.cpp2
-rw-r--r--src/devices/bus/iq151/grafik.cpp6
-rw-r--r--src/devices/bus/iq151/staper.cpp6
-rw-r--r--src/devices/bus/isa/3c503.cpp6
-rw-r--r--src/devices/bus/isa/adlib.cpp2
-rw-r--r--src/devices/bus/isa/aga.cpp4
-rw-r--r--src/devices/bus/isa/aha1542.cpp4
-rw-r--r--src/devices/bus/isa/cga.cpp4
-rw-r--r--src/devices/bus/isa/com.cpp152
-rw-r--r--src/devices/bus/isa/dectalk.cpp18
-rw-r--r--src/devices/bus/isa/ega.cpp8
-rw-r--r--src/devices/bus/isa/eis_sad8852.cpp6
-rw-r--r--src/devices/bus/isa/fdc.cpp20
-rw-r--r--src/devices/bus/isa/finalchs.cpp4
-rw-r--r--src/devices/bus/isa/gus.cpp30
-rw-r--r--src/devices/bus/isa/hdc.cpp8
-rw-r--r--src/devices/bus/isa/ibm_mfc.cpp30
-rw-r--r--src/devices/bus/isa/ide.cpp2
-rw-r--r--src/devices/bus/isa/isa.cpp14
-rw-r--r--src/devices/bus/isa/isa.h49
-rw-r--r--src/devices/bus/isa/lpt.cpp2
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp4
-rw-r--r--src/devices/bus/isa/mda.cpp16
-rw-r--r--src/devices/bus/isa/mpu401.cpp2
-rw-r--r--src/devices/bus/isa/mufdc.cpp6
-rw-r--r--src/devices/bus/isa/myb3k_com.cpp28
-rw-r--r--src/devices/bus/isa/myb3k_fdc.cpp12
-rw-r--r--src/devices/bus/isa/ne1000.cpp6
-rw-r--r--src/devices/bus/isa/ne2000.cpp6
-rw-r--r--src/devices/bus/isa/omti8621.cpp4
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp4
-rw-r--r--src/devices/bus/isa/p1_sound.cpp16
-rw-r--r--src/devices/bus/isa/pgc.cpp8
-rw-r--r--src/devices/bus/isa/sb16.cpp18
-rw-r--r--src/devices/bus/isa/sblaster.cpp24
-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.cpp20
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp38
-rw-r--r--src/devices/bus/isa/xtide.cpp2
-rw-r--r--src/devices/bus/isbx/compis_fdc.cpp4
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp4
-rw-r--r--src/devices/bus/kc/d002.cpp30
-rw-r--r--src/devices/bus/kc/d004.cpp18
-rw-r--r--src/devices/bus/lpci/southbridge.cpp128
-rw-r--r--src/devices/bus/megadrive/svp.cpp6
-rw-r--r--src/devices/bus/midi/midiinport.cpp2
-rw-r--r--src/devices/bus/msx_cart/bm_012.cpp28
-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.cpp4
-rw-r--r--src/devices/bus/msx_cart/msx_audio.cpp28
-rw-r--r--src/devices/bus/msx_cart/yamaha.cpp12
-rw-r--r--src/devices/bus/msx_slot/cartridge.cpp4
-rw-r--r--src/devices/bus/nes/jaleco.cpp14
-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_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/newbrain/eim.cpp12
-rw-r--r--src/devices/bus/newbrain/fdc.cpp8
-rw-r--r--src/devices/bus/nubus/bootbug.cpp20
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp6
-rw-r--r--src/devices/bus/nubus/quadralink.cpp48
-rw-r--r--src/devices/bus/odyssey2/chess.cpp6
-rw-r--r--src/devices/bus/odyssey2/voice.cpp4
-rw-r--r--src/devices/bus/oricext/jasmin.cpp2
-rw-r--r--src/devices/bus/oricext/microdisc.cpp6
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp12
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp12
-rw-r--r--src/devices/bus/pc_kbd/keytro.cpp18
-rw-r--r--src/devices/bus/pc_kbd/msnat.cpp14
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp10
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp16
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp14
-rw-r--r--src/devices/bus/pet/2joysnd.cpp2
-rw-r--r--src/devices/bus/pet/cb2snd.cpp2
-rw-r--r--src/devices/bus/pet/superpet.cpp20
-rw-r--r--src/devices/bus/plus4/c1551.cpp30
-rw-r--r--src/devices/bus/plus4/exp.h8
-rw-r--r--src/devices/bus/plus4/sid.cpp2
-rw-r--r--src/devices/bus/pofo/hpc101.cpp24
-rw-r--r--src/devices/bus/pofo/hpc102.cpp22
-rw-r--r--src/devices/bus/pofo/hpc104.cpp6
-rw-r--r--src/devices/bus/psi_kbd/ergoline.cpp6
-rw-r--r--src/devices/bus/ql/cst_q_plus4.cpp8
-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/rs232/printer.cpp2
-rw-r--r--src/devices/bus/rs232/rs232.h4
-rw-r--r--src/devices/bus/rs232/sun_kbd.cpp2
-rw-r--r--src/devices/bus/s100/dj2db.cpp6
-rw-r--r--src/devices/bus/s100/djdma.cpp6
-rw-r--r--src/devices/bus/s100/wunderbus.cpp70
-rw-r--r--src/devices/bus/scsi/s1410.cpp6
-rw-r--r--src/devices/bus/scsi/scsi.h32
-rw-r--r--src/devices/bus/scsi/scsicd.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp2
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp6
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp8
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp4
-rw-r--r--src/devices/bus/snes/event.cpp6
-rw-r--r--src/devices/bus/snes/sa1.cpp4
-rw-r--r--src/devices/bus/snes/sfx.cpp6
-rw-r--r--src/devices/bus/snes/sgb.cpp16
-rw-r--r--src/devices/bus/snes/upd.cpp72
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp2
-rw-r--r--src/devices/bus/spc1000/fdd.cpp16
-rw-r--r--src/devices/bus/spc1000/vdp.cpp2
-rw-r--r--src/devices/bus/spectrum/exp.h4
-rw-r--r--src/devices/bus/spectrum/fuller.cpp2
-rw-r--r--src/devices/bus/spectrum/intf1.cpp4
-rw-r--r--src/devices/bus/spectrum/melodik.cpp2
-rw-r--r--src/devices/bus/spectrum/uslot.cpp8
-rw-r--r--src/devices/bus/spectrum/uspeech.cpp2
-rw-r--r--src/devices/bus/ss50/mpc.cpp24
-rw-r--r--src/devices/bus/ss50/mps.cpp10
-rw-r--r--src/devices/bus/sunkbd/hlekbd.cpp2
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.cpp6
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.cpp6
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.cpp4
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.cpp2
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.cpp20
-rw-r--r--src/devices/bus/ti8x/graphlinkhle.cpp4
-rw-r--r--src/devices/bus/ti8x/teeconn.cpp8
-rw-r--r--src/devices/bus/ti8x/tispeaker.cpp6
-rw-r--r--src/devices/bus/ti99/gromport/cartridges.cpp10
-rw-r--r--src/devices/bus/ti99/peb/bwg.cpp4
-rw-r--r--src/devices/bus/ti99/peb/evpc.cpp6
-rw-r--r--src/devices/bus/ti99/peb/hfdc.cpp12
-rw-r--r--src/devices/bus/ti99/peb/pcode.cpp20
-rw-r--r--src/devices/bus/ti99/peb/samsmem.cpp4
-rw-r--r--src/devices/bus/ti99/peb/spchsyn.cpp4
-rw-r--r--src/devices/bus/ti99/peb/ti_fdc.cpp20
-rw-r--r--src/devices/bus/ti99/peb/ti_rs232.cpp32
-rw-r--r--src/devices/bus/ti99/peb/tn_ide.cpp4
-rw-r--r--src/devices/bus/tiki100/8088.cpp6
-rw-r--r--src/devices/bus/vcs/harmony_melody.cpp4
-rw-r--r--src/devices/bus/vic20/exp.cpp3
-rw-r--r--src/devices/bus/vic20/exp.h6
-rw-r--r--src/devices/bus/vic20/speakeasy.cpp2
-rw-r--r--src/devices/bus/vic20/vic1011.cpp10
-rw-r--r--src/devices/bus/vic20/vic1112.cpp18
-rw-r--r--src/devices/bus/vip/vp575.cpp30
-rw-r--r--src/devices/bus/vip/vp590.cpp6
-rw-r--r--src/devices/bus/vme/vme_fccpu20.cpp58
-rw-r--r--src/devices/bus/vme/vme_fcisio.cpp102
-rw-r--r--src/devices/bus/vme/vme_fcscsi.cpp24
-rw-r--r--src/devices/bus/vme/vme_hcpu30.cpp34
-rw-r--r--src/devices/bus/vme/vme_mvme350.cpp4
-rw-r--r--src/devices/bus/vme/vme_mzr8105.cpp4
-rw-r--r--src/devices/bus/vme/vme_mzr8300.cpp28
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp2
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp4
-rw-r--r--src/devices/bus/wangpc/lvc.cpp2
-rw-r--r--src/devices/bus/wangpc/mvc.cpp2
-rw-r--r--src/devices/bus/wangpc/rtc.cpp6
-rw-r--r--src/devices/bus/wangpc/wdc.cpp6
-rw-r--r--src/devices/bus/x68k/x68k_midi.cpp4
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.cpp6
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.cpp4
-rw-r--r--src/devices/cpu/i8089/i8089.cpp4
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp6
-rw-r--r--src/devices/cpu/nec/v53.cpp56
-rw-r--r--src/devices/cpu/psx/psx.cpp12
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp6
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp50
-rw-r--r--src/devices/imagedev/floppy.cpp2
-rw-r--r--src/devices/machine/68307.cpp10
-rw-r--r--src/devices/machine/68340.cpp2
-rw-r--r--src/devices/machine/8042kbdc.cpp2
-rw-r--r--src/devices/machine/at_keybc.cpp12
-rw-r--r--src/devices/machine/ataintf.cpp16
-rw-r--r--src/devices/machine/atapicdr.cpp2
-rw-r--r--src/devices/machine/cr511b.cpp2
-rw-r--r--src/devices/machine/cs4031.cpp72
-rw-r--r--src/devices/machine/fdc37c93x.cpp14
-rw-r--r--src/devices/machine/genpc.cpp80
-rw-r--r--src/devices/machine/i80130.cpp8
-rw-r--r--src/devices/machine/i82371sb.cpp122
-rw-r--r--src/devices/machine/ie15.cpp14
-rw-r--r--src/devices/machine/keyboard.cpp2
-rw-r--r--src/devices/machine/ldpr8210.cpp24
-rw-r--r--src/devices/machine/ldv1000.cpp22
-rw-r--r--src/devices/machine/ldvp931.cpp16
-rw-r--r--src/devices/machine/mb89363b.cpp24
-rw-r--r--src/devices/machine/mos6551.cpp2
-rw-r--r--src/devices/machine/mpu401.cpp10
-rw-r--r--src/devices/machine/pc_fdc.cpp4
-rw-r--r--src/devices/machine/pc_lpt.cpp28
-rw-r--r--src/devices/machine/pci-ide.cpp4
-rw-r--r--src/devices/machine/pdc.cpp26
-rw-r--r--src/devices/machine/rf5c296.cpp4
-rw-r--r--src/devices/machine/rf5c296.h7
-rw-r--r--src/devices/machine/sega_scu.cpp8
-rw-r--r--src/devices/machine/sis85c496.cpp82
-rw-r--r--src/devices/machine/smioc.cpp36
-rw-r--r--src/devices/machine/smioc.h17
-rw-r--r--src/devices/machine/stvcd.cpp2
-rw-r--r--src/devices/machine/terminal.cpp2
-rw-r--r--src/devices/machine/vrc5074.cpp18
-rw-r--r--src/devices/machine/wd7600.cpp72
-rw-r--r--src/devices/machine/wozfdc.cpp2
-rw-r--r--src/devices/sound/ad1848.cpp4
-rw-r--r--src/devices/sound/bsmt2000.cpp8
-rw-r--r--src/devices/sound/cdda.cpp6
-rw-r--r--src/devices/sound/cdda.h2
-rw-r--r--src/devices/sound/cdp1864.h2
-rw-r--r--src/devices/sound/dave.h2
-rw-r--r--src/devices/sound/discrete.h2
-rw-r--r--src/devices/sound/dmadac.h2
-rw-r--r--src/devices/sound/es8712.cpp2
-rw-r--r--src/devices/sound/flt_rc.h14
-rw-r--r--src/devices/sound/mos6560.h6
-rw-r--r--src/devices/sound/qs1000.cpp20
-rw-r--r--src/devices/sound/qsound.cpp10
-rw-r--r--src/devices/sound/samples.h2
-rw-r--r--src/devices/sound/scsp.cpp18
-rw-r--r--src/devices/sound/scsp.h2
-rw-r--r--src/devices/sound/sn76477.h2
-rw-r--r--src/devices/sound/spkrdev.h2
-rw-r--r--src/devices/sound/spu.h6
-rw-r--r--src/devices/sound/upd7759.h8
-rw-r--r--src/devices/sound/wave.h2
-rw-r--r--src/devices/video/huc6272.cpp14
-rw-r--r--src/devices/video/psx.h12
-rw-r--r--src/emu/devcb.h42
-rw-r--r--src/emu/devcpu.h22
-rw-r--r--src/emu/devfind.h11
-rw-r--r--src/emu/device.h5
-rw-r--r--src/emu/digfx.h2
-rw-r--r--src/emu/dislot.cpp5
-rw-r--r--src/emu/dislot.h12
-rw-r--r--src/emu/disound.h12
-rw-r--r--src/emu/drawgfx.h4
-rw-r--r--src/emu/drivers/testcpu.cpp4
-rw-r--r--src/emu/mconfig.cpp4
-rw-r--r--src/emu/softlist_dev.h6
-rw-r--r--src/emu/speaker.h11
-rw-r--r--src/emu/tilemap.h4
-rw-r--r--src/mame/audio/alesis.cpp2
-rw-r--r--src/mame/audio/arcadia.h9
-rw-r--r--src/mame/audio/asteroid.cpp18
-rw-r--r--src/mame/audio/astrof.cpp4
-rw-r--r--src/mame/audio/atarijsa.cpp36
-rw-r--r--src/mame/audio/avalnche.cpp16
-rw-r--r--src/mame/audio/bwidow.cpp10
-rw-r--r--src/mame/audio/bzone.cpp4
-rw-r--r--src/mame/audio/cage.cpp20
-rw-r--r--src/mame/audio/carnival.cpp14
-rw-r--r--src/mame/audio/cclimber.cpp6
-rw-r--r--src/mame/audio/channelf.h2
-rw-r--r--src/mame/audio/cheekyms.cpp2
-rw-r--r--src/mame/audio/cinemat.cpp162
-rw-r--r--src/mame/audio/cmi01a.cpp32
-rw-r--r--src/mame/audio/copsnrob.cpp18
-rw-r--r--src/mame/audio/crbaloon.cpp4
-rw-r--r--src/mame/audio/csd.cpp14
-rw-r--r--src/mame/audio/csd.h2
-rw-r--r--src/mame/audio/dai_snd.h6
-rw-r--r--src/mame/audio/dcs.cpp96
-rw-r--r--src/mame/audio/decobsmt.cpp6
-rw-r--r--src/mame/audio/depthch.cpp2
-rw-r--r--src/mame/audio/dkong.cpp104
-rw-r--r--src/mame/audio/dsbz80.cpp12
-rw-r--r--src/mame/audio/efo_zsu.cpp50
-rw-r--r--src/mame/audio/exidy.cpp66
-rw-r--r--src/mame/audio/galaxian.cpp16
-rw-r--r--src/mame/audio/geebee.cpp6
-rw-r--r--src/mame/audio/geebee.h2
-rw-r--r--src/mame/audio/gomoku.cpp48
-rw-r--r--src/mame/audio/gomoku.h27
-rw-r--r--src/mame/audio/gottlieb.cpp40
-rw-r--r--src/mame/audio/gottlieb.h22
-rw-r--r--src/mame/audio/harddriv.cpp24
-rw-r--r--src/mame/audio/hng64.cpp20
-rw-r--r--src/mame/audio/invinco.cpp2
-rw-r--r--src/mame/audio/irem.cpp66
-rw-r--r--src/mame/audio/jedi.cpp14
-rw-r--r--src/mame/audio/leland.cpp130
-rw-r--r--src/mame/audio/llander.cpp2
-rw-r--r--src/mame/audio/m72.h2
-rw-r--r--src/mame/audio/mario.cpp32
-rw-r--r--src/mame/audio/micro3d.cpp6
-rw-r--r--src/mame/audio/micro3d.h4
-rw-r--r--src/mame/audio/midway.cpp77
-rw-r--r--src/mame/audio/midway.h8
-rw-r--r--src/mame/audio/mw8080bw.cpp60
-rw-r--r--src/mame/audio/n8080.cpp50
-rw-r--r--src/mame/audio/namco52.cpp18
-rw-r--r--src/mame/audio/namco54.cpp10
-rw-r--r--src/mame/audio/nichisnd.cpp24
-rw-r--r--src/mame/audio/phoenix.cpp4
-rw-r--r--src/mame/audio/phoenix.h4
-rw-r--r--src/mame/audio/pleiads.cpp12
-rw-r--r--src/mame/audio/pleiads.h14
-rw-r--r--src/mame/audio/polepos.cpp170
-rw-r--r--src/mame/audio/polepos.h57
-rw-r--r--src/mame/audio/pulsar.cpp2
-rw-r--r--src/mame/audio/qix.cpp48
-rw-r--r--src/mame/audio/rax.cpp16
-rw-r--r--src/mame/audio/redalert.cpp40
-rw-r--r--src/mame/audio/s11c_bg.cpp18
-rw-r--r--src/mame/audio/s11c_bg.h5
-rw-r--r--src/mame/audio/scramble.cpp24
-rw-r--r--src/mame/audio/segag80r.cpp38
-rw-r--r--src/mame/audio/segam1audio.cpp16
-rw-r--r--src/mame/audio/segasnd.cpp50
-rw-r--r--src/mame/audio/segasnd.h6
-rw-r--r--src/mame/audio/snes_snd.cpp15
-rw-r--r--src/mame/audio/snes_snd.h19
-rw-r--r--src/mame/audio/spacefb.cpp4
-rw-r--r--src/mame/audio/spiders.cpp2
-rw-r--r--src/mame/audio/sprint8.cpp28
-rw-r--r--src/mame/audio/t5182.cpp6
-rw-r--r--src/mame/audio/taito_en.cpp16
-rw-r--r--src/mame/audio/taito_zm.cpp8
-rw-r--r--src/mame/audio/targ.cpp8
-rw-r--r--src/mame/audio/timeplt.cpp40
-rw-r--r--src/mame/audio/timeplt.h4
-rw-r--r--src/mame/audio/trackfld.cpp2
-rw-r--r--src/mame/audio/tranqgun.cpp2
-rw-r--r--src/mame/audio/turbo.cpp6
-rw-r--r--src/mame/audio/tx1.cpp26
-rw-r--r--src/mame/audio/tx1.h104
-rw-r--r--src/mame/audio/vicdual-97271p.cpp2
-rw-r--r--src/mame/audio/vicdual.cpp8
-rw-r--r--src/mame/audio/warpwarp.cpp19
-rw-r--r--src/mame/audio/warpwarp.h4
-rw-r--r--src/mame/audio/williams.cpp34
-rw-r--r--src/mame/audio/williams.h6
-rw-r--r--src/mame/audio/wpcsnd.cpp16
-rw-r--r--src/mame/audio/wpcsnd.h5
-rw-r--r--src/mame/audio/zaccaria.cpp56
-rw-r--r--src/mame/audio/zaccaria.h4
-rw-r--r--src/mame/audio/zaxxon.cpp4
-rw-r--r--src/mame/drivers/1942.cpp34
-rw-r--r--src/mame/drivers/1943.cpp16
-rw-r--r--src/mame/drivers/1945kiii.cpp10
-rw-r--r--src/mame/drivers/20pacgal.cpp16
-rw-r--r--src/mame/drivers/24cdjuke.cpp12
-rw-r--r--src/mame/drivers/2mindril.cpp20
-rw-r--r--src/mame/drivers/30test.cpp6
-rw-r--r--src/mame/drivers/39in1.cpp10
-rw-r--r--src/mame/drivers/3do.cpp8
-rw-r--r--src/mame/drivers/3x3puzzl.cpp6
-rw-r--r--src/mame/drivers/4004clk.cpp4
-rw-r--r--src/mame/drivers/40love.cpp48
-rw-r--r--src/mame/drivers/4dpi.cpp6
-rw-r--r--src/mame/drivers/4enlinea.cpp27
-rw-r--r--src/mame/drivers/4enraya.cpp18
-rw-r--r--src/mame/drivers/4roses.cpp14
-rw-r--r--src/mame/drivers/5clown.cpp22
-rw-r--r--src/mame/drivers/68ksbc.cpp18
-rw-r--r--src/mame/drivers/8080bw.cpp188
-rw-r--r--src/mame/drivers/88games.cpp16
-rw-r--r--src/mame/drivers/a2600.cpp60
-rw-r--r--src/mame/drivers/a5105.cpp12
-rw-r--r--src/mame/drivers/a51xx.cpp12
-rw-r--r--src/mame/drivers/a6809.cpp8
-rw-r--r--src/mame/drivers/a7150.cpp74
-rw-r--r--src/mame/drivers/a7800.cpp20
-rw-r--r--src/mame/drivers/aa310.cpp48
-rw-r--r--src/mame/drivers/aaa.cpp6
-rw-r--r--src/mame/drivers/abc1600.cpp96
-rw-r--r--src/mame/drivers/abc80.cpp18
-rw-r--r--src/mame/drivers/abc80x.cpp236
-rw-r--r--src/mame/drivers/ac1.cpp18
-rw-r--r--src/mame/drivers/accomm.cpp34
-rw-r--r--src/mame/drivers/ace.cpp4
-rw-r--r--src/mame/drivers/aceex.cpp4
-rw-r--r--src/mame/drivers/acefruit.cpp8
-rw-r--r--src/mame/drivers/aces1.cpp34
-rw-r--r--src/mame/drivers/acesp.cpp6
-rw-r--r--src/mame/drivers/acommand.cpp4
-rw-r--r--src/mame/drivers/acrnsys1.cpp10
-rw-r--r--src/mame/drivers/actfancr.cpp28
-rw-r--r--src/mame/drivers/acvirus.cpp4
-rw-r--r--src/mame/drivers/adam.cpp24
-rw-r--r--src/mame/drivers/adp.cpp30
-rw-r--r--src/mame/drivers/advision.cpp26
-rw-r--r--src/mame/drivers/aeroboto.cpp18
-rw-r--r--src/mame/drivers/aerofgt.cpp164
-rw-r--r--src/mame/drivers/agat.cpp22
-rw-r--r--src/mame/drivers/age_candy.cpp6
-rw-r--r--src/mame/drivers/aim65.cpp26
-rw-r--r--src/mame/drivers/aim65_40.cpp22
-rw-r--r--src/mame/drivers/airbustr.cpp26
-rw-r--r--src/mame/drivers/airraid.cpp20
-rw-r--r--src/mame/drivers/ajax.cpp20
-rw-r--r--src/mame/drivers/akaiax80.cpp12
-rw-r--r--src/mame/drivers/albazc.cpp8
-rw-r--r--src/mame/drivers/albazg.cpp16
-rw-r--r--src/mame/drivers/aleck64.cpp28
-rw-r--r--src/mame/drivers/alesis.cpp26
-rw-r--r--src/mame/drivers/alesis_qs.cpp4
-rw-r--r--src/mame/drivers/alg.cpp36
-rw-r--r--src/mame/drivers/alien.cpp4
-rw-r--r--src/mame/drivers/aliens.cpp16
-rw-r--r--src/mame/drivers/alinvade.cpp6
-rw-r--r--src/mame/drivers/allied.cpp82
-rw-r--r--src/mame/drivers/alpha68k.cpp218
-rw-r--r--src/mame/drivers/alphasma.cpp10
-rw-r--r--src/mame/drivers/alphatpx.cpp58
-rw-r--r--src/mame/drivers/alphatro.cpp30
-rw-r--r--src/mame/drivers/altair.cpp22
-rw-r--r--src/mame/drivers/alto2.cpp10
-rw-r--r--src/mame/drivers/altos2.cpp26
-rw-r--r--src/mame/drivers/altos486.cpp120
-rw-r--r--src/mame/drivers/altos5.cpp62
-rw-r--r--src/mame/drivers/altos8600.cpp78
-rw-r--r--src/mame/drivers/alvg.cpp4
-rw-r--r--src/mame/drivers/amaticmg.cpp24
-rw-r--r--src/mame/drivers/ambush.cpp34
-rw-r--r--src/mame/drivers/amerihok.cpp8
-rw-r--r--src/mame/drivers/amico2k.cpp12
-rw-r--r--src/mame/drivers/amiga.cpp190
-rw-r--r--src/mame/drivers/ampex.cpp14
-rw-r--r--src/mame/drivers/ampoker2.cpp10
-rw-r--r--src/mame/drivers/ampro.cpp26
-rw-r--r--src/mame/drivers/ampscarp.cpp4
-rw-r--r--src/mame/drivers/amspdwy.cpp12
-rw-r--r--src/mame/drivers/amstr_pc.cpp39
-rw-r--r--src/mame/drivers/amstrad.cpp114
-rw-r--r--src/mame/drivers/amusco.cpp32
-rw-r--r--src/mame/drivers/amust.cpp54
-rw-r--r--src/mame/drivers/anes.cpp10
-rw-r--r--src/mame/drivers/angelkds.cpp32
-rw-r--r--src/mame/drivers/anzterm.cpp4
-rw-r--r--src/mame/drivers/apc.cpp40
-rw-r--r--src/mame/drivers/apexc.cpp10
-rw-r--r--src/mame/drivers/apf.cpp28
-rw-r--r--src/mame/drivers/apogee.cpp30
-rw-r--r--src/mame/drivers/apollo.cpp68
-rw-r--r--src/mame/drivers/apple1.cpp10
-rw-r--r--src/mame/drivers/apple2.cpp36
-rw-r--r--src/mame/drivers/apple2e.cpp86
-rw-r--r--src/mame/drivers/apple2gs.cpp78
-rw-r--r--src/mame/drivers/apple3.cpp52
-rw-r--r--src/mame/drivers/applix.cpp44
-rw-r--r--src/mame/drivers/appoooh.cpp30
-rw-r--r--src/mame/drivers/apricot.cpp90
-rw-r--r--src/mame/drivers/apricotf.cpp16
-rw-r--r--src/mame/drivers/apricotp.cpp40
-rw-r--r--src/mame/drivers/aquarium.cpp12
-rw-r--r--src/mame/drivers/aquarius.cpp12
-rw-r--r--src/mame/drivers/arabian.cpp40
-rw-r--r--src/mame/drivers/arachnid.cpp32
-rw-r--r--src/mame/drivers/arcadecl.cpp6
-rw-r--r--src/mame/drivers/arcadia.cpp12
-rw-r--r--src/mame/drivers/argo.cpp6
-rw-r--r--src/mame/drivers/argox.cpp6
-rw-r--r--src/mame/drivers/argus.cpp42
-rw-r--r--src/mame/drivers/aristmk4.cpp52
-rw-r--r--src/mame/drivers/aristmk5.cpp50
-rw-r--r--src/mame/drivers/aristmk6.cpp6
-rw-r--r--src/mame/drivers/arkanoid.cpp44
-rw-r--r--src/mame/drivers/armedf.cpp160
-rw-r--r--src/mame/drivers/arsystems.cpp32
-rw-r--r--src/mame/drivers/artmagic.cpp38
-rw-r--r--src/mame/drivers/ashnojoe.cpp22
-rw-r--r--src/mame/drivers/asst128.cpp15
-rw-r--r--src/mame/drivers/asterix.cpp10
-rw-r--r--src/mame/drivers/asteroid.cpp38
-rw-r--r--src/mame/drivers/astinvad.cpp28
-rw-r--r--src/mame/drivers/astrafr.cpp24
-rw-r--r--src/mame/drivers/astrcorp.cpp18
-rw-r--r--src/mame/drivers/astrocde.cpp70
-rw-r--r--src/mame/drivers/astrof.cpp14
-rw-r--r--src/mame/drivers/astrohome.cpp8
-rw-r--r--src/mame/drivers/astropc.cpp6
-rw-r--r--src/mame/drivers/asuka.cpp90
-rw-r--r--src/mame/drivers/at.cpp304
-rw-r--r--src/mame/drivers/atari400.cpp74
-rw-r--r--src/mame/drivers/atari_s1.cpp14
-rw-r--r--src/mame/drivers/atari_s2.cpp12
-rw-r--r--src/mame/drivers/atarifb.cpp22
-rw-r--r--src/mame/drivers/atarig1.cpp6
-rw-r--r--src/mame/drivers/atarig42.cpp6
-rw-r--r--src/mame/drivers/atarigt.cpp14
-rw-r--r--src/mame/drivers/atarigx2.cpp6
-rw-r--r--src/mame/drivers/atarist.cpp202
-rw-r--r--src/mame/drivers/atarisy1.cpp50
-rw-r--r--src/mame/drivers/atarisy2.cpp16
-rw-r--r--src/mame/drivers/atarisy4.cpp22
-rw-r--r--src/mame/drivers/atetris.cpp28
-rw-r--r--src/mame/drivers/atlantis.cpp62
-rw-r--r--src/mame/drivers/atm.cpp8
-rw-r--r--src/mame/drivers/atom.cpp64
-rw-r--r--src/mame/drivers/atpci.cpp66
-rw-r--r--src/mame/drivers/atronic.cpp8
-rw-r--r--src/mame/drivers/att4425.cpp50
-rw-r--r--src/mame/drivers/att630.cpp4
-rw-r--r--src/mame/drivers/attache.cpp148
-rw-r--r--src/mame/drivers/attckufo.cpp4
-rw-r--r--src/mame/drivers/atvtrack.cpp18
-rw-r--r--src/mame/drivers/aussiebyte.cpp72
-rw-r--r--src/mame/drivers/avalnche.cpp12
-rw-r--r--src/mame/drivers/avigo.cpp32
-rw-r--r--src/mame/drivers/avt.cpp18
-rw-r--r--src/mame/drivers/ax20.cpp6
-rw-r--r--src/mame/drivers/aztarac.cpp22
-rw-r--r--src/mame/drivers/b16.cpp10
-rw-r--r--src/mame/drivers/b2m.cpp40
-rw-r--r--src/mame/drivers/babbage.cpp18
-rw-r--r--src/mame/drivers/backfire.cpp8
-rw-r--r--src/mame/drivers/badlands.cpp10
-rw-r--r--src/mame/drivers/badlandsbl.cpp10
-rw-r--r--src/mame/drivers/bagman.cpp86
-rw-r--r--src/mame/drivers/balsente.cpp32
-rw-r--r--src/mame/drivers/banctec.cpp8
-rw-r--r--src/mame/drivers/bankp.cpp14
-rw-r--r--src/mame/drivers/baraduke.cpp14
-rw-r--r--src/mame/drivers/barata.cpp10
-rw-r--r--src/mame/drivers/barni.cpp12
-rw-r--r--src/mame/drivers/bartop52.cpp6
-rw-r--r--src/mame/drivers/basic52.cpp24
-rw-r--r--src/mame/drivers/batman.cpp4
-rw-r--r--src/mame/drivers/battlane.cpp12
-rw-r--r--src/mame/drivers/battlera.cpp26
-rw-r--r--src/mame/drivers/battlex.cpp16
-rw-r--r--src/mame/drivers/battlnts.cpp14
-rw-r--r--src/mame/drivers/bbc.cpp236
-rw-r--r--src/mame/drivers/bbcbc.cpp10
-rw-r--r--src/mame/drivers/bbusters.cpp34
-rw-r--r--src/mame/drivers/bcs3.cpp20
-rw-r--r--src/mame/drivers/beaminv.cpp6
-rw-r--r--src/mame/drivers/beathead.cpp4
-rw-r--r--src/mame/drivers/bebox.cpp56
-rw-r--r--src/mame/drivers/beehive.cpp6
-rw-r--r--src/mame/drivers/beezer.cpp46
-rw-r--r--src/mame/drivers/belatra.cpp4
-rw-r--r--src/mame/drivers/berzerk.cpp14
-rw-r--r--src/mame/drivers/besta.cpp4
-rw-r--r--src/mame/drivers/bestleag.cpp6
-rw-r--r--src/mame/drivers/beta.cpp14
-rw-r--r--src/mame/drivers/bfcobra.cpp30
-rw-r--r--src/mame/drivers/bfm_ad5.cpp6
-rw-r--r--src/mame/drivers/bfm_sc1.cpp30
-rw-r--r--src/mame/drivers/bfm_sc2.cpp56
-rw-r--r--src/mame/drivers/bfm_sc4.cpp224
-rw-r--r--src/mame/drivers/bfm_sc5.cpp14
-rw-r--r--src/mame/drivers/bfm_swp.cpp6
-rw-r--r--src/mame/drivers/bfmsys83.cpp6
-rw-r--r--src/mame/drivers/bfmsys85.cpp20
-rw-r--r--src/mame/drivers/bgt.cpp6
-rw-r--r--src/mame/drivers/big10.cpp10
-rw-r--r--src/mame/drivers/bigbord2.cpp50
-rw-r--r--src/mame/drivers/bigevglf.cpp34
-rw-r--r--src/mame/drivers/bigstrkb.cpp6
-rw-r--r--src/mame/drivers/binbug.cpp26
-rw-r--r--src/mame/drivers/bingo.cpp12
-rw-r--r--src/mame/drivers/bingoc.cpp16
-rw-r--r--src/mame/drivers/bingoman.cpp6
-rw-r--r--src/mame/drivers/bingor.cpp30
-rw-r--r--src/mame/drivers/bingowav.cpp18
-rw-r--r--src/mame/drivers/bionicc.cpp20
-rw-r--r--src/mame/drivers/bishi.cpp6
-rw-r--r--src/mame/drivers/bitgraph.cpp102
-rw-r--r--src/mame/drivers/bk.cpp10
-rw-r--r--src/mame/drivers/bking.cpp32
-rw-r--r--src/mame/drivers/blackt96.cpp20
-rw-r--r--src/mame/drivers/bladestl.cpp32
-rw-r--r--src/mame/drivers/blitz68k.cpp64
-rw-r--r--src/mame/drivers/blktiger.cpp30
-rw-r--r--src/mame/drivers/blmbycar.cpp10
-rw-r--r--src/mame/drivers/blockade.cpp10
-rw-r--r--src/mame/drivers/blockhl.cpp10
-rw-r--r--src/mame/drivers/blockout.cpp14
-rw-r--r--src/mame/drivers/blocktax.cpp2
-rw-r--r--src/mame/drivers/bloodbro.cpp46
-rw-r--r--src/mame/drivers/blstroid.cpp6
-rw-r--r--src/mame/drivers/blueprnt.cpp28
-rw-r--r--src/mame/drivers/bmcbowl.cpp22
-rw-r--r--src/mame/drivers/bmcpokr.cpp10
-rw-r--r--src/mame/drivers/bmjr.cpp8
-rw-r--r--src/mame/drivers/bml3.cpp40
-rw-r--r--src/mame/drivers/bnstars.cpp14
-rw-r--r--src/mame/drivers/bntyhunt.cpp4
-rw-r--r--src/mame/drivers/bob85.cpp10
-rw-r--r--src/mame/drivers/bogeyman.cpp12
-rw-r--r--src/mame/drivers/bombjack.cpp18
-rw-r--r--src/mame/drivers/boogwing.cpp14
-rw-r--r--src/mame/drivers/bottom9.cpp20
-rw-r--r--src/mame/drivers/bowltry.cpp6
-rw-r--r--src/mame/drivers/boxer.cpp4
-rw-r--r--src/mame/drivers/bpmmicro.cpp6
-rw-r--r--src/mame/drivers/br8641.cpp14
-rw-r--r--src/mame/drivers/brkthru.cpp28
-rw-r--r--src/mame/drivers/bsktball.cpp14
-rw-r--r--src/mame/drivers/btime.cpp66
-rw-r--r--src/mame/drivers/btoads.cpp12
-rw-r--r--src/mame/drivers/bublbobl.cpp74
-rw-r--r--src/mame/drivers/buggychl.cpp28
-rw-r--r--src/mame/drivers/bullet.cpp128
-rw-r--r--src/mame/drivers/busicom.cpp2
-rw-r--r--src/mame/drivers/buster.cpp8
-rw-r--r--src/mame/drivers/bw12.cpp64
-rw-r--r--src/mame/drivers/bw2.cpp38
-rw-r--r--src/mame/drivers/bwidow.cpp18
-rw-r--r--src/mame/drivers/bwing.cpp22
-rw-r--r--src/mame/drivers/by17.cpp34
-rw-r--r--src/mame/drivers/by35.cpp44
-rw-r--r--src/mame/drivers/by6803.cpp28
-rw-r--r--src/mame/drivers/by68701.cpp4
-rw-r--r--src/mame/drivers/byvid.cpp58
-rw-r--r--src/mame/drivers/bzone.cpp16
-rw-r--r--src/mame/drivers/c10.cpp6
-rw-r--r--src/mame/drivers/c128.cpp240
-rw-r--r--src/mame/drivers/c64.cpp304
-rw-r--r--src/mame/drivers/c65.cpp22
-rw-r--r--src/mame/drivers/c80.cpp14
-rw-r--r--src/mame/drivers/c900.cpp20
-rw-r--r--src/mame/drivers/cabal.cpp60
-rw-r--r--src/mame/drivers/cabaret.cpp16
-rw-r--r--src/mame/drivers/calchase.cpp30
-rw-r--r--src/mame/drivers/calcune.cpp24
-rw-r--r--src/mame/drivers/calomega.cpp62
-rw-r--r--src/mame/drivers/calorie.cpp30
-rw-r--r--src/mame/drivers/camplynx.cpp18
-rw-r--r--src/mame/drivers/candela.cpp40
-rw-r--r--src/mame/drivers/canon_s80.cpp4
-rw-r--r--src/mame/drivers/canyon.cpp16
-rw-r--r--src/mame/drivers/capbowl.cpp22
-rw-r--r--src/mame/drivers/capcom.cpp4
-rw-r--r--src/mame/drivers/capr1.cpp10
-rw-r--r--src/mame/drivers/caprcyc.cpp4
-rw-r--r--src/mame/drivers/cardline.cpp16
-rw-r--r--src/mame/drivers/carjmbre.cpp16
-rw-r--r--src/mame/drivers/carpolo.cpp38
-rw-r--r--src/mame/drivers/carrera.cpp12
-rw-r--r--src/mame/drivers/casloopy.cpp8
-rw-r--r--src/mame/drivers/castle.cpp12
-rw-r--r--src/mame/drivers/caswin.cpp10
-rw-r--r--src/mame/drivers/cat.cpp20
-rw-r--r--src/mame/drivers/cave.cpp178
-rw-r--r--src/mame/drivers/cavepc.cpp6
-rw-r--r--src/mame/drivers/cb2001.cpp10
-rw-r--r--src/mame/drivers/cball.cpp4
-rw-r--r--src/mame/drivers/cbasebal.cpp12
-rw-r--r--src/mame/drivers/cbm2.cpp386
-rw-r--r--src/mame/drivers/cbuster.cpp12
-rw-r--r--src/mame/drivers/cc40.cpp10
-rw-r--r--src/mame/drivers/ccastles.cpp8
-rw-r--r--src/mame/drivers/cchance.cpp10
-rw-r--r--src/mame/drivers/cchasm.cpp22
-rw-r--r--src/mame/drivers/cclimber.cpp98
-rw-r--r--src/mame/drivers/ccs2810.cpp56
-rw-r--r--src/mame/drivers/ccs300.cpp22
-rw-r--r--src/mame/drivers/cd2650.cpp18
-rw-r--r--src/mame/drivers/cdc721.cpp10
-rw-r--r--src/mame/drivers/cdi.cpp60
-rw-r--r--src/mame/drivers/cedar_magnet.cpp24
-rw-r--r--src/mame/drivers/centiped.cpp80
-rw-r--r--src/mame/drivers/cesclass.cpp8
-rw-r--r--src/mame/drivers/cfx9850.cpp16
-rw-r--r--src/mame/drivers/cgc7900.cpp70
-rw-r--r--src/mame/drivers/cgenie.cpp22
-rw-r--r--src/mame/drivers/chaknpop.cpp14
-rw-r--r--src/mame/drivers/cham24.cpp4
-rw-r--r--src/mame/drivers/champbas.cpp124
-rw-r--r--src/mame/drivers/champbwl.cpp20
-rw-r--r--src/mame/drivers/chanbara.cpp10
-rw-r--r--src/mame/drivers/chance32.cpp8
-rw-r--r--src/mame/drivers/changela.cpp26
-rw-r--r--src/mame/drivers/channelf.cpp32
-rw-r--r--src/mame/drivers/chaos.cpp8
-rw-r--r--src/mame/drivers/cheekyms.cpp24
-rw-r--r--src/mame/drivers/chessmst.cpp50
-rw-r--r--src/mame/drivers/chesstrv.cpp12
-rw-r--r--src/mame/drivers/chexx.cpp26
-rw-r--r--src/mame/drivers/chihiro.cpp6
-rw-r--r--src/mame/drivers/chinagat.cpp56
-rw-r--r--src/mame/drivers/chinsan.cpp30
-rw-r--r--src/mame/drivers/chqflag.cpp18
-rw-r--r--src/mame/drivers/chsuper.cpp10
-rw-r--r--src/mame/drivers/cidelsa.cpp58
-rw-r--r--src/mame/drivers/cinemat.cpp44
-rw-r--r--src/mame/drivers/circus.cpp32
-rw-r--r--src/mame/drivers/circusc.cpp28
-rw-r--r--src/mame/drivers/cischeat.cpp88
-rw-r--r--src/mame/drivers/cit101.cpp68
-rw-r--r--src/mame/drivers/cit220.cpp8
-rw-r--r--src/mame/drivers/citycon.cpp20
-rw-r--r--src/mame/drivers/ckz80.cpp6
-rw-r--r--src/mame/drivers/clayshoo.cpp12
-rw-r--r--src/mame/drivers/clcd.cpp54
-rw-r--r--src/mame/drivers/cliffhgr.cpp10
-rw-r--r--src/mame/drivers/cloak.cpp22
-rw-r--r--src/mame/drivers/cloud9.cpp12
-rw-r--r--src/mame/drivers/clowndwn.cpp4
-rw-r--r--src/mame/drivers/clpoker.cpp16
-rw-r--r--src/mame/drivers/clshroad.cpp42
-rw-r--r--src/mame/drivers/cm1800.cpp12
-rw-r--r--src/mame/drivers/cmi.cpp146
-rw-r--r--src/mame/drivers/cmmb.cpp8
-rw-r--r--src/mame/drivers/cninja.cpp68
-rw-r--r--src/mame/drivers/cntsteer.cpp46
-rw-r--r--src/mame/drivers/cobra.cpp20
-rw-r--r--src/mame/drivers/coco12.cpp88
-rw-r--r--src/mame/drivers/coco3.cpp66
-rw-r--r--src/mame/drivers/cocoloco.cpp8
-rw-r--r--src/mame/drivers/codata.cpp36
-rw-r--r--src/mame/drivers/coinmstr.cpp30
-rw-r--r--src/mame/drivers/coinmvga.cpp10
-rw-r--r--src/mame/drivers/coleco.cpp18
-rw-r--r--src/mame/drivers/combatsc.cpp30
-rw-r--r--src/mame/drivers/comebaby.cpp6
-rw-r--r--src/mame/drivers/commando.cpp20
-rw-r--r--src/mame/drivers/compc.cpp27
-rw-r--r--src/mame/drivers/compgolf.cpp10
-rw-r--r--src/mame/drivers/compis.cpp88
-rw-r--r--src/mame/drivers/compucolor.cpp26
-rw-r--r--src/mame/drivers/comquest.cpp8
-rw-r--r--src/mame/drivers/comx35.cpp36
-rw-r--r--src/mame/drivers/concept.cpp44
-rw-r--r--src/mame/drivers/contra.cpp10
-rw-r--r--src/mame/drivers/controlid.cpp12
-rw-r--r--src/mame/drivers/coolpool.cpp40
-rw-r--r--src/mame/drivers/coolridr.cpp32
-rw-r--r--src/mame/drivers/cop01.cpp40
-rw-r--r--src/mame/drivers/cops.cpp32
-rw-r--r--src/mame/drivers/copsnrob.cpp4
-rw-r--r--src/mame/drivers/corona.cpp76
-rw-r--r--src/mame/drivers/cortex.cpp18
-rw-r--r--src/mame/drivers/cosmic.cpp32
-rw-r--r--src/mame/drivers/cosmicos.cpp28
-rw-r--r--src/mame/drivers/cp1.cpp20
-rw-r--r--src/mame/drivers/cps1.cpp48
-rw-r--r--src/mame/drivers/cps2.cpp20
-rw-r--r--src/mame/drivers/cps3.cpp12
-rw-r--r--src/mame/drivers/craft.cpp10
-rw-r--r--src/mame/drivers/crbaloon.cpp8
-rw-r--r--src/mame/drivers/crgolf.cpp46
-rw-r--r--src/mame/drivers/crimfght.cpp18
-rw-r--r--src/mame/drivers/crospang.cpp22
-rw-r--r--src/mame/drivers/crshrace.cpp18
-rw-r--r--src/mame/drivers/crvision.cpp44
-rw-r--r--src/mame/drivers/crystal.cpp22
-rw-r--r--src/mame/drivers/csplayh5.cpp18
-rw-r--r--src/mame/drivers/cswat.cpp8
-rw-r--r--src/mame/drivers/ct486.cpp90
-rw-r--r--src/mame/drivers/cubeqst.cpp58
-rw-r--r--src/mame/drivers/cubo.cpp42
-rw-r--r--src/mame/drivers/cultures.cpp8
-rw-r--r--src/mame/drivers/cupidon.cpp4
-rw-r--r--src/mame/drivers/cv1k.cpp16
-rw-r--r--src/mame/drivers/cvicny.cpp4
-rw-r--r--src/mame/drivers/cvs.cpp40
-rw-r--r--src/mame/drivers/cxgz80.cpp6
-rw-r--r--src/mame/drivers/cxhumax.cpp4
-rw-r--r--src/mame/drivers/cyberbal.cpp32
-rw-r--r--src/mame/drivers/cybertnk.cpp20
-rw-r--r--src/mame/drivers/cybiko.cpp44
-rw-r--r--src/mame/drivers/cybstorm.cpp4
-rw-r--r--src/mame/drivers/cyclemb.cpp24
-rw-r--r--src/mame/drivers/cz101.cpp14
-rw-r--r--src/mame/drivers/czk80.cpp18
-rw-r--r--src/mame/drivers/d400.cpp4
-rw-r--r--src/mame/drivers/d6800.cpp16
-rw-r--r--src/mame/drivers/d6809.cpp4
-rw-r--r--src/mame/drivers/d9final.cpp10
-rw-r--r--src/mame/drivers/dacholer.cpp38
-rw-r--r--src/mame/drivers/dai.cpp20
-rw-r--r--src/mame/drivers/dai3wksi.cpp20
-rw-r--r--src/mame/drivers/dambustr.cpp8
-rw-r--r--src/mame/drivers/darius.cpp38
-rw-r--r--src/mame/drivers/darkmist.cpp8
-rw-r--r--src/mame/drivers/darkseal.cpp12
-rw-r--r--src/mame/drivers/daruma.cpp8
-rw-r--r--src/mame/drivers/dassault.cpp20
-rw-r--r--src/mame/drivers/datum.cpp10
-rw-r--r--src/mame/drivers/dblcrown.cpp14
-rw-r--r--src/mame/drivers/dblewing.cpp20
-rw-r--r--src/mame/drivers/dbox.cpp26
-rw-r--r--src/mame/drivers/dbz.cpp12
-rw-r--r--src/mame/drivers/dccons.cpp20
-rw-r--r--src/mame/drivers/dcheese.cpp16
-rw-r--r--src/mame/drivers/dcon.cpp42
-rw-r--r--src/mame/drivers/dct11em.cpp4
-rw-r--r--src/mame/drivers/dday.cpp8
-rw-r--r--src/mame/drivers/ddayjlc.cpp16
-rw-r--r--src/mame/drivers/ddealer.cpp10
-rw-r--r--src/mame/drivers/ddenlovr.cpp430
-rw-r--r--src/mame/drivers/ddragon.cpp72
-rw-r--r--src/mame/drivers/ddragon3.cpp36
-rw-r--r--src/mame/drivers/ddribble.cpp30
-rw-r--r--src/mame/drivers/de_2.cpp42
-rw-r--r--src/mame/drivers/de_3.cpp10
-rw-r--r--src/mame/drivers/de_3b.cpp10
-rw-r--r--src/mame/drivers/deadang.cpp28
-rw-r--r--src/mame/drivers/dec0.cpp138
-rw-r--r--src/mame/drivers/dec8.cpp204
-rw-r--r--src/mame/drivers/deco156.cpp14
-rw-r--r--src/mame/drivers/deco32.cpp136
-rw-r--r--src/mame/drivers/deco_ld.cpp22
-rw-r--r--src/mame/drivers/deco_mlc.cpp18
-rw-r--r--src/mame/drivers/decocass.cpp22
-rw-r--r--src/mame/drivers/dectalk.cpp30
-rw-r--r--src/mame/drivers/decwritr.cpp22
-rw-r--r--src/mame/drivers/deniam.cpp22
-rw-r--r--src/mame/drivers/deshoros.cpp8
-rw-r--r--src/mame/drivers/destroyr.cpp6
-rw-r--r--src/mame/drivers/dfruit.cpp8
-rw-r--r--src/mame/drivers/dgn_beta.cpp54
-rw-r--r--src/mame/drivers/dgpix.cpp6
-rw-r--r--src/mame/drivers/diablo1300.cpp6
-rw-r--r--src/mame/drivers/didact.cpp42
-rw-r--r--src/mame/drivers/dietgo.cpp12
-rw-r--r--src/mame/drivers/digel804.cpp36
-rw-r--r--src/mame/drivers/digijet.cpp4
-rw-r--r--src/mame/drivers/dim68k.cpp6
-rw-r--r--src/mame/drivers/discoboy.cpp20
-rw-r--r--src/mame/drivers/divebomb.cpp34
-rw-r--r--src/mame/drivers/diverboy.cpp10
-rw-r--r--src/mame/drivers/djboy.cpp48
-rw-r--r--src/mame/drivers/djmain.cpp18
-rw-r--r--src/mame/drivers/dkong.cpp66
-rw-r--r--src/mame/drivers/dlair.cpp20
-rw-r--r--src/mame/drivers/dlair2.cpp8
-rw-r--r--src/mame/drivers/dm7000.cpp4
-rw-r--r--src/mame/drivers/dmax8000.cpp46
-rw-r--r--src/mame/drivers/dmndrby.cpp14
-rw-r--r--src/mame/drivers/dms5000.cpp6
-rw-r--r--src/mame/drivers/dms86.cpp40
-rw-r--r--src/mame/drivers/dmv.cpp82
-rw-r--r--src/mame/drivers/docastle.cpp44
-rw-r--r--src/mame/drivers/dogfgt.cpp14
-rw-r--r--src/mame/drivers/dolphunk.cpp12
-rw-r--r--src/mame/drivers/dominob.cpp10
-rw-r--r--src/mame/drivers/dooyong.cpp120
-rw-r--r--src/mame/drivers/dorachan.cpp8
-rw-r--r--src/mame/drivers/dotrikun.cpp6
-rw-r--r--src/mame/drivers/dps1.cpp24
-rw-r--r--src/mame/drivers/dragon.cpp74
-rw-r--r--src/mame/drivers/dragrace.cpp34
-rw-r--r--src/mame/drivers/dreambal.cpp6
-rw-r--r--src/mame/drivers/dreamwld.cpp14
-rw-r--r--src/mame/drivers/drgnmst.cpp22
-rw-r--r--src/mame/drivers/dribling.cpp20
-rw-r--r--src/mame/drivers/drmicro.cpp18
-rw-r--r--src/mame/drivers/drtomy.cpp6
-rw-r--r--src/mame/drivers/drw80pkr.cpp28
-rw-r--r--src/mame/drivers/dsb46.cpp30
-rw-r--r--src/mame/drivers/dual68.cpp10
-rw-r--r--src/mame/drivers/duet16.cpp72
-rw-r--r--src/mame/drivers/dunhuang.cpp16
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp8
-rw-r--r--src/mame/drivers/dvk_ksm.cpp34
-rw-r--r--src/mame/drivers/dwarfd.cpp24
-rw-r--r--src/mame/drivers/dynadice.cpp14
-rw-r--r--src/mame/drivers/dynamoah.cpp18
-rw-r--r--src/mame/drivers/dynax.cpp328
-rw-r--r--src/mame/drivers/dynduke.cpp30
-rw-r--r--src/mame/drivers/e100.cpp22
-rw-r--r--src/mame/drivers/eacc.cpp18
-rw-r--r--src/mame/drivers/ec184x.cpp63
-rw-r--r--src/mame/drivers/ec65.cpp8
-rw-r--r--src/mame/drivers/ecoinf1.cpp6
-rw-r--r--src/mame/drivers/ecoinf2.cpp44
-rw-r--r--src/mame/drivers/ecoinf3.cpp112
-rw-r--r--src/mame/drivers/ecoinfr.cpp14
-rw-r--r--src/mame/drivers/egghunt.cpp12
-rw-r--r--src/mame/drivers/einstein.cpp70
-rw-r--r--src/mame/drivers/electron.cpp12
-rw-r--r--src/mame/drivers/elekscmp.cpp4
-rw-r--r--src/mame/drivers/elektronmono.cpp4
-rw-r--r--src/mame/drivers/elf.cpp26
-rw-r--r--src/mame/drivers/elwro800.cpp24
-rw-r--r--src/mame/drivers/embargo.cpp8
-rw-r--r--src/mame/drivers/enigma2.cpp34
-rw-r--r--src/mame/drivers/enmirage.cpp12
-rw-r--r--src/mame/drivers/eolith.cpp32
-rw-r--r--src/mame/drivers/eolith16.cpp4
-rw-r--r--src/mame/drivers/ep64.cpp14
-rw-r--r--src/mame/drivers/epos.cpp28
-rw-r--r--src/mame/drivers/eprom.cpp22
-rw-r--r--src/mame/drivers/equites.cpp64
-rw-r--r--src/mame/drivers/ertictac.cpp22
-rw-r--r--src/mame/drivers/esd16.cpp38
-rw-r--r--src/mame/drivers/esh.cpp14
-rw-r--r--src/mame/drivers/espial.cpp18
-rw-r--r--src/mame/drivers/esprit.cpp8
-rw-r--r--src/mame/drivers/esq1.cpp24
-rw-r--r--src/mame/drivers/esq5505.cpp88
-rw-r--r--src/mame/drivers/esqasr.cpp28
-rw-r--r--src/mame/drivers/esqkt.cpp28
-rw-r--r--src/mame/drivers/esqmr.cpp12
-rw-r--r--src/mame/drivers/esripsys.cpp32
-rw-r--r--src/mame/drivers/et3400.cpp26
-rw-r--r--src/mame/drivers/eti660.cpp22
-rw-r--r--src/mame/drivers/ettrivia.cpp14
-rw-r--r--src/mame/drivers/eurocom2.cpp48
-rw-r--r--src/mame/drivers/europc.cpp22
-rw-r--r--src/mame/drivers/eva.cpp30
-rw-r--r--src/mame/drivers/excali64.cpp44
-rw-r--r--src/mame/drivers/exedexes.cpp18
-rw-r--r--src/mame/drivers/exelv.cpp48
-rw-r--r--src/mame/drivers/exerion.cpp16
-rw-r--r--src/mame/drivers/exidy.cpp36
-rw-r--r--src/mame/drivers/exidy440.cpp22
-rw-r--r--src/mame/drivers/exp85.cpp18
-rw-r--r--src/mame/drivers/expro02.cpp34
-rw-r--r--src/mame/drivers/exprraid.cpp20
-rw-r--r--src/mame/drivers/exterm.cpp20
-rw-r--r--src/mame/drivers/extrema.cpp6
-rw-r--r--src/mame/drivers/exzisus.cpp22
-rw-r--r--src/mame/drivers/ez2d.cpp4
-rw-r--r--src/mame/drivers/f-32.cpp16
-rw-r--r--src/mame/drivers/f1gp.cpp48
-rw-r--r--src/mame/drivers/famibox.cpp4
-rw-r--r--src/mame/drivers/fantland.cpp68
-rw-r--r--src/mame/drivers/fanucs15.cpp16
-rw-r--r--src/mame/drivers/fanucspmg.cpp40
-rw-r--r--src/mame/drivers/fastfred.cpp42
-rw-r--r--src/mame/drivers/fastinvaders.cpp34
-rw-r--r--src/mame/drivers/fastlane.cpp12
-rw-r--r--src/mame/drivers/fb01.cpp18
-rw-r--r--src/mame/drivers/fc100.cpp24
-rw-r--r--src/mame/drivers/fccpu30.cpp90
-rw-r--r--src/mame/drivers/fcombat.cpp14
-rw-r--r--src/mame/drivers/fcrash.cpp172
-rw-r--r--src/mame/drivers/feversoc.cpp6
-rw-r--r--src/mame/drivers/fgoal.cpp4
-rw-r--r--src/mame/drivers/fidel6502.cpp174
-rw-r--r--src/mame/drivers/fidel68k.cpp48
-rw-r--r--src/mame/drivers/fidelmcs48.cpp16
-rw-r--r--src/mame/drivers/fidelz80.cpp106
-rw-r--r--src/mame/drivers/finalizr.cpp20
-rw-r--r--src/mame/drivers/fireball.cpp16
-rw-r--r--src/mame/drivers/firebeat.cpp48
-rw-r--r--src/mame/drivers/firefox.cpp52
-rw-r--r--src/mame/drivers/firetrap.cpp38
-rw-r--r--src/mame/drivers/firetrk.cpp18
-rw-r--r--src/mame/drivers/fitfight.cpp32
-rw-r--r--src/mame/drivers/fk1.cpp46
-rw-r--r--src/mame/drivers/flicker.cpp6
-rw-r--r--src/mame/drivers/flipjack.cpp24
-rw-r--r--src/mame/drivers/flkatck.cpp14
-rw-r--r--src/mame/drivers/flower.cpp20
-rw-r--r--src/mame/drivers/flstory.cpp104
-rw-r--r--src/mame/drivers/flyball.cpp6
-rw-r--r--src/mame/drivers/fm7.cpp146
-rw-r--r--src/mame/drivers/fmtowns.cpp138
-rw-r--r--src/mame/drivers/fontwriter.cpp6
-rw-r--r--src/mame/drivers/foodf.cpp28
-rw-r--r--src/mame/drivers/force68k.cpp74
-rw-r--r--src/mame/drivers/forte2.cpp12
-rw-r--r--src/mame/drivers/fortecar.cpp16
-rw-r--r--src/mame/drivers/fp1100.cpp30
-rw-r--r--src/mame/drivers/fp200.cpp12
-rw-r--r--src/mame/drivers/fp6000.cpp6
-rw-r--r--src/mame/drivers/freekick.cpp104
-rw-r--r--src/mame/drivers/fresh.cpp6
-rw-r--r--src/mame/drivers/fromanc2.cpp58
-rw-r--r--src/mame/drivers/fromance.cpp60
-rw-r--r--src/mame/drivers/fruitpc.cpp35
-rw-r--r--src/mame/drivers/ft68m.cpp36
-rw-r--r--src/mame/drivers/funkball.cpp10
-rw-r--r--src/mame/drivers/funkybee.cpp18
-rw-r--r--src/mame/drivers/funkyjet.cpp10
-rw-r--r--src/mame/drivers/funtech.cpp10
-rw-r--r--src/mame/drivers/funworld.cpp80
-rw-r--r--src/mame/drivers/funybubl.cpp12
-rw-r--r--src/mame/drivers/fuukifg2.cpp14
-rw-r--r--src/mame/drivers/fuukifg3.cpp14
-rw-r--r--src/mame/drivers/g627.cpp14
-rw-r--r--src/mame/drivers/gaelco.cpp54
-rw-r--r--src/mame/drivers/gaelco2.cpp108
-rw-r--r--src/mame/drivers/gaelco3d.cpp72
-rw-r--r--src/mame/drivers/gaelcopc.cpp4
-rw-r--r--src/mame/drivers/gaiden.cpp60
-rw-r--r--src/mame/drivers/gal3.cpp34
-rw-r--r--src/mame/drivers/galaga.cpp214
-rw-r--r--src/mame/drivers/galastrm.cpp14
-rw-r--r--src/mame/drivers/galaxi.cpp12
-rw-r--r--src/mame/drivers/galaxia.cpp28
-rw-r--r--src/mame/drivers/galaxian.cpp302
-rw-r--r--src/mame/drivers/galaxold.cpp134
-rw-r--r--src/mame/drivers/galaxy.cpp20
-rw-r--r--src/mame/drivers/galeb.cpp6
-rw-r--r--src/mame/drivers/galgame.cpp8
-rw-r--r--src/mame/drivers/galgames.cpp20
-rw-r--r--src/mame/drivers/galivan.cpp52
-rw-r--r--src/mame/drivers/galpani2.cpp8
-rw-r--r--src/mame/drivers/galpani3.cpp6
-rw-r--r--src/mame/drivers/galpanic.cpp10
-rw-r--r--src/mame/drivers/galspnbl.cpp12
-rw-r--r--src/mame/drivers/gamate.cpp6
-rw-r--r--src/mame/drivers/gambl186.cpp8
-rw-r--r--src/mame/drivers/gamecom.cpp16
-rw-r--r--src/mame/drivers/gamecstl.cpp10
-rw-r--r--src/mame/drivers/gamecube.cpp4
-rw-r--r--src/mame/drivers/gameking.cpp6
-rw-r--r--src/mame/drivers/gameplan.cpp48
-rw-r--r--src/mame/drivers/gamepock.cpp16
-rw-r--r--src/mame/drivers/gammagic.cpp8
-rw-r--r--src/mame/drivers/gamtor.cpp6
-rw-r--r--src/mame/drivers/gaplus.cpp32
-rw-r--r--src/mame/drivers/gatron.cpp10
-rw-r--r--src/mame/drivers/gauntlet.cpp26
-rw-r--r--src/mame/drivers/gb.cpp36
-rw-r--r--src/mame/drivers/gba.cpp24
-rw-r--r--src/mame/drivers/gberet.cpp20
-rw-r--r--src/mame/drivers/gcpinbal.cpp12
-rw-r--r--src/mame/drivers/gei.cpp60
-rw-r--r--src/mame/drivers/geneve.cpp44
-rw-r--r--src/mame/drivers/geniusiq.cpp6
-rw-r--r--src/mame/drivers/genpc.cpp20
-rw-r--r--src/mame/drivers/ggconnie.cpp40
-rw-r--r--src/mame/drivers/ghosteo.cpp44
-rw-r--r--src/mame/drivers/giclassic.cpp12
-rw-r--r--src/mame/drivers/gijoe.cpp10
-rw-r--r--src/mame/drivers/gimix.cpp68
-rw-r--r--src/mame/drivers/ginganin.cpp16
-rw-r--r--src/mame/drivers/gizmondo.cpp8
-rw-r--r--src/mame/drivers/gkigt.cpp18
-rw-r--r--src/mame/drivers/gladiatr.cpp96
-rw-r--r--src/mame/drivers/glasgow.cpp14
-rw-r--r--src/mame/drivers/glass.cpp14
-rw-r--r--src/mame/drivers/globalfr.cpp4
-rw-r--r--src/mame/drivers/globalvr.cpp4
-rw-r--r--src/mame/drivers/gluck2.cpp8
-rw-r--r--src/mame/drivers/gmaster.cpp24
-rw-r--r--src/mame/drivers/gng.cpp30
-rw-r--r--src/mame/drivers/go2000.cpp14
-rw-r--r--src/mame/drivers/goal92.cpp22
-rw-r--r--src/mame/drivers/goindol.cpp14
-rw-r--r--src/mame/drivers/gokidetor.cpp24
-rw-r--r--src/mame/drivers/goldngam.cpp14
-rw-r--r--src/mame/drivers/goldnpkr.cpp148
-rw-r--r--src/mame/drivers/goldstar.cpp270
-rw-r--r--src/mame/drivers/gomoku.cpp12
-rw-r--r--src/mame/drivers/good.cpp6
-rw-r--r--src/mame/drivers/goodejan.cpp28
-rw-r--r--src/mame/drivers/gotcha.cpp8
-rw-r--r--src/mame/drivers/gottlieb.cpp24
-rw-r--r--src/mame/drivers/gotya.cpp8
-rw-r--r--src/mame/drivers/goupil.cpp56
-rw-r--r--src/mame/drivers/gp2x.cpp4
-rw-r--r--src/mame/drivers/gp32.cpp8
-rw-r--r--src/mame/drivers/gp_1.cpp20
-rw-r--r--src/mame/drivers/gp_2.cpp12
-rw-r--r--src/mame/drivers/gpworld.cpp10
-rw-r--r--src/mame/drivers/gradius3.cpp18
-rw-r--r--src/mame/drivers/grchamp.cpp38
-rw-r--r--src/mame/drivers/grfd2301.cpp6
-rw-r--r--src/mame/drivers/gridcomp.cpp22
-rw-r--r--src/mame/drivers/gridlee.cpp12
-rw-r--r--src/mame/drivers/groundfx.cpp18
-rw-r--r--src/mame/drivers/gstream.cpp16
-rw-r--r--src/mame/drivers/gstriker.cpp34
-rw-r--r--src/mame/drivers/gsword.cpp72
-rw-r--r--src/mame/drivers/gticlub.cpp34
-rw-r--r--src/mame/drivers/gts1.cpp30
-rw-r--r--src/mame/drivers/gts3.cpp28
-rw-r--r--src/mame/drivers/gts3a.cpp32
-rw-r--r--src/mame/drivers/gts80.cpp36
-rw-r--r--src/mame/drivers/gts80a.cpp40
-rw-r--r--src/mame/drivers/gts80b.cpp34
-rw-r--r--src/mame/drivers/guab.cpp42
-rw-r--r--src/mame/drivers/gumbo.cpp14
-rw-r--r--src/mame/drivers/gunbustr.cpp14
-rw-r--r--src/mame/drivers/gundealr.cpp12
-rw-r--r--src/mame/drivers/gunpey.cpp8
-rw-r--r--src/mame/drivers/gunsmoke.cpp16
-rw-r--r--src/mame/drivers/gyruss.cpp52
-rw-r--r--src/mame/drivers/h19.cpp14
-rw-r--r--src/mame/drivers/h8.cpp18
-rw-r--r--src/mame/drivers/h89.cpp12
-rw-r--r--src/mame/drivers/halleys.cpp24
-rw-r--r--src/mame/drivers/hanaawas.cpp12
-rw-r--r--src/mame/drivers/hankin.cpp46
-rw-r--r--src/mame/drivers/hapyfish.cpp4
-rw-r--r--src/mame/drivers/harddriv.cpp112
-rw-r--r--src/mame/drivers/harriet.cpp10
-rw-r--r--src/mame/drivers/hazelgr.cpp20
-rw-r--r--src/mame/drivers/hazeltin.cpp18
-rw-r--r--src/mame/drivers/hcastle.cpp16
-rw-r--r--src/mame/drivers/headonb.cpp8
-rw-r--r--src/mame/drivers/hec2hrp.cpp78
-rw-r--r--src/mame/drivers/hexion.cpp14
-rw-r--r--src/mame/drivers/hh_amis2k.cpp10
-rw-r--r--src/mame/drivers/hh_cop400.cpp170
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp532
-rw-r--r--src/mame/drivers/hh_melps4.cpp34
-rw-r--r--src/mame/drivers/hh_pic16.cpp124
-rw-r--r--src/mame/drivers/hh_sm510.cpp774
-rw-r--r--src/mame/drivers/hh_tms1k.cpp700
-rw-r--r--src/mame/drivers/hh_ucom4.cpp368
-rw-r--r--src/mame/drivers/hideseek.cpp4
-rw-r--r--src/mame/drivers/higemaru.cpp8
-rw-r--r--src/mame/drivers/highvdeo.cpp72
-rw-r--r--src/mame/drivers/hikaru.cpp12
-rw-r--r--src/mame/drivers/himesiki.cpp18
-rw-r--r--src/mame/drivers/hitme.cpp8
-rw-r--r--src/mame/drivers/hitpoker.cpp10
-rw-r--r--src/mame/drivers/hk68v10.cpp16
-rw-r--r--src/mame/drivers/hnayayoi.cpp40
-rw-r--r--src/mame/drivers/hng64.cpp8
-rw-r--r--src/mame/drivers/holeland.cpp38
-rw-r--r--src/mame/drivers/homedata.cpp96
-rw-r--r--src/mame/drivers/homelab.cpp26
-rw-r--r--src/mame/drivers/homerun.cpp28
-rw-r--r--src/mame/drivers/homez80.cpp8
-rw-r--r--src/mame/drivers/horizon.cpp34
-rw-r--r--src/mame/drivers/hornet.cpp32
-rw-r--r--src/mame/drivers/hotblock.cpp8
-rw-r--r--src/mame/drivers/hotstuff.cpp4
-rw-r--r--src/mame/drivers/hp16500.cpp28
-rw-r--r--src/mame/drivers/hp2620.cpp6
-rw-r--r--src/mame/drivers/hp2640.cpp18
-rw-r--r--src/mame/drivers/hp48.cpp24
-rw-r--r--src/mame/drivers/hp49gp.cpp8
-rw-r--r--src/mame/drivers/hp64k.cpp84
-rw-r--r--src/mame/drivers/hp700.cpp6
-rw-r--r--src/mame/drivers/hp80.cpp28
-rw-r--r--src/mame/drivers/hp9845.cpp72
-rw-r--r--src/mame/drivers/hp9k.cpp4
-rw-r--r--src/mame/drivers/hp9k_3xx.cpp182
-rw-r--r--src/mame/drivers/hp_ipc.cpp56
-rw-r--r--src/mame/drivers/hprot1.cpp26
-rw-r--r--src/mame/drivers/hpz80unk.cpp24
-rw-r--r--src/mame/drivers/ht6000.cpp8
-rw-r--r--src/mame/drivers/ht68k.cpp16
-rw-r--r--src/mame/drivers/huebler.cpp14
-rw-r--r--src/mame/drivers/hunter2.cpp28
-rw-r--r--src/mame/drivers/hvyunit.cpp48
-rw-r--r--src/mame/drivers/hx20.cpp28
-rw-r--r--src/mame/drivers/hyhoo.cpp12
-rw-r--r--src/mame/drivers/hyperscan.cpp6
-rw-r--r--src/mame/drivers/hyperspt.cpp50
-rw-r--r--src/mame/drivers/hyprduel.cpp22
-rw-r--r--src/mame/drivers/i7000.cpp18
-rw-r--r--src/mame/drivers/ibm3153.cpp6
-rw-r--r--src/mame/drivers/ibm6580.cpp82
-rw-r--r--src/mame/drivers/ibmpc.cpp42
-rw-r--r--src/mame/drivers/ibmpcjr.cpp54
-rw-r--r--src/mame/drivers/icatel.cpp16
-rw-r--r--src/mame/drivers/ice_bozopail.cpp4
-rw-r--r--src/mame/drivers/ice_tbd.cpp6
-rw-r--r--src/mame/drivers/icecold.cpp28
-rw-r--r--src/mame/drivers/ichiban.cpp10
-rw-r--r--src/mame/drivers/idsa.cpp38
-rw-r--r--src/mame/drivers/if800.cpp6
-rw-r--r--src/mame/drivers/igs009.cpp20
-rw-r--r--src/mame/drivers/igs011.cpp62
-rw-r--r--src/mame/drivers/igs017.cpp56
-rw-r--r--src/mame/drivers/igs_fear.cpp6
-rw-r--r--src/mame/drivers/igs_m027.cpp12
-rw-r--r--src/mame/drivers/igs_m036.cpp8
-rw-r--r--src/mame/drivers/igspc.cpp6
-rw-r--r--src/mame/drivers/igspoker.cpp18
-rw-r--r--src/mame/drivers/ikki.cpp14
-rw-r--r--src/mame/drivers/imds.cpp6
-rw-r--r--src/mame/drivers/imds2.cpp118
-rw-r--r--src/mame/drivers/imolagp.cpp16
-rw-r--r--src/mame/drivers/imsai.cpp10
-rw-r--r--src/mame/drivers/inder.cpp120
-rw-r--r--src/mame/drivers/inderp.cpp6
-rw-r--r--src/mame/drivers/indiana.cpp19
-rw-r--r--src/mame/drivers/indigo.cpp10
-rw-r--r--src/mame/drivers/indy_indigo2.cpp16
-rw-r--r--src/mame/drivers/instantm.cpp14
-rw-r--r--src/mame/drivers/instruct.cpp14
-rw-r--r--src/mame/drivers/inteladv.cpp4
-rw-r--r--src/mame/drivers/intellec4.cpp66
-rw-r--r--src/mame/drivers/interact.cpp12
-rw-r--r--src/mame/drivers/interpro.cpp100
-rw-r--r--src/mame/drivers/intrscti.cpp16
-rw-r--r--src/mame/drivers/intv.cpp36
-rw-r--r--src/mame/drivers/inufuku.cpp16
-rw-r--r--src/mame/drivers/invqix.cpp10
-rw-r--r--src/mame/drivers/ipc.cpp44
-rw-r--r--src/mame/drivers/ipds.cpp6
-rw-r--r--src/mame/drivers/iq151.cpp70
-rw-r--r--src/mame/drivers/iqblock.cpp10
-rw-r--r--src/mame/drivers/iqunlim.cpp4
-rw-r--r--src/mame/drivers/iris3130.cpp14
-rw-r--r--src/mame/drivers/irisha.cpp26
-rw-r--r--src/mame/drivers/irobot.cpp12
-rw-r--r--src/mame/drivers/ironhors.cpp30
-rw-r--r--src/mame/drivers/isbc.cpp200
-rw-r--r--src/mame/drivers/isbc8010.cpp40
-rw-r--r--src/mame/drivers/isbc8030.cpp26
-rw-r--r--src/mame/drivers/iskr103x.cpp20
-rw-r--r--src/mame/drivers/istellar.cpp22
-rw-r--r--src/mame/drivers/istrebiteli.cpp14
-rw-r--r--src/mame/drivers/iteagle.cpp8
-rw-r--r--src/mame/drivers/itech32.cpp48
-rw-r--r--src/mame/drivers/itech8.cpp74
-rw-r--r--src/mame/drivers/itgambl2.cpp6
-rw-r--r--src/mame/drivers/itgambl3.cpp4
-rw-r--r--src/mame/drivers/itgamble.cpp12
-rw-r--r--src/mame/drivers/itt3030.cpp24
-rw-r--r--src/mame/drivers/jack.cpp40
-rw-r--r--src/mame/drivers/jackal.cpp10
-rw-r--r--src/mame/drivers/jackie.cpp12
-rw-r--r--src/mame/drivers/jackpool.cpp14
-rw-r--r--src/mame/drivers/jade.cpp24
-rw-r--r--src/mame/drivers/jaguar.cpp64
-rw-r--r--src/mame/drivers/jailbrek.cpp12
-rw-r--r--src/mame/drivers/jalmah.cpp10
-rw-r--r--src/mame/drivers/jangou.cpp52
-rw-r--r--src/mame/drivers/jankenmn.cpp16
-rw-r--r--src/mame/drivers/jantotsu.cpp14
-rw-r--r--src/mame/drivers/jchan.cpp10
-rw-r--r--src/mame/drivers/jclub2.cpp20
-rw-r--r--src/mame/drivers/jedi.cpp14
-rw-r--r--src/mame/drivers/jeutel.cpp44
-rw-r--r--src/mame/drivers/joctronic.cpp70
-rw-r--r--src/mame/drivers/jokrwild.cpp8
-rw-r--r--src/mame/drivers/jollyjgr.cpp12
-rw-r--r--src/mame/drivers/jongkyo.cpp16
-rw-r--r--src/mame/drivers/jonos.cpp4
-rw-r--r--src/mame/drivers/joystand.cpp14
-rw-r--r--src/mame/drivers/jp.cpp40
-rw-r--r--src/mame/drivers/jpmimpct.cpp38
-rw-r--r--src/mame/drivers/jpmmps.cpp10
-rw-r--r--src/mame/drivers/jpms80.cpp10
-rw-r--r--src/mame/drivers/jpmsys5.cpp144
-rw-r--r--src/mame/drivers/jpmsys7.cpp4
-rw-r--r--src/mame/drivers/jr100.cpp16
-rw-r--r--src/mame/drivers/jr200.cpp8
-rw-r--r--src/mame/drivers/jrpacman.cpp28
-rw-r--r--src/mame/drivers/jtc.cpp26
-rw-r--r--src/mame/drivers/jubilee.cpp2
-rw-r--r--src/mame/drivers/juicebox.cpp12
-rw-r--r--src/mame/drivers/jungleyo.cpp6
-rw-r--r--src/mame/drivers/junior.cpp12
-rw-r--r--src/mame/drivers/junofrst.cpp95
-rw-r--r--src/mame/drivers/jupace.cpp22
-rw-r--r--src/mame/drivers/jupiter.cpp30
-rw-r--r--src/mame/drivers/jvh.cpp8
-rw-r--r--src/mame/drivers/k1003.cpp6
-rw-r--r--src/mame/drivers/k28.cpp14
-rw-r--r--src/mame/drivers/k8915.cpp26
-rw-r--r--src/mame/drivers/kaneko16.cpp74
-rw-r--r--src/mame/drivers/kangaroo.cpp18
-rw-r--r--src/mame/drivers/karnov.cpp46
-rw-r--r--src/mame/drivers/kas89.cpp14
-rw-r--r--src/mame/drivers/kaypro.cpp108
-rw-r--r--src/mame/drivers/kc.cpp56
-rw-r--r--src/mame/drivers/kchamp.cpp62
-rw-r--r--src/mame/drivers/kdt6.cpp94
-rw-r--r--src/mame/drivers/kenseim.cpp22
-rw-r--r--src/mame/drivers/kickgoal.cpp18
-rw-r--r--src/mame/drivers/kim1.cpp12
-rw-r--r--src/mame/drivers/kingdrby.cpp62
-rw-r--r--src/mame/drivers/kingobox.cpp52
-rw-r--r--src/mame/drivers/kingpin.cpp18
-rw-r--r--src/mame/drivers/kinst.cpp6
-rw-r--r--src/mame/drivers/kissproto.cpp4
-rw-r--r--src/mame/drivers/klax.cpp18
-rw-r--r--src/mame/drivers/kncljoe.cpp24
-rw-r--r--src/mame/drivers/koftball.cpp6
-rw-r--r--src/mame/drivers/koikoi.cpp12
-rw-r--r--src/mame/drivers/konamigq.cpp18
-rw-r--r--src/mame/drivers/konamigv.cpp22
-rw-r--r--src/mame/drivers/konamigx.cpp32
-rw-r--r--src/mame/drivers/konamim2.cpp18
-rw-r--r--src/mame/drivers/konblands.cpp16
-rw-r--r--src/mame/drivers/konendev.cpp10
-rw-r--r--src/mame/drivers/konin.cpp36
-rw-r--r--src/mame/drivers/konmedal.cpp16
-rw-r--r--src/mame/drivers/konmedal68k.cpp4
-rw-r--r--src/mame/drivers/kontest.cpp12
-rw-r--r--src/mame/drivers/kopunch.cpp22
-rw-r--r--src/mame/drivers/kramermc.cpp12
-rw-r--r--src/mame/drivers/kron.cpp8
-rw-r--r--src/mame/drivers/krz2000.cpp6
-rw-r--r--src/mame/drivers/ksayakyu.cpp24
-rw-r--r--src/mame/drivers/ksys573.cpp104
-rw-r--r--src/mame/drivers/kungfur.cpp24
-rw-r--r--src/mame/drivers/kurukuru.cpp38
-rw-r--r--src/mame/drivers/kyocera.cpp122
-rw-r--r--src/mame/drivers/kyugo.cpp52
-rw-r--r--src/mame/drivers/labyrunr.cpp12
-rw-r--r--src/mame/drivers/ladybug.cpp40
-rw-r--r--src/mame/drivers/ladyfrog.cpp22
-rw-r--r--src/mame/drivers/laser3k.cpp14
-rw-r--r--src/mame/drivers/laserbas.cpp30
-rw-r--r--src/mame/drivers/laserbat.cpp14
-rw-r--r--src/mame/drivers/lasso.cpp52
-rw-r--r--src/mame/drivers/lastbank.cpp18
-rw-r--r--src/mame/drivers/lastduel.cpp32
-rw-r--r--src/mame/drivers/lastfght.cpp6
-rw-r--r--src/mame/drivers/laz_aftrshok.cpp8
-rw-r--r--src/mame/drivers/laz_awetoss.cpp8
-rw-r--r--src/mame/drivers/laz_ribrac.cpp6
-rw-r--r--src/mame/drivers/lazercmd.cpp34
-rw-r--r--src/mame/drivers/lb186.cpp30
-rw-r--r--src/mame/drivers/lbeach.cpp4
-rw-r--r--src/mame/drivers/lc80.cpp48
-rw-r--r--src/mame/drivers/lckydraw.cpp4
-rw-r--r--src/mame/drivers/lcmate2.cpp8
-rw-r--r--src/mame/drivers/ldplayer.cpp4
-rw-r--r--src/mame/drivers/leapster.cpp6
-rw-r--r--src/mame/drivers/legionna.cpp158
-rw-r--r--src/mame/drivers/leland.cpp78
-rw-r--r--src/mame/drivers/lemmings.cpp12
-rw-r--r--src/mame/drivers/lethal.cpp10
-rw-r--r--src/mame/drivers/lethalj.cpp6
-rw-r--r--src/mame/drivers/lft.cpp6
-rw-r--r--src/mame/drivers/lg-dvd.cpp4
-rw-r--r--src/mame/drivers/lgp.cpp18
-rw-r--r--src/mame/drivers/liberate.cpp56
-rw-r--r--src/mame/drivers/liberatr.cpp20
-rw-r--r--src/mame/drivers/limenko.cpp40
-rw-r--r--src/mame/drivers/lindbergh.cpp2
-rw-r--r--src/mame/drivers/lisa.cpp46
-rw-r--r--src/mame/drivers/littlerb.cpp8
-rw-r--r--src/mame/drivers/lkage.cpp36
-rw-r--r--src/mame/drivers/llc.cpp36
-rw-r--r--src/mame/drivers/lockon.cpp26
-rw-r--r--src/mame/drivers/lola8a.cpp18
-rw-r--r--src/mame/drivers/looping.cpp46
-rw-r--r--src/mame/drivers/lordgun.cpp54
-rw-r--r--src/mame/drivers/lsasquad.cpp46
-rw-r--r--src/mame/drivers/ltcasino.cpp8
-rw-r--r--src/mame/drivers/ltd.cpp14
-rw-r--r--src/mame/drivers/luckgrln.cpp14
-rw-r--r--src/mame/drivers/lucky74.cpp26
-rw-r--r--src/mame/drivers/luckybal.cpp16
-rw-r--r--src/mame/drivers/lvcards.cpp18
-rw-r--r--src/mame/drivers/lviv.cpp32
-rw-r--r--src/mame/drivers/lwings.cpp62
-rw-r--r--src/mame/drivers/lwriter.cpp48
-rw-r--r--src/mame/drivers/lynx.cpp8
-rw-r--r--src/mame/drivers/m10.cpp30
-rw-r--r--src/mame/drivers/m107.cpp32
-rw-r--r--src/mame/drivers/m14.cpp12
-rw-r--r--src/mame/drivers/m20.cpp38
-rw-r--r--src/mame/drivers/m24.cpp39
-rw-r--r--src/mame/drivers/m3.cpp6
-rw-r--r--src/mame/drivers/m5.cpp38
-rw-r--r--src/mame/drivers/m52.cpp12
-rw-r--r--src/mame/drivers/m57.cpp6
-rw-r--r--src/mame/drivers/m58.cpp6
-rw-r--r--src/mame/drivers/m62.cpp72
-rw-r--r--src/mame/drivers/m63.cpp64
-rw-r--r--src/mame/drivers/m6805evs.cpp4
-rw-r--r--src/mame/drivers/m68705prg.cpp16
-rw-r--r--src/mame/drivers/m72.cpp158
-rw-r--r--src/mame/drivers/m79152pc.cpp36
-rw-r--r--src/mame/drivers/m79amb.cpp8
-rw-r--r--src/mame/drivers/m90.cpp76
-rw-r--r--src/mame/drivers/m92.cpp48
-rw-r--r--src/mame/drivers/mac.cpp580
-rw-r--r--src/mame/drivers/mac128.cpp30
-rw-r--r--src/mame/drivers/macp.cpp10
-rw-r--r--src/mame/drivers/macpci.cpp28
-rw-r--r--src/mame/drivers/macrossp.cpp16
-rw-r--r--src/mame/drivers/macs.cpp8
-rw-r--r--src/mame/drivers/madalien.cpp16
-rw-r--r--src/mame/drivers/madmotor.cpp12
-rw-r--r--src/mame/drivers/magic10.cpp24
-rw-r--r--src/mame/drivers/magicard.cpp14
-rw-r--r--src/mame/drivers/magicfly.cpp6
-rw-r--r--src/mame/drivers/magictg.cpp16
-rw-r--r--src/mame/drivers/magmax.cpp22
-rw-r--r--src/mame/drivers/magnum.cpp10
-rw-r--r--src/mame/drivers/magreel.cpp4
-rw-r--r--src/mame/drivers/magtouch.cpp39
-rw-r--r--src/mame/drivers/mainevt.cpp34
-rw-r--r--src/mame/drivers/mainsnk.cpp18
-rw-r--r--src/mame/drivers/majorpkr.cpp8
-rw-r--r--src/mame/drivers/malzak.cpp20
-rw-r--r--src/mame/drivers/manohman.cpp8
-rw-r--r--src/mame/drivers/mappy.cpp108
-rw-r--r--src/mame/drivers/marineb.cpp36
-rw-r--r--src/mame/drivers/marinedt.cpp10
-rw-r--r--src/mame/drivers/mario.cpp32
-rw-r--r--src/mame/drivers/markham.cpp16
-rw-r--r--src/mame/drivers/marywu.cpp24
-rw-r--r--src/mame/drivers/mastboy.cpp22
-rw-r--r--src/mame/drivers/mastboyo.cpp10
-rw-r--r--src/mame/drivers/matmania.cpp34
-rw-r--r--src/mame/drivers/maxaflex.cpp26
-rw-r--r--src/mame/drivers/maygay1b.cpp78
-rw-r--r--src/mame/drivers/maygayep.cpp6
-rw-r--r--src/mame/drivers/maygaysw.cpp4
-rw-r--r--src/mame/drivers/maygayv1.cpp40
-rw-r--r--src/mame/drivers/mazerbla.cpp66
-rw-r--r--src/mame/drivers/mbc200.cpp24
-rw-r--r--src/mame/drivers/mbc55x.cpp36
-rw-r--r--src/mame/drivers/mbee.cpp94
-rw-r--r--src/mame/drivers/mc10.cpp22
-rw-r--r--src/mame/drivers/mc1000.cpp22
-rw-r--r--src/mame/drivers/mc1502.cpp78
-rw-r--r--src/mame/drivers/mc8020.cpp18
-rw-r--r--src/mame/drivers/mc8030.cpp38
-rw-r--r--src/mame/drivers/mcatadv.cpp24
-rw-r--r--src/mame/drivers/mcb216.cpp28
-rw-r--r--src/mame/drivers/mccpm.cpp22
-rw-r--r--src/mame/drivers/mcr.cpp42
-rw-r--r--src/mame/drivers/mcr3.cpp22
-rw-r--r--src/mame/drivers/mcr68.cpp26
-rw-r--r--src/mame/drivers/meadows.cpp42
-rw-r--r--src/mame/drivers/mediagx.cpp14
-rw-r--r--src/mame/drivers/megadriv.cpp30
-rw-r--r--src/mame/drivers/megadriv_acbl.cpp4
-rw-r--r--src/mame/drivers/megadriv_rad.cpp12
-rw-r--r--src/mame/drivers/megaphx.cpp22
-rw-r--r--src/mame/drivers/megaplay.cpp24
-rw-r--r--src/mame/drivers/megasys1.cpp72
-rw-r--r--src/mame/drivers/megatech.cpp20
-rw-r--r--src/mame/drivers/megazone.cpp44
-rw-r--r--src/mame/drivers/meijinsn.cpp16
-rw-r--r--src/mame/drivers/mekd2.cpp20
-rw-r--r--src/mame/drivers/mephisto.cpp22
-rw-r--r--src/mame/drivers/mephisto_montec.cpp40
-rw-r--r--src/mame/drivers/mephistp.cpp38
-rw-r--r--src/mame/drivers/merit.cpp76
-rw-r--r--src/mame/drivers/meritm.cpp54
-rw-r--r--src/mame/drivers/mermaid.cpp36
-rw-r--r--src/mame/drivers/mes.cpp6
-rw-r--r--src/mame/drivers/metalmx.cpp24
-rw-r--r--src/mame/drivers/metlclsh.cpp12
-rw-r--r--src/mame/drivers/metlfrzr.cpp8
-rw-r--r--src/mame/drivers/metro.cpp300
-rw-r--r--src/mame/drivers/mexico86.cpp30
-rw-r--r--src/mame/drivers/meyc8080.cpp6
-rw-r--r--src/mame/drivers/meyc8088.cpp20
-rw-r--r--src/mame/drivers/mfabfz.cpp36
-rw-r--r--src/mame/drivers/mgames.cpp6
-rw-r--r--src/mame/drivers/mgavegas.cpp16
-rw-r--r--src/mame/drivers/mgolf.cpp4
-rw-r--r--src/mame/drivers/mhavoc.cpp26
-rw-r--r--src/mame/drivers/mice.cpp30
-rw-r--r--src/mame/drivers/micral.cpp20
-rw-r--r--src/mame/drivers/micro20.cpp28
-rw-r--r--src/mame/drivers/micro3d.cpp86
-rw-r--r--src/mame/drivers/microdec.cpp44
-rw-r--r--src/mame/drivers/microkit.cpp10
-rw-r--r--src/mame/drivers/micronic.cpp10
-rw-r--r--src/mame/drivers/micropin.cpp40
-rw-r--r--src/mame/drivers/microtan.cpp32
-rw-r--r--src/mame/drivers/microterm.cpp36
-rw-r--r--src/mame/drivers/microvsn.cpp26
-rw-r--r--src/mame/drivers/midas.cpp20
-rw-r--r--src/mame/drivers/midqslvr.cpp10
-rw-r--r--src/mame/drivers/midtunit.cpp6
-rw-r--r--src/mame/drivers/midvunit.cpp10
-rw-r--r--src/mame/drivers/midwunit.cpp4
-rw-r--r--src/mame/drivers/midxunit.cpp6
-rw-r--r--src/mame/drivers/midyunit.cpp36
-rw-r--r--src/mame/drivers/midzeus.cpp16
-rw-r--r--src/mame/drivers/mightyframe.cpp4
-rw-r--r--src/mame/drivers/mikie.cpp24
-rw-r--r--src/mame/drivers/mikro80.cpp22
-rw-r--r--src/mame/drivers/mikromik.cpp62
-rw-r--r--src/mame/drivers/mikrosha.cpp28
-rw-r--r--src/mame/drivers/mil4000.cpp12
-rw-r--r--src/mame/drivers/milton6805.cpp6
-rw-r--r--src/mame/drivers/milwaukee.cpp22
-rw-r--r--src/mame/drivers/mini2440.cpp28
-rw-r--r--src/mame/drivers/miniboy7.cpp16
-rw-r--r--src/mame/drivers/minicom.cpp14
-rw-r--r--src/mame/drivers/miniforce.cpp2
-rw-r--r--src/mame/drivers/miniframe.cpp14
-rw-r--r--src/mame/drivers/minitel_2_rpic.cpp14
-rw-r--r--src/mame/drivers/minivadr.cpp6
-rw-r--r--src/mame/drivers/mirage.cpp8
-rw-r--r--src/mame/drivers/mirax.cpp26
-rw-r--r--src/mame/drivers/missb2.cpp24
-rw-r--r--src/mame/drivers/missile.cpp12
-rw-r--r--src/mame/drivers/mitchell.cpp76
-rw-r--r--src/mame/drivers/mits680b.cpp18
-rw-r--r--src/mame/drivers/mjkjidai.cpp22
-rw-r--r--src/mame/drivers/mjsenpu.cpp8
-rw-r--r--src/mame/drivers/mjsister.cpp34
-rw-r--r--src/mame/drivers/mk1.cpp6
-rw-r--r--src/mame/drivers/mk14.cpp14
-rw-r--r--src/mame/drivers/mk2.cpp14
-rw-r--r--src/mame/drivers/mk85.cpp4
-rw-r--r--src/mame/drivers/mk90.cpp4
-rw-r--r--src/mame/drivers/mkit09.cpp24
-rw-r--r--src/mame/drivers/mlanding.cpp40
-rw-r--r--src/mame/drivers/mmagic.cpp8
-rw-r--r--src/mame/drivers/mmd1.cpp22
-rw-r--r--src/mame/drivers/mmm.cpp10
-rw-r--r--src/mame/drivers/mmodular.cpp32
-rw-r--r--src/mame/drivers/mod8.cpp8
-rw-r--r--src/mame/drivers/model1.cpp56
-rw-r--r--src/mame/drivers/model2.cpp158
-rw-r--r--src/mame/drivers/model3.cpp70
-rw-r--r--src/mame/drivers/modellot.cpp6
-rw-r--r--src/mame/drivers/mogura.cpp12
-rw-r--r--src/mame/drivers/mole.cpp8
-rw-r--r--src/mame/drivers/molecular.cpp20
-rw-r--r--src/mame/drivers/momoko.cpp16
-rw-r--r--src/mame/drivers/monty.cpp14
-rw-r--r--src/mame/drivers/monzagp.cpp12
-rw-r--r--src/mame/drivers/moo.cpp20
-rw-r--r--src/mame/drivers/mosaic.cpp16
-rw-r--r--src/mame/drivers/mouser.cpp26
-rw-r--r--src/mame/drivers/mpf1.cpp50
-rw-r--r--src/mame/drivers/mps1230.cpp8
-rw-r--r--src/mame/drivers/mpu12wbk.cpp6
-rw-r--r--src/mame/drivers/mpu2.cpp4
-rw-r--r--src/mame/drivers/mpu3.cpp62
-rw-r--r--src/mame/drivers/mpu4dealem.cpp8
-rw-r--r--src/mame/drivers/mpu4plasma.cpp6
-rw-r--r--src/mame/drivers/mpu4vid.cpp46
-rw-r--r--src/mame/drivers/mpu5.cpp4
-rw-r--r--src/mame/drivers/mpz80.cpp10
-rw-r--r--src/mame/drivers/mquake.cpp26
-rw-r--r--src/mame/drivers/mrdo.cpp10
-rw-r--r--src/mame/drivers/mrflea.cpp40
-rw-r--r--src/mame/drivers/mrgame.cpp38
-rw-r--r--src/mame/drivers/mrjong.cpp10
-rw-r--r--src/mame/drivers/ms0515.cpp46
-rw-r--r--src/mame/drivers/ms32.cpp16
-rw-r--r--src/mame/drivers/ms6102.cpp40
-rw-r--r--src/mame/drivers/ms9540.cpp4
-rw-r--r--src/mame/drivers/msbc1.cpp4
-rw-r--r--src/mame/drivers/msisaac.cpp22
-rw-r--r--src/mame/drivers/mstation.cpp8
-rw-r--r--src/mame/drivers/msx.cpp118
-rw-r--r--src/mame/drivers/mt735.cpp4
-rw-r--r--src/mame/drivers/mtouchxl.cpp30
-rw-r--r--src/mame/drivers/mtx.cpp26
-rw-r--r--src/mame/drivers/mugsmash.cpp10
-rw-r--r--src/mame/drivers/multfish.cpp14
-rw-r--r--src/mame/drivers/multi16.cpp8
-rw-r--r--src/mame/drivers/multi8.cpp22
-rw-r--r--src/mame/drivers/multigam.cpp16
-rw-r--r--src/mame/drivers/munchmo.cpp26
-rw-r--r--src/mame/drivers/murogem.cpp8
-rw-r--r--src/mame/drivers/murogmbl.cpp12
-rw-r--r--src/mame/drivers/mustache.cpp8
-rw-r--r--src/mame/drivers/mvme147.cpp16
-rw-r--r--src/mame/drivers/mw18w.cpp8
-rw-r--r--src/mame/drivers/mw8080bw.cpp90
-rw-r--r--src/mame/drivers/mwarr.cpp6
-rw-r--r--src/mame/drivers/mwsub.cpp8
-rw-r--r--src/mame/drivers/mx2178.cpp34
-rw-r--r--src/mame/drivers/myb3k.cpp90
-rw-r--r--src/mame/drivers/mycom.cpp26
-rw-r--r--src/mame/drivers/mystston.cpp8
-rw-r--r--src/mame/drivers/mystwarr.cpp40
-rw-r--r--src/mame/drivers/myvision.cpp16
-rw-r--r--src/mame/drivers/mz2000.cpp30
-rw-r--r--src/mame/drivers/mz2500.cpp42
-rw-r--r--src/mame/drivers/mz3500.cpp22
-rw-r--r--src/mame/drivers/mz6500.cpp6
-rw-r--r--src/mame/drivers/mz700.cpp38
-rw-r--r--src/mame/drivers/mz80.cpp22
-rw-r--r--src/mame/drivers/mzr8105.cpp4
-rw-r--r--src/mame/drivers/n64.cpp30
-rw-r--r--src/mame/drivers/n8080.cpp42
-rw-r--r--src/mame/drivers/nakajies.cpp8
-rw-r--r--src/mame/drivers/namcofl.cpp10
-rw-r--r--src/mame/drivers/namcona1.cpp24
-rw-r--r--src/mame/drivers/namconb1.cpp20
-rw-r--r--src/mame/drivers/namcond1.cpp24
-rw-r--r--src/mame/drivers/namcops2.cpp4
-rw-r--r--src/mame/drivers/namcos1.cpp36
-rw-r--r--src/mame/drivers/namcos10.cpp8
-rw-r--r--src/mame/drivers/namcos11.cpp58
-rw-r--r--src/mame/drivers/namcos12.cpp82
-rw-r--r--src/mame/drivers/namcos2.cpp164
-rw-r--r--src/mame/drivers/namcos21.cpp114
-rw-r--r--src/mame/drivers/namcos22.cpp132
-rw-r--r--src/mame/drivers/namcos23.cpp130
-rw-r--r--src/mame/drivers/namcos86.cpp56
-rw-r--r--src/mame/drivers/nanos.cpp28
-rw-r--r--src/mame/drivers/naomi.cpp58
-rw-r--r--src/mame/drivers/nascom1.cpp24
-rw-r--r--src/mame/drivers/naughtyb.cpp12
-rw-r--r--src/mame/drivers/nbmj8688.cpp114
-rw-r--r--src/mame/drivers/nbmj8891.cpp112
-rw-r--r--src/mame/drivers/nbmj8900.cpp16
-rw-r--r--src/mame/drivers/nbmj8991.cpp80
-rw-r--r--src/mame/drivers/nbmj9195.cpp200
-rw-r--r--src/mame/drivers/nc.cpp34
-rw-r--r--src/mame/drivers/nds.cpp8
-rw-r--r--src/mame/drivers/nemesis.cpp290
-rw-r--r--src/mame/drivers/neogeo.cpp30
-rw-r--r--src/mame/drivers/neogeocd.cpp12
-rw-r--r--src/mame/drivers/neoprint.cpp32
-rw-r--r--src/mame/drivers/neptunp2.cpp8
-rw-r--r--src/mame/drivers/nes.cpp16
-rw-r--r--src/mame/drivers/nes_vt.cpp58
-rw-r--r--src/mame/drivers/newbrain.cpp26
-rw-r--r--src/mame/drivers/news.cpp6
-rw-r--r--src/mame/drivers/next.cpp64
-rw-r--r--src/mame/drivers/nexus3d.cpp4
-rw-r--r--src/mame/drivers/ngen.cpp226
-rw-r--r--src/mame/drivers/ngp.cpp22
-rw-r--r--src/mame/drivers/nibble.cpp2
-rw-r--r--src/mame/drivers/nightgal.cpp58
-rw-r--r--src/mame/drivers/ninjakd2.cpp64
-rw-r--r--src/mame/drivers/ninjaw.cpp44
-rw-r--r--src/mame/drivers/nitedrvr.cpp8
-rw-r--r--src/mame/drivers/niyanpai.cpp22
-rw-r--r--src/mame/drivers/nmg5.cpp34
-rw-r--r--src/mame/drivers/nmk16.cpp222
-rw-r--r--src/mame/drivers/nmkmedal.cpp6
-rw-r--r--src/mame/drivers/nokia_3310.cpp4
-rw-r--r--src/mame/drivers/norautp.cpp114
-rw-r--r--src/mame/drivers/notechan.cpp8
-rw-r--r--src/mame/drivers/notetaker.cpp20
-rw-r--r--src/mame/drivers/nova2001.cpp64
-rw-r--r--src/mame/drivers/novag6502.cpp38
-rw-r--r--src/mame/drivers/novag68k.cpp10
-rw-r--r--src/mame/drivers/novagf8.cpp6
-rw-r--r--src/mame/drivers/novagmcs48.cpp12
-rw-r--r--src/mame/drivers/nsg6809.cpp8
-rw-r--r--src/mame/drivers/nsm.cpp4
-rw-r--r--src/mame/drivers/nsmpoker.cpp2
-rw-r--r--src/mame/drivers/nss.cpp20
-rw-r--r--src/mame/drivers/nwk-tr.cpp20
-rw-r--r--src/mame/drivers/nycaptor.cpp110
-rw-r--r--src/mame/drivers/nyny.cpp44
-rw-r--r--src/mame/drivers/ob68k1a.cpp36
-rw-r--r--src/mame/drivers/octopus.cpp124
-rw-r--r--src/mame/drivers/odyssey.cpp4
-rw-r--r--src/mame/drivers/odyssey2.cpp88
-rw-r--r--src/mame/drivers/offtwall.cpp4
-rw-r--r--src/mame/drivers/ohmygod.cpp6
-rw-r--r--src/mame/drivers/ojankohs.cpp60
-rw-r--r--src/mame/drivers/okean240.cpp54
-rw-r--r--src/mame/drivers/olibochu.cpp12
-rw-r--r--src/mame/drivers/olyboss.cpp62
-rw-r--r--src/mame/drivers/omegrace.cpp20
-rw-r--r--src/mame/drivers/ondra.cpp8
-rw-r--r--src/mame/drivers/oneshot.cpp12
-rw-r--r--src/mame/drivers/onetwo.cpp16
-rw-r--r--src/mame/drivers/onyx.cpp78
-rw-r--r--src/mame/drivers/opwolf.cpp50
-rw-r--r--src/mame/drivers/orao.cpp6
-rw-r--r--src/mame/drivers/orbit.cpp12
-rw-r--r--src/mame/drivers/oric.cpp46
-rw-r--r--src/mame/drivers/orion.cpp86
-rw-r--r--src/mame/drivers/osbexec.cpp112
-rw-r--r--src/mame/drivers/osborne1.cpp56
-rw-r--r--src/mame/drivers/osi.cpp44
-rw-r--r--src/mame/drivers/othello.cpp34
-rw-r--r--src/mame/drivers/othunder.cpp20
-rw-r--r--src/mame/drivers/otomedius.cpp4
-rw-r--r--src/mame/drivers/overdriv.cpp14
-rw-r--r--src/mame/drivers/p112.cpp6
-rw-r--r--src/mame/drivers/p2000t.cpp22
-rw-r--r--src/mame/drivers/p8k.cpp78
-rw-r--r--src/mame/drivers/pachifev.cpp10
-rw-r--r--src/mame/drivers/pacland.cpp14
-rw-r--r--src/mame/drivers/pacman.cpp174
-rw-r--r--src/mame/drivers/palm.cpp22
-rw-r--r--src/mame/drivers/palmz22.cpp22
-rw-r--r--src/mame/drivers/pandoras.cpp42
-rw-r--r--src/mame/drivers/pangofun.cpp8
-rw-r--r--src/mame/drivers/panicr.cpp6
-rw-r--r--src/mame/drivers/paradise.cpp24
-rw-r--r--src/mame/drivers/paranoia.cpp36
-rw-r--r--src/mame/drivers/parodius.cpp12
-rw-r--r--src/mame/drivers/partner.cpp28
-rw-r--r--src/mame/drivers/pasha2.cpp10
-rw-r--r--src/mame/drivers/paso1600.cpp12
-rw-r--r--src/mame/drivers/pasogo.cpp10
-rw-r--r--src/mame/drivers/pasopia.cpp30
-rw-r--r--src/mame/drivers/pasopia7.cpp42
-rw-r--r--src/mame/drivers/pass.cpp16
-rw-r--r--src/mame/drivers/pastelg.cpp24
-rw-r--r--src/mame/drivers/patapata.cpp6
-rw-r--r--src/mame/drivers/patinho_feio.cpp14
-rw-r--r--src/mame/drivers/pb1000.cpp28
-rw-r--r--src/mame/drivers/pbaction.cpp28
-rw-r--r--src/mame/drivers/pc.cpp103
-rw-r--r--src/mame/drivers/pc100.cpp44
-rw-r--r--src/mame/drivers/pc1500.cpp16
-rw-r--r--src/mame/drivers/pc1512.cpp240
-rw-r--r--src/mame/drivers/pc2000.cpp22
-rw-r--r--src/mame/drivers/pc4.cpp8
-rw-r--r--src/mame/drivers/pc6001.cpp54
-rw-r--r--src/mame/drivers/pc8001.cpp36
-rw-r--r--src/mame/drivers/pc8401a.cpp44
-rw-r--r--src/mame/drivers/pc8801.cpp54
-rw-r--r--src/mame/drivers/pc88va.cpp68
-rw-r--r--src/mame/drivers/pc9801.cpp146
-rw-r--r--src/mame/drivers/pcat_dyn.cpp63
-rw-r--r--src/mame/drivers/pcat_nit.cpp28
-rw-r--r--src/mame/drivers/pcd.cpp68
-rw-r--r--src/mame/drivers/pce.cpp56
-rw-r--r--src/mame/drivers/pce220.cpp24
-rw-r--r--src/mame/drivers/pcfx.cpp12
-rw-r--r--src/mame/drivers/pcipc.cpp12
-rw-r--r--src/mame/drivers/pcktgal.cpp20
-rw-r--r--src/mame/drivers/pcm.cpp22
-rw-r--r--src/mame/drivers/pcw.cpp48
-rw-r--r--src/mame/drivers/pcw16.cpp50
-rw-r--r--src/mame/drivers/pcxt.cpp22
-rw-r--r--src/mame/drivers/pda600.cpp6
-rw-r--r--src/mame/drivers/pdp1.cpp8
-rw-r--r--src/mame/drivers/pdp11.cpp8
-rw-r--r--src/mame/drivers/pecom.cpp14
-rw-r--r--src/mame/drivers/pegasus.cpp22
-rw-r--r--src/mame/drivers/pencil2.cpp12
-rw-r--r--src/mame/drivers/pengadvb.cpp18
-rw-r--r--src/mame/drivers/pengo.cpp44
-rw-r--r--src/mame/drivers/pentagon.cpp14
-rw-r--r--src/mame/drivers/peoplepc.cpp42
-rw-r--r--src/mame/drivers/peplus.cpp14
-rw-r--r--src/mame/drivers/pes.cpp12
-rw-r--r--src/mame/drivers/pet.cpp174
-rw-r--r--src/mame/drivers/peyper.cpp26
-rw-r--r--src/mame/drivers/pg685.cpp38
-rw-r--r--src/mame/drivers/pgm.cpp16
-rw-r--r--src/mame/drivers/pgm2.cpp18
-rw-r--r--src/mame/drivers/pgm3.cpp6
-rw-r--r--src/mame/drivers/phc25.cpp18
-rw-r--r--src/mame/drivers/phoenix.cpp28
-rw-r--r--src/mame/drivers/photon.cpp24
-rw-r--r--src/mame/drivers/photon2.cpp10
-rw-r--r--src/mame/drivers/photoply.cpp12
-rw-r--r--src/mame/drivers/phunsy.cpp14
-rw-r--r--src/mame/drivers/picno.cpp6
-rw-r--r--src/mame/drivers/piggypas.cpp24
-rw-r--r--src/mame/drivers/pimps.cpp46
-rw-r--r--src/mame/drivers/pinball2k.cpp10
-rw-r--r--src/mame/drivers/pingpong.cpp10
-rw-r--r--src/mame/drivers/pinkiri8.cpp8
-rw-r--r--src/mame/drivers/pipbug.cpp10
-rw-r--r--src/mame/drivers/pipedrm.cpp36
-rw-r--r--src/mame/drivers/pipeline.cpp22
-rw-r--r--src/mame/drivers/pirates.cpp6
-rw-r--r--src/mame/drivers/piratesh.cpp6
-rw-r--r--src/mame/drivers/pitagjr.cpp4
-rw-r--r--src/mame/drivers/pitnrun.cpp54
-rw-r--r--src/mame/drivers/pk8000.cpp24
-rw-r--r--src/mame/drivers/pk8020.cpp28
-rw-r--r--src/mame/drivers/pkscram.cpp10
-rw-r--r--src/mame/drivers/pktgaldx.cpp14
-rw-r--r--src/mame/drivers/plan80.cpp6
-rw-r--r--src/mame/drivers/play_1.cpp26
-rw-r--r--src/mame/drivers/play_2.cpp42
-rw-r--r--src/mame/drivers/play_3.cpp48
-rw-r--r--src/mame/drivers/playch10.cpp30
-rw-r--r--src/mame/drivers/playmark.cpp134
-rw-r--r--src/mame/drivers/plus4.cpp92
-rw-r--r--src/mame/drivers/pluto5.cpp4
-rw-r--r--src/mame/drivers/plygonet.cpp18
-rw-r--r--src/mame/drivers/pm68k.cpp44
-rw-r--r--src/mame/drivers/pmd85.cpp126
-rw-r--r--src/mame/drivers/pmi80.cpp6
-rw-r--r--src/mame/drivers/pntnpuzl.cpp14
-rw-r--r--src/mame/drivers/pockchal.cpp6
-rw-r--r--src/mame/drivers/pocketc.cpp86
-rw-r--r--src/mame/drivers/pockstat.cpp6
-rw-r--r--src/mame/drivers/pofo.cpp16
-rw-r--r--src/mame/drivers/poisk1.cpp50
-rw-r--r--src/mame/drivers/pokechmp.cpp14
-rw-r--r--src/mame/drivers/pokemini.cpp6
-rw-r--r--src/mame/drivers/poker72.cpp8
-rw-r--r--src/mame/drivers/polepos.cpp103
-rw-r--r--src/mame/drivers/polgar.cpp38
-rw-r--r--src/mame/drivers/policetr.cpp10
-rw-r--r--src/mame/drivers/poly.cpp22
-rw-r--r--src/mame/drivers/poly88.cpp20
-rw-r--r--src/mame/drivers/poly880.cpp18
-rw-r--r--src/mame/drivers/polyplay.cpp32
-rw-r--r--src/mame/drivers/pong.cpp6
-rw-r--r--src/mame/drivers/poolshrk.cpp8
-rw-r--r--src/mame/drivers/pooyan.cpp20
-rw-r--r--src/mame/drivers/popeye.cpp18
-rw-r--r--src/mame/drivers/popobear.cpp10
-rw-r--r--src/mame/drivers/popper.cpp12
-rw-r--r--src/mame/drivers/portrait.cpp12
-rw-r--r--src/mame/drivers/potgoldu.cpp4
-rw-r--r--src/mame/drivers/powerbal.cpp18
-rw-r--r--src/mame/drivers/powerins.cpp24
-rw-r--r--src/mame/drivers/powerstack.cpp4
-rw-r--r--src/mame/drivers/pp01.cpp26
-rw-r--r--src/mame/drivers/ppmast93.cpp20
-rw-r--r--src/mame/drivers/prehisle.cpp16
-rw-r--r--src/mame/drivers/prestige.cpp16
-rw-r--r--src/mame/drivers/primo.cpp34
-rw-r--r--src/mame/drivers/pro80.cpp6
-rw-r--r--src/mame/drivers/proconn.cpp80
-rw-r--r--src/mame/drivers/prodigy.cpp18
-rw-r--r--src/mame/drivers/prof180x.cpp6
-rw-r--r--src/mame/drivers/prof80.cpp44
-rw-r--r--src/mame/drivers/progolf.cpp16
-rw-r--r--src/mame/drivers/prophet600.cpp18
-rw-r--r--src/mame/drivers/proteus.cpp82
-rw-r--r--src/mame/drivers/proteus3.cpp50
-rw-r--r--src/mame/drivers/ps2.cpp45
-rw-r--r--src/mame/drivers/ps2sony.cpp4
-rw-r--r--src/mame/drivers/psikyo.cpp62
-rw-r--r--src/mame/drivers/psikyo4.cpp8
-rw-r--r--src/mame/drivers/psikyosh.cpp18
-rw-r--r--src/mame/drivers/psion.cpp28
-rw-r--r--src/mame/drivers/psx.cpp44
-rw-r--r--src/mame/drivers/psychic5.cpp28
-rw-r--r--src/mame/drivers/pt68k4.cpp56
-rw-r--r--src/mame/drivers/ptcsol.cpp16
-rw-r--r--src/mame/drivers/pturn.cpp28
-rw-r--r--src/mame/drivers/puckpkmn.cpp12
-rw-r--r--src/mame/drivers/pulsar.cpp34
-rw-r--r--src/mame/drivers/punchout.cpp30
-rw-r--r--src/mame/drivers/pv1000.cpp8
-rw-r--r--src/mame/drivers/pv2000.cpp10
-rw-r--r--src/mame/drivers/pv9234.cpp4
-rw-r--r--src/mame/drivers/pve500.cpp96
-rw-r--r--src/mame/drivers/pwrview.cpp12
-rw-r--r--src/mame/drivers/px4.cpp30
-rw-r--r--src/mame/drivers/px8.cpp16
-rw-r--r--src/mame/drivers/pyl601.cpp12
-rw-r--r--src/mame/drivers/pyson.cpp4
-rw-r--r--src/mame/drivers/pzletime.cpp6
-rw-r--r--src/mame/drivers/qdrmfgp.cpp16
-rw-r--r--src/mame/drivers/qix.cpp44
-rw-r--r--src/mame/drivers/ql.cpp56
-rw-r--r--src/mame/drivers/qtsbc.cpp24
-rw-r--r--src/mame/drivers/quakeat.cpp8
-rw-r--r--src/mame/drivers/quantum.cpp44
-rw-r--r--src/mame/drivers/quasar.cpp26
-rw-r--r--src/mame/drivers/queen.cpp12
-rw-r--r--src/mame/drivers/quickpick5.cpp10
-rw-r--r--src/mame/drivers/quizdna.cpp20
-rw-r--r--src/mame/drivers/quizo.cpp10
-rw-r--r--src/mame/drivers/quizpani.cpp8
-rw-r--r--src/mame/drivers/quizpun2.cpp54
-rw-r--r--src/mame/drivers/quizshow.cpp10
-rw-r--r--src/mame/drivers/qvt103.cpp8
-rw-r--r--src/mame/drivers/qvt201.cpp8
-rw-r--r--src/mame/drivers/qvt6800.cpp18
-rw-r--r--src/mame/drivers/qvt70.cpp4
-rw-r--r--src/mame/drivers/qx10.cpp60
-rw-r--r--src/mame/drivers/r2dtank.cpp32
-rw-r--r--src/mame/drivers/r2dx_v33.cpp36
-rw-r--r--src/mame/drivers/r9751.cpp8
-rw-r--r--src/mame/drivers/rabbit.cpp6
-rw-r--r--src/mame/drivers/rad_eu3a05.cpp8
-rw-r--r--src/mame/drivers/rad_eu3a14.cpp8
-rw-r--r--src/mame/drivers/radio86.cpp80
-rw-r--r--src/mame/drivers/raiden.cpp52
-rw-r--r--src/mame/drivers/raiden2.cpp54
-rw-r--r--src/mame/drivers/rainbow.cpp74
-rw-r--r--src/mame/drivers/rallyx.cpp46
-rw-r--r--src/mame/drivers/rambo.cpp8
-rw-r--r--src/mame/drivers/rampart.cpp8
-rw-r--r--src/mame/drivers/rastan.cpp18
-rw-r--r--src/mame/drivers/rastersp.cpp28
-rw-r--r--src/mame/drivers/ravens.cpp20
-rw-r--r--src/mame/drivers/rbisland.cpp34
-rw-r--r--src/mame/drivers/rbmk.cpp22
-rw-r--r--src/mame/drivers/rc702.cpp50
-rw-r--r--src/mame/drivers/rc759.cpp48
-rw-r--r--src/mame/drivers/rcorsair.cpp12
-rw-r--r--src/mame/drivers/rd100.cpp4
-rw-r--r--src/mame/drivers/rd110.cpp6
-rw-r--r--src/mame/drivers/re900.cpp20
-rw-r--r--src/mame/drivers/realbrk.cpp26
-rw-r--r--src/mame/drivers/redalert.cpp24
-rw-r--r--src/mame/drivers/redclash.cpp12
-rw-r--r--src/mame/drivers/relief.cpp8
-rw-r--r--src/mame/drivers/renegade.cpp18
-rw-r--r--src/mame/drivers/replicator.cpp10
-rw-r--r--src/mame/drivers/retofinv.cpp40
-rw-r--r--src/mame/drivers/rex6000.cpp64
-rw-r--r--src/mame/drivers/rgum.cpp6
-rw-r--r--src/mame/drivers/risc2500.cpp8
-rw-r--r--src/mame/drivers/riscpc.cpp24
-rw-r--r--src/mame/drivers/rltennis.cpp10
-rw-r--r--src/mame/drivers/rm380z.cpp12
-rw-r--r--src/mame/drivers/rmhaihai.cpp18
-rw-r--r--src/mame/drivers/rmnimbus.cpp90
-rw-r--r--src/mame/drivers/rmt32.cpp6
-rw-r--r--src/mame/drivers/rockrage.cpp12
-rw-r--r--src/mame/drivers/rocnrope.cpp20
-rw-r--r--src/mame/drivers/rohga.cpp52
-rw-r--r--src/mame/drivers/rollerg.cpp16
-rw-r--r--src/mame/drivers/rollext.cpp16
-rw-r--r--src/mame/drivers/rollrace.cpp32
-rw-r--r--src/mame/drivers/ron.cpp26
-rw-r--r--src/mame/drivers/rotaryf.cpp16
-rw-r--r--src/mame/drivers/roul.cpp14
-rw-r--r--src/mame/drivers/route16.cpp46
-rw-r--r--src/mame/drivers/rowamet.cpp12
-rw-r--r--src/mame/drivers/royalmah.cpp206
-rw-r--r--src/mame/drivers/rpunch.cpp32
-rw-r--r--src/mame/drivers/rsc55.cpp6
-rw-r--r--src/mame/drivers/rt1715.cpp12
-rw-r--r--src/mame/drivers/runaway.cpp24
-rw-r--r--src/mame/drivers/rungun.cpp12
-rw-r--r--src/mame/drivers/rvoice.cpp12
-rw-r--r--src/mame/drivers/rx78.cpp10
-rw-r--r--src/mame/drivers/rz1.cpp22
-rw-r--r--src/mame/drivers/rzone.cpp24
-rw-r--r--src/mame/drivers/s11.cpp102
-rw-r--r--src/mame/drivers/s11a.cpp102
-rw-r--r--src/mame/drivers/s11b.cpp106
-rw-r--r--src/mame/drivers/s11c.cpp72
-rw-r--r--src/mame/drivers/s3.cpp52
-rw-r--r--src/mame/drivers/s4.cpp52
-rw-r--r--src/mame/drivers/s6.cpp70
-rw-r--r--src/mame/drivers/s6a.cpp70
-rw-r--r--src/mame/drivers/s7.cpp78
-rw-r--r--src/mame/drivers/s8.cpp60
-rw-r--r--src/mame/drivers/s8a.cpp60
-rw-r--r--src/mame/drivers/s9.cpp66
-rw-r--r--src/mame/drivers/sacstate.cpp6
-rw-r--r--src/mame/drivers/safarir.cpp6
-rw-r--r--src/mame/drivers/sage2.cpp68
-rw-r--r--src/mame/drivers/sam.cpp4
-rw-r--r--src/mame/drivers/samcoupe.cpp14
-rw-r--r--src/mame/drivers/sandscrp.cpp16
-rw-r--r--src/mame/drivers/sangho.cpp16
-rw-r--r--src/mame/drivers/sanremmg.cpp4
-rw-r--r--src/mame/drivers/sanremo.cpp10
-rw-r--r--src/mame/drivers/sansa_fuze.cpp4
-rw-r--r--src/mame/drivers/sapi1.cpp32
-rw-r--r--src/mame/drivers/sartorius.cpp2
-rw-r--r--src/mame/drivers/saturn.cpp44
-rw-r--r--src/mame/drivers/sauro.cpp48
-rw-r--r--src/mame/drivers/savia84.cpp14
-rw-r--r--src/mame/drivers/savquest.cpp18
-rw-r--r--src/mame/drivers/sbasketb.cpp32
-rw-r--r--src/mame/drivers/sbc6510.cpp22
-rw-r--r--src/mame/drivers/sbowling.cpp8
-rw-r--r--src/mame/drivers/sbrain.cpp36
-rw-r--r--src/mame/drivers/sbrkout.cpp12
-rw-r--r--src/mame/drivers/sbugger.cpp10
-rw-r--r--src/mame/drivers/sc1.cpp12
-rw-r--r--src/mame/drivers/sc2.cpp16
-rw-r--r--src/mame/drivers/scobra.cpp98
-rw-r--r--src/mame/drivers/scopus.cpp36
-rw-r--r--src/mame/drivers/scorpion.cpp8
-rw-r--r--src/mame/drivers/scotrsht.cpp14
-rw-r--r--src/mame/drivers/scramble.cpp132
-rw-r--r--src/mame/drivers/scregg.cpp16
-rw-r--r--src/mame/drivers/scv.cpp20
-rw-r--r--src/mame/drivers/scyclone.cpp24
-rw-r--r--src/mame/drivers/sderby.cpp36
-rw-r--r--src/mame/drivers/sderby2.cpp18
-rw-r--r--src/mame/drivers/sdk80.cpp22
-rw-r--r--src/mame/drivers/sdk85.cpp12
-rw-r--r--src/mame/drivers/sdk86.cpp28
-rw-r--r--src/mame/drivers/seabattl.cpp22
-rw-r--r--src/mame/drivers/sealy.cpp4
-rw-r--r--src/mame/drivers/seattle.cpp52
-rw-r--r--src/mame/drivers/seattlecmp.cpp44
-rw-r--r--src/mame/drivers/segac2.cpp30
-rw-r--r--src/mame/drivers/segacoin.cpp18
-rw-r--r--src/mame/drivers/segae.cpp52
-rw-r--r--src/mame/drivers/segag80r.cpp54
-rw-r--r--src/mame/drivers/segag80v.cpp18
-rw-r--r--src/mame/drivers/segahang.cpp88
-rw-r--r--src/mame/drivers/segajw.cpp26
-rw-r--r--src/mame/drivers/segald.cpp10
-rw-r--r--src/mame/drivers/segam1.cpp26
-rw-r--r--src/mame/drivers/segaorun.cpp52
-rw-r--r--src/mame/drivers/segapico.cpp24
-rw-r--r--src/mame/drivers/segapm.cpp4
-rw-r--r--src/mame/drivers/segas16a.cpp98
-rw-r--r--src/mame/drivers/segas16b.cpp114
-rw-r--r--src/mame/drivers/segas18.cpp58
-rw-r--r--src/mame/drivers/segas24.cpp56
-rw-r--r--src/mame/drivers/segas32.cpp96
-rw-r--r--src/mame/drivers/segasp.cpp8
-rw-r--r--src/mame/drivers/segaufo.cpp76
-rw-r--r--src/mame/drivers/segaxbd.cpp104
-rw-r--r--src/mame/drivers/segaybd.cpp44
-rw-r--r--src/mame/drivers/seibucats.cpp10
-rw-r--r--src/mame/drivers/seibuspi.cpp82
-rw-r--r--src/mame/drivers/seicross.cpp28
-rw-r--r--src/mame/drivers/seicupbl.cpp16
-rw-r--r--src/mame/drivers/selz80.cpp34
-rw-r--r--src/mame/drivers/sengokmj.cpp24
-rw-r--r--src/mame/drivers/senjyo.cpp50
-rw-r--r--src/mame/drivers/seta.cpp386
-rw-r--r--src/mame/drivers/seta2.cpp98
-rw-r--r--src/mame/drivers/sf.cpp34
-rw-r--r--src/mame/drivers/sfbonus.cpp10
-rw-r--r--src/mame/drivers/sfcbox.cpp18
-rw-r--r--src/mame/drivers/sfkick.cpp22
-rw-r--r--src/mame/drivers/sg1000.cpp48
-rw-r--r--src/mame/drivers/sg1000a.cpp24
-rw-r--r--src/mame/drivers/sh4robot.cpp6
-rw-r--r--src/mame/drivers/shadfrce.cpp10
-rw-r--r--src/mame/drivers/shangha3.cpp36
-rw-r--r--src/mame/drivers/shanghai.cpp40
-rw-r--r--src/mame/drivers/shangkid.cpp74
-rw-r--r--src/mame/drivers/shaolins.cpp12
-rw-r--r--src/mame/drivers/shisen.cpp28
-rw-r--r--src/mame/drivers/shootaway2.cpp8
-rw-r--r--src/mame/drivers/shootout.cpp24
-rw-r--r--src/mame/drivers/shougi.cpp20
-rw-r--r--src/mame/drivers/shtzone.cpp4
-rw-r--r--src/mame/drivers/shuuz.cpp6
-rw-r--r--src/mame/drivers/sidearms.cpp48
-rw-r--r--src/mame/drivers/sidepckt.cpp16
-rw-r--r--src/mame/drivers/sigmab52.cpp12
-rw-r--r--src/mame/drivers/sigmab98.cpp82
-rw-r--r--src/mame/drivers/silkroad.cpp6
-rw-r--r--src/mame/drivers/silvmil.cpp14
-rw-r--r--src/mame/drivers/simpl156.cpp22
-rw-r--r--src/mame/drivers/simple_st0016.cpp18
-rw-r--r--src/mame/drivers/simpsons.cpp14
-rw-r--r--src/mame/drivers/sitcom.cpp24
-rw-r--r--src/mame/drivers/skeetsht.cpp14
-rw-r--r--src/mame/drivers/skimaxx.cpp16
-rw-r--r--src/mame/drivers/skullxbo.cpp6
-rw-r--r--src/mame/drivers/skyarmy.cpp22
-rw-r--r--src/mame/drivers/skydiver.cpp50
-rw-r--r--src/mame/drivers/skyfox.cpp14
-rw-r--r--src/mame/drivers/skykid.cpp14
-rw-r--r--src/mame/drivers/skylncr.cpp22
-rw-r--r--src/mame/drivers/skyraid.cpp8
-rw-r--r--src/mame/drivers/slapfght.cpp112
-rw-r--r--src/mame/drivers/slapshot.cpp32
-rw-r--r--src/mame/drivers/slc1.cpp8
-rw-r--r--src/mame/drivers/sleic.cpp4
-rw-r--r--src/mame/drivers/slicer.cpp50
-rw-r--r--src/mame/drivers/sliver.cpp14
-rw-r--r--src/mame/drivers/slotcarn.cpp10
-rw-r--r--src/mame/drivers/sm1800.cpp18
-rw-r--r--src/mame/drivers/sm7238.cpp52
-rw-r--r--src/mame/drivers/smc777.cpp16
-rw-r--r--src/mame/drivers/sms.cpp122
-rw-r--r--src/mame/drivers/sms_bootleg.cpp10
-rw-r--r--src/mame/drivers/smsmcorp.cpp20
-rw-r--r--src/mame/drivers/snes.cpp16
-rw-r--r--src/mame/drivers/snesb.cpp16
-rw-r--r--src/mame/drivers/snk.cpp252
-rw-r--r--src/mame/drivers/snk6502.cpp52
-rw-r--r--src/mame/drivers/snk68.cpp20
-rw-r--r--src/mame/drivers/snookr10.cpp14
-rw-r--r--src/mame/drivers/snowbros.cpp88
-rw-r--r--src/mame/drivers/socrates.cpp30
-rw-r--r--src/mame/drivers/softbox.cpp38
-rw-r--r--src/mame/drivers/solomon.cpp22
-rw-r--r--src/mame/drivers/sonson.cpp24
-rw-r--r--src/mame/drivers/sorcerer.cpp14
-rw-r--r--src/mame/drivers/sothello.cpp22
-rw-r--r--src/mame/drivers/spacefb.cpp20
-rw-r--r--src/mame/drivers/spaceg.cpp8
-rw-r--r--src/mame/drivers/spartanxtec.cpp22
-rw-r--r--src/mame/drivers/spbactn.cpp32
-rw-r--r--src/mame/drivers/spc1000.cpp18
-rw-r--r--src/mame/drivers/spc1500.cpp26
-rw-r--r--src/mame/drivers/spcforce.cpp44
-rw-r--r--src/mame/drivers/spdodgeb.cpp18
-rw-r--r--src/mame/drivers/spec128.cpp10
-rw-r--r--src/mame/drivers/special.cpp82
-rw-r--r--src/mame/drivers/specpls3.cpp6
-rw-r--r--src/mame/drivers/spectra.cpp14
-rw-r--r--src/mame/drivers/spectrum.cpp12
-rw-r--r--src/mame/drivers/speedatk.cpp12
-rw-r--r--src/mame/drivers/speedbal.cpp18
-rw-r--r--src/mame/drivers/speedspn.cpp12
-rw-r--r--src/mame/drivers/speglsht.cpp14
-rw-r--r--src/mame/drivers/spiders.cpp38
-rw-r--r--src/mame/drivers/spinb.cpp118
-rw-r--r--src/mame/drivers/spirit76.cpp16
-rw-r--r--src/mame/drivers/splash.cpp72
-rw-r--r--src/mame/drivers/splus.cpp12
-rw-r--r--src/mame/drivers/spoker.cpp28
-rw-r--r--src/mame/drivers/spool99.cpp10
-rw-r--r--src/mame/drivers/sprcros2.cpp22
-rw-r--r--src/mame/drivers/sprint2.cpp22
-rw-r--r--src/mame/drivers/sprint4.cpp16
-rw-r--r--src/mame/drivers/sprint8.cpp6
-rw-r--r--src/mame/drivers/spy.cpp20
-rw-r--r--src/mame/drivers/spyhuntertec.cpp30
-rw-r--r--src/mame/drivers/squale.cpp36
-rw-r--r--src/mame/drivers/srmp2.cpp48
-rw-r--r--src/mame/drivers/srmp5.cpp14
-rw-r--r--src/mame/drivers/srmp6.cpp6
-rw-r--r--src/mame/drivers/srumbler.cpp16
-rw-r--r--src/mame/drivers/ssem.cpp4
-rw-r--r--src/mame/drivers/ssfindo.cpp14
-rw-r--r--src/mame/drivers/sshangha.cpp16
-rw-r--r--src/mame/drivers/sshot.cpp4
-rw-r--r--src/mame/drivers/ssingles.cpp18
-rw-r--r--src/mame/drivers/sslam.cpp24
-rw-r--r--src/mame/drivers/ssozumo.cpp18
-rw-r--r--src/mame/drivers/sspeedr.cpp10
-rw-r--r--src/mame/drivers/ssrj.cpp10
-rw-r--r--src/mame/drivers/sstrangr.cpp8
-rw-r--r--src/mame/drivers/ssv.cpp114
-rw-r--r--src/mame/drivers/ssystem3.cpp12
-rw-r--r--src/mame/drivers/st17xx.cpp4
-rw-r--r--src/mame/drivers/st_mp100.cpp26
-rw-r--r--src/mame/drivers/st_mp200.cpp28
-rw-r--r--src/mame/drivers/stactics.cpp30
-rw-r--r--src/mame/drivers/stadhero.cpp14
-rw-r--r--src/mame/drivers/starcrus.cpp10
-rw-r--r--src/mame/drivers/starfire.cpp8
-rw-r--r--src/mame/drivers/stargame.cpp16
-rw-r--r--src/mame/drivers/starshp1.cpp38
-rw-r--r--src/mame/drivers/starwars.cpp48
-rw-r--r--src/mame/drivers/statriv2.cpp16
-rw-r--r--src/mame/drivers/stellafr.cpp12
-rw-r--r--src/mame/drivers/stfight.cpp44
-rw-r--r--src/mame/drivers/stlforce.cpp10
-rw-r--r--src/mame/drivers/stratos.cpp4
-rw-r--r--src/mame/drivers/strkzn.cpp12
-rw-r--r--src/mame/drivers/strnskil.cpp22
-rw-r--r--src/mame/drivers/studio2.cpp56
-rw-r--r--src/mame/drivers/stuntair.cpp28
-rw-r--r--src/mame/drivers/stv.cpp48
-rw-r--r--src/mame/drivers/su2000.cpp26
-rw-r--r--src/mame/drivers/sub.cpp22
-rw-r--r--src/mame/drivers/subhuntr.cpp12
-rw-r--r--src/mame/drivers/subs.cpp20
-rw-r--r--src/mame/drivers/subsino.cpp56
-rw-r--r--src/mame/drivers/subsino2.cpp46
-rw-r--r--src/mame/drivers/summit.cpp6
-rw-r--r--src/mame/drivers/sumt8035.cpp6
-rw-r--r--src/mame/drivers/sun1.cpp42
-rw-r--r--src/mame/drivers/sun2.cpp68
-rw-r--r--src/mame/drivers/sun3.cpp76
-rw-r--r--src/mame/drivers/sun3x.cpp56
-rw-r--r--src/mame/drivers/sun4.cpp70
-rw-r--r--src/mame/drivers/suna16.cpp96
-rw-r--r--src/mame/drivers/suna8.cpp148
-rw-r--r--src/mame/drivers/supbtime.cpp18
-rw-r--r--src/mame/drivers/supdrapo.cpp12
-rw-r--r--src/mame/drivers/supduck.cpp12
-rw-r--r--src/mame/drivers/super6.cpp48
-rw-r--r--src/mame/drivers/super80.cpp60
-rw-r--r--src/mame/drivers/superchs.cpp30
-rw-r--r--src/mame/drivers/supercrd.cpp4
-rw-r--r--src/mame/drivers/superdq.cpp12
-rw-r--r--src/mame/drivers/superqix.cpp68
-rw-r--r--src/mame/drivers/superslave.cpp74
-rw-r--r--src/mame/drivers/supertnk.cpp4
-rw-r--r--src/mame/drivers/superwng.cpp18
-rw-r--r--src/mame/drivers/supracan.cpp12
-rw-r--r--src/mame/drivers/suprgolf.cpp32
-rw-r--r--src/mame/drivers/suprloco.cpp20
-rw-r--r--src/mame/drivers/suprnova.cpp6
-rw-r--r--src/mame/drivers/suprridr.cpp20
-rw-r--r--src/mame/drivers/suprslam.cpp16
-rw-r--r--src/mame/drivers/supstarf.cpp32
-rw-r--r--src/mame/drivers/surpratk.cpp8
-rw-r--r--src/mame/drivers/sv8000.cpp32
-rw-r--r--src/mame/drivers/svi318.cpp34
-rw-r--r--src/mame/drivers/svision.cpp20
-rw-r--r--src/mame/drivers/svmu.cpp10
-rw-r--r--src/mame/drivers/swtpc.cpp120
-rw-r--r--src/mame/drivers/swtpc09.cpp50
-rw-r--r--src/mame/drivers/swyft.cpp38
-rw-r--r--src/mame/drivers/sym1.cpp40
-rw-r--r--src/mame/drivers/symbolics.cpp4
-rw-r--r--src/mame/drivers/sys2900.cpp6
-rw-r--r--src/mame/drivers/sys9002.cpp46
-rw-r--r--src/mame/drivers/systec.cpp22
-rw-r--r--src/mame/drivers/system1.cpp152
-rw-r--r--src/mame/drivers/system16.cpp174
-rw-r--r--src/mame/drivers/tagteam.cpp18
-rw-r--r--src/mame/drivers/tail2nos.cpp20
-rw-r--r--src/mame/drivers/taito.cpp46
-rw-r--r--src/mame/drivers/taito_b.cpp292
-rw-r--r--src/mame/drivers/taito_f2.cpp198
-rw-r--r--src/mame/drivers/taito_f3.cpp16
-rw-r--r--src/mame/drivers/taito_h.cpp46
-rw-r--r--src/mame/drivers/taito_l.cpp134
-rw-r--r--src/mame/drivers/taito_o.cpp6
-rw-r--r--src/mame/drivers/taito_x.cpp48
-rw-r--r--src/mame/drivers/taito_z.cpp200
-rw-r--r--src/mame/drivers/taitoair.cpp24
-rw-r--r--src/mame/drivers/taitogn.cpp34
-rw-r--r--src/mame/drivers/taitojc.cpp24
-rw-r--r--src/mame/drivers/taitopjc.cpp22
-rw-r--r--src/mame/drivers/taitosj.cpp52
-rw-r--r--src/mame/drivers/taitotx.cpp4
-rw-r--r--src/mame/drivers/taitotz.cpp16
-rw-r--r--src/mame/drivers/taitowlf.cpp8
-rw-r--r--src/mame/drivers/tamag1.cpp6
-rw-r--r--src/mame/drivers/tandy1t.cpp72
-rw-r--r--src/mame/drivers/tandy2k.cpp92
-rw-r--r--src/mame/drivers/tank8.cpp8
-rw-r--r--src/mame/drivers/tankbatt.cpp22
-rw-r--r--src/mame/drivers/tankbust.cpp22
-rw-r--r--src/mame/drivers/taotaido.cpp18
-rw-r--r--src/mame/drivers/tapatune.cpp16
-rw-r--r--src/mame/drivers/targeth.cpp10
-rw-r--r--src/mame/drivers/tasman.cpp14
-rw-r--r--src/mame/drivers/tatsumi.cpp74
-rw-r--r--src/mame/drivers/tattack.cpp10
-rw-r--r--src/mame/drivers/tavernie.cpp38
-rw-r--r--src/mame/drivers/taxidriv.cpp64
-rw-r--r--src/mame/drivers/tb303.cpp22
-rw-r--r--src/mame/drivers/tbowl.cpp28
-rw-r--r--src/mame/drivers/tceptor.cpp28
-rw-r--r--src/mame/drivers/tdv2324.cpp16
-rw-r--r--src/mame/drivers/tec1.cpp16
-rw-r--r--src/mame/drivers/techno.cpp8
-rw-r--r--src/mame/drivers/tecmo.cpp38
-rw-r--r--src/mame/drivers/tecmo16.cpp14
-rw-r--r--src/mame/drivers/tecmosys.cpp18
-rw-r--r--src/mame/drivers/tecnbras.cpp6
-rw-r--r--src/mame/drivers/tehkanwc.cpp48
-rw-r--r--src/mame/drivers/tek405x.cpp92
-rw-r--r--src/mame/drivers/tek410x.cpp6
-rw-r--r--src/mame/drivers/tek440x.cpp22
-rw-r--r--src/mame/drivers/tekxp33x.cpp8
-rw-r--r--src/mame/drivers/tempest.cpp42
-rw-r--r--src/mame/drivers/terak.cpp4
-rw-r--r--src/mame/drivers/terco.cpp4
-rw-r--r--src/mame/drivers/terracre.cpp36
-rw-r--r--src/mame/drivers/test_t400.cpp8
-rw-r--r--src/mame/drivers/testconsole.cpp14
-rw-r--r--src/mame/drivers/tetrisp2.cpp72
-rw-r--r--src/mame/drivers/tg100.cpp8
-rw-r--r--src/mame/drivers/tgtpanic.cpp8
-rw-r--r--src/mame/drivers/thayers.cpp24
-rw-r--r--src/mame/drivers/thedealr.cpp12
-rw-r--r--src/mame/drivers/thedeep.cpp24
-rw-r--r--src/mame/drivers/thepit.cpp40
-rw-r--r--src/mame/drivers/thief.cpp24
-rw-r--r--src/mame/drivers/thomson.cpp200
-rw-r--r--src/mame/drivers/thoop2.cpp14
-rw-r--r--src/mame/drivers/thunderj.cpp10
-rw-r--r--src/mame/drivers/thunderx.cpp24
-rw-r--r--src/mame/drivers/ti630.cpp12
-rw-r--r--src/mame/drivers/ti74.cpp20
-rw-r--r--src/mame/drivers/ti85.cpp48
-rw-r--r--src/mame/drivers/ti89.cpp20
-rw-r--r--src/mame/drivers/ti990_10.cpp8
-rw-r--r--src/mame/drivers/ti990_4.cpp20
-rw-r--r--src/mame/drivers/ti99_2.cpp2
-rw-r--r--src/mame/drivers/ti99_4p.cpp34
-rw-r--r--src/mame/drivers/ti99_4x.cpp164
-rw-r--r--src/mame/drivers/ti99_8.cpp106
-rw-r--r--src/mame/drivers/tiamc1.cpp20
-rw-r--r--src/mame/drivers/ticalc1x.cpp104
-rw-r--r--src/mame/drivers/tickee.cpp22
-rw-r--r--src/mame/drivers/tigeroad.cpp74
-rw-r--r--src/mame/drivers/tiki100.cpp56
-rw-r--r--src/mame/drivers/tim011.cpp10
-rw-r--r--src/mame/drivers/tim100.cpp50
-rw-r--r--src/mame/drivers/timelimt.cpp26
-rw-r--r--src/mame/drivers/timeplt.cpp34
-rw-r--r--src/mame/drivers/timetrv.cpp16
-rw-r--r--src/mame/drivers/timex.cpp20
-rw-r--r--src/mame/drivers/tispeak.cpp76
-rw-r--r--src/mame/drivers/tispellb.cpp36
-rw-r--r--src/mame/drivers/tk2000.cpp6
-rw-r--r--src/mame/drivers/tk80.cpp46
-rw-r--r--src/mame/drivers/tk80bs.cpp8
-rw-r--r--src/mame/drivers/tm990189.cpp104
-rw-r--r--src/mame/drivers/tmaster.cpp12
-rw-r--r--src/mame/drivers/tmc1800.cpp66
-rw-r--r--src/mame/drivers/tmc2000e.cpp18
-rw-r--r--src/mame/drivers/tmc600.cpp18
-rw-r--r--src/mame/drivers/tmmjprd.cpp4
-rw-r--r--src/mame/drivers/tmnt.cpp126
-rw-r--r--src/mame/drivers/tmspoker.cpp2
-rw-r--r--src/mame/drivers/tnzs.cpp102
-rw-r--r--src/mame/drivers/toaplan1.cpp142
-rw-r--r--src/mame/drivers/toaplan2.cpp202
-rw-r--r--src/mame/drivers/toki.cpp44
-rw-r--r--src/mame/drivers/tomcat.cpp36
-rw-r--r--src/mame/drivers/tonton.cpp12
-rw-r--r--src/mame/drivers/toobin.cpp6
-rw-r--r--src/mame/drivers/topspeed.cpp30
-rw-r--r--src/mame/drivers/toratora.cpp30
-rw-r--r--src/mame/drivers/tosh1000.cpp21
-rw-r--r--src/mame/drivers/tourtabl.cpp12
-rw-r--r--src/mame/drivers/tourvis.cpp28
-rw-r--r--src/mame/drivers/toypop.cpp32
-rw-r--r--src/mame/drivers/tp84.cpp40
-rw-r--r--src/mame/drivers/tr175.cpp4
-rw-r--r--src/mame/drivers/tr606.cpp2
-rw-r--r--src/mame/drivers/trackfld.cpp96
-rw-r--r--src/mame/drivers/tranz330.cpp32
-rw-r--r--src/mame/drivers/travrusa.cpp6
-rw-r--r--src/mame/drivers/tricep.cpp20
-rw-r--r--src/mame/drivers/triforce.cpp4
-rw-r--r--src/mame/drivers/triplhnt.cpp28
-rw-r--r--src/mame/drivers/trs80.cpp72
-rw-r--r--src/mame/drivers/trs80dt1.cpp18
-rw-r--r--src/mame/drivers/trs80m2.cpp98
-rw-r--r--src/mame/drivers/truco.cpp18
-rw-r--r--src/mame/drivers/trucocl.cpp8
-rw-r--r--src/mame/drivers/trvmadns.cpp8
-rw-r--r--src/mame/drivers/trvquest.cpp22
-rw-r--r--src/mame/drivers/tryout.cpp12
-rw-r--r--src/mame/drivers/ts3000.cpp6
-rw-r--r--src/mame/drivers/ts802.cpp14
-rw-r--r--src/mame/drivers/ts803.cpp24
-rw-r--r--src/mame/drivers/ts816.cpp14
-rw-r--r--src/mame/drivers/tsamurai.cpp98
-rw-r--r--src/mame/drivers/tsispch.cpp26
-rw-r--r--src/mame/drivers/ttchamp.cpp8
-rw-r--r--src/mame/drivers/tti.cpp18
-rw-r--r--src/mame/drivers/tubep.cpp104
-rw-r--r--src/mame/drivers/tugboat.cpp10
-rw-r--r--src/mame/drivers/tumbleb.cpp66
-rw-r--r--src/mame/drivers/tunhunt.cpp20
-rw-r--r--src/mame/drivers/turbo.cpp100
-rw-r--r--src/mame/drivers/turrett.cpp12
-rw-r--r--src/mame/drivers/tutankhm.cpp27
-rw-r--r--src/mame/drivers/tutor.cpp8
-rw-r--r--src/mame/drivers/tv910.cpp30
-rw-r--r--src/mame/drivers/tv912.cpp26
-rw-r--r--src/mame/drivers/tv950.cpp18
-rw-r--r--src/mame/drivers/tv955.cpp12
-rw-r--r--src/mame/drivers/tv965.cpp6
-rw-r--r--src/mame/drivers/tv990.cpp42
-rw-r--r--src/mame/drivers/tvboy.cpp30
-rw-r--r--src/mame/drivers/tvc.cpp14
-rw-r--r--src/mame/drivers/tvcapcom.cpp4
-rw-r--r--src/mame/drivers/tvgame.cpp10
-rw-r--r--src/mame/drivers/twin16.cpp36
-rw-r--r--src/mame/drivers/twincobr.cpp48
-rw-r--r--src/mame/drivers/twinkle.cpp34
-rw-r--r--src/mame/drivers/twins.cpp24
-rw-r--r--src/mame/drivers/tx0.cpp30
-rw-r--r--src/mame/drivers/tx1.cpp93
-rw-r--r--src/mame/drivers/uapce.cpp22
-rw-r--r--src/mame/drivers/uknc.cpp8
-rw-r--r--src/mame/drivers/ultraman.cpp12
-rw-r--r--src/mame/drivers/ultratnk.cpp14
-rw-r--r--src/mame/drivers/ultrsprt.cpp10
-rw-r--r--src/mame/drivers/umipoker.cpp16
-rw-r--r--src/mame/drivers/undrfire.cpp42
-rw-r--r--src/mame/drivers/unianapc.cpp4
-rw-r--r--src/mame/drivers/unichamp.cpp10
-rw-r--r--src/mame/drivers/unico.cpp22
-rw-r--r--src/mame/drivers/unior.cpp36
-rw-r--r--src/mame/drivers/unistar.cpp8
-rw-r--r--src/mame/drivers/univac.cpp30
-rw-r--r--src/mame/drivers/unixpc.cpp8
-rw-r--r--src/mame/drivers/unkhorse.cpp14
-rw-r--r--src/mame/drivers/upscope.cpp38
-rw-r--r--src/mame/drivers/usgames.cpp12
-rw-r--r--src/mame/drivers/ut88.cpp20
-rw-r--r--src/mame/drivers/uzebox.cpp10
-rw-r--r--src/mame/drivers/v100.cpp32
-rw-r--r--src/mame/drivers/v102.cpp14
-rw-r--r--src/mame/drivers/v1050.cpp94
-rw-r--r--src/mame/drivers/v6809.cpp22
-rw-r--r--src/mame/drivers/vamphalf.cpp102
-rw-r--r--src/mame/drivers/vaportra.cpp12
-rw-r--r--src/mame/drivers/vastar.cpp22
-rw-r--r--src/mame/drivers/vax11.cpp4
-rw-r--r--src/mame/drivers/vball.cpp8
-rw-r--r--src/mame/drivers/vboy.cpp6
-rw-r--r--src/mame/drivers/vc4000.cpp16
-rw-r--r--src/mame/drivers/vcombat.cpp40
-rw-r--r--src/mame/drivers/vcs80.cpp10
-rw-r--r--src/mame/drivers/vd.cpp10
-rw-r--r--src/mame/drivers/vector06.cpp38
-rw-r--r--src/mame/drivers/vector4.cpp62
-rw-r--r--src/mame/drivers/vectrex.cpp32
-rw-r--r--src/mame/drivers/vectrix.cpp6
-rw-r--r--src/mame/drivers/vega.cpp44
-rw-r--r--src/mame/drivers/vegaeo.cpp16
-rw-r--r--src/mame/drivers/vegas.cpp140
-rw-r--r--src/mame/drivers/vendetta.cpp16
-rw-r--r--src/mame/drivers/vertigo.cpp30
-rw-r--r--src/mame/drivers/vg5k.cpp8
-rw-r--r--src/mame/drivers/vgmplay.cpp58
-rw-r--r--src/mame/drivers/vic10.cpp38
-rw-r--r--src/mame/drivers/vic20.cpp102
-rw-r--r--src/mame/drivers/vicdual.cpp120
-rw-r--r--src/mame/drivers/victor9k.cpp116
-rw-r--r--src/mame/drivers/victory.cpp8
-rw-r--r--src/mame/drivers/vidbrain.cpp16
-rw-r--r--src/mame/drivers/videopin.cpp6
-rw-r--r--src/mame/drivers/videopkr.cpp80
-rw-r--r--src/mame/drivers/vigilant.cpp88
-rw-r--r--src/mame/drivers/vii.cpp6
-rw-r--r--src/mame/drivers/vindictr.cpp4
-rw-r--r--src/mame/drivers/vip.cpp40
-rw-r--r--src/mame/drivers/viper.cpp10
-rw-r--r--src/mame/drivers/vis.cpp25
-rw-r--r--src/mame/drivers/vixen.cpp48
-rw-r--r--src/mame/drivers/vk100.cpp30
-rw-r--r--src/mame/drivers/vlc.cpp10
-rw-r--r--src/mame/drivers/volfied.cpp14
-rw-r--r--src/mame/drivers/votrpss.cpp42
-rw-r--r--src/mame/drivers/votrtnt.cpp18
-rw-r--r--src/mame/drivers/voyager.cpp10
-rw-r--r--src/mame/drivers/vp101.cpp10
-rw-r--r--src/mame/drivers/vp122.cpp6
-rw-r--r--src/mame/drivers/vp415.cpp72
-rw-r--r--src/mame/drivers/vp60.cpp10
-rw-r--r--src/mame/drivers/vpoker.cpp10
-rw-r--r--src/mame/drivers/vroulet.cpp16
-rw-r--r--src/mame/drivers/vsmilepro.cpp4
-rw-r--r--src/mame/drivers/vsnes.cpp30
-rw-r--r--src/mame/drivers/vt100.cpp102
-rw-r--r--src/mame/drivers/vt220.cpp12
-rw-r--r--src/mame/drivers/vt240.cpp56
-rw-r--r--src/mame/drivers/vt320.cpp6
-rw-r--r--src/mame/drivers/vt520.cpp12
-rw-r--r--src/mame/drivers/vta2000.cpp6
-rw-r--r--src/mame/drivers/vtech1.cpp28
-rw-r--r--src/mame/drivers/vtech2.cpp10
-rw-r--r--src/mame/drivers/vtech_eu3a12.cpp2
-rw-r--r--src/mame/drivers/vtech_unk1.cpp2
-rw-r--r--src/mame/drivers/vtech_unk2.cpp2
-rw-r--r--src/mame/drivers/vulgus.cpp16
-rw-r--r--src/mame/drivers/wacky_gator.cpp34
-rw-r--r--src/mame/drivers/wallc.cpp18
-rw-r--r--src/mame/drivers/wangpc.cpp100
-rw-r--r--src/mame/drivers/wardner.cpp46
-rw-r--r--src/mame/drivers/warpsped.cpp8
-rw-r--r--src/mame/drivers/warpwarp.cpp40
-rw-r--r--src/mame/drivers/warriorb.cpp28
-rw-r--r--src/mame/drivers/wc90.cpp18
-rw-r--r--src/mame/drivers/wc90b.cpp24
-rw-r--r--src/mame/drivers/wecleman.cpp36
-rw-r--r--src/mame/drivers/welltris.cpp14
-rw-r--r--src/mame/drivers/wgp.cpp20
-rw-r--r--src/mame/drivers/wheelfir.cpp16
-rw-r--r--src/mame/drivers/white_mod.cpp4
-rw-r--r--src/mame/drivers/whitestar.cpp6
-rw-r--r--src/mame/drivers/wicat.cpp136
-rw-r--r--src/mame/drivers/wico.cpp10
-rw-r--r--src/mame/drivers/wildpkr.cpp18
-rw-r--r--src/mame/drivers/williams.cpp180
-rw-r--r--src/mame/drivers/wink.cpp32
-rw-r--r--src/mame/drivers/wiping.cpp20
-rw-r--r--src/mame/drivers/witch.cpp32
-rw-r--r--src/mame/drivers/wiz.cpp36
-rw-r--r--src/mame/drivers/wmg.cpp24
-rw-r--r--src/mame/drivers/wms.cpp12
-rw-r--r--src/mame/drivers/wolfpack.cpp8
-rw-r--r--src/mame/drivers/wpc_95.cpp8
-rw-r--r--src/mame/drivers/wpc_an.cpp22
-rw-r--r--src/mame/drivers/wpc_dcs.cpp8
-rw-r--r--src/mame/drivers/wpc_dot.cpp20
-rw-r--r--src/mame/drivers/wpc_flip1.cpp20
-rw-r--r--src/mame/drivers/wpc_flip2.cpp20
-rw-r--r--src/mame/drivers/wpc_s.cpp8
-rw-r--r--src/mame/drivers/wrally.cpp16
-rw-r--r--src/mame/drivers/wswan.cpp12
-rw-r--r--src/mame/drivers/wwfsstar.cpp8
-rw-r--r--src/mame/drivers/wyse.cpp6
-rw-r--r--src/mame/drivers/wyvernf0.cpp22
-rw-r--r--src/mame/drivers/x07.cpp8
-rw-r--r--src/mame/drivers/x1.cpp42
-rw-r--r--src/mame/drivers/x1twin.cpp36
-rw-r--r--src/mame/drivers/x68k.cpp64
-rw-r--r--src/mame/drivers/xain.cpp20
-rw-r--r--src/mame/drivers/xavix.cpp12
-rw-r--r--src/mame/drivers/xbox.cpp8
-rw-r--r--src/mame/drivers/xerox820.cpp124
-rw-r--r--src/mame/drivers/xexex.cpp8
-rw-r--r--src/mame/drivers/xmen.cpp18
-rw-r--r--src/mame/drivers/xor100.cpp60
-rw-r--r--src/mame/drivers/xorworld.cpp18
-rw-r--r--src/mame/drivers/xtheball.cpp14
-rw-r--r--src/mame/drivers/xtom3d.cpp8
-rw-r--r--src/mame/drivers/xxmissio.cpp20
-rw-r--r--src/mame/drivers/xybots.cpp6
-rw-r--r--src/mame/drivers/xyonix.cpp14
-rw-r--r--src/mame/drivers/yiear.cpp14
-rw-r--r--src/mame/drivers/ymmu100.cpp10
-rw-r--r--src/mame/drivers/yunsun16.cpp20
-rw-r--r--src/mame/drivers/yunsung8.cpp20
-rw-r--r--src/mame/drivers/yuvomz80.cpp24
-rw-r--r--src/mame/drivers/z100.cpp20
-rw-r--r--src/mame/drivers/z1013.cpp12
-rw-r--r--src/mame/drivers/z80dev.cpp6
-rw-r--r--src/mame/drivers/z80ne.cpp38
-rw-r--r--src/mame/drivers/z88.cpp18
-rw-r--r--src/mame/drivers/z9001.cpp14
-rw-r--r--src/mame/drivers/zac2650.cpp6
-rw-r--r--src/mame/drivers/zac_1.cpp20
-rw-r--r--src/mame/drivers/zac_2.cpp12
-rw-r--r--src/mame/drivers/zac_proto.cpp4
-rw-r--r--src/mame/drivers/zaccaria.cpp20
-rw-r--r--src/mame/drivers/zapcomputer.cpp6
-rw-r--r--src/mame/drivers/zaurus.cpp6
-rw-r--r--src/mame/drivers/zaxxon.cpp90
-rw-r--r--src/mame/drivers/zerozone.cpp10
-rw-r--r--src/mame/drivers/zexall.cpp4
-rw-r--r--src/mame/drivers/zms8085.cpp12
-rw-r--r--src/mame/drivers/zn.cpp168
-rw-r--r--src/mame/drivers/zodiack.cpp18
-rw-r--r--src/mame/drivers/zorba.cpp114
-rw-r--r--src/mame/drivers/zr107.cpp32
-rw-r--r--src/mame/drivers/zrt80.cpp8
-rw-r--r--src/mame/drivers/zsbc3.cpp30
-rw-r--r--src/mame/drivers/zwackery.cpp22
-rw-r--r--src/mame/drivers/zx.cpp26
-rw-r--r--src/mame/etc/korgm1.cpp8
-rw-r--r--src/mame/etc/template_device.cpp2
-rw-r--r--src/mame/etc/template_device.h2
-rw-r--r--src/mame/etc/template_driver.cpp8
-rw-r--r--src/mame/includes/msx.h4
-rw-r--r--src/mame/includes/next.h2
-rw-r--r--src/mame/includes/polepos.h59
-rw-r--r--src/mame/includes/tutankhm.h37
-rw-r--r--src/mame/includes/tx1.h103
-rw-r--r--src/mame/machine/abc80kb.cpp4
-rw-r--r--src/mame/machine/acs8600_ics.cpp144
-rw-r--r--src/mame/machine/alpha8201.cpp16
-rw-r--r--src/mame/machine/apollo.cpp140
-rw-r--r--src/mame/machine/apricotkb.cpp4
-rw-r--r--src/mame/machine/asic65.cpp8
-rw-r--r--src/mame/machine/at.cpp116
-rw-r--r--src/mame/machine/cedar_magnet_plane.cpp22
-rw-r--r--src/mame/machine/cedar_magnet_sprite.cpp30
-rw-r--r--src/mame/machine/cit101_kbd.cpp2
-rw-r--r--src/mame/machine/compiskb.cpp12
-rw-r--r--src/mame/machine/cuda.cpp4
-rw-r--r--src/mame/machine/dec_lk201.cpp6
-rw-r--r--src/mame/machine/decopincpu.cpp62
-rw-r--r--src/mame/machine/dmv_keyb.cpp8
-rw-r--r--src/mame/machine/egret.cpp4
-rw-r--r--src/mame/machine/gaelco_ds5002fp.cpp6
-rw-r--r--src/mame/machine/genpin.cpp2
-rw-r--r--src/mame/machine/hec2hrp.cpp4
-rw-r--r--src/mame/machine/hng64_net.cpp6
-rw-r--r--src/mame/machine/ibm6580_fdc.cpp18
-rw-r--r--src/mame/machine/ibm6580_kbd.cpp16
-rw-r--r--src/mame/machine/inder_sb.cpp22
-rw-r--r--src/mame/machine/inder_vid.cpp6
-rw-r--r--src/mame/machine/ioc2.cpp34
-rw-r--r--src/mame/machine/isbc_208.cpp16
-rw-r--r--src/mame/machine/isbc_215g.cpp14
-rw-r--r--src/mame/machine/iteagle_fpga.cpp26
-rw-r--r--src/mame/machine/jvs13551.cpp2
-rw-r--r--src/mame/machine/kay_kbd.cpp16
-rw-r--r--src/mame/machine/km035.cpp20
-rw-r--r--src/mame/machine/m1comm.cpp28
-rw-r--r--src/mame/machine/m20_8086.cpp8
-rw-r--r--src/mame/machine/m24_kbd.cpp14
-rw-r--r--src/mame/machine/m24_z8000.cpp14
-rw-r--r--src/mame/machine/m3comm.cpp4
-rw-r--r--src/mame/machine/mackbd.cpp14
-rw-r--r--src/mame/machine/mega32x.cpp32
-rw-r--r--src/mame/machine/megacd.cpp6
-rw-r--r--src/mame/machine/megacdcd.cpp2
-rw-r--r--src/mame/machine/megadriv.cpp54
-rw-r--r--src/mame/machine/midwayic.cpp12
-rw-r--r--src/mame/machine/mie.cpp8
-rw-r--r--src/mame/machine/mm1kb.cpp2
-rw-r--r--src/mame/machine/mmboard.cpp2
-rw-r--r--src/mame/machine/model1io.cpp24
-rw-r--r--src/mame/machine/mpu4.cpp386
-rw-r--r--src/mame/machine/ms7004.cpp16
-rw-r--r--src/mame/machine/namco50.cpp10
-rw-r--r--src/mame/machine/namco51.cpp10
-rw-r--r--src/mame/machine/namco53.cpp16
-rw-r--r--src/mame/machine/namco62.cpp10
-rw-r--r--src/mame/machine/nmk004.cpp6
-rw-r--r--src/mame/machine/pc1512kb.cpp14
-rw-r--r--src/mame/machine/pcd_kbd.cpp14
-rw-r--r--src/mame/machine/pce_cd.cpp6
-rw-r--r--src/mame/machine/pcshare.cpp26
-rw-r--r--src/mame/machine/pgmprot_igs025_igs012.cpp4
-rw-r--r--src/mame/machine/pgmprot_igs025_igs022.cpp4
-rw-r--r--src/mame/machine/pgmprot_igs025_igs028.cpp4
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.cpp20
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.cpp8
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp8
-rw-r--r--src/mame/machine/saturn_cdb.cpp4
-rw-r--r--src/mame/machine/st0016.cpp2
-rw-r--r--src/mame/machine/taito68705interface.cpp28
-rw-r--r--src/mame/machine/taitocchip.cpp34
-rw-r--r--src/mame/machine/taitosjsec.cpp10
-rw-r--r--src/mame/machine/tandy2kb.cpp8
-rw-r--r--src/mame/machine/teleprinter.cpp2
-rw-r--r--src/mame/machine/thomson.cpp26
-rw-r--r--src/mame/machine/trs80m2kb.cpp10
-rw-r--r--src/mame/machine/v1050kb.cpp10
-rw-r--r--src/mame/machine/victor9k_fdc.cpp48
-rw-r--r--src/mame/machine/victor9k_kb.cpp10
-rw-r--r--src/mame/machine/vt100_kbd.cpp8
-rw-r--r--src/mame/machine/wangpckb.cpp18
-rw-r--r--src/mame/machine/x820kb.cpp14
-rw-r--r--src/mame/machine/xbox.cpp28
-rw-r--r--src/mame/machine/xbox_pci.cpp2
-rw-r--r--src/mame/machine/zorbakbd.cpp12
-rw-r--r--src/mame/video/20pacgal.cpp2
-rw-r--r--src/mame/video/911_vdt.cpp2
-rw-r--r--src/mame/video/abc800.cpp4
-rw-r--r--src/mame/video/abc802.cpp2
-rw-r--r--src/mame/video/abc806.cpp4
-rw-r--r--src/mame/video/bfm_adr2.cpp6
-rw-r--r--src/mame/video/bfm_dm01.cpp6
-rw-r--r--src/mame/video/cgc7900.cpp2
-rw-r--r--src/mame/video/cidelsa.cpp8
-rw-r--r--src/mame/video/comx35.cpp4
-rw-r--r--src/mame/video/decodmd1.cpp16
-rw-r--r--src/mame/video/decodmd2.cpp4
-rw-r--r--src/mame/video/decodmd3.cpp4
-rw-r--r--src/mame/video/mikromik.cpp4
-rw-r--r--src/mame/video/pc_t1t.cpp8
-rw-r--r--src/mame/video/pcd.cpp20
-rw-r--r--src/mame/video/pecom.cpp2
-rw-r--r--src/mame/video/qix.cpp24
-rw-r--r--src/mame/video/tmc1800.cpp2
-rw-r--r--src/mame/video/tmc600.cpp2
-rw-r--r--src/mame/video/v1050.cpp2
-rw-r--r--src/zexall/zexall.cpp4
2781 files changed, 41698 insertions, 41805 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 9f03c3711cd..5c1260a4472 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2759,6 +2759,7 @@ files {
MAME_DIR .. "src/mame/drivers/polepos.cpp",
MAME_DIR .. "src/mame/includes/polepos.h",
MAME_DIR .. "src/mame/audio/polepos.cpp",
+ MAME_DIR .. "src/mame/audio/polepos.h",
MAME_DIR .. "src/mame/video/polepos.cpp",
MAME_DIR .. "src/mame/drivers/rallyx.cpp",
MAME_DIR .. "src/mame/includes/rallyx.h",
@@ -3929,6 +3930,7 @@ files {
MAME_DIR .. "src/mame/includes/tx1.h",
MAME_DIR .. "src/mame/machine/tx1.cpp",
MAME_DIR .. "src/mame/audio/tx1.cpp",
+ MAME_DIR .. "src/mame/audio/tx1.h",
MAME_DIR .. "src/mame/video/tx1.cpp",
}
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index 2f2d007b4d6..214c63de6a6 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -42,29 +42,29 @@ DEFINE_DEVICE_TYPE(A2BUS_AESMS, a2bus_aesms_device, "a2aesms", "Applied Engin
MACHINE_CONFIG_START(a2bus_sn76489_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r")
- MCFG_SOUND_ADD(SN1_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN1_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50)
- MCFG_SOUND_ADD(SN2_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN2_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50)
- MCFG_SOUND_ADD(SN3_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN3_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2bus_aesms_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r")
- MCFG_SOUND_ADD(SN1_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN1_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50)
- MCFG_SOUND_ADD(SN2_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN2_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50)
- MCFG_SOUND_ADD(SN3_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN3_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50)
- MCFG_SOUND_ADD(SN4_TAG, SN76489, 1020484)
+ MCFG_DEVICE_ADD(SN4_TAG, SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_r", 0.50)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index e9a15c19c74..f74aa9706c5 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -53,9 +53,9 @@ ROM_END
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 6000000) // Z80 runs at 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index 30f05377502..935ad309993 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -39,12 +39,12 @@ DEFINE_DEVICE_TYPE(A2BUS_ARCADEBOARD, a2bus_arcboard_device, "a2arcbd", "Third M
MACHINE_CONFIG_START(a2bus_arcboard_device::device_add_mconfig)
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_arcboard_device, tms_irq_w))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, a2bus_arcboard_device, tms_irq_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TMS_TAG, tms9918a_device, screen_update )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY_TAG, AY8910, 1022727)
+ MCFG_DEVICE_ADD(AY_TAG, AY8910, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index d41cd92a89e..669a63503a3 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -33,8 +33,8 @@ DEFINE_DEVICE_TYPE(A2BUS_DX1, a2bus_dx1_device, "a2dx1", "Decillonix DX-1")
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
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index 921789991e7..8516431d4e2 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ECHOII, a2bus_echoii_device, "a2echoii", "Street Electr
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_DEVICE_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)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index 82abf6fb342..6be63715d88 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -62,7 +62,7 @@ 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))
+ MCFG_NCR5380N_DRQ_HANDLER(WRITELINE("^^", a2bus_hsscsi_device, drq_w))
}
static void hsscsi_devices(device_slot_interface &device)
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index 2a7912a6a84..2b82cbc536f 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -53,7 +53,7 @@ MACHINE_CONFIG_START(a2bus_mcms1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("mcms_l", "mcms_r")
MCFG_DEVICE_ADD(ENGINE_TAG, MCMS, 1000000)
- MCFG_MCMS_IRQ_CALLBACK(WRITELINE(a2bus_mcms1_device, irq_w))
+ MCFG_MCMS_IRQ_CALLBACK(WRITELINE(*this, a2bus_mcms1_device, irq_w))
MCFG_SOUND_ROUTE(0, "mcms_l", 1.0)
MCFG_SOUND_ROUTE(1, "mcms_r", 1.0)
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index 7bd353ae51b..72f8c75ac28 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -35,19 +35,19 @@ DEFINE_DEVICE_TYPE(A2BUS_MIDI, a2bus_midi_device, "a2midi", "6850 MIDI card")
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))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, a2bus_midi_device, ptm_irq_w))
MCFG_DEVICE_ADD(MIDI_ACIA_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(a2bus_midi_device, acia_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, a2bus_midi_device, acia_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MIDI_ACIA_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MIDI_ACIA_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(a2bus_midi_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, a2bus_midi_device, write_acia_clock))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index b7eecab83b8..a6348f40314 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -40,64 +40,64 @@ DEFINE_DEVICE_TYPE(A2BUS_ECHOPLUS, a2bus_echoplus_device, "a2echop", "S
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))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(a2bus_ayboard_device, via1_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, a2bus_ayboard_device, via1_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via1_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via1_irq_w))
MCFG_DEVICE_ADD(VIA2_TAG, VIA6522, 1022727)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(a2bus_ayboard_device, via2_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via2_irq_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD(AY1_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY1_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD(AY2_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY2_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
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))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(a2bus_ayboard_device, via1_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, a2bus_ayboard_device, via1_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via1_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via1_irq_w))
MCFG_DEVICE_ADD(VIA2_TAG, VIA6522, 1022727)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(a2bus_ayboard_device, via2_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via2_irq_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2")
- MCFG_SOUND_ADD(AY1_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY1_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD(AY2_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY2_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker2", 1.0)
- MCFG_SOUND_ADD(AY3_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY3_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD(AY4_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY4_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker2", 1.0)
MACHINE_CONFIG_END
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))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(a2bus_ayboard_device, via1_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, a2bus_ayboard_device, via1_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via1_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via1_irq_w))
MCFG_DEVICE_ADD(VIA2_TAG, VIA6522, 1022727)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(a2bus_ayboard_device, via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(a2bus_ayboard_device, via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(a2bus_ayboard_device, via2_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via2_irq_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD(AY1_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY1_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD(AY2_TAG, AY8913, 1022727)
+ MCFG_DEVICE_ADD(AY2_TAG, AY8913, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_SPEAKER_STANDARD_MONO("echosp")
- MCFG_SOUND_ADD(E2P_TMS_TAG, TMS5220, 640000)
+ MCFG_DEVICE_ADD(E2P_TMS_TAG, TMS5220, 640000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "echosp", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index 48f4ee204d1..799a056ccff 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -74,7 +74,7 @@ ioport_constructor a2bus_pic_device::device_input_ports() const
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))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, a2bus_pic_device, ack_w))
MCFG_DEVICE_ADD("ctx_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("ctx_data_out", PIC_CENTRONICS_TAG)
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index 72b70433007..a497363788d 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SAM, a2bus_sam_device, "a2sam", "Don't Ask Software S.A
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 2cfd5c0f364..ef3422e9783 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -55,7 +55,7 @@ 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))
+ MCFG_NCR5380N_DRQ_HANDLER(WRITELINE("^^", a2bus_scsi_device, drq_w))
}
static void scsi_devices(device_slot_interface &device)
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index 4e04d8e0c58..bbecdfee3d7 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -38,8 +38,8 @@ void a2bus_softcard_device::z80_mem(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 1021800*2) // Z80 runs on double the Apple II's clock
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index ac5a546fc35..da5fa5ce49f 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -99,14 +99,14 @@ ioport_constructor a2bus_ssc_device::device_input_ports() const
MACHINE_CONFIG_START(a2bus_ssc_device::device_add_mconfig)
MCFG_DEVICE_ADD(SSC_ACIA_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2bus_ssc_device, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(SSC_RS232_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(SSC_RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SSC_ACIA_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2bus_ssc_device, acia_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(SSC_RS232_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(SSC_RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SSC_ACIA_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SSC_ACIA_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(SSC_ACIA_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SSC_ACIA_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index c55abe6975b..e190e4fb270 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -54,8 +54,8 @@ void a2bus_themill_device::m6809_mem(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(M6809_TAG, M6809, 1021800) // M6809 runs at ~1 MHz as per Stellation Two's print ads
+ MCFG_DEVICE_PROGRAM_MAP(m6809_mem)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index 69870004f47..dfa54932f5a 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -55,7 +55,7 @@ ROM_END
//-------------------------------------------------
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)
+ MCFG_UPD1990A_ADD(THUNDERCLOCK_UPD1990_TAG, 1021800, WRITELINE(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 114795bc0cb..f14694aee7d 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -113,7 +113,7 @@ MACHINE_CONFIG_START(a2bus_videx160_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(a2bus_videx160_device, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(a2bus_videx160_device, vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, a2bus_videx160_device, vsync_changed))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 6eaccbc80db..23fb28de986 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -126,7 +126,7 @@ MACHINE_CONFIG_START(a2bus_videx80_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(a2bus_videx80_device, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(a2bus_videx80_device, vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, a2bus_videx80_device, vsync_changed))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp
index 9fc1cdf9901..7ad0e43dd16 100644
--- a/src/devices/bus/a2bus/agat7ports.cpp
+++ b/src/devices/bus/a2bus/agat7ports.cpp
@@ -53,12 +53,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(a2bus_agat7_ports_device::device_add_mconfig)
MCFG_DEVICE_ADD("d9", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(a2bus_agat7_ports_device, write_portb))
- MCFG_I8255_IN_PORTC_CB(READ8(a2bus_agat7_ports_device, read_portc))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, a2bus_agat7_ports_device, write_portb))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, a2bus_agat7_ports_device, read_portc))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(a2bus_agat7_ports_device, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, a2bus_agat7_ports_device, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("d10", I8251, 0)
diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp
index 9923d1fafca..5a7c3484910 100644
--- a/src/devices/bus/a2bus/agat840k_hle.cpp
+++ b/src/devices/bus/a2bus/agat840k_hle.cpp
@@ -54,21 +54,21 @@ static const floppy_interface agat840k_hle_floppy_interface =
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))
+ MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, a2bus_agat840k_hle_device, index_0_w))
MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0)
MCFG_LEGACY_FLOPPY_CONFIG(agat840k_hle_floppy_interface)
- MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(a2bus_agat840k_hle_device, index_1_w))
+ MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, a2bus_agat840k_hle_device, index_1_w))
MCFG_DEVICE_ADD("d14", I8255, 0)
// PA not connected
- MCFG_I8255_IN_PORTB_CB(READ8(a2bus_agat840k_hle_device, d14_i_b)) // status signals from drive
- MCFG_I8255_OUT_PORTC_CB(WRITE8(a2bus_agat840k_hle_device, d14_o_c)) // control
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, a2bus_agat840k_hle_device, d14_i_b)) // status signals from drive
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, a2bus_agat840k_hle_device, d14_o_c)) // control
MCFG_DEVICE_ADD("d15", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(a2bus_agat840k_hle_device, d15_i_a)) // read data
-// MCFG_I8255_OUT_PORTB_CB(WRITE8(a2bus_agat840k_hle_device, d15_o_b)) // write data
- MCFG_I8255_IN_PORTC_CB(READ8(a2bus_agat840k_hle_device, d15_i_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(a2bus_agat840k_hle_device, d15_o_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, a2bus_agat840k_hle_device, d15_i_a)) // read data
+// MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, a2bus_agat840k_hle_device, d15_o_b)) // write data
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, a2bus_agat840k_hle_device, d15_i_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, a2bus_agat840k_hle_device, d15_o_c))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index 10657674e04..5a9c9384b99 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -85,8 +85,8 @@ enum
MACHINE_CONFIG_START(a2bus_corvfdc01_device::device_add_mconfig)
MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL(16'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, a2bus_corvfdc01_device, intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, a2bus_corvfdc01_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":0", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":1", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":2", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats)
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index 3367d18384e..89206a39150 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -54,8 +54,8 @@ ROM_END
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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, a2bus_corvfdc02_device, intrq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, a2bus_corvfdc02_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC02_FDC_TAG":0", corv_floppies, "525dsqd", a2bus_corvfdc02_device::corv_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC02_FDC_TAG":1", corv_floppies, "525dsqd", a2bus_corvfdc02_device::corv_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC02_FDC_TAG":2", corv_floppies, "525dsqd", a2bus_corvfdc02_device::corv_floppy_formats)
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index 7fc669a6d85..6f67650b488 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -43,14 +43,14 @@ DEFINE_DEVICE_TYPE(A2BUS_EZCGI_9958, a2bus_ezcgi_9958_device, "a2ezcgi5", "E-Z C
MACHINE_CONFIG_START(a2bus_ezcgi_device::device_add_mconfig)
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ezcgi_device, tms_irq_w))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, a2bus_ezcgi_device, tms_irq_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TMS_TAG, tms9918a_device, screen_update )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2bus_ezcgi_9938_device::device_add_mconfig)
MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL(21'477'272)) // 192K of VRAM / typical 9938 clock, not verified
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, a2bus_ezcgi_9938_device, tms_irq_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -63,7 +63,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2bus_ezcgi_9958_device::device_add_mconfig)
MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL(21'477'272)) // 192K of VRAM / typcial 9938/9958 clock, not verified
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, a2bus_ezcgi_9958_device, tms_irq_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 4c495a9ec77..23f3951f128 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -128,18 +128,18 @@ ioport_constructor a2bus_mouse_device::device_input_ports() const
-------------------------------------------------*/
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))
- MCFG_M68705_PORTA_W_CB(WRITE8(a2bus_mouse_device, mcu_port_a_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(a2bus_mouse_device, mcu_port_b_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(a2bus_mouse_device, mcu_port_c_w))
+ MCFG_DEVICE_ADD(MOUSE_MCU_TAG, M68705P3, 2043600)
+ MCFG_M68705_PORTA_R_CB(READ8(*this, a2bus_mouse_device, mcu_port_a_r))
+ MCFG_M68705_PORTB_R_CB(READ8(*this, a2bus_mouse_device, mcu_port_b_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, a2bus_mouse_device, mcu_port_a_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, a2bus_mouse_device, mcu_port_b_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, a2bus_mouse_device, mcu_port_c_w))
MCFG_DEVICE_ADD(MOUSE_PIA_TAG, PIA6821, 1021800)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(a2bus_mouse_device, pia_out_a))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(a2bus_mouse_device, pia_out_b))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(a2bus_mouse_device, pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(a2bus_mouse_device, pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, a2bus_mouse_device, pia_out_a))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a2bus_mouse_device, pia_out_b))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, a2bus_mouse_device, pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, a2bus_mouse_device, pia_irqb_w))
MACHINE_CONFIG_END
/*-------------------------------------------------
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 94498ee751b..77ec1b3ea5c 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -116,64 +116,64 @@ void a2bus_pcxporter_device::pc_io(address_map &map)
//-------------------------------------------------
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)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(m_v30, V30, A2BUS_7M_CLOCK) // 7.16 MHz as per manual
+ MCFG_DEVICE_PROGRAM_MAP(pc_map)
+ MCFG_DEVICE_IO_MAP(pc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_DISABLE()
- MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
+ MCFG_DEVICE_ADD(m_pit8253, PIT8253, 0)
MCFG_PIT8253_CLK0(A2BUS_7M_CLOCK / 6.0) // heartbeat IRQ
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(m_pic8259, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(A2BUS_7M_CLOCK / 6.0) // dram refresh
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(a2bus_pcxporter_device, pc_pit8253_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, a2bus_pcxporter_device, pc_pit8253_out1_changed))
MCFG_PIT8253_CLK2(A2BUS_7M_CLOCK / 6.0) // pio port c pin 4, and speaker polling enough
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(a2bus_pcxporter_device, pc_pit8253_out2_changed))
-
- MCFG_DEVICE_ADD("dma8237", PCXPORT_DMAC, A2BUS_7M_CLOCK / 2)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(a2bus_pcxporter_device, pc_dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(a2bus_pcxporter_device, pc_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(a2bus_pcxporter_device, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(a2bus_pcxporter_device, pc_dma_write_byte))
- MCFG_I8237_IN_IOR_1_CB(READ8(a2bus_pcxporter_device, pc_dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(a2bus_pcxporter_device, pc_dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(a2bus_pcxporter_device, pc_dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(a2bus_pcxporter_device, pc_dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(a2bus_pcxporter_device, pc_dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(a2bus_pcxporter_device, pc_dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(a2bus_pcxporter_device, pc_dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(a2bus_pcxporter_device, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(a2bus_pcxporter_device, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(a2bus_pcxporter_device, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(a2bus_pcxporter_device, pc_dack3_w))
-
- MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(INPUTLINE("v30", 0))
-
- MCFG_DEVICE_ADD("isa", ISA8, 0)
- MCFG_ISA8_CPU("v30")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237", am9517a_device, dreq3_w))
-
- MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(a2bus_pcxporter_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(a2bus_pcxporter_device, keyboard_data_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, a2bus_pcxporter_device, pc_pit8253_out2_changed))
+
+ MCFG_DEVICE_ADD(m_dma8237, PCXPORT_DMAC, A2BUS_7M_CLOCK / 2)
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, a2bus_pcxporter_device, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, a2bus_pcxporter_device, pc_dma_write_byte))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, a2bus_pcxporter_device, pc_dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, a2bus_pcxporter_device, pc_dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, a2bus_pcxporter_device, pc_dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, a2bus_pcxporter_device, pc_dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, a2bus_pcxporter_device, pc_dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, a2bus_pcxporter_device, pc_dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, a2bus_pcxporter_device, pc_dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dack3_w))
+
+ MCFG_DEVICE_ADD(m_pic8259, PIC8259, 0)
+ MCFG_PIC8259_OUT_INT_CB(INPUTLINE(m_v30, 0))
+
+ MCFG_DEVICE_ADD(m_isabus, ISA8, 0)
+ MCFG_ISA8_CPU(m_v30)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE(m_pic8259, pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE(m_pic8259, pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE(m_pic8259, pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE(m_pic8259, pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE(m_pic8259, pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE(m_pic8259, pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE(m_dma8237, am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE(m_dma8237, am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE(m_dma8237, am9517a_device, dreq3_w))
+
+ MCFG_DEVICE_ADD(m_pc_kbdc, PC_KBDC, 0)
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, a2bus_pcxporter_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, a2bus_pcxporter_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_ISA8_SLOT_ADD("isa", "isa1", pc_isa8_cards, "cga", true)
- MCFG_ISA8_SLOT_ADD("isa", "isa2", pc_isa8_cards, "fdc_xt", true)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, m_isabus, pc_isa8_cards, "cga", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, m_isabus, pc_isa8_cards, "fdc_xt", true)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/a2bus/ssbapple.cpp b/src/devices/bus/a2bus/ssbapple.cpp
index 76190bc359f..508f4b46685 100644
--- a/src/devices/bus/a2bus/ssbapple.cpp
+++ b/src/devices/bus/a2bus/ssbapple.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSBAPPLE, a2bus_ssb_device, "a2ssbapl", "Multitech Indu
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_DEVICE_ADD(TMS_TAG, TMS5220, 640000) // guess - this gives 8 kHz output according to the datasheet
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssbapple", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp
index 6a171b7823a..2307bd5ac5e 100644
--- a/src/devices/bus/a2bus/ssprite.cpp
+++ b/src/devices/bus/a2bus/ssprite.cpp
@@ -36,14 +36,14 @@ DEFINE_DEVICE_TYPE(A2BUS_SSPRITE, a2bus_ssprite_device, "a2ssprite", "Synetix Su
MACHINE_CONFIG_START(a2bus_ssprite_device::device_add_mconfig)
MCFG_DEVICE_ADD( TMS_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000) // 16k of VRAM
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(a2bus_ssprite_device, tms_irq_w))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, a2bus_ssprite_device, tms_irq_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TMS_TAG, tms9918a_device, screen_update )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY_TAG, AY8912, 1022727)
+ MCFG_DEVICE_ADD(AY_TAG, AY8912, 1022727)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD(TMS5220_TAG, TMS5220, 640000)
+ MCFG_DEVICE_ADD(TMS5220_TAG, TMS5220, 640000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index d2d6a7b4e09..860403d60e5 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -95,10 +95,10 @@ ioport_constructor a2bus_timemasterho_device::device_input_ports() const
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))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(a2bus_timemasterho_device, pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(a2bus_timemasterho_device, pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, a2bus_timemasterho_device, pia_out_a))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a2bus_timemasterho_device, pia_out_b))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, a2bus_timemasterho_device, pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, a2bus_timemasterho_device, pia_irqb_w))
MCFG_DEVICE_ADD(TIMEMASTER_M5832_TAG, MSM5832, 32768)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a2bus/transwarp.cpp b/src/devices/bus/a2bus/transwarp.cpp
index 09b91eb7343..bfbe3697cc6 100644
--- a/src/devices/bus/a2bus/transwarp.cpp
+++ b/src/devices/bus/a2bus/transwarp.cpp
@@ -122,8 +122,8 @@ ioport_constructor a2bus_transwarp_device::device_input_ports() const
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(CPU_TAG, M65C02, A2BUS_7M_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(m65c02_mem)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp
index 24d771dd596..6593f89f269 100644
--- a/src/devices/bus/a7800/cpuwiz.cpp
+++ b/src/devices/bus/a7800/cpuwiz.cpp
@@ -123,6 +123,6 @@ WRITE8_MEMBER(a78_megacart_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_p450_vb_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index f6228971794..4bf9d084287 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -247,7 +247,7 @@ WRITE8_MEMBER(a78_rom_pokey_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
@@ -345,7 +345,7 @@ WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_sg_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
@@ -500,17 +500,17 @@ WRITE8_MEMBER(a78_rom_act_device::write_40xx)
MACHINE_CONFIG_START(a78_rom_p450_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a78_rom_p450_pokey_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("pokey", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00)
MACHINE_CONFIG_END
@@ -518,13 +518,13 @@ MACHINE_CONFIG_END
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'318'181)/8)
+ MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a78_rom_p450_sg9_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("pokey_450")
- MCFG_SOUND_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index f7f7436b634..826dda467d3 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -111,7 +111,7 @@ MACHINE_CONFIG_START(a78_xboard_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
- MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
MACHINE_CONFIG_END
@@ -120,10 +120,10 @@ MACHINE_CONFIG_START(a78_xm_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("xb_speaker")
- MCFG_SOUND_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
- MCFG_SOUND_ADD("xm_ym2151", YM2151, XTAL(14'318'181)/4)
+ MCFG_DEVICE_ADD("xm_ym2151", YM2151, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abcbus/cadmouse.cpp b/src/devices/bus/abcbus/cadmouse.cpp
index 8919162b90c..df15985e9ad 100644
--- a/src/devices/bus/abcbus/cadmouse.cpp
+++ b/src/devices/bus/abcbus/cadmouse.cpp
@@ -126,9 +126,9 @@ void abc_cadmouse_device::abc_cadmouse_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(abc_cadmouse_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(abc_cadmouse_mem)
- MCFG_CPU_IO_MAP(abc_cadmouse_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(abc_cadmouse_mem)
+ MCFG_DEVICE_IO_MAP(abc_cadmouse_io)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/abcbus/db411223.cpp b/src/devices/bus/abcbus/db411223.cpp
index 0af074f0c6e..d9d2906f6d6 100644
--- a/src/devices/bus/abcbus/db411223.cpp
+++ b/src/devices/bus/abcbus/db411223.cpp
@@ -69,9 +69,9 @@ void databoard_4112_23_t::databoard_4112_23_io(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(databoard_4112_23_mem)
+ MCFG_DEVICE_IO_MAP(databoard_4112_23_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index 7783a69242a..0a235132e57 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -238,22 +238,22 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(abc_fd2_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(abc_fd2_mem)
- MCFG_CPU_IO_MAP(abc_fd2_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(abc_fd2_mem)
+ MCFG_DEVICE_IO_MAP(abc_fd2_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(abc_fd2_device, pio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(abc_fd2_device, pio_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(abc_fd2_device, pio_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(abc_fd2_device, pio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, abc_fd2_device, pio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, abc_fd2_device, pio_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, abc_fd2_device, pio_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, abc_fd2_device, pio_pb_w))
MCFG_FD1771_ADD(FD1771_TAG, XTAL(4'000'000)/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb7_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb5_w))
- MCFG_WD_FDC_HLD_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb6_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z80PIO_TAG, z80pio_device, pb7_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80PIO_TAG, z80pio_device, pb5_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(Z80PIO_TAG, z80pio_device, pb6_w))
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG ":0", abc_fd2_floppies, "525sssd", abc_fd2_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG ":1", abc_fd2_floppies, "525sssd", abc_fd2_device::floppy_formats)
diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp
index 1f33bca1acb..0c0dc86086e 100644
--- a/src/devices/bus/abcbus/hdc.cpp
+++ b/src/devices/bus/abcbus/hdc.cpp
@@ -84,9 +84,9 @@ static const z80_daisy_config daisy_chain[] =
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(abc_hdc_mem)
+ MCFG_DEVICE_IO_MAP(abc_hdc_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index c20305dfa3c..095ee01e8d0 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -321,21 +321,21 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w )
//-------------------------------------------------
MACHINE_CONFIG_START(luxor_55_10828_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(luxor_55_10828_mem)
- MCFG_CPU_IO_MAP(luxor_55_10828_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(luxor_55_10828_mem)
+ MCFG_DEVICE_IO_MAP(luxor_55_10828_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(4'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(luxor_55_10828_device, pio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(luxor_55_10828_device, pio_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(luxor_55_10828_device, pio_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(luxor_55_10828_device, pio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, luxor_55_10828_device, pio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, luxor_55_10828_device, pio_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, luxor_55_10828_device, pio_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, luxor_55_10828_device, pio_pb_w))
MCFG_MB8876_ADD(MB8876_TAG, XTAL(4'000'000)/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_10828_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, luxor_55_10828_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":0", abc_floppies, "525ssdd", luxor_55_10828_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":1", abc_floppies, "525ssdd", luxor_55_10828_device::floppy_formats)
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 8ae0cef2e4a..67e10c10a25 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -291,22 +291,22 @@ static const z80_daisy_config z80_daisy_chain[] =
//-------------------------------------------------
MACHINE_CONFIG_START(luxor_55_21046_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(luxor_55_21046_mem)
- MCFG_CPU_IO_MAP(luxor_55_21046_io)
+ MCFG_DEVICE_PROGRAM_MAP(luxor_55_21046_mem)
+ MCFG_DEVICE_IO_MAP(luxor_55_21046_io)
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
- MCFG_Z80DMA_OUT_INT_CB(WRITELINE(luxor_55_21046_device, dma_int_w))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21046_device, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(luxor_55_21046_device, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_device, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_device, io_write_byte))
+ MCFG_Z80DMA_OUT_INT_CB(WRITELINE(*this, luxor_55_21046_device, dma_int_w))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, luxor_55_21046_device, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, luxor_55_21046_device, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, luxor_55_21046_device, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, luxor_55_21046_device, io_write_byte))
MCFG_FD1793_ADD(SAB1793_TAG, XTAL(16'000'000)/16)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_device, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, luxor_55_21046_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc830_device::device_add_mconfig)
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index 07717b667a9..e5208fb694a 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -248,26 +248,26 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg )
//-------------------------------------------------
MACHINE_CONFIG_START(luxor_55_21056_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(luxor_55_21056_mem)
- MCFG_CPU_IO_MAP(luxor_55_21056_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(luxor_55_21056_mem)
+ MCFG_DEVICE_IO_MAP(luxor_55_21056_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(luxor_55_21056_device, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(luxor_55_21056_device, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21056_device, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21056_device, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, luxor_55_21056_device, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, luxor_55_21056_device, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, luxor_55_21056_device, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, luxor_55_21056_device, io_write_byte))
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in")
- MCFG_SCSI_REQ_HANDLER(WRITELINE(luxor_55_21056_device, write_sasi_req))
- MCFG_SCSI_IO_HANDLER(WRITELINE(luxor_55_21056_device, write_sasi_io))
- MCFG_SCSI_CD_HANDLER(WRITELINE(luxor_55_21056_device, write_sasi_cd))
- MCFG_SCSI_MSG_HANDLER(WRITELINE(luxor_55_21056_device, write_sasi_msg))
- MCFG_SCSI_BSY_HANDLER(WRITELINE(luxor_55_21056_device, write_sasi_bsy))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, luxor_55_21056_device, write_sasi_req))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(*this, luxor_55_21056_device, write_sasi_io))
+ MCFG_SCSI_CD_HANDLER(WRITELINE(*this, luxor_55_21056_device, write_sasi_cd))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE(*this, luxor_55_21056_device, write_sasi_msg))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE(*this, luxor_55_21056_device, write_sasi_bsy))
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", S1410, SCSI_ID_0)
MCFG_SCSI_OUTPUT_LATCH_ADD("sasi_data_out", SASIBUS_TAG)
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index e644ea3bb9d..f8b9e571a7c 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -75,10 +75,10 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd )
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))
- MCFG_SCSI_REQ_HANDLER(WRITELINE(luxor_4105_device, write_sasi_req))
- MCFG_SCSI_CD_HANDLER(WRITELINE(luxor_4105_device, write_sasi_cd))
- MCFG_SCSI_IO_HANDLER(WRITELINE(luxor_4105_device, write_sasi_io))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE(*this, luxor_4105_device, write_sasi_bsy))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, luxor_4105_device, write_sasi_req))
+ MCFG_SCSI_CD_HANDLER(WRITELINE(*this, luxor_4105_device, write_sasi_cd))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(*this, luxor_4105_device, write_sasi_io))
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", S1410, SCSI_ID_0)
MCFG_SCSI_OUTPUT_LATCH_ADD("sasi_data_out", SASIBUS_TAG)
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index bb05c5df93c..87959e8f970 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -131,13 +131,13 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
// keyboard cpu
- MCFG_CPU_ADD(I8035_TAG, I8035, XTAL(4'608'000))
- MCFG_CPU_PROGRAM_MAP(abc77_map)
- MCFG_CPU_IO_MAP(abc77_io)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(abc77_device, p1_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc77_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(abc77_device, t1_r))
- MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(abc77_device, prog_w))
+ MCFG_DEVICE_ADD(I8035_TAG, I8035, XTAL(4'608'000))
+ MCFG_DEVICE_PROGRAM_MAP(abc77_map)
+ MCFG_DEVICE_IO_MAP(abc77_io)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, abc77_device, p1_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, abc77_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, abc77_device, t1_r))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(*this, abc77_device, prog_w))
// watchdog
MCFG_WATCHDOG_ADD("watchdog")
@@ -145,7 +145,7 @@ MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
// discrete sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE, 0)
MCFG_DISCRETE_INTF(abc77)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index 50c26c98942..6cfcda5808d 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -113,11 +113,11 @@ const tiny_rom_entry *abc800_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(abc800_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'990'400))
- 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))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc800_keyboard_device, kb_p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(abc800_keyboard_device, kb_t1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, XTAL(5'990'400))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, abc800_keyboard_device, kb_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, abc800_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, abc800_keyboard_device, kb_p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, abc800_keyboard_device, kb_t1_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index b3641afe185..9e27927bb93 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -154,26 +154,26 @@ void abc99_device::abc99_z5_mem(address_map &map)
MACHINE_CONFIG_START(abc99_device::device_add_mconfig)
// keyboard CPU
- MCFG_CPU_ADD(I8035_Z2_TAG, I8035, XTAL(6'000'000)/3) // from Z5 T0 output
- MCFG_CPU_PROGRAM_MAP(abc99_z2_mem)
- MCFG_CPU_IO_MAP(abc99_z2_io)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(abc99_device, z2_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(abc99_device, z2_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(abc99_device, z2_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(abc99_device, z2_t1_r))
+ MCFG_DEVICE_ADD(I8035_Z2_TAG, I8035, XTAL(6'000'000)/3) // from Z5 T0 output
+ MCFG_DEVICE_PROGRAM_MAP(abc99_z2_mem)
+ MCFG_DEVICE_IO_MAP(abc99_z2_io)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, abc99_device, z2_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, abc99_device, z2_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, abc99_device, z2_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, abc99_device, z2_t1_r))
// mouse CPU
- MCFG_CPU_ADD(I8035_Z5_TAG, I8035, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(abc99_z5_mem)
- //MCFG_MCS48_PORT_P1_IN_CB(READ8(abc99_device, z5_p1_r))
- //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(abc99_device, z5_p2_w))
+ MCFG_DEVICE_ADD(I8035_Z5_TAG, I8035, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(abc99_z5_mem)
+ //MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, abc99_device, z5_p1_r))
+ //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, abc99_device, z5_p2_w))
//MCFG_MCS48_PORT_T0_CLK_CUSTOM() // Z2 CLK
- //MCFG_MCS48_PORT_T1_IN_CB(READ8(abc99_device, z5_t1_r))
+ //MCFG_MCS48_PORT_T1_IN_CB(READ8(*this, abc99_device, z5_t1_r))
MCFG_DEVICE_DISABLE() // HACK fix for broken serial I/O
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index be383cdcc74..60e32136c62 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -84,9 +84,9 @@ static const struct CassetteOptions adam_cassette_options =
//-------------------------------------------------
MACHINE_CONFIG_START(adam_digital_data_pack_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(adam_ddp_mem)
- MCFG_CPU_IO_MAP(adam_ddp_io)
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(adam_ddp_mem)
+ MCFG_DEVICE_IO_MAP(adam_ddp_io)
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(coleco_adam_cassette_formats)
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index 68d6b377062..25871d3d033 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -128,9 +128,9 @@ static void adam_fdc_floppies(device_slot_interface &device)
//-------------------------------------------------
MACHINE_CONFIG_START(adam_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(adam_fdc_mem)
- MCFG_CPU_IO_MAP(adam_fdc_io)
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(adam_fdc_mem)
+ MCFG_DEVICE_IO_MAP(adam_fdc_io)
MCFG_WD2793_ADD(WD2793_TAG, XTAL(4'000'000)/4)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6801_TAG, INPUT_LINE_NMI))
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 00e486e02cc..e5e702156eb 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -76,9 +76,9 @@ void adam_keyboard_device::adam_kb_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(adam_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(adam_kb_mem)
- MCFG_CPU_IO_MAP(adam_kb_io)
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(adam_kb_mem)
+ MCFG_DEVICE_IO_MAP(adam_kb_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index 2f9165d3eaf..e23fd924265 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -76,9 +76,9 @@ void adam_printer_device::adam_prn_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(adam_printer_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(adam_prn_mem)
- MCFG_CPU_IO_MAP(adam_prn_io)
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(adam_prn_mem)
+ MCFG_DEVICE_IO_MAP(adam_prn_io)
MCFG_DEVICE_DISABLE() // TODO
MACHINE_CONFIG_END
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index 2d2589b6445..636e2fdfa9b 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -76,14 +76,14 @@ void adam_spi_device::adam_spi_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(adam_spi_device::device_add_mconfig)
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(adam_spi_mem)
- MCFG_CPU_IO_MAP(adam_spi_io)
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(adam_spi_mem)
+ MCFG_DEVICE_IO_MAP(adam_spi_io)
MCFG_DEVICE_DISABLE()
MCFG_DEVICE_ADD(MC2661_TAG, MC2661, XTAL(4'915'200))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp
index 89d6c2c69fa..d411085aa2b 100644
--- a/src/devices/bus/amiga/keyboard/a1200.cpp
+++ b/src/devices/bus/amiga/keyboard/a1200.cpp
@@ -127,13 +127,13 @@ WRITE_LINE_MEMBER(a1200_kbd_device::mpu_tcmp)
}
MACHINE_CONFIG_START(a1200_kbd_device::device_add_mconfig)
- MCFG_CPU_ADD("mpu", M68HC705C8A, XTAL(3'000'000))
- MCFG_M68HC05_PORTB_R_CB(READ8(a1200_kbd_device, mpu_portb_r));
+ MCFG_DEVICE_ADD("mpu", M68HC705C8A, XTAL(3'000'000))
+ MCFG_M68HC05_PORTB_R_CB(READ8(*this, a1200_kbd_device, mpu_portb_r));
MCFG_M68HC05_PORTD_R_CB(IOPORT("MOD"));
- MCFG_M68HC05_PORTA_W_CB(WRITE8(a1200_kbd_device, mpu_porta_w));
- MCFG_M68HC05_PORTB_W_CB(WRITE8(a1200_kbd_device, mpu_portb_w));
- MCFG_M68HC05_PORTC_W_CB(WRITE8(a1200_kbd_device, mpu_portc_w));
- MCFG_M68HC05_TCMP_CB(WRITELINE(a1200_kbd_device, mpu_tcmp));
+ MCFG_M68HC05_PORTA_W_CB(WRITE8(*this, a1200_kbd_device, mpu_porta_w));
+ MCFG_M68HC05_PORTB_W_CB(WRITE8(*this, a1200_kbd_device, mpu_portb_w));
+ MCFG_M68HC05_PORTC_W_CB(WRITE8(*this, a1200_kbd_device, mpu_portc_w));
+ MCFG_M68HC05_TCMP_CB(WRITELINE(*this, a1200_kbd_device, mpu_tcmp));
MACHINE_CONFIG_END
const tiny_rom_entry *a1200_kbd_device::device_rom_region() const
diff --git a/src/devices/bus/amiga/keyboard/a500.cpp b/src/devices/bus/amiga/keyboard/a500.cpp
index 314c070c260..404a4d0f519 100644
--- a/src/devices/bus/amiga/keyboard/a500.cpp
+++ b/src/devices/bus/amiga/keyboard/a500.cpp
@@ -138,8 +138,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(a500_kbd_device::device_add_mconfig)
- MCFG_CPU_ADD("ic1", M6502, XTAL(3'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mpu6500_map)
+ MCFG_DEVICE_ADD("ic1", M6502, XTAL(3'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mpu6500_map)
MACHINE_CONFIG_END
const tiny_rom_entry *a500_kbd_device::device_rom_region() const
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index 0e28a420877..60bfd11b9b6 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -48,94 +48,94 @@ void a2232_device::iocpu_map(address_map &map)
MACHINE_CONFIG_START(a2232_device::device_add_mconfig)
// main cpu
- MCFG_CPU_ADD("iocpu", M65CE02, XTAL(28'375'160) / 8) // should run at Amiga clock 7M / 2
- MCFG_CPU_PROGRAM_MAP(iocpu_map)
+ MCFG_DEVICE_ADD("iocpu", M65CE02, XTAL(28'375'160) / 8) // should run at Amiga clock 7M / 2
+ MCFG_DEVICE_PROGRAM_MAP(iocpu_map)
// acia
MCFG_DEVICE_ADD("acia_0", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_0_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_0_irq_w))
MCFG_DEVICE_ADD("acia_1", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_1_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_2", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_1_irq_w))
MCFG_DEVICE_ADD("acia_2", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_3", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_2_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_3", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_2_irq_w))
MCFG_DEVICE_ADD("acia_3", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_4", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_3_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_4", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_3_irq_w))
MCFG_DEVICE_ADD("acia_4", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_5", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_4_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_5", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_4_irq_w))
MCFG_DEVICE_ADD("acia_5", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_6", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_5_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_6", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_5_irq_w))
MCFG_DEVICE_ADD("acia_6", MOS6551, XTAL(28'375'160) / 8)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232_7", rs232_port_device, write_txd))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(a2232_device, acia_6_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232_7", rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, a2232_device, acia_6_irq_w))
// cia
MCFG_DEVICE_ADD("cia", MOS8520, XTAL(1'843'200))
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(a2232_device, cia_irq_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(a2232_device, cia_port_a_r))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(a2232_device, cia_port_b_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(a2232_device, cia_port_b_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, a2232_device, cia_irq_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, a2232_device, cia_port_a_r))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, a2232_device, cia_port_b_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, a2232_device, cia_port_b_w))
// rs232 ports
- MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(a2232_device, rs232_1_rxd_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_1_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_0", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_1_cts_w))
-
- MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_1", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_2_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_1", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_2_cts_w))
-
- MCFG_RS232_PORT_ADD("rs232_3", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_2", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_3_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_2", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_3_cts_w))
-
- MCFG_RS232_PORT_ADD("rs232_4", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_3", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_4_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_3", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_4_cts_w))
-
- MCFG_RS232_PORT_ADD("rs232_5", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_4", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_5_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_4", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_5_cts_w))
-
- MCFG_RS232_PORT_ADD("rs232_6", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_5", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_6_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_5", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_6_cts_w))
-
- MCFG_RS232_PORT_ADD("rs232_7", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia_6", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(WRITELINE(a2232_device, rs232_7_dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia_6", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(WRITELINE(a2232_device, rs232_7_cts_w))
+ MCFG_DEVICE_ADD("rs232_1", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, a2232_device, rs232_1_rxd_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_1_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_0", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_1_cts_w))
+
+ MCFG_DEVICE_ADD("rs232_2", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia_1", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_2_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_1", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_2_cts_w))
+
+ MCFG_DEVICE_ADD("rs232_3", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia_2", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_3_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_2", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_3_cts_w))
+
+ MCFG_DEVICE_ADD("rs232_4", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia_3", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_4_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_3", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_4_cts_w))
+
+ MCFG_DEVICE_ADD("rs232_5", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia_4", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_5_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_4", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_5_cts_w))
+
+ MCFG_DEVICE_ADD("rs232_6", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia_5", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_6_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_5", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_6_cts_w))
+
+ MCFG_DEVICE_ADD("rs232_7", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia_6", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, a2232_device, rs232_7_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia_6", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, a2232_device, rs232_7_cts_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 129449d267a..b59a51053e2 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -116,15 +116,15 @@ ioport_constructor a2091_device::device_input_ports() const
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))
- MCFG_DMAC_INT_HANDLER(WRITELINE(dmac_hdc_device, dmac_int_w))
- MCFG_DMAC_CFGOUT_HANDLER(WRITELINE(dmac_hdc_device, dmac_cfgout_w))
+ MCFG_DMAC_SCSI_READ_HANDLER(READ8(*this, dmac_hdc_device, dmac_scsi_r))
+ MCFG_DMAC_SCSI_WRITE_HANDLER(WRITE8(*this, dmac_hdc_device, dmac_scsi_w))
+ MCFG_DMAC_INT_HANDLER(WRITELINE(*this, dmac_hdc_device, dmac_int_w))
+ MCFG_DMAC_CFGOUT_HANDLER(WRITELINE(*this, dmac_hdc_device, dmac_cfgout_w))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_1)
MCFG_DEVICE_ADD("wd33c93", WD33C93, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_WD33C93_IRQ_CB(WRITELINE(dmac_hdc_device, scsi_irq_w))
+ MCFG_WD33C93_IRQ_CB(WRITELINE(*this, dmac_hdc_device, scsi_irq_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index ed9742f0948..0ceeab84c8d 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -60,9 +60,9 @@ void buddha_device::mmio_map(address_map &map)
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_IRQ_HANDLER(WRITELINE(*this, buddha_device, ide_0_interrupt_w))
MCFG_ATA_INTERFACE_ADD("ata_1", ata_devices, nullptr, nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(buddha_device, ide_1_interrupt_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, buddha_device, ide_1_interrupt_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.h b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
index f53d015b345..e2237bef0ff 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.h
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
@@ -96,8 +96,8 @@
#define MCFG_BBC_PASSTHRU_1MHZBUS_SLOT_ADD() \
MCFG_BBC_1MHZBUS_SLOT_ADD(BBC_1MHZBUS_SLOT_TAG, bbc_1mhzbus_devices, nullptr) \
- MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_1mhzbus_slot_device, irq_w)) \
- MCFG_BBC_1MHZBUS_SLOT_NMI_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_1mhzbus_slot_device, nmi_w))
+ MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, bbc_1mhzbus_slot_device, irq_w)) \
+ MCFG_BBC_1MHZBUS_SLOT_NMI_HANDLER(WRITELINE(DEVICE_SELF_OWNER, bbc_1mhzbus_slot_device, nmi_w))
#define MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(_devcb) \
devcb = &downcast<bbc_1mhzbus_slot_device &>(*device).set_irq_handler(DEVCB_##_devcb);
diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
index b9fcf6ebc0f..7de066e5933 100644
--- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp
+++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(BBC_BEEBSID, bbc_beebsid_device, "beebsid", "BeebSID")
MACHINE_CONFIG_START(bbc_beebsid_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL(16'000'000) / 16)
+ MCFG_DEVICE_ADD(MOS8580_TAG, MOS8580, XTAL(16'000'000) / 16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_BBC_PASSTHRU_1MHZBUS_SLOT_ADD()
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index 57e6893222b..b75d0c6d123 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -84,7 +84,7 @@ ROM_END
MACHINE_CONFIG_START(bbc_opus3_device::device_add_mconfig)
/* fdc */
MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 2)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opus3_device, fdc_drq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_opus3_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", bbc_floppies, nullptr, floppy_formats)
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 5c61ccc813a..250dc54f81a 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -123,9 +123,9 @@ ROM_END
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))
- MCFG_I8271_OPT_CALLBACK(WRITELINE(bbc_acorn8271_device, side_w))
+ MCFG_I8271_IRQ_CALLBACK(WRITELINE(*this, bbc_acorn8271_device, fdc_intrq_w))
+ MCFG_I8271_HDL_CALLBACK(WRITELINE(*this, bbc_acorn8271_device, motor_w))
+ MCFG_I8271_OPT_CALLBACK(WRITELINE(*this, bbc_acorn8271_device, side_w))
MCFG_FLOPPY_DRIVE_ADD("i8271:0", bbc_floppies_525, "525qd", bbc_acorn8271_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("i8271:1", bbc_floppies_525, "525qd", bbc_acorn8271_device::floppy_formats)
@@ -134,8 +134,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_acorn1770_device::device_add_mconfig)
MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_acorn1770_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_acorn1770_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", bbc_acorn8271_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", bbc_floppies_525, "525qd", bbc_acorn8271_device::floppy_formats)
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index d36cc0b820e..bbb63dfed6c 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -61,9 +61,9 @@ ROM_END
MACHINE_CONFIG_START(bbc_cumana1_device::device_add_mconfig)
MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 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))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cumanafdc_device, motor_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", bbc_floppies_525, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", bbc_floppies_525, "525qd", floppy_formats)
@@ -72,9 +72,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_cumana2_device::device_add_mconfig)
MCFG_MB8877_ADD("mb8877a", XTAL(16'000'000) / 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))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cumanafdc_device, motor_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_cumanafdc_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", bbc_floppies_525, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", bbc_floppies_525, "525qd", floppy_formats)
diff --git a/src/devices/bus/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp
index 940595b9ff6..cc5059b0002 100644
--- a/src/devices/bus/bbc/fdc/cv1797.cpp
+++ b/src/devices/bus/bbc/fdc/cv1797.cpp
@@ -54,9 +54,9 @@ ROM_END
MACHINE_CONFIG_START(bbc_cv1797_device::device_add_mconfig)
MCFG_FD1797_ADD("fd1797", XTAL(8'000'000) / 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))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_cv1797_device, motor_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_cv1797_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_cv1797_device, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_cv1797_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("fd1797:0", bbc_floppies_525, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fd1797:1", bbc_floppies_525, "525qd", floppy_formats)
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index 8a81c86ce74..ee3437623df 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -91,7 +91,7 @@ ROM_END
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_UPD765_INTRQ_CALLBACK(WRITELINE(*this, bbc_opus8272_device, fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD("i8272:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("i8272:1", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
@@ -100,8 +100,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_opus2791_device::device_add_mconfig)
MCFG_WD2791_ADD("fdc", XTAL(16'000'000) / 16)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
@@ -110,8 +110,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_opus2793_device::device_add_mconfig)
MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(bbc_opusfdc_device, motor_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, motor_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
@@ -120,7 +120,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_opus1770_device::device_add_mconfig)
MCFG_WD1770_ADD("fdc", XTAL(16'000'000) / 2)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_opusfdc_device, fdc_drq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_opusfdc_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bbc_floppies_525, "525qd", bbc_opusfdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", 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 90dd63cad76..95b47bfe0eb 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -67,8 +67,8 @@ ROM_END
MACHINE_CONFIG_START(bbc_weddb2_device::device_add_mconfig)
MCFG_WD1772_ADD("wd1772", XTAL(16'000'000) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_weddb2_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_weddb2_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", bbc_floppies_525, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("wd1772:1", bbc_floppies_525, "525qd", floppy_formats)
@@ -77,8 +77,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_weddb3_device::device_add_mconfig)
MCFG_WD1770_ADD("wd1770", XTAL(16'000'000) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_weddb3_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_weddb3_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("wd1770:1", bbc_floppies_525, "525qd", floppy_formats)
diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp
index 51ace257c96..71d11ad10ac 100644
--- a/src/devices/bus/bbc/tube/tube_6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_6502.cpp
@@ -44,8 +44,8 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_6502_device::device_add_mconfig)
- MCFG_CPU_ADD("m6502", M65C02, XTAL(12'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(tube_6502_mem)
+ MCFG_DEVICE_ADD("m6502", M65C02, XTAL(12'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(tube_6502_mem)
MCFG_TUBE_ADD("ula")
MCFG_TUBE_PNMI_HANDLER(INPUTLINE("m6502", M65C02_NMI_LINE))
diff --git a/src/devices/bus/bbc/tube/tube_65c102.cpp b/src/devices/bus/bbc/tube/tube_65c102.cpp
index c1542ef6949..d2bf3ddf2ab 100644
--- a/src/devices/bus/bbc/tube/tube_65c102.cpp
+++ b/src/devices/bus/bbc/tube/tube_65c102.cpp
@@ -44,8 +44,8 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_65c102_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(tube_6502_mem)
+ MCFG_DEVICE_ADD("maincpu", M65C02, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(tube_6502_mem)
MCFG_TUBE_ADD("ula")
MCFG_TUBE_PNMI_HANDLER(INPUTLINE("maincpu", M65C02_NMI_LINE))
diff --git a/src/devices/bus/bbc/tube/tube_80186.cpp b/src/devices/bus/bbc/tube/tube_80186.cpp
index 502814c2b55..46350c4a13b 100644
--- a/src/devices/bus/bbc/tube/tube_80186.cpp
+++ b/src/devices/bus/bbc/tube/tube_80186.cpp
@@ -54,16 +54,16 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_80186_device::device_add_mconfig)
- MCFG_CPU_ADD("i80186", I80186, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(tube_80186_mem)
- MCFG_CPU_IO_MAP(tube_80186_io)
- //MCFG_80186_CHIP_SELECT_CB(WRITE16(bbc_tube_80186_device, chip_select_cb))
+ MCFG_DEVICE_ADD("i80186", I80186, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tube_80186_mem)
+ MCFG_DEVICE_IO_MAP(tube_80186_io)
+ //MCFG_80186_CHIP_SELECT_CB(WRITE16(*this, bbc_tube_80186_device, chip_select_cb))
MCFG_80186_TMROUT0_HANDLER(INPUTLINE("i80186", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT
MCFG_80186_TMROUT1_HANDLER(INPUTLINE("i80186", INPUT_LINE_NMI)) MCFG_DEVCB_INVERT
MCFG_TUBE_ADD("ula")
- MCFG_TUBE_PIRQ_HANDLER(DEVWRITELINE("i80186", i80186_cpu_device, int0_w))
- MCFG_TUBE_DRQ_HANDLER(DEVWRITELINE("i80186", i80186_cpu_device, drq0_w))
+ MCFG_TUBE_PIRQ_HANDLER(WRITELINE("i80186", i80186_cpu_device, int0_w))
+ MCFG_TUBE_DRQ_HANDLER(WRITELINE("i80186", i80186_cpu_device, drq0_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp
index 1e978445f38..af0c3e8c625 100644
--- a/src/devices/bus/bbc/tube/tube_80286.cpp
+++ b/src/devices/bus/bbc/tube/tube_80286.cpp
@@ -58,10 +58,10 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_80286_device::device_add_mconfig)
- MCFG_CPU_ADD("i80286", I80286, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(tube_80286_mem)
- MCFG_CPU_IO_MAP(tube_80286_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_80286_device, irq_callback)
+ MCFG_DEVICE_ADD("i80286", I80286, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tube_80286_mem)
+ MCFG_DEVICE_IO_MAP(tube_80286_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_80286_device, irq_callback)
MCFG_TUBE_ADD("ula")
MCFG_TUBE_PNMI_HANDLER(INPUTLINE("i80286", INPUT_LINE_NMI))
diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp
index 5b20f12316f..c427cd30b8a 100644
--- a/src/devices/bus/bbc/tube/tube_arm.cpp
+++ b/src/devices/bus/bbc/tube/tube_arm.cpp
@@ -51,11 +51,11 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_arm_device::device_add_mconfig)
- MCFG_CPU_ADD("arm", ARM, XTAL(20'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(tube_arm_mem)
+ MCFG_DEVICE_ADD("arm", ARM, XTAL(20'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(tube_arm_mem)
MCFG_TUBE_ADD("ula")
- MCFG_TUBE_HIRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
+ MCFG_TUBE_HIRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
MCFG_TUBE_PNMI_HANDLER(INPUTLINE("arm", ARM_FIRQ_LINE))
MCFG_TUBE_PIRQ_HANDLER(INPUTLINE("arm", ARM_IRQ_LINE))
diff --git a/src/devices/bus/bbc/tube/tube_casper.cpp b/src/devices/bus/bbc/tube/tube_casper.cpp
index 578b9d8d76e..02c19165fd0 100644
--- a/src/devices/bus/bbc/tube/tube_casper.cpp
+++ b/src/devices/bus/bbc/tube/tube_casper.cpp
@@ -49,19 +49,19 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_casper_device::device_add_mconfig)
- MCFG_CPU_ADD(m_m68000, M68000, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(tube_casper_mem)
+ MCFG_DEVICE_ADD(m_m68000, M68000, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tube_casper_mem)
MCFG_DEVICE_ADD(m_via6522_0, VIA6522, XTAL(4'000'000) / 2)
- MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8(m_via6522_1, via6522_device, write_pa))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(m_via6522_1, via6522_device, write_cb1))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(m_via6522_1, via6522_device, write_ca1))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(m_via6522_1, via6522_device, write_pa))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_via6522_1, via6522_device, write_cb1))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(m_via6522_1, via6522_device, write_ca1))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
MCFG_DEVICE_ADD(m_via6522_1, VIA6522, XTAL(4'000'000) / 2)
- MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8(m_via6522_0, via6522_device, write_pa))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(m_via6522_0, via6522_device, write_cb1))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(m_via6522_0, via6522_device, write_ca1))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(m_via6522_0, via6522_device, write_pa))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(m_via6522_0, via6522_device, write_cb1))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(m_via6522_0, via6522_device, write_ca1))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(m_m68000, M68K_IRQ_1))
/* software lists */
diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp
index 0f345386ce1..10603e773f6 100644
--- a/src/devices/bus/bbc/tube/tube_z80.cpp
+++ b/src/devices/bus/bbc/tube/tube_z80.cpp
@@ -62,15 +62,15 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_z80_device::device_add_mconfig)
- MCFG_CPU_ADD("z80", Z80, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(tube_z80_mem)
- MCFG_CPU_OPCODES_MAP(tube_z80_fetch)
- MCFG_CPU_IO_MAP(tube_z80_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_z80_device, irq_callback)
+ MCFG_DEVICE_ADD("z80", Z80, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tube_z80_mem)
+ MCFG_DEVICE_OPCODES_MAP(tube_z80_fetch)
+ MCFG_DEVICE_IO_MAP(tube_z80_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, bbc_tube_z80_device, irq_callback)
MCFG_TUBE_ADD("ula")
- MCFG_TUBE_HIRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
- MCFG_TUBE_PNMI_HANDLER(WRITELINE(bbc_tube_z80_device, nmi_w))
+ MCFG_TUBE_HIRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
+ MCFG_TUBE_PNMI_HANDLER(WRITELINE(*this, bbc_tube_z80_device, nmi_w))
MCFG_TUBE_PIRQ_HANDLER(INPUTLINE("z80", INPUT_LINE_IRQ0))
/* internal ram */
diff --git a/src/devices/bus/bbc/tube/tube_zep100.cpp b/src/devices/bus/bbc/tube/tube_zep100.cpp
index b276ffaa861..2d26b423a6f 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.cpp
+++ b/src/devices/bus/bbc/tube/tube_zep100.cpp
@@ -58,20 +58,20 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_tube_zep100_device::device_add_mconfig)
- MCFG_CPU_ADD("z80", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(tube_zep100_mem)
- MCFG_CPU_IO_MAP(tube_zep100_io)
+ MCFG_DEVICE_ADD("z80", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tube_zep100_mem)
+ MCFG_DEVICE_IO_MAP(tube_zep100_io)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 2)
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bbc_tube_zep100_device, via_pb_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("ppi", i8255_device, pc2_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("ppi", i8255_device, pc6_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, bbc_tube_zep100_device, via_pb_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE("ppi", i8255_device, pc2_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("ppi", i8255_device, pc6_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, bbc_tube_slot_device, irq_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("via", via6522_device, write_pa))
- MCFG_I8255_IN_PORTB_CB(READ8(bbc_tube_zep100_device, ppi_pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(bbc_tube_zep100_device, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("via", via6522_device, write_pa))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, bbc_tube_zep100_device, ppi_pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, bbc_tube_zep100_device, ppi_pc_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/devices/bus/bbc/userport/beebspch.cpp b/src/devices/bus/bbc/userport/beebspch.cpp
index 8ca275c361a..0ddc6d7f09a 100644
--- a/src/devices/bus/bbc/userport/beebspch.cpp
+++ b/src/devices/bus/bbc/userport/beebspch.cpp
@@ -52,9 +52,9 @@ const tiny_rom_entry *bbc_beebspch_device::device_rom_region() const
MACHINE_CONFIG_START(bbc_beebspch_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SP0256_TAG, SP0256, 14_MHz_XTAL / 4) // TODO: Crystal unknown
- MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(bbc_beebspch_device, cb1_w))
- MCFG_SP0256_STANDBY_CB(WRITELINE(bbc_beebspch_device, cb2_w))
+ MCFG_DEVICE_ADD(SP0256_TAG, SP0256, 14_MHz_XTAL / 4) // TODO: Crystal unknown
+ MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, bbc_beebspch_device, cb1_w))
+ MCFG_SP0256_STANDBY_CB(WRITELINE(*this, bbc_beebspch_device, cb2_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp
index a6c7e4a1d2c..19749bb619f 100644
--- a/src/devices/bus/bml3/bml3mp1802.cpp
+++ b/src/devices/bus/bml3/bml3mp1802.cpp
@@ -54,7 +54,7 @@ ROM_END
MACHINE_CONFIG_START(bml3bus_mp1802_device::device_add_mconfig)
MCFG_MB8866_ADD("fdc", XTAL(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bml3bus_mp1802_device, bml3_wd17xx_intrq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mp1802_floppies, "dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", mp1802_floppies, "dd", floppy_image_device::default_floppy_formats)
diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp
index 85f7961a601..b9d3232d7f6 100644
--- a/src/devices/bus/bml3/bml3mp1805.cpp
+++ b/src/devices/bus/bml3/bml3mp1805.cpp
@@ -56,7 +56,7 @@ ROM_END
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_MC6843_IRQ_CALLBACK(WRITELINE(*this, bml3bus_mp1805_device, bml3_mc6843_intrq_w))
MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(bml3_mp1805_floppy_interface)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index c74cab3d55b..b5ef249fe65 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -61,9 +61,9 @@ void c64_cpm_cartridge_device::z80_io(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 3000000)
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 3c5d33fd8b1..25c870085b0 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -114,7 +114,7 @@ const tiny_rom_entry *c64_currah_speech_cartridge_device::device_rom_region() co
MACHINE_CONFIG_START(c64_currah_speech_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SP0256_TAG, SP0256, 4000000) // ???
+ MCFG_DEVICE_ADD(SP0256_TAG, SP0256, 4000000) // ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h
index 0824ecf67ba..de35666a5d2 100644
--- a/src/devices/bus/c64/exp.h
+++ b/src/devices/bus/c64/exp.h
@@ -59,12 +59,12 @@
#define MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD() \
MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, 0, c64_expansion_cards, nullptr) \
- MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, irq_w)) \
- MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, nmi_w)) \
- MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)) \
- MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(DEVREAD8(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_cd_r)) \
- MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(DEVWRITE8(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_cd_w)) \
- MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_w))
+ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, irq_w)) \
+ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, nmi_w)) \
+ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, reset_w)) \
+ MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_cd_r)) \
+ MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_cd_w)) \
+ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, c64_expansion_slot_device, dma_w))
#define MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(_write) \
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 5a792e12db5..3e3dfc1d334 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -76,8 +76,8 @@ void c64_final_chesscard_device::c64_fcc_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(c64_final_chesscard_device::device_add_mconfig)
- MCFG_CPU_ADD(G65SC02P4_TAG, M65SC02, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(c64_fcc_map)
+ MCFG_DEVICE_ADD(G65SC02P4_TAG, M65SC02, XTAL(5'000'000))
+ MCFG_DEVICE_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 bae3e43ad94..ab4d5db39dc 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(C64_GEOCABLE, c64_geocable_device, "c64_geocable", "C64 geoCa
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))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, c64_geocable_device, output_b))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index 3cbb3c8107b..51769f142b3 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -143,12 +143,12 @@ WRITE8_MEMBER( c64_ieee488_device::tpi_pc_w )
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))
- MCFG_TPI6525_IN_PB_CB(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_TPI6525_OUT_PB_CB(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_TPI6525_IN_PC_CB(READ8(c64_ieee488_device, tpi_pc_r))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(c64_ieee488_device, tpi_pc_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, c64_ieee488_device, tpi_pa_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, c64_ieee488_device, tpi_pa_w))
+ MCFG_TPI6525_IN_PB_CB(READ8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, c64_ieee488_device, tpi_pc_r))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, c64_ieee488_device, tpi_pc_w))
MCFG_CBM_IEEE488_ADD(nullptr)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index faec481505e..23aa125ce46 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -98,9 +98,9 @@ WRITE_LINE_MEMBER( c64_magic_formel_cartridge_device::pia_cb2_w )
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))
- MCFG_PIA_CB2_HANDLER(WRITELINE(c64_magic_formel_cartridge_device, pia_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, c64_magic_formel_cartridge_device, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, c64_magic_formel_cartridge_device, pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, c64_magic_formel_cartridge_device, pia_cb2_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index 8f7b866b303..02e44d73af7 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -221,23 +221,23 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::apd_w )
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))
- MCFG_TPI6525_OUT_PA_CB(WRITE8(c64_magic_voice_cartridge_device, tpi_pa_w))
- MCFG_TPI6525_IN_PB_CB(READ8(c64_magic_voice_cartridge_device, tpi_pb_r))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(c64_magic_voice_cartridge_device, tpi_pb_w))
- MCFG_TPI6525_OUT_CA_CB(WRITELINE(c64_magic_voice_cartridge_device, tpi_ca_w))
- MCFG_TPI6525_OUT_CA_CB(WRITELINE(c64_magic_voice_cartridge_device, tpi_cb_w))
+ MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(*this, c64_magic_voice_cartridge_device, tpi_irq_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, c64_magic_voice_cartridge_device, tpi_pa_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, c64_magic_voice_cartridge_device, tpi_pa_w))
+ MCFG_TPI6525_IN_PB_CB(READ8(*this, c64_magic_voice_cartridge_device, tpi_pb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, c64_magic_voice_cartridge_device, tpi_pb_w))
+ MCFG_TPI6525_OUT_CA_CB(WRITELINE(*this, c64_magic_voice_cartridge_device, tpi_ca_w))
+ MCFG_TPI6525_OUT_CA_CB(WRITELINE(*this, c64_magic_voice_cartridge_device, tpi_cb_w))
MCFG_DEVICE_ADD(CD40105_TAG, CD40105, 0)
- MCFG_40105_DATA_IN_READY_CB(DEVWRITELINE(MOS6525_TAG, tpi6525_device, i3_w))
+ MCFG_40105_DATA_IN_READY_CB(WRITELINE(MOS6525_TAG, tpi6525_device, i3_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL(640'000))
- MCFG_T6721A_EOS_HANDLER(DEVWRITELINE(MOS6525_TAG, tpi6525_device, i2_w))
- MCFG_T6721A_PHI2_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, phi2_w))
- MCFG_T6721A_DTRD_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, dtrd_w))
- MCFG_T6721A_APD_HANDLER(DEVWRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, apd_w))
+ MCFG_DEVICE_ADD(T6721A_TAG, T6721A, XTAL(640'000))
+ MCFG_T6721A_EOS_HANDLER(WRITELINE(MOS6525_TAG, tpi6525_device, i2_w))
+ MCFG_T6721A_PHI2_HANDLER(WRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, phi2_w))
+ MCFG_T6721A_DTRD_HANDLER(WRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, dtrd_w))
+ MCFG_T6721A_APD_HANDLER(WRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, apd_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index 2e074194213..92cc095d698 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -46,16 +46,16 @@ WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::write_acia_clock )
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))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, c64_maplin_midi_cartridge_device, acia_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(c64_maplin_midi_cartridge_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_maplin_midi_cartridge_device, write_acia_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp
index 5a03ef967b4..fdd05a37c3b 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -46,16 +46,16 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::write_acia_clock )
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))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, c64_namesoft_midi_cartridge_device, acia_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(c64_namesoft_midi_cartridge_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_namesoft_midi_cartridge_device, write_acia_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp
index ff1c292110b..2857c8327f4 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -60,20 +60,20 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::write_acia_clock )
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))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, c64_passport_midi_cartridge_device, acia_irq_w))
MCFG_DEVICE_ADD(MC6840_TAG, PTM6840, 1021800)
MCFG_PTM6840_EXTERNAL_CLOCKS(1021800.0f, 1021800.0f, 1021800.0f)
- MCFG_PTM6840_IRQ_CB(WRITELINE(c64_passport_midi_cartridge_device, ptm_irq_w))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, c64_passport_midi_cartridge_device, ptm_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16) /// TODO: work out if the clock should come from the 6840
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(c64_passport_midi_cartridge_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_passport_midi_cartridge_device, write_acia_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index f78e5155c4a..34d58bb5486 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -46,16 +46,16 @@ WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::write_acia_clock )
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))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, c64_sequential_midi_cartridge_device, acia_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(c64_sequential_midi_cartridge_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_sequential_midi_cartridge_device, write_acia_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp
index 0b705bfa1ce..f3eddb7750b 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -46,16 +46,16 @@ WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::write_acia_clock )
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))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, c64_siel_midi_cartridge_device, acia_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(c64_siel_midi_cartridge_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, c64_siel_midi_cartridge_device, write_acia_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index 759c40d1bc8..e243a335e50 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -113,8 +113,8 @@ void c64_multiscreen_cartridge_device::multiscreen_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(c64_multiscreen_cartridge_device::device_add_mconfig)
- MCFG_CPU_ADD(MC6802P_TAG, M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(multiscreen_mem)
+ MCFG_DEVICE_ADD(MC6802P_TAG, M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(multiscreen_mem)
MCFG_DEVICE_ADD(MC6821P_0_TAG, PIA6821, 0)
MCFG_DEVICE_ADD(MC6821P_1_TAG, PIA6821, 0)
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index 2df60f4ef17..fd5b36306d7 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -43,8 +43,8 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w )
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'579'545))
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(c64_sfx_sound_expander_cartridge_device, opl_irq_w))
+ MCFG_DEVICE_ADD(YM3526_TAG, YM3526, XTAL(3'579'545))
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, c64_sfx_sound_expander_cartridge_device, opl_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp
index 6f50af714e4..ff566a8456b 100644
--- a/src/devices/bus/c64/speakeasy.cpp
+++ b/src/devices/bus/c64/speakeasy.cpp
@@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(C64_SPEAKEASY, c64_speakeasy_cartridge_device, "c64_speakeasy
MACHINE_CONFIG_START(c64_speakeasy_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SC01A_TAG, VOTRAX_SC01, 720000)
+ MCFG_DEVICE_ADD(SC01A_TAG, VOTRAX_SC01, 720000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index 035c878a915..339ff77de74 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -62,8 +62,8 @@ void c64_supercpu_device::c64_supercpu_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(c64_supercpu_device::device_add_mconfig)
- MCFG_CPU_ADD(G65816_TAG, G65816, 1000000)
- MCFG_CPU_PROGRAM_MAP(c64_supercpu_map)
+ MCFG_DEVICE_ADD(G65816_TAG, G65816, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(c64_supercpu_map)
MCFG_C64_PASSTHRU_EXPANSION_SLOT_ADD()
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 7fffd60dac2..b4a3f5658a1 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -41,14 +41,14 @@ DEFINE_DEVICE_TYPE(C64_SWIFTLINK, c64_swiftlink_cartridge_device, "c64_swiftlink
MACHINE_CONFIG_START(c64_swiftlink_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(3'686'400))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_swiftlink_cartridge_device, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, c64_swiftlink_cartridge_device, acia_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index 653a79a7627..fb6d84a24c8 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -40,14 +40,14 @@ DEFINE_DEVICE_TYPE(C64_TURBO232, c64_turbo232_cartridge_device, "c64_turbo232",
MACHINE_CONFIG_START(c64_turbo232_cartridge_device::device_add_mconfig)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(3'686'400))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(c64_turbo232_cartridge_device, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, c64_turbo232_cartridge_device, acia_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index f7f6fe14121..547d6f85289 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -89,8 +89,8 @@ void c1526_device_base::c1526_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(c1526_device::device_add_mconfig)
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(c1526_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(c1526_mem)
MACHINE_CONFIG_END
@@ -99,8 +99,8 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_START(c4023_device::device_add_mconfig)
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(c1526_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(c1526_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index bbadac3b80f..3b04805e683 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -816,30 +816,30 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pb_w )
//-------------------------------------------------
MACHINE_CONFIG_START(c1541_device_base::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1541_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1541_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1541_device_base, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1541_device_base, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1541_device_base, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1541_device_base, via0_pb_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(c1541_device_base, via0_ca2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_device_base, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1541_device_base, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1541_device_base, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1541_device_base, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1541_device_base, via0_pb_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, c1541_device_base, via0_ca2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1541_device_base, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1541_device_base, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1541_device_base, via1_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1541_device_base, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1541_device_base, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1541_device_base, via1_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1541_device_base, via1_irq_w))
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_ATN_CALLBACK(WRITELINE(c1541_device_base, atn_w))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1541_device_base, byte_w))
+ MCFG_64H156_ATN_CALLBACK(WRITELINE(*this, c1541_device_base, atn_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1541_device_base, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1540_floppies, "525ssqd", c1541_device_base::floppy_formats)
MACHINE_CONFIG_END
@@ -852,33 +852,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1541_dolphin_dos_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
- MCFG_CPU_MODIFY(M6502_TAG)
- MCFG_CPU_PROGRAM_MAP(c1541dd_mem)
+ MCFG_DEVICE_MODIFY(M6502_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(c1541dd_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1541_professional_dos_v1_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
- MCFG_CPU_MODIFY(M6502_TAG)
- MCFG_CPU_PROGRAM_MAP(c1541pd_mem)
+ MCFG_DEVICE_MODIFY(M6502_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(c1541pd_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1541_prologic_dos_classic_device::device_add_mconfig)
c1541_device_base::device_add_mconfig(config);
- MCFG_CPU_MODIFY(M6502_TAG)
- MCFG_CPU_PROGRAM_MAP(c1541pdc_mem)
+ MCFG_DEVICE_MODIFY(M6502_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(c1541pdc_mem)
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(c1541_prologic_dos_classic_device, pia_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(c1541_prologic_dos_classic_device, pia_pb_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, c1541_prologic_dos_classic_device, pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, c1541_prologic_dos_classic_device, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, c1541_prologic_dos_classic_device, pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(MC6821_TAG, pia6821_device, ca1_w))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(MC6821_TAG, pia6821_device, ca1_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 2cbe03c58c2..336cc049118 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -605,144 +605,144 @@ static void mini_chief_isa8_cards(device_slot_interface &device)
//-------------------------------------------------
MACHINE_CONFIG_START(c1570_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1571_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via1_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
- MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1571_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w))
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1571_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1571_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via1_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
- MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1571_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w))
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1571cr_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c1571_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c1571_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571cr_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571cr_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571cr_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571cr_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via1_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w))
//MCFG_MOS5710_ADD(M5710_TAG, XTAL(16'000'000)/16, 0)
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mini_chief_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(mini_chief_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(mini_chief_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c1571_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c1571_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c1571_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c1571_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c1571_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c1571_device, via1_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c1571_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c1571_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c1571_device, via1_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c1571_device, via1_irq_w))
MCFG_DEVICE_ADD(M6526_TAG, MOS6526, XTAL(16'000'000)/16)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c1571_device, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1571_device, cia_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1571_device, cia_sp_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1571_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_device, cia_pb_w))
- MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_device, cia_pc_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c1571_device, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1571_device, cia_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1571_device, cia_sp_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1571_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1571_device, cia_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(*this, c1571_device, cia_pc_w))
MCFG_WD1770_ADD(WD1770_TAG, XTAL(16'000'000)/2)
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c1571_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1571_floppies, "525qd", c1571_device::floppy_formats)
MCFG_DEVICE_ADD(ISA_BUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(M6502_TAG)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", mini_chief_isa8_cards, "wd1002a_wx1", false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, ISA_BUS_TAG, mini_chief_isa8_cards, "wd1002a_wx1", false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 8e9f0ec9555..f0dad13a58c 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -268,17 +268,17 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c1581_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(c1581_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(c1581_mem)
MCFG_DEVICE_ADD(M8520_TAG, MOS8520, XTAL(16'000'000)/8)
MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c1581_device, cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c1581_device, sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c1581_device, cia_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c1581_device, cia_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_device, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_device, cia_pb_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c1581_device, cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c1581_device, sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c1581_device, cia_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c1581_device, cia_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c1581_device, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c1581_device, cia_pb_w))
MCFG_WD1772_ADD(WD1772_TAG, XTAL(16'000'000)/2)
MCFG_FLOPPY_DRIVE_ADD_FIXED(WD1772_TAG":0", c1581_floppies, "35dd", c1581_device::floppy_formats)
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 0a770d370cb..cf3ea0eec04 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -78,8 +78,8 @@ void cmd_hd_device::cmd_hd_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(cmd_hd_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, 2000000)
- MCFG_CPU_PROGRAM_MAP(cmd_hd_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(cmd_hd_mem)
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 2000000)
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 2000000)
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index a14f69d17a6..a4f47b0d83e 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -216,14 +216,14 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(fd2000_device::device_add_mconfig)
- MCFG_CPU_ADD(G65SC02PI2_TAG, M65C02, XTAL(24'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(fd2000_mem)
+ MCFG_DEVICE_ADD(G65SC02PI2_TAG, M65C02, XTAL(24'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(fd2000_mem)
MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL(24'000'000)/12)
- MCFG_VIA6522_READPA_HANDLER(READ8(fd2000_device, via_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(fd2000_device, via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(fd2000_device, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(fd2000_device, via_pb_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, fd2000_device, via_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, fd2000_device, via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, fd2000_device, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, fd2000_device, via_pb_w))
MCFG_DP8473_ADD(DP8473V_TAG)
@@ -232,14 +232,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fd4000_device::device_add_mconfig)
- MCFG_CPU_ADD(R65C02P4_TAG, M65C02, XTAL(24'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(fd4000_mem)
+ MCFG_DEVICE_ADD(R65C02P4_TAG, M65C02, XTAL(24'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(fd4000_mem)
MCFG_DEVICE_ADD(G65SC22P2_TAG, VIA6522, XTAL(24'000'000)/12)
- MCFG_VIA6522_READPA_HANDLER(READ8(fd2000_device, via_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(fd2000_device, via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(fd2000_device, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(fd2000_device, via_pb_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, fd2000_device, via_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, fd2000_device, via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, fd2000_device, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, fd2000_device, via_pb_w))
MCFG_PC8477A_ADD(PC8477AV1_TAG)
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index 009229f6674..d6111dafe4d 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -124,8 +124,8 @@ void interpod_device::interpod_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(interpod_device::device_add_mconfig)
- MCFG_CPU_ADD(R6502_TAG, M6502, 1000000)
- MCFG_CPU_PROGRAM_MAP(interpod_mem)
+ MCFG_DEVICE_ADD(R6502_TAG, M6502, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(interpod_mem)
MCFG_DEVICE_ADD(R6522_TAG, VIA6522, 1000000)
MCFG_DEVICE_ADD(R6532_TAG, MOS6532_NEW, 1000000)
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 04682e661de..b14eca1f389 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -70,8 +70,8 @@ void serial_box_device::serial_box_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(serial_box_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M65C02, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(serial_box_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M65C02, XTAL(4'000'000)/4)
+ MCFG_DEVICE_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 20b9420c2b5..1afc47ce807 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -62,9 +62,9 @@ void vic1515_device::vic1515_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(vic1515_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8039, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(vic1515_mem)
- MCFG_CPU_IO_MAP(vic1515_io)
+ MCFG_DEVICE_ADD("maincpu", I8039, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vic1515_mem)
+ MCFG_DEVICE_IO_MAP(vic1515_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index c437790cf46..d93094bcd9a 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -95,8 +95,8 @@ void vic1520_device::vic1520_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(vic1520_device::device_add_mconfig)
- MCFG_CPU_ADD(M6500_1_TAG, M6502, XTAL(2'000'000)) // M6500/1
- MCFG_CPU_PROGRAM_MAP(vic1520_mem)
+ MCFG_DEVICE_ADD(M6500_1_TAG, M6502, XTAL(2'000'000)) // M6500/1
+ MCFG_DEVICE_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 83aa59e0ee5..85c841d8052 100644
--- a/src/devices/bus/cbus/mpu_pc98.cpp
+++ b/src/devices/bus/cbus/mpu_pc98.cpp
@@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(MPU_PC98, mpu_pc98_device, "mpu_pc98", "Roland MPU-401 MIDI I
//-------------------------------------------------
MACHINE_CONFIG_START(mpu_pc98_device::device_add_mconfig)
- MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(mpu_pc98_device, mpu_irq_out))
+ MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(*this, 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 ecd86eb39c2..13e7503b2fc 100644
--- a/src/devices/bus/cbus/pc9801_118.cpp
+++ b/src/devices/bus/cbus/pc9801_118.cpp
@@ -52,12 +52,12 @@ WRITE_LINE_MEMBER(pc9801_118_device::pc9801_sound_irq)
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))
- MCFG_AY8910_PORT_A_READ_CB(READ8(pc9801_118_device, opn_porta_r))
- //MCFG_AY8910_PORT_B_READ_CB(READ8(pc9801_state, opn_portb_r))
- //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(pc9801_state, opn_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pc9801_118_device, opn_portb_w))
+ MCFG_DEVICE_ADD("opn3", YM2608, MAIN_CLOCK_X2*4) // actually YMF288, unknown clock / divider, might be X1 x 5 actually
+ MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc9801_118_device, pc9801_sound_irq))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_118_device, opn_porta_r))
+ //MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc9801_state, opn_portb_r))
+ //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, pc9801_state, opn_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_118_device, opn_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp
index 57fc88f09e5..45dbe8bd216 100644
--- a/src/devices/bus/cbus/pc9801_26.cpp
+++ b/src/devices/bus/cbus/pc9801_26.cpp
@@ -53,12 +53,12 @@ WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq)
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))
- MCFG_AY8910_PORT_A_READ_CB(READ8(pc9801_26_device, opn_porta_r))
- //MCFG_AY8910_PORT_B_READ_CB(READ8(pc9801_state, opn_portb_r))
- //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(pc9801_state, opn_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pc9801_26_device, opn_portb_w))
+ MCFG_DEVICE_ADD("opn", YM2203, MAIN_CLOCK_X1*2) // unknown clock / divider
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, pc9801_26_device, pc9801_sound_irq))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_26_device, opn_porta_r))
+ //MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc9801_state, opn_portb_r))
+ //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, pc9801_state, opn_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_26_device, opn_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp
index c280702414d..104c68a8cde 100644
--- a/src/devices/bus/cbus/pc9801_86.cpp
+++ b/src/devices/bus/cbus/pc9801_86.cpp
@@ -54,17 +54,17 @@ WRITE_LINE_MEMBER(pc9801_86_device::sound_irq)
MACHINE_CONFIG_START(pc9801_86_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("opna", YM2608, 7.987_MHz_XTAL)
- MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc9801_86_device, sound_irq))
+ MCFG_DEVICE_ADD("opna", YM2608, 7.987_MHz_XTAL)
+ MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc9801_86_device, sound_irq))
MCFG_AY8910_OUTPUT_TYPE(0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(pc9801_86_device, opn_porta_r))
- //MCFG_AY8910_PORT_B_READ_CB(READ8(pc9801_state, opn_portb_r))
- //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(pc9801_state, opn_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pc9801_86_device, opn_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_86_device, opn_porta_r))
+ //MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc9801_state, opn_portb_r))
+ //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, pc9801_state, opn_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_86_device, opn_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // burr brown pcm61p
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // burr brown pcm61p
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // burr brown pcm61p
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // burr brown pcm61p
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp
index 3fb6e13d9a8..6f9d3bbbd49 100644
--- a/src/devices/bus/cbus/pc9801_amd98.cpp
+++ b/src/devices/bus/cbus/pc9801_amd98.cpp
@@ -47,17 +47,17 @@ DEFINE_DEVICE_TYPE(PC9801_AMD98, pc9801_amd98_device, "pc9801_amd98", "pc9801_am
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_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK_X1*2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("OPN_PA1"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pc9801_amd98_device,ay3_address_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_amd98_device,ay3_address_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK_X1*2)
+ MCFG_DEVICE_ADD("ay2", AY8910, MAIN_CLOCK_X1*2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("OPN_PA2"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pc9801_amd98_device,ay3_data_latch_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_amd98_device,ay3_data_latch_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ay3", AY8910, MAIN_CLOCK_X1*2)
+ MCFG_DEVICE_ADD("ay3", AY8910, MAIN_CLOCK_X1*2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index 51791f680b2..afdce31a8bf 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -87,8 +87,8 @@ void comx_pl80_device::comxpl80_mem(address_map &map)
//-------------------------------------------------
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_DEVICE_ADD(CX005_TAG, M6805, 4000000) // CX005: some kind of MC6805/MC68HC05 clone
+ MCFG_DEVICE_PROGRAM_MAP(comxpl80_mem)
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp
index 80e355b82a9..9db269fc137 100644
--- a/src/devices/bus/centronics/covox.cpp
+++ b/src/devices/bus/centronics/covox.cpp
@@ -41,7 +41,7 @@ centronics_covox_device::centronics_covox_device(const machine_config &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
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -90,8 +90,8 @@ centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_con
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
- MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h
index c274b3d7832..4117c8d0a31 100644
--- a/src/devices/bus/centronics/ctronics.h
+++ b/src/devices/bus/centronics/ctronics.h
@@ -71,24 +71,24 @@
#define MCFG_CENTRONICS_OUTPUT_LATCH_ADD(_tag, _centronics_tag) \
MCFG_DEVICE_ADD(_tag, OUTPUT_LATCH, 0) \
- MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data0)) \
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data1)) \
- MCFG_OUTPUT_LATCH_BIT2_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data2)) \
- MCFG_OUTPUT_LATCH_BIT3_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data3)) \
- MCFG_OUTPUT_LATCH_BIT4_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data4)) \
- MCFG_OUTPUT_LATCH_BIT5_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data5)) \
- MCFG_OUTPUT_LATCH_BIT6_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data6)) \
- MCFG_OUTPUT_LATCH_BIT7_HANDLER(DEVWRITELINE(_centronics_tag, centronics_device, write_data7))
+ MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data0)) \
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data1)) \
+ MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data2)) \
+ MCFG_OUTPUT_LATCH_BIT3_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data3)) \
+ MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data4)) \
+ MCFG_OUTPUT_LATCH_BIT5_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data5)) \
+ MCFG_OUTPUT_LATCH_BIT6_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data6)) \
+ MCFG_OUTPUT_LATCH_BIT7_HANDLER(WRITELINE(_centronics_tag, centronics_device, write_data7))
#define MCFG_CENTRONICS_DATA_INPUT_BUFFER(_tag) \
- MCFG_CENTRONICS_DATA0_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit0)) \
- MCFG_CENTRONICS_DATA1_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit1)) \
- MCFG_CENTRONICS_DATA2_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit2)) \
- MCFG_CENTRONICS_DATA3_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit3)) \
- MCFG_CENTRONICS_DATA4_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit4)) \
- MCFG_CENTRONICS_DATA5_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit5)) \
- MCFG_CENTRONICS_DATA6_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit6)) \
- MCFG_CENTRONICS_DATA7_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_DATA0_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit0)) \
+ MCFG_CENTRONICS_DATA1_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit1)) \
+ MCFG_CENTRONICS_DATA2_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit2)) \
+ MCFG_CENTRONICS_DATA3_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit3)) \
+ MCFG_CENTRONICS_DATA4_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit4)) \
+ MCFG_CENTRONICS_DATA5_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit5)) \
+ MCFG_CENTRONICS_DATA6_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit6)) \
+ MCFG_CENTRONICS_DATA7_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit7))
DECLARE_DEVICE_TYPE(CENTRONICS, centronics_device)
diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp
index 27bb97be119..a97f86a3c8a 100644
--- a/src/devices/bus/centronics/digiblst.cpp
+++ b/src/devices/bus/centronics/digiblst.cpp
@@ -41,7 +41,7 @@ centronics_digiblaster_device::centronics_digiblaster_device(const machine_confi
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
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index ace4bd0ca25..aa25e459cc8 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -217,20 +217,20 @@ void epson_ex800_device::ex800_mem(address_map &map)
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)
- MCFG_UPD7810_PORTA_READ_CB(READ8(epson_ex800_device, porta_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_ex800_device, porta_w))
- MCFG_UPD7810_PORTB_READ_CB(READ8(epson_ex800_device, portb_r))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(epson_ex800_device, portb_w))
- MCFG_UPD7810_PORTC_READ_CB(READ8(epson_ex800_device, portc_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(epson_ex800_device, portc_w))
+ MCFG_DEVICE_ADD("maincpu", UPD7810, 12000000) /* 12 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(ex800_mem)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, epson_ex800_device, porta_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, epson_ex800_device, porta_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, epson_ex800_device, portb_r))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, epson_ex800_device, portb_w))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, epson_ex800_device, portc_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, epson_ex800_device, portc_w))
MCFG_DEFAULT_LAYOUT(layout_ex800)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 4000) /* measured at 4000 Hz */
+ MCFG_DEVICE_ADD("beeper", BEEP, 4000) /* measured at 4000 Hz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index 217421fb275..9e782023bb5 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -68,33 +68,33 @@ void epson_lx800_device::lx800_mem(address_map &map)
MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL(14'745'600))
- MCFG_CPU_PROGRAM_MAP(lx800_mem)
- MCFG_UPD7810_PORTA_READ_CB(READ8(epson_lx800_device, porta_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_lx800_device, porta_w))
+ MCFG_DEVICE_ADD("maincpu", UPD7810, XTAL(14'745'600))
+ MCFG_DEVICE_PROGRAM_MAP(lx800_mem)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, epson_lx800_device, porta_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, epson_lx800_device, porta_w))
MCFG_UPD7810_PORTB_READ_CB(IOPORT("DIPSW1"))
- MCFG_UPD7810_PORTC_READ_CB(READ8(epson_lx800_device, portc_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(epson_lx800_device, portc_w))
- MCFG_UPD7810_AN0(READLINE(epson_lx800_device, an0_r))
- MCFG_UPD7810_AN1(READLINE(epson_lx800_device, an1_r))
- MCFG_UPD7810_AN2(READLINE(epson_lx800_device, an2_r))
- MCFG_UPD7810_AN3(READLINE(epson_lx800_device, an3_r))
- MCFG_UPD7810_AN4(READLINE(epson_lx800_device, an4_r))
- MCFG_UPD7810_AN5(READLINE(epson_lx800_device, an5_r))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, epson_lx800_device, portc_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, epson_lx800_device, portc_w))
+ MCFG_UPD7810_AN0(READLINE(*this, epson_lx800_device, an0_r))
+ MCFG_UPD7810_AN1(READLINE(*this, epson_lx800_device, an1_r))
+ MCFG_UPD7810_AN2(READLINE(*this, epson_lx800_device, an2_r))
+ MCFG_UPD7810_AN3(READLINE(*this, epson_lx800_device, an3_r))
+ MCFG_UPD7810_AN4(READLINE(*this, epson_lx800_device, an4_r))
+ MCFG_UPD7810_AN5(READLINE(*this, epson_lx800_device, an5_r))
MCFG_DEFAULT_LAYOUT(layout_lx800)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 4000) // ?
+ MCFG_DEVICE_ADD("beeper", BEEP, 4000) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
/* gate array */
MCFG_DEVICE_ADD("ic3b", E05A03, 0)
- MCFG_E05A03_PE_LP_CALLBACK(WRITELINE(epson_lx800_device, paperempty_led_w))
- MCFG_E05A03_RESO_CALLBACK(WRITELINE(epson_lx800_device, reset_w))
- MCFG_E05A03_PE_CALLBACK(WRITELINE(epson_lx800_device, centronics_pe_w))
- MCFG_E05A03_DATA_CALLBACK(READ8(epson_lx800_device, centronics_data_r))
+ MCFG_E05A03_PE_LP_CALLBACK(WRITELINE(*this, epson_lx800_device, paperempty_led_w))
+ MCFG_E05A03_RESO_CALLBACK(WRITELINE(*this, epson_lx800_device, reset_w))
+ MCFG_E05A03_PE_CALLBACK(WRITELINE(*this, epson_lx800_device, centronics_pe_w))
+ MCFG_E05A03_DATA_CALLBACK(READ8(*this, epson_lx800_device, centronics_data_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index 466e1351357..a3c327267b8 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -111,24 +111,24 @@ void epson_lx810l_device::lx810l_mem(address_map &map)
MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL(14'745'600))
- MCFG_CPU_PROGRAM_MAP(lx810l_mem)
- MCFG_UPD7810_PORTA_READ_CB(READ8(epson_lx810l_device, porta_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(epson_lx810l_device, porta_w))
- MCFG_UPD7810_PORTB_READ_CB(READ8(epson_lx810l_device, portb_r))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(epson_lx810l_device, portb_w))
- MCFG_UPD7810_PORTC_READ_CB(READ8(epson_lx810l_device, portc_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(epson_lx810l_device, portc_w))
- MCFG_UPD7810_AN0(READ8(epson_lx810l_device, an0_r))
- MCFG_UPD7810_AN1(READ8(epson_lx810l_device, an1_r))
- MCFG_UPD7810_AN2(READ8(epson_lx810l_device, an2_r))
- MCFG_UPD7810_AN3(READ8(epson_lx810l_device, an3_r))
- MCFG_UPD7810_AN4(READ8(epson_lx810l_device, an4_r))
- MCFG_UPD7810_AN5(READ8(epson_lx810l_device, an5_r))
- MCFG_UPD7810_AN6(READ8(epson_lx810l_device, an6_r))
- MCFG_UPD7810_AN7(READ8(epson_lx810l_device, an7_r))
- MCFG_UPD7810_CO0(WRITELINE(epson_lx810l_device, co0_w))
- MCFG_UPD7810_CO1(DEVWRITELINE("dac", dac_bit_interface, write))
+ MCFG_DEVICE_ADD("maincpu", UPD7810, XTAL(14'745'600))
+ MCFG_DEVICE_PROGRAM_MAP(lx810l_mem)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, epson_lx810l_device, porta_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, epson_lx810l_device, porta_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, epson_lx810l_device, portb_r))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, epson_lx810l_device, portb_w))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, epson_lx810l_device, portc_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, epson_lx810l_device, portc_w))
+ MCFG_UPD7810_AN0(READ8(*this, epson_lx810l_device, an0_r))
+ MCFG_UPD7810_AN1(READ8(*this, epson_lx810l_device, an1_r))
+ MCFG_UPD7810_AN2(READ8(*this, epson_lx810l_device, an2_r))
+ MCFG_UPD7810_AN3(READ8(*this, epson_lx810l_device, an3_r))
+ MCFG_UPD7810_AN4(READ8(*this, epson_lx810l_device, an4_r))
+ MCFG_UPD7810_AN5(READ8(*this, epson_lx810l_device, an5_r))
+ MCFG_UPD7810_AN6(READ8(*this, epson_lx810l_device, an6_r))
+ MCFG_UPD7810_AN7(READ8(*this, epson_lx810l_device, an7_r))
+ MCFG_UPD7810_CO0(WRITELINE(*this, epson_lx810l_device, co0_w))
+ MCFG_UPD7810_CO1(WRITELINE("dac", dac_bit_interface, write))
// MCFG_DEFAULT_LAYOUT(layout_lx800)
@@ -142,21 +142,21 @@ MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
/* gate array */
MCFG_DEVICE_ADD("e05a30", E05A30, 0)
- MCFG_E05A30_PRINTHEAD_CALLBACK(WRITE16(epson_lx810l_device, printhead))
- MCFG_E05A30_PF_STEPPER_CALLBACK(WRITE8(epson_lx810l_device, pf_stepper))
- MCFG_E05A30_CR_STEPPER_CALLBACK(WRITE8(epson_lx810l_device, cr_stepper))
- MCFG_E05A30_READY_CALLBACK(WRITELINE(epson_lx810l_device, e05a30_ready))
- MCFG_E05A30_CENTRONICS_ACK_CALLBACK(WRITELINE(epson_lx810l_device, e05a30_centronics_ack))
- MCFG_E05A30_CENTRONICS_BUSY_CALLBACK(WRITELINE(epson_lx810l_device, e05a30_centronics_busy))
- MCFG_E05A30_CENTRONICS_PERROR_CALLBACK(WRITELINE(epson_lx810l_device, e05a30_centronics_perror))
- MCFG_E05A30_CENTRONICS_FAULT_CALLBACK(WRITELINE(epson_lx810l_device, e05a30_centronics_fault))
- MCFG_E05A30_CENTRONICS_SELECT_CALLBACK(WRITELINE(epson_lx810l_device, e05a30_centronics_select))
+ MCFG_E05A30_PRINTHEAD_CALLBACK(WRITE16(*this, epson_lx810l_device, printhead))
+ MCFG_E05A30_PF_STEPPER_CALLBACK(WRITE8(*this, epson_lx810l_device, pf_stepper))
+ MCFG_E05A30_CR_STEPPER_CALLBACK(WRITE8(*this, epson_lx810l_device, cr_stepper))
+ MCFG_E05A30_READY_CALLBACK(WRITELINE(*this, epson_lx810l_device, e05a30_ready))
+ MCFG_E05A30_CENTRONICS_ACK_CALLBACK(WRITELINE(*this, epson_lx810l_device, e05a30_centronics_ack))
+ MCFG_E05A30_CENTRONICS_BUSY_CALLBACK(WRITELINE(*this, epson_lx810l_device, e05a30_centronics_busy))
+ MCFG_E05A30_CENTRONICS_PERROR_CALLBACK(WRITELINE(*this, epson_lx810l_device, e05a30_centronics_perror))
+ MCFG_E05A30_CENTRONICS_FAULT_CALLBACK(WRITELINE(*this, epson_lx810l_device, e05a30_centronics_fault))
+ MCFG_E05A30_CENTRONICS_SELECT_CALLBACK(WRITELINE(*this, epson_lx810l_device, e05a30_centronics_select))
/* 256-bit eeprom */
MCFG_EEPROM_SERIAL_93C06_ADD("eeprom")
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index 6af7046955b..cd7914a0bde 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -51,8 +51,8 @@ void nec_p72_device::p72_mem(address_map &map)
MACHINE_CONFIG_START(nec_p72_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33, XTAL(16'000'000)/2) /* TODO it's actually a V40 */
- MCFG_CPU_PROGRAM_MAP(p72_mem)
+ MCFG_DEVICE_ADD("maincpu", V33, XTAL(16'000'000)/2) /* TODO it's actually a V40 */
+ MCFG_DEVICE_PROGRAM_MAP(p72_mem)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/centronics/printer.cpp b/src/devices/bus/centronics/printer.cpp
index 67c126a6121..129e53426f4 100644
--- a/src/devices/bus/centronics/printer.cpp
+++ b/src/devices/bus/centronics/printer.cpp
@@ -34,7 +34,7 @@ centronics_printer_device::centronics_printer_device(const machine_config &mconf
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))
+ MCFG_PRINTER_ONLINE_CB(WRITELINE(*this, 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 0a2680023df..723376213e7 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -75,7 +75,7 @@ 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(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cgenie_fdc_device, intrq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, cgenie_fdc_device, intrq_w))
MCFG_FLOPPY_DRIVE_ADD("fd1793:0", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1793:1", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats)
diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp
index bfd901493d9..b31e09da419 100644
--- a/src/devices/bus/cgenie/parallel/printer.cpp
+++ b/src/devices/bus/cgenie/parallel/printer.cpp
@@ -29,10 +29,10 @@ DEFINE_DEVICE_TYPE(CGENIE_PRINTER, cgenie_printer_device, "cgenie_printer", "Pri
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))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(cgenie_printer_device, select_w))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(cgenie_printer_device, fault_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, cgenie_printer_device, busy_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, cgenie_printer_device, perror_w))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, cgenie_printer_device, select_w))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, cgenie_printer_device, fault_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("latch", "centronics")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp
index bfbb58f05c7..d4cba829a0d 100644
--- a/src/devices/bus/coco/coco_dcmodem.cpp
+++ b/src/devices/bus/coco/coco_dcmodem.cpp
@@ -84,14 +84,14 @@ namespace
MACHINE_CONFIG_START(coco_dc_modem_device::device_add_mconfig)
MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(coco_dc_modem_device, uart_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PORT_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(PORT_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, coco_dc_modem_device, uart_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(PORT_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(PORT_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp
index 0f0fbc59e46..e3913c2e0e7 100644
--- a/src/devices/bus/coco/coco_fdc.cpp
+++ b/src/devices/bus/coco/coco_fdc.cpp
@@ -128,8 +128,8 @@ static void coco_fdc_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(coco_fdc_device_base::device_add_mconfig)
MCFG_WD1773_ADD(WD_TAG, XTAL(8'000'000))
- 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, coco_fdc_device_base, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, coco_fdc_device_base, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD_TAG ":0", coco_fdc_floppies, "qd", coco_fdc_device_base::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp
index 7e820c427c1..25aafe1f0a3 100644
--- a/src/devices/bus/coco/coco_gmc.cpp
+++ b/src/devices/bus/coco/coco_gmc.cpp
@@ -53,7 +53,7 @@ namespace
MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("gmc_speaker")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, 4_MHz_XTAL)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 4_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp
index afe7e4c6a57..6f42c45d946 100644
--- a/src/devices/bus/coco/coco_multi.cpp
+++ b/src/devices/bus/coco/coco_multi.cpp
@@ -161,7 +161,7 @@ static void coco_cart_slot1_3(device_slot_interface &device)
device.option_add("rs232", COCO_RS232);
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
- device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1));
+ device.option_add("ssc", COCO_SSC);
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
@@ -174,7 +174,7 @@ static void coco_cart_slot4(device_slot_interface &device)
device.option_add("rs232", COCO_RS232);
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
- device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1));
+ device.option_add("ssc", COCO_SSC);
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
@@ -183,21 +183,21 @@ static void coco_cart_slot4(device_slot_interface &device)
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))
- MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_halt_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_cart_w))
+ MCFG_COCO_CARTRIDGE_NMI_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_nmi_w))
+ MCFG_COCO_CARTRIDGE_HALT_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot1_halt_w))
MCFG_COCO_CARTRIDGE_ADD(SLOT2_TAG, coco_cart_slot1_3, nullptr)
- MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot2_cart_w))
- MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot2_nmi_w))
- MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot2_halt_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot2_cart_w))
+ MCFG_COCO_CARTRIDGE_NMI_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot2_nmi_w))
+ MCFG_COCO_CARTRIDGE_HALT_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot2_halt_w))
MCFG_COCO_CARTRIDGE_ADD(SLOT3_TAG, coco_cart_slot1_3, nullptr)
- MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot3_cart_w))
- MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot3_nmi_w))
- MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot3_halt_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot3_cart_w))
+ MCFG_COCO_CARTRIDGE_NMI_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot3_nmi_w))
+ MCFG_COCO_CARTRIDGE_HALT_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot3_halt_w))
MCFG_COCO_CARTRIDGE_ADD(SLOT4_TAG, coco_cart_slot4, "fdcv11")
- MCFG_COCO_CARTRIDGE_CART_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot4_cart_w))
- MCFG_COCO_CARTRIDGE_NMI_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot4_nmi_w))
- MCFG_COCO_CARTRIDGE_HALT_CB(DEVWRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot4_halt_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot4_cart_w))
+ MCFG_COCO_CARTRIDGE_NMI_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot4_nmi_w))
+ MCFG_COCO_CARTRIDGE_HALT_CB(WRITELINE(DEVICE_SELF, coco_multipak_device, multi_slot4_halt_w))
MACHINE_CONFIG_END
INPUT_PORTS_START( coco_multipack )
diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp
index cc5aa959636..58738456824 100644
--- a/src/devices/bus/coco/coco_orch90.cpp
+++ b/src/devices/bus/coco/coco_orch90.cpp
@@ -109,8 +109,8 @@ namespace
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)
+ MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // ls374.ic5 + r7 (8x20k) + r9 (8x10k)
+ MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // ls374.ic4 + r6 (8x20k) + r8 (8x10k)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/devices/bus/coco/coco_rs232.cpp b/src/devices/bus/coco/coco_rs232.cpp
index 2ff5ee4a043..914b5f9c0c2 100644
--- a/src/devices/bus/coco/coco_rs232.cpp
+++ b/src/devices/bus/coco/coco_rs232.cpp
@@ -83,14 +83,14 @@ MACHINE_CONFIG_START(coco_rs232_device::device_add_mconfig)
MCFG_DEVICE_ADD(UART_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(coco_rs232_device, uart_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PORT_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(PORT_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UART_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, coco_rs232_device, uart_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(PORT_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(PORT_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UART_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
ROM_START(coco_rs232_device)
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp
index 154875c235d..8c630dfb75c 100644
--- a/src/devices/bus/coco/coco_ssc.cpp
+++ b/src/devices/bus/coco/coco_ssc.cpp
@@ -155,13 +155,13 @@ template class device_finder<device_cococart_interface, true>;
//**************************************************************************
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))
- MCFG_TMS7000_IN_PORTC_CB(READ8(coco_ssc_device, ssc_port_c_r))
- MCFG_TMS7000_OUT_PORTC_CB(WRITE8(coco_ssc_device, ssc_port_c_w))
- MCFG_TMS7000_IN_PORTD_CB(READ8(coco_ssc_device, ssc_port_d_r))
- MCFG_TMS7000_OUT_PORTD_CB(WRITE8(coco_ssc_device, ssc_port_d_w))
+ MCFG_DEVICE_ADD(PIC_TAG, TMS7040, DERIVED_CLOCK(2, 1))
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, coco_ssc_device, ssc_port_a_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, coco_ssc_device, ssc_port_b_w))
+ MCFG_TMS7000_IN_PORTC_CB(READ8(*this, coco_ssc_device, ssc_port_c_r))
+ MCFG_TMS7000_OUT_PORTC_CB(WRITE8(*this, coco_ssc_device, ssc_port_c_w))
+ MCFG_TMS7000_IN_PORTD_CB(READ8(*this, coco_ssc_device, ssc_port_d_r))
+ MCFG_TMS7000_OUT_PORTD_CB(WRITE8(*this, coco_ssc_device, ssc_port_d_w))
MCFG_RAM_ADD("staticram")
MCFG_RAM_DEFAULT_SIZE("2K")
@@ -169,11 +169,11 @@ MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("ssc_audio")
- MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL(3'120'000))
+ MCFG_DEVICE_ADD(SP0256_TAG, SP0256, XTAL(3'120'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", SP0256_GAIN)
MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE(PIC_TAG, TMS7000_INT1_LINE))
- MCFG_SOUND_ADD(AY_TAG, AY8913, DERIVED_CLOCK(2, 1))
+ MCFG_DEVICE_ADD(AY_TAG, AY8913, DERIVED_CLOCK(2, 1))
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "coco_sac_tag", AY8913_GAIN)
diff --git a/src/devices/bus/coco/coco_t4426.cpp b/src/devices/bus/coco/coco_t4426.cpp
index 05dfecd0f1d..e611b1d4487 100644
--- a/src/devices/bus/coco/coco_t4426.cpp
+++ b/src/devices/bus/coco/coco_t4426.cpp
@@ -150,28 +150,28 @@ namespace
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))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_t4426_device, pia_A_w))
MCFG_DEVICE_ADD(UART_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER (DEVWRITELINE (SERIAL_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER (DEVWRITELINE (SERIAL_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER (WRITELINE (SERIAL_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER (WRITELINE (SERIAL_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD (SERIAL_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE (UART_TAG, acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE (UART_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD (SERIAL_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE (UART_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER (WRITELINE (UART_TAG, acia6850_device, write_cts))
/* Bit Rate Generator */
MCFG_MC14411_ADD (BRG_TAG, XTAL(1'843'200))
- MCFG_MC14411_F1_CB(WRITELINE (coco_t4426_device, write_f1_clock))
- MCFG_MC14411_F3_CB(WRITELINE (coco_t4426_device, write_f3_clock))
- MCFG_MC14411_F5_CB(WRITELINE (coco_t4426_device, write_f5_clock))
- MCFG_MC14411_F7_CB(WRITELINE (coco_t4426_device, write_f7_clock))
- MCFG_MC14411_F8_CB(WRITELINE (coco_t4426_device, write_f8_clock))
- MCFG_MC14411_F9_CB(WRITELINE (coco_t4426_device, write_f9_clock))
- MCFG_MC14411_F11_CB(WRITELINE (coco_t4426_device, write_f11_clock))
- MCFG_MC14411_F13_CB(WRITELINE (coco_t4426_device, write_f13_clock))
- MCFG_MC14411_F15_CB(WRITELINE (coco_t4426_device, write_f15_clock))
+ MCFG_MC14411_F1_CB(WRITELINE (*this, coco_t4426_device, write_f1_clock))
+ MCFG_MC14411_F3_CB(WRITELINE (*this, coco_t4426_device, write_f3_clock))
+ MCFG_MC14411_F5_CB(WRITELINE (*this, coco_t4426_device, write_f5_clock))
+ MCFG_MC14411_F7_CB(WRITELINE (*this, coco_t4426_device, write_f7_clock))
+ MCFG_MC14411_F8_CB(WRITELINE (*this, coco_t4426_device, write_f8_clock))
+ MCFG_MC14411_F9_CB(WRITELINE (*this, coco_t4426_device, write_f9_clock))
+ MCFG_MC14411_F11_CB(WRITELINE (*this, coco_t4426_device, write_f11_clock))
+ MCFG_MC14411_F13_CB(WRITELINE (*this, coco_t4426_device, write_f13_clock))
+ MCFG_MC14411_F15_CB(WRITELINE (*this, coco_t4426_device, write_f15_clock))
MACHINE_CONFIG_END
ROM_START( coco_t4426 )
diff --git a/src/devices/bus/coco/cococart.cpp b/src/devices/bus/coco/cococart.cpp
index 30ac0b04fdc..cfbf2fcd326 100644
--- a/src/devices/bus/coco/cococart.cpp
+++ b/src/devices/bus/coco/cococart.cpp
@@ -82,6 +82,7 @@ cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const
m_nmi_callback(*this),
m_halt_callback(*this), m_cart(nullptr)
{
+ set_default_clock(DERIVED_CLOCK(1, 1));
}
diff --git a/src/devices/bus/coco/dragon_fdc.cpp b/src/devices/bus/coco/dragon_fdc.cpp
index d1473a8c0b6..e8a83e8c9a7 100644
--- a/src/devices/bus/coco/dragon_fdc.cpp
+++ b/src/devices/bus/coco/dragon_fdc.cpp
@@ -151,8 +151,8 @@ static void dragon_fdc_drives(device_slot_interface &device)
MACHINE_CONFIG_START(dragon_fdc_device_base::device_add_mconfig)
MCFG_WD2797_ADD(WD2797_TAG, XTAL(4'000'000) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, dragon_fdc_device_base, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dragon_fdc_device_base, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", dragon_fdc_drives, "qd", dragon_fdc_device_base::floppy_formats)
diff --git a/src/devices/bus/coco/dragon_jcbsnd.cpp b/src/devices/bus/coco/dragon_jcbsnd.cpp
index 1b6bf429dc7..239e4160405 100644
--- a/src/devices/bus/coco/dragon_jcbsnd.cpp
+++ b/src/devices/bus/coco/dragon_jcbsnd.cpp
@@ -82,7 +82,7 @@ uint8_t* dragon_jcbsnd_device::get_cart_base()
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_DEVICE_ADD("ay8910", AY8910, DERIVED_CLOCK(1, 1)) /* AY-3-8910 - clock not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp
index c64737f1213..56fceacf7f7 100644
--- a/src/devices/bus/comx35/expbox.cpp
+++ b/src/devices/bus/comx35/expbox.cpp
@@ -100,13 +100,13 @@ const tiny_rom_entry *comx_eb_device::device_rom_region() const
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_IRQ_CALLBACK(WRITELINE(*this, comx_eb_device, slot1_irq_w))
MCFG_COMX_EXPANSION_SLOT_ADD(SLOT2_TAG, comx_expansion_cards, "clm")
- MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot2_irq_w))
+ MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, comx_eb_device, slot2_irq_w))
MCFG_COMX_EXPANSION_SLOT_ADD(SLOT3_TAG, comx_expansion_cards, "joy")
- MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot3_irq_w))
+ MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, comx_eb_device, slot3_irq_w))
MCFG_COMX_EXPANSION_SLOT_ADD(SLOT4_TAG, comx_expansion_cards, "ram")
- MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot4_irq_w))
+ MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, comx_eb_device, slot4_irq_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp
index ad5540b87ce..8d815509912 100644
--- a/src/devices/bus/comx35/printer.cpp
+++ b/src/devices/bus/comx35/printer.cpp
@@ -57,10 +57,10 @@ const tiny_rom_entry *comx_prn_device::device_rom_region() const
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))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit2))
- MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit3))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit0))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit2))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit3))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp
index df9b0a7ff5f..3d892f473d9 100644
--- a/src/devices/bus/cpc/amdrum.cpp
+++ b/src/devices/bus/cpc/amdrum.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(CPC_AMDRUM, cpc_amdrum_device, "cpc_amdrum", "Amdrum")
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// no pass-through
diff --git a/src/devices/bus/cpc/cpc_rom.cpp b/src/devices/bus/cpc/cpc_rom.cpp
index af5150862e9..113e2efdef3 100644
--- a/src/devices/bus/cpc/cpc_rom.cpp
+++ b/src/devices/bus/cpc/cpc_rom.cpp
@@ -31,9 +31,9 @@ MACHINE_CONFIG_START(cpc_rom_device::device_add_mconfig)
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index 688b1b4e2ab..80c8b15b669 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -38,27 +38,27 @@ MACHINE_CONFIG_START(cpc_rs232_device::device_add_mconfig)
MCFG_PIT8253_CLK0(2000000)
MCFG_PIT8253_CLK1(2000000)
MCFG_PIT8253_CLK2(2000000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(cpc_rs232_device, pit_out0_w))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(cpc_rs232_device, pit_out1_w))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(cpc_rs232_device, pit_out2_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, cpc_rs232_device, pit_out0_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, cpc_rs232_device, pit_out1_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, cpc_rs232_device, pit_out2_w))
MCFG_DEVICE_ADD("dart", Z80DART, XTAL(4'000'000))
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart",z80dart_device,rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("dart",z80dart_device,dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart",z80dart_device,ctsa_w))
-// MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart",z80dart_device,ria_w))
+ MCFG_DEVICE_ADD("rs232",RS232_PORT,default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("dart",z80dart_device,rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("dart",z80dart_device,dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("dart",z80dart_device,ctsa_w))
+// MCFG_RS232_RI_HANDLER(WRITELINE("dart",z80dart_device,ria_w))
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp
index 47759ac3307..cbfbe0c161d 100644
--- a/src/devices/bus/cpc/cpc_ssa1.cpp
+++ b/src/devices/bus/cpc/cpc_ssa1.cpp
@@ -117,33 +117,33 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const
// device machine config
MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sp0256",SP0256,XTAL(3'120'000))
- MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_ssa1_device, lrq_cb))
- MCFG_SP0256_STANDBY_CB(WRITELINE(cpc_ssa1_device, sby_cb))
+ MCFG_DEVICE_ADD("sp0256",SP0256,XTAL(3'120'000))
+ MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, cpc_ssa1_device, lrq_cb))
+ MCFG_SP0256_STANDBY_CB(WRITELINE(*this, cpc_ssa1_device, sby_cb))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sp0256",SP0256,XTAL(4'000'000)) // uses the CPC's clock from pin 50 of the expansion port
- MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(cpc_dkspeech_device, lrq_cb))
- MCFG_SP0256_STANDBY_CB(WRITELINE(cpc_dkspeech_device, sby_cb))
+ MCFG_DEVICE_ADD("sp0256",SP0256,XTAL(4'000'000)) // uses the CPC's clock from pin 50 of the expansion port
+ MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, cpc_dkspeech_device, lrq_cb))
+ MCFG_SP0256_STANDBY_CB(WRITELINE(*this, cpc_dkspeech_device, sby_cb))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/ddi1.cpp b/src/devices/bus/cpc/ddi1.cpp
index 13bb7950077..bac64263871 100644
--- a/src/devices/bus/cpc/ddi1.cpp
+++ b/src/devices/bus/cpc/ddi1.cpp
@@ -48,9 +48,9 @@ MACHINE_CONFIG_START(cpc_ddi1_device::device_add_mconfig)
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/hd20.cpp b/src/devices/bus/cpc/hd20.cpp
index a9e14adb6ca..909444f60e9 100644
--- a/src/devices/bus/cpc/hd20.cpp
+++ b/src/devices/bus/cpc/hd20.cpp
@@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(CPC_HD20, cpc_hd20_device, "cpc_hd20", "Dobbertin HD20")
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_XTHDC_IRQ_HANDLER(WRITELINE(*this, cpc_hd20_device, irq_w))
MCFG_HARDDISK_ADD("hdc:primary")
// no pass-through (?)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp
index fef6582ae11..cd18889445d 100644
--- a/src/devices/bus/cpc/magicsound.cpp
+++ b/src/devices/bus/cpc/magicsound.cpp
@@ -25,17 +25,17 @@ MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig)
// 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
// the K1810WT37 is different to the i8237/AM9517A
- //MCFG_I8237_OUT_EOP_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w)) // MCFG_DEVCB_INVERT
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dmac", am9517a_device, hack_w))
- MCFG_I8237_IN_MEMR_CB(READ8(al_magicsound_device, dma_read_byte))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(al_magicsound_device, dma_write_byte))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(al_magicsound_device, dma_write_byte))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(al_magicsound_device, dma_write_byte))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(al_magicsound_device, dma_write_byte))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(al_magicsound_device, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(al_magicsound_device, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(al_magicsound_device, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(al_magicsound_device, dack3_w))
+ //MCFG_I8237_OUT_EOP_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w)) // MCFG_DEVCB_INVERT
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dmac", am9517a_device, hack_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, al_magicsound_device, dma_read_byte))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, al_magicsound_device, dma_write_byte))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, al_magicsound_device, dma_write_byte))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, al_magicsound_device, dma_write_byte))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, al_magicsound_device, dma_write_byte))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, al_magicsound_device, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, al_magicsound_device, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, al_magicsound_device, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, al_magicsound_device, dack3_w))
// Timing does not seem to be correct.
// According to the schematics, the clock is from the clock pin on the expansion port (4MHz), and
@@ -43,21 +43,21 @@ MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig)
// Timer outputs to SAM0/1/2/3 are sample clocks for each sound channel, D/A0 is the low bit of the channel select.
MCFG_DEVICE_ADD("timer1", PIT8254, 0)
MCFG_PIT8253_CLK0(XTAL(4'000'000))
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(al_magicsound_device, sam0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, al_magicsound_device, sam0_w))
MCFG_PIT8253_CLK1(XTAL(4'000'000))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(al_magicsound_device, sam1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, al_magicsound_device, sam1_w))
MCFG_PIT8253_CLK2(XTAL(4'000'000))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(al_magicsound_device, sam2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, al_magicsound_device, sam2_w))
MCFG_DEVICE_ADD("timer2", PIT8254, 0)
MCFG_PIT8253_CLK0(XTAL(4'000'000))
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(al_magicsound_device, sam3_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, al_magicsound_device, sam3_w))
MCFG_PIT8253_CLK1(XTAL(4'000'000))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(al_magicsound_device, da0_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, al_magicsound_device, da0_w))
MCFG_PIT8253_CLK2(XTAL(4'000'000))
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// no pass-through(?)
diff --git a/src/devices/bus/cpc/mface2.cpp b/src/devices/bus/cpc/mface2.cpp
index 98c2ded0ce8..15fd375a458 100644
--- a/src/devices/bus/cpc/mface2.cpp
+++ b/src/devices/bus/cpc/mface2.cpp
@@ -112,9 +112,9 @@ 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)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
void cpc_multiface2_device::check_button_state()
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index 66c1bd715a5..a375fccce2c 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -26,22 +26,22 @@ DEFINE_DEVICE_TYPE(CPC_PLAYCITY, cpc_playcity_device, "cpc_playcity", "PlayCity"
// device machine config
MACHINE_CONFIG_START(cpc_playcity_device::device_add_mconfig)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(cpc_playcity_device, ctc_zc1_cb))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc",z80ctc_device, trg3))
- MCFG_Z80CTC_INTR_CB(WRITELINE(cpc_playcity_device, ctc_intr_cb))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, cpc_playcity_device, ctc_zc1_cb))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc",z80ctc_device, trg3))
+ MCFG_Z80CTC_INTR_CB(WRITELINE(*this, cpc_playcity_device, ctc_intr_cb))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("ymz_1",YMZ294,XTAL(4'000'000)) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST)
+ MCFG_DEVICE_ADD("ymz_1",YMZ294,XTAL(4'000'000)) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("ymz_2",YMZ294,XTAL(4'000'000))
+ MCFG_DEVICE_ADD("ymz_2",YMZ294,XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
- MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(DEVWRITELINE("^", cpc_expansion_slot_device, irq_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(DEVWRITELINE("^", cpc_expansion_slot_device, nmi_w))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(DEVWRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp
index cf9a1cfffc2..6d47b8f5921 100644
--- a/src/devices/bus/dmv/k210.cpp
+++ b/src/devices/bus/dmv/k210.cpp
@@ -75,22 +75,22 @@ void dmv_k210_device::device_timer(emu_timer &timer, device_timer_id tid, int pa
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))
- MCFG_I8255_IN_PORTC_CB(READ8(dmv_k210_device, portc_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(dmv_k210_device, porta_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(dmv_k210_device, portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(dmv_k210_device, portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, dmv_k210_device, porta_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, dmv_k210_device, portb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, dmv_k210_device, portc_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, dmv_k210_device, porta_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, dmv_k210_device, portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, dmv_k210_device, portc_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(dmv_k210_device, cent_ack_w))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(dmv_k210_device, cent_busy_w))
- MCFG_CENTRONICS_SELECT_IN_HANDLER(WRITELINE(dmv_k210_device, cent_slct_w))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(dmv_k210_device, cent_pe_w))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(dmv_k210_device, cent_fault_w))
- MCFG_CENTRONICS_AUTOFD_HANDLER(WRITELINE(dmv_k210_device, cent_autofd_w))
- MCFG_CENTRONICS_INIT_HANDLER(WRITELINE(dmv_k210_device, cent_init_w))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, dmv_k210_device, cent_ack_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, dmv_k210_device, cent_busy_w))
+ MCFG_CENTRONICS_SELECT_IN_HANDLER(WRITELINE(*this, dmv_k210_device, cent_slct_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, dmv_k210_device, cent_pe_w))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, dmv_k210_device, cent_fault_w))
+ MCFG_CENTRONICS_AUTOFD_HANDLER(WRITELINE(*this, dmv_k210_device, cent_autofd_w))
+ MCFG_CENTRONICS_INIT_HANDLER(WRITELINE(*this, dmv_k210_device, cent_init_w))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/devices/bus/dmv/k220.cpp b/src/devices/bus/dmv/k220.cpp
index 334751200e6..43ea0b5910e 100644
--- a/src/devices/bus/dmv/k220.cpp
+++ b/src/devices/bus/dmv/k220.cpp
@@ -160,15 +160,15 @@ void dmv_k220_device::device_reset()
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_OUT_PORTA_CB(WRITE8(*this, dmv_k220_device, porta_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SWITCH"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(dmv_k220_device, portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, dmv_k220_device, portc_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(1'000'000)) // CLK1
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(dmv_k220_device, write_out0))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(dmv_k220_device, write_out1))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(dmv_k220_device, write_out2))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, dmv_k220_device, write_out0))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, dmv_k220_device, write_out1))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, dmv_k220_device, write_out2))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/dmv/k230.cpp b/src/devices/bus/dmv/k230.cpp
index bbf0efdb1cb..a3c95566326 100644
--- a/src/devices/bus/dmv/k230.cpp
+++ b/src/devices/bus/dmv/k230.cpp
@@ -167,21 +167,21 @@ void dmv_k234_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_k230_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(k230_mem)
- MCFG_CPU_IO_MAP(k230_io)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(k230_mem)
+ MCFG_DEVICE_IO_MAP(k230_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dmv_k234_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", M68008, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(k234_mem)
+ MCFG_DEVICE_ADD("maincpu", M68008, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(k234_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dmv_k235_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", V20, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(k230_mem)
- MCFG_CPU_IO_MAP(k235_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", V20, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(k230_mem)
+ MCFG_DEVICE_IO_MAP(k235_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp
index cb6352ba058..45ee5df50ad 100644
--- a/src/devices/bus/dmv/k801.cpp
+++ b/src/devices/bus/dmv/k801.cpp
@@ -144,17 +144,17 @@ void dmv_k801_device::device_reset()
MACHINE_CONFIG_START(dmv_k801_device::device_add_mconfig)
MCFG_DEVICE_ADD("epci", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_MC2661_RXRDY_HANDLER(WRITELINE(dmv_k801_device, epci_irq_w))
- MCFG_MC2661_TXRDY_HANDLER(WRITELINE(dmv_k801_device, epci_irq_w))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "printer")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("epci", mc2661_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("epci", mc2661_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("epci", mc2661_device, dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("epci", mc2661_device, cts_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_MC2661_RXRDY_HANDLER(WRITELINE(*this, dmv_k801_device, epci_irq_w))
+ MCFG_MC2661_TXRDY_HANDLER(WRITELINE(*this, dmv_k801_device, epci_irq_w))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "printer")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("epci", mc2661_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("epci", mc2661_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("epci", mc2661_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("epci", mc2661_device, cts_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dmv_k211_device::device_add_mconfig)
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp
index 99deb19fdde..04ed7445b0e 100644
--- a/src/devices/bus/dmv/k803.cpp
+++ b/src/devices/bus/dmv/k803.cpp
@@ -77,7 +77,7 @@ void dmv_k803_device::device_reset()
MACHINE_CONFIG_START(dmv_k803_device::device_add_mconfig)
MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(WRITELINE(dmv_k803_device, rtc_irq_w))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, 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 742f97c2a33..44d90f5a0af 100644
--- a/src/devices/bus/dmv/k806.cpp
+++ b/src/devices/bus/dmv/k806.cpp
@@ -101,10 +101,10 @@ void dmv_k806_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_k806_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8741, XTAL(6'000'000))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_k806_device, port1_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_k806_device, port2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(dmv_k806_device, portt1_r))
+ MCFG_DEVICE_ADD("mcu", I8741, XTAL(6'000'000))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, dmv_k806_device, port1_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, dmv_k806_device, port2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, dmv_k806_device, portt1_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mouse_timer", dmv_k806_device, mouse_timer, attotime::from_hz(1000))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index 68e0b6f5df8..0be0ed9a8e5 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -407,10 +407,10 @@ void ecb_grip21_device::kb_w(uint8_t data)
MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
MCFG_Z80_DAISY_CHAIN(grip_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(grip_mem)
- MCFG_CPU_IO_MAP(grip_io)
+ MCFG_DEVICE_PROGRAM_MAP(grip_mem)
+ MCFG_DEVICE_IO_MAP(grip_io)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::white())
@@ -424,7 +424,7 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SPEAKER_LEVELS(4, speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -433,27 +433,27 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(ecb_grip21_device, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, i1_w))
- MCFG_MC6845_OUT_CUR_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, i1_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(Z80STI_TAG, z80sti_device, i1_w))
+ MCFG_MC6845_OUT_CUR_CB(WRITELINE(Z80STI_TAG, z80sti_device, i1_w))
// MCFG_MC6845_ADD(HD6345_TAG, HD6345, SCREEN_TAG, XTAL(16'000'000)/4)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecb_grip21_device, ppi_pa_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecb_grip21_device, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(ecb_grip21_device, ppi_pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecb_grip21_device, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecb_grip21_device, ppi_pa_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecb_grip21_device, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecb_grip21_device, ppi_pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecb_grip21_device, ppi_pc_w))
MCFG_DEVICE_ADD(Z80STI_TAG, Z80STI, XTAL(16'000'000)/4)
MCFG_Z80STI_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80STI_IN_GPIO_CB(READ8(ecb_grip21_device, sti_gpio_r))
- MCFG_Z80STI_OUT_TBO_CB(WRITELINE(ecb_grip21_device, speaker_w))
- MCFG_Z80STI_OUT_TCO_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, tc_w))
- MCFG_Z80STI_OUT_TDO_CB(DEVWRITELINE(Z80STI_TAG, z80sti_device, tc_w))
+ MCFG_Z80STI_IN_GPIO_CB(READ8(*this, ecb_grip21_device, sti_gpio_r))
+ MCFG_Z80STI_OUT_TBO_CB(WRITELINE(*this, ecb_grip21_device, speaker_w))
+ MCFG_Z80STI_OUT_TCO_CB(WRITELINE(Z80STI_TAG, z80sti_device, tc_w))
+ MCFG_Z80STI_OUT_TDO_CB(WRITELINE(Z80STI_TAG, z80sti_device, tc_w))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(ecb_grip21_device, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(ecb_grip21_device, write_centronics_fault))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, ecb_grip21_device, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, ecb_grip21_device, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index ec668e3954e..1375a9515b1 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -245,42 +245,42 @@ void econet_e01_device::e01_mem(address_map &map)
MACHINE_CONFIG_START(econet_e01_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(R65C102_TAG, M65C02, XTAL(8'000'000)/4) // Rockwell R65C102P3
- MCFG_CPU_PROGRAM_MAP(e01_mem)
+ MCFG_DEVICE_ADD(R65C102_TAG, M65C02, XTAL(8'000'000)/4) // Rockwell R65C102P3
+ MCFG_DEVICE_PROGRAM_MAP(e01_mem)
MCFG_MC146818_ADD(HD146818_TAG, XTAL(32'768))
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(econet_e01_device, rtc_irq_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, econet_e01_device, rtc_irq_w))
// devices
MCFG_DEVICE_ADD(R6522_TAG, VIA6522, XTAL(8'000'000) / 4)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(econet_e01_device, via_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, econet_e01_device, via_irq_w))
MCFG_DEVICE_ADD(MC6854_TAG, MC6854, 0)
- MCFG_MC6854_OUT_IRQ_CB(WRITELINE(econet_e01_device, adlc_irq_w))
- MCFG_MC6854_OUT_TXD_CB(WRITELINE(econet_e01_device, econet_data_w))
+ MCFG_MC6854_OUT_IRQ_CB(WRITELINE(*this, econet_e01_device, adlc_irq_w))
+ MCFG_MC6854_OUT_TXD_CB(WRITELINE(*this, econet_e01_device, econet_data_w))
MCFG_WD2793_ADD(WD2793_TAG, XTAL(8'000'000)/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(econet_e01_device, fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(econet_e01_device, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, econet_e01_device, fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, econet_e01_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", floppy_formats_afs)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", e01_floppies, "35dd", floppy_formats_afs)
MCFG_SOFTWARE_LIST_ADD("flop_ls_e01", "e01_flop")
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_ca1))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_ca1))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD(SCSIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit0))
- MCFG_SCSI_BSY_HANDLER(WRITELINE(econet_e01_device, scsi_bsy_w)) // bit1
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit0))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE(*this, econet_e01_device, scsi_bsy_w)) // bit1
// bit 2 0
// bit 3 0
// bit 4 NIRQ
- MCFG_SCSI_REQ_HANDLER(WRITELINE(econet_e01_device, scsi_req_w)) // bit5
- MCFG_SCSI_IO_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6))
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, econet_e01_device, scsi_req_w)) // bit5
+ MCFG_SCSI_IO_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6))
+ MCFG_SCSI_CD_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
MCFG_SCSI_OUTPUT_LATCH_ADD("scsi_data_out", SCSIBUS_TAG)
diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp
index bf05dc5e846..90b2000568f 100644
--- a/src/devices/bus/einstein/pipe/speculator.cpp
+++ b/src/devices/bus/einstein/pipe/speculator.cpp
@@ -33,7 +33,7 @@ MACHINE_CONFIG_START(einstein_speculator_device::device_add_mconfig)
MCFG_TTL74123_A_PIN_VALUE(1)
MCFG_TTL74123_B_PIN_VALUE(1)
MCFG_TTL74123_CLEAR_PIN_VALUE(0)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(einstein_speculator_device, ic5a_q_w))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, einstein_speculator_device, ic5a_q_w))
MCFG_DEVICE_ADD("ic5b", TTL74123, 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
@@ -42,12 +42,12 @@ MACHINE_CONFIG_START(einstein_speculator_device::device_add_mconfig)
MCFG_TTL74123_A_PIN_VALUE(1)
MCFG_TTL74123_B_PIN_VALUE(1)
MCFG_TTL74123_CLEAR_PIN_VALUE(0)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(einstein_speculator_device, ic5b_q_w))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, einstein_speculator_device, ic5b_q_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_CASSETTE_ADD("cassette")
diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp
index d71c608905a..2e5ebd8f85b 100644
--- a/src/devices/bus/einstein/pipe/tk02.cpp
+++ b/src/devices/bus/einstein/pipe/tk02.cpp
@@ -109,7 +109,7 @@ MACHINE_CONFIG_START(tk02_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(tk02_device, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(tk02_device, de_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, tk02_device, de_w))
MCFG_TATUNG_PIPE_ADD("pipe")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/einstein/userport/speech.cpp b/src/devices/bus/einstein/userport/speech.cpp
index b2713641ce1..3d049ae1355 100644
--- a/src/devices/bus/einstein/userport/speech.cpp
+++ b/src/devices/bus/einstein/userport/speech.cpp
@@ -39,7 +39,7 @@ const tiny_rom_entry *einstein_speech_device::device_rom_region() const
MACHINE_CONFIG_START(einstein_speech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sp0256", SP0256, 3120000) // ???
+ MCFG_DEVICE_ADD("sp0256", SP0256, 3120000) // ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/electron/cart/click.cpp b/src/devices/bus/electron/cart/click.cpp
index 5503e400007..c4b57bad194 100644
--- a/src/devices/bus/electron/cart/click.cpp
+++ b/src/devices/bus/electron/cart/click.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_CLICK, electron_click_device, "electron_click", "Slo
MACHINE_CONFIG_START(electron_click_device::device_add_mconfig)
/* rtc */
MCFG_MC146818_ADD("rtc", 32.768_kHz_XTAL)
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(electron_click_device, irq_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, electron_click_device, irq_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/electron/cart/peg400.cpp b/src/devices/bus/electron/cart/peg400.cpp
index 9e8df57c310..957223eab03 100644
--- a/src/devices/bus/electron/cart/peg400.cpp
+++ b/src/devices/bus/electron/cart/peg400.cpp
@@ -44,7 +44,7 @@ void peg400_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(electron_peg400_device::device_add_mconfig)
/* fdc */
MCFG_WD1770_ADD("fdc", 16_MHz_XTAL / 2)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(electron_peg400_device, fdc_drq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, electron_peg400_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", peg400_floppies, "525qd", electron_peg400_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", peg400_floppies, nullptr, electron_peg400_device::floppy_formats)
diff --git a/src/devices/bus/electron/cart/sndexp.cpp b/src/devices/bus/electron/cart/sndexp.cpp
index b7fbf0e837c..c04305cbb57 100644
--- a/src/devices/bus/electron/cart/sndexp.cpp
+++ b/src/devices/bus/electron/cart/sndexp.cpp
@@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_SNDEXP, electron_sndexp_device, "electron_sndexp", "
MACHINE_CONFIG_START(electron_sndexp_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, 16_MHz_XTAL / 4)
+ MCFG_DEVICE_ADD("sn76489", SN76489, 16_MHz_XTAL / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/electron/cart/sndexp3.cpp b/src/devices/bus/electron/cart/sndexp3.cpp
index dd1dd67f23c..26f62fcd7d2 100644
--- a/src/devices/bus/electron/cart/sndexp3.cpp
+++ b/src/devices/bus/electron/cart/sndexp3.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_SNDEXP3, electron_sndexp3_device, "electron_sndexp3"
MACHINE_CONFIG_START(electron_sndexp3_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, 16_MHz_XTAL / 4)
+ MCFG_DEVICE_ADD("sn76489", SN76489, 16_MHz_XTAL / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/electron/cart/stlefs.cpp b/src/devices/bus/electron/cart/stlefs.cpp
index a47dca06e67..093b805bb83 100644
--- a/src/devices/bus/electron/cart/stlefs.cpp
+++ b/src/devices/bus/electron/cart/stlefs.cpp
@@ -47,8 +47,8 @@ void stlefs_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(electron_stlefs_device::device_add_mconfig)
/* fdc */
MCFG_WD1770_ADD("fdc", 16_MHz_XTAL / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(electron_stlefs_device, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(electron_stlefs_device, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, electron_stlefs_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, electron_stlefs_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", stlefs_floppies, "525qd", electron_stlefs_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", stlefs_floppies, nullptr, electron_stlefs_device::floppy_formats)
diff --git a/src/devices/bus/electron/exp.h b/src/devices/bus/electron/exp.h
index 25657cc3a06..7457c6099fc 100644
--- a/src/devices/bus/electron/exp.h
+++ b/src/devices/bus/electron/exp.h
@@ -107,8 +107,8 @@ AC RETURNS (pins 3,4) - adaptor. A total of 6W may be drawn from these lines as
#define MCFG_ELECTRON_PASSTHRU_EXPANSION_SLOT_ADD(_def_slot) \
MCFG_ELECTRON_EXPANSION_SLOT_ADD(ELECTRON_EXPANSION_SLOT_TAG, electron_expansion_devices, _def_slot, false) \
- MCFG_ELECTRON_EXPANSION_SLOT_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, electron_expansion_slot_device, irq_w)) \
- MCFG_ELECTRON_EXPANSION_SLOT_NMI_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, electron_expansion_slot_device, nmi_w))
+ MCFG_ELECTRON_EXPANSION_SLOT_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, electron_expansion_slot_device, irq_w)) \
+ MCFG_ELECTRON_EXPANSION_SLOT_NMI_HANDLER(WRITELINE(DEVICE_SELF_OWNER, electron_expansion_slot_device, nmi_w))
#define MCFG_ELECTRON_EXPANSION_SLOT_IRQ_HANDLER(_devcb) \
devcb = &downcast<electron_expansion_slot_device &>(*device).set_irq_handler(DEVCB_##_devcb);
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index b61d2fc7104..f18ea158766 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -59,41 +59,41 @@ MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_INPUT_MERGER_ANY_HIGH("irqs")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(electron_m2105_device, intrq_w))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, electron_m2105_device, intrq_w))
/* system via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- /*MCFG_VIA6522_READPA_HANDLER(READ8(electron_m2105_device, m2105_via_system_read_porta))
- MCFG_VIA6522_READPB_HANDLER(READ8(electron_m2105_device, m2105_via_system_read_portb))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(electron_m2105_device, m2105_via_system_write_porta))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(electron_m2105_device, m2105_via_system_write_portb))*/
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<0>))
+ /*MCFG_VIA6522_READPA_HANDLER(READ8(*this, electron_m2105_device, m2105_via_system_read_porta))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, electron_m2105_device, m2105_via_system_read_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, electron_m2105_device, m2105_via_system_write_porta))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, electron_m2105_device, m2105_via_system_write_portb))*/
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<0>))
/* user via */
MCFG_DEVICE_ADD("via6522_1", VIA6522, 1000000)
- //MCFG_VIA6522_READPB_HANDLER(READ8(electron_m2105_device, m2105_via_user_read_portb))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(electron_m2105_device, m2105_via_user_write_portb))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
+ //MCFG_VIA6522_READPB_HANDLER(READ8(*this, electron_m2105_device, m2105_via_user_read_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, electron_m2105_device, m2105_via_user_write_portb))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<1>))
/* duart */
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
- MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(electron_m2105_device, sio_out_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE("irqs", input_merger_device, in_w<2>))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, electron_m2105_device, sio_out_w))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_a_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w))
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* speech hardware */
MCFG_DEVICE_ADD("vsm", SPEECHROM, 0)
- MCFG_SOUND_ADD("tms5220", TMS5220, 640000)
+ MCFG_DEVICE_ADD("tms5220", TMS5220, 640000)
MCFG_TMS52XX_SPEECHROM("vsm")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/electron/plus1.cpp b/src/devices/bus/electron/plus1.cpp
index d4d5ad619ed..9b37f92f2f4 100644
--- a/src/devices/bus/electron/plus1.cpp
+++ b/src/devices/bus/electron/plus1.cpp
@@ -93,12 +93,12 @@ ioport_constructor electron_plus1_device::device_input_ports() const
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))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, electron_plus1_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* adc */
MCFG_ADC0844_ADD("adc")
- MCFG_ADC0844_INTR_CB(WRITELINE(electron_plus1_device, ready_w))
+ MCFG_ADC0844_INTR_CB(WRITELINE(*this, electron_plus1_device, ready_w))
MCFG_ADC0844_CH1_CB(IOPORT("JOY1"))
MCFG_ADC0844_CH2_CB(IOPORT("JOY2"))
MCFG_ADC0844_CH3_CB(IOPORT("JOY3"))
@@ -106,11 +106,11 @@ MACHINE_CONFIG_START(electron_plus1_device::device_add_mconfig)
/* cartridges */
MCFG_ELECTRON_CARTSLOT_ADD("cart_sk1", electron_cart, nullptr)
- MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(electron_plus1_device, irq_w))
- MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(electron_plus1_device, nmi_w))
+ MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(*this, electron_plus1_device, irq_w))
+ MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(*this, electron_plus1_device, nmi_w))
MCFG_ELECTRON_CARTSLOT_ADD("cart_sk2", electron_cart, nullptr)
- MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(electron_plus1_device, irq_w))
- MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(electron_plus1_device, nmi_w))
+ MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(*this, electron_plus1_device, irq_w))
+ MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(*this, electron_plus1_device, nmi_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/electron/romboxp.cpp b/src/devices/bus/electron/romboxp.cpp
index a33175dccd9..119940bda65 100644
--- a/src/devices/bus/electron/romboxp.cpp
+++ b/src/devices/bus/electron/romboxp.cpp
@@ -87,7 +87,7 @@ ioport_constructor electron_romboxp_device::device_input_ports() const
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))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, electron_romboxp_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* rom sockets */
@@ -106,11 +106,11 @@ MACHINE_CONFIG_START(electron_romboxp_device::device_add_mconfig)
/* cartridges */
MCFG_ELECTRON_CARTSLOT_ADD("cart1", electron_cart, nullptr) // ROM SLOT 0/1
- MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(electron_romboxp_device, irq_w))
- MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(electron_romboxp_device, nmi_w))
+ MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(*this, electron_romboxp_device, irq_w))
+ MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(*this, electron_romboxp_device, nmi_w))
MCFG_ELECTRON_CARTSLOT_ADD("cart2", electron_cart, nullptr) // ROM SLOT 2/3
- MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(electron_romboxp_device, irq_w))
- MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(electron_romboxp_device, nmi_w))
+ MCFG_ELECTRON_CARTSLOT_IRQ_HANDLER(WRITELINE(*this, electron_romboxp_device, irq_w))
+ MCFG_ELECTRON_CARTSLOT_NMI_HANDLER(WRITELINE(*this, electron_romboxp_device, nmi_w))
MACHINE_CONFIG_END
const tiny_rom_entry *electron_romboxp_device::device_rom_region() const
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index aa358832041..16acaaa3e52 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -67,17 +67,17 @@ static void pf10_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(epson_pf10_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", HD6303Y, XTAL(4'915'200)) // HD63A03XF
- MCFG_CPU_PROGRAM_MAP(cpu_mem)
- MCFG_CPU_IO_MAP(cpu_io)
- MCFG_M6801_SER_TX(DEVWRITELINE(DEVICE_SELF, epson_pf10_device, hd6303_tx_w))
+ MCFG_DEVICE_ADD("maincpu", HD6303Y, XTAL(4'915'200)) // HD63A03XF
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mem)
+ MCFG_DEVICE_IO_MAP(cpu_io)
+ MCFG_M6801_SER_TX(WRITELINE(DEVICE_SELF, epson_pf10_device, hd6303_tx_w))
MCFG_UPD765A_ADD("upd765a", false, true)
MCFG_FLOPPY_DRIVE_ADD("upd765a:0", pf10_floppies, "smd165", floppy_image_device::default_floppy_formats)
MCFG_EPSON_SIO_ADD("sio", nullptr)
- MCFG_EPSON_SIO_RX(DEVWRITELINE(DEVICE_SELF, epson_pf10_device, rxc_w))
- MCFG_EPSON_SIO_PIN(DEVWRITELINE(DEVICE_SELF, epson_pf10_device, pinc_w))
+ MCFG_EPSON_SIO_RX(WRITELINE(DEVICE_SELF, epson_pf10_device, rxc_w))
+ MCFG_EPSON_SIO_PIN(WRITELINE(DEVICE_SELF, epson_pf10_device, pinc_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index b59592d6f5b..f7f5418f2e0 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -87,10 +87,10 @@ static void tf20_floppies(device_slot_interface &device)
}
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)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, epson_tf20_device, irq_callback)
+ MCFG_DEVICE_ADD("19b", Z80, XTAL_CR1 / 2) /* uPD780C */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mem)
+ MCFG_DEVICE_IO_MAP(cpu_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, epson_tf20_device, irq_callback)
// 64k internal ram
MCFG_RAM_ADD("ram")
@@ -98,8 +98,8 @@ MACHINE_CONFIG_START(epson_tf20_device::device_add_mconfig)
// upd7201 serial interface
MCFG_DEVICE_ADD("3a", UPD7201, XTAL_CR1 / 2)
- MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(epson_tf20_device, txda_w))
- MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(epson_tf20_device, dtra_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(*this, epson_tf20_device, txda_w))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(*this, epson_tf20_device, dtra_w))
// floppy disk controller
MCFG_UPD765A_ADD("5a", true, true)
@@ -111,8 +111,8 @@ MACHINE_CONFIG_START(epson_tf20_device::device_add_mconfig)
// serial interface to another device
MCFG_EPSON_SIO_ADD("sio", nullptr)
- MCFG_EPSON_SIO_RX(DEVWRITELINE(DEVICE_SELF, epson_tf20_device, rxc_w))
- MCFG_EPSON_SIO_PIN(DEVWRITELINE(DEVICE_SELF, epson_tf20_device, pinc_w))
+ MCFG_EPSON_SIO_RX(WRITELINE(DEVICE_SELF, epson_tf20_device, rxc_w))
+ MCFG_EPSON_SIO_PIN(WRITELINE(DEVICE_SELF, epson_tf20_device, pinc_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index 9ed7abd6571..7a5eee4ba4b 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -82,7 +82,7 @@ READ32_MEMBER( sms_ctrl_adaptor_device::pixel_r )
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))
+ MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_ctrl_adaptor_device, th_pin_w))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_ctrl_adaptor_device, pixel_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/hexbus/hx5102.cpp b/src/devices/bus/hexbus/hx5102.cpp
index d3ba512d679..aba3494d712 100644
--- a/src/devices/bus/hexbus/hx5102.cpp
+++ b/src/devices/bus/hexbus/hx5102.cpp
@@ -652,24 +652,24 @@ static void hx5102_drive(device_slot_interface &device)
MACHINE_CONFIG_START(hx5102_device::device_add_mconfig)
// Hexbus controller
MCFG_DEVICE_ADD(IBC_TAG, IBC, 0)
- MCFG_IBC_HEXBUS_OUT_CALLBACK(WRITE8(hx5102_device, hexbus_out))
- MCFG_IBC_HSKLATCH_CALLBACK(WRITELINE(hx5102_device, hsklatch_out))
+ MCFG_IBC_HEXBUS_OUT_CALLBACK(WRITE8(*this, hx5102_device, hexbus_out))
+ MCFG_IBC_HSKLATCH_CALLBACK(WRITELINE(*this, hx5102_device, hsklatch_out))
// Outgoing socket for downstream devices
MCFG_HEXBUS_ADD("hexbus")
// TMS9995 CPU @ 12.0 MHz
MCFG_TMS99xx_ADD(TMS9995_TAG, TMS9995, XTAL(12'000'000), memmap, crumap)
- MCFG_TMS9995_EXTOP_HANDLER( WRITE8(hx5102_device, external_operation) )
- MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(hx5102_device, clock_out) )
+ MCFG_TMS9995_EXTOP_HANDLER( WRITE8(*this, hx5102_device, external_operation) )
+ MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(*this, hx5102_device, clock_out) )
// Disk controller i8272A
// Not connected: Select lines (DS0, DS1), Head load (HDL), VCO
// Tied to 1: READY
// Tied to 0: TC
MCFG_I8272A_ADD(FDC_TAG, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(hx5102_device, fdc_irq_w))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(hx5102_device, fdc_drq_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, hx5102_device, fdc_irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, hx5102_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("d0", hx5102_drive, "525dd", hx5102_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("d1", hx5102_drive, nullptr, hx5102_device::floppy_formats)
@@ -683,7 +683,7 @@ MACHINE_CONFIG_START(hx5102_device::device_add_mconfig)
MCFG_TTL74123_A_PIN_VALUE(0)
MCFG_TTL74123_B_PIN_VALUE(1)
MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(hx5102_device, motor_w))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, hx5102_device, motor_w))
MCFG_DEVICE_ADD(MTSPD_TAG, TTL74123, 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_GROUNDED)
@@ -692,11 +692,11 @@ MACHINE_CONFIG_START(hx5102_device::device_add_mconfig)
MCFG_TTL74123_A_PIN_VALUE(0)
MCFG_TTL74123_B_PIN_VALUE(1)
MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(hx5102_device, mspeed_w))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, hx5102_device, mspeed_w))
// READY flipflop
MCFG_DEVICE_ADD(READYFF_TAG, TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(hx5102_device, board_ready))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, hx5102_device, board_ready))
// RAM
MCFG_RAM_ADD(RAM1_TAG)
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index 9cb2b3931ad..f547d5294b7 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -329,27 +329,27 @@ const tiny_rom_entry *hp82937_io_card_device::device_rom_region() const
}
MACHINE_CONFIG_START(hp82937_io_card_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu" , I8049 , XTAL(11'000'000))
- MCFG_CPU_IO_MAP(cpu_io_map)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(hp82937_io_card_device , t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("xlator" , hp_1mb5_device , int_r))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(hp82937_io_card_device , p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(hp82937_io_card_device , p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(hp82937_io_card_device , dio_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(hp82937_io_card_device , dio_w))
+ MCFG_DEVICE_ADD("cpu" , I8049 , XTAL(11'000'000))
+ MCFG_DEVICE_IO_MAP(cpu_io_map)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, hp82937_io_card_device , t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE("xlator" , hp_1mb5_device , int_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, hp82937_io_card_device , p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, hp82937_io_card_device , p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, hp82937_io_card_device , dio_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, hp82937_io_card_device , dio_w))
MCFG_DEVICE_ADD("xlator" , HP_1MB5 , 0)
- MCFG_1MB5_IRL_HANDLER(WRITELINE(hp82937_io_card_device , irl_w))
- MCFG_1MB5_HALT_HANDLER(WRITELINE(hp82937_io_card_device , halt_w))
- MCFG_1MB5_RESET_HANDLER(WRITELINE(hp82937_io_card_device , reset_w))
+ MCFG_1MB5_IRL_HANDLER(WRITELINE(*this, hp82937_io_card_device , irl_w))
+ MCFG_1MB5_HALT_HANDLER(WRITELINE(*this, hp82937_io_card_device , halt_w))
+ MCFG_1MB5_RESET_HANDLER(WRITELINE(*this, hp82937_io_card_device , reset_w))
MCFG_IEEE488_SLOT_ADD("ieee_dev" , 0 , hp_ieee488_devices , nullptr)
MCFG_IEEE488_SLOT_ADD("ieee_rem" , 0 , remote488_devices , nullptr)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_IFC_CALLBACK(WRITELINE(hp82937_io_card_device , ieee488_ctrl_w))
- MCFG_IEEE488_ATN_CALLBACK(WRITELINE(hp82937_io_card_device , ieee488_ctrl_w))
- MCFG_IEEE488_REN_CALLBACK(WRITELINE(hp82937_io_card_device , ieee488_ctrl_w))
- MCFG_IEEE488_EOI_CALLBACK(WRITELINE(hp82937_io_card_device , ieee488_ctrl_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE(*this, hp82937_io_card_device , ieee488_ctrl_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(*this, hp82937_io_card_device , ieee488_ctrl_w))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE(*this, hp82937_io_card_device , ieee488_ctrl_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE(*this, hp82937_io_card_device , ieee488_ctrl_w))
MACHINE_CONFIG_END
// device type definition
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index c98404f9d30..1cf400d4cee 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -366,18 +366,18 @@ const tiny_rom_entry *hp98034_io_card_device::device_rom_region() const
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)
- MCFG_CPU_PROGRAM_MAP(np_program_map)
- MCFG_CPU_IO_MAP(np_io_map)
- MCFG_HP_NANO_DC_CHANGED(WRITE8(hp98034_io_card_device , dc_w))
- MCFG_HP_NANO_READ_DC_CB(READ8(hp98034_io_card_device , dc_r))
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp98034_io_card_device , irq_callback)
+ MCFG_DEVICE_ADD("np" , HP_NANOPROCESSOR , 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(np_program_map)
+ MCFG_DEVICE_IO_MAP(np_io_map)
+ MCFG_HP_NANO_DC_CHANGED(WRITE8(*this, hp98034_io_card_device , dc_w))
+ MCFG_HP_NANO_READ_DC_CB(READ8(*this, hp98034_io_card_device , dc_r))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(hp98034_io_card_device , irq_callback)
MCFG_IEEE488_SLOT_ADD("ieee_dev" , 0 , hp_ieee488_devices , nullptr)
MCFG_IEEE488_SLOT_ADD("ieee_rem" , 0 , remote488_devices , nullptr)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_IFC_CALLBACK(WRITELINE(hp98034_io_card_device , ieee488_ctrl_w))
- MCFG_IEEE488_ATN_CALLBACK(WRITELINE(hp98034_io_card_device , ieee488_ctrl_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE(*this, hp98034_io_card_device , ieee488_ctrl_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(*this, hp98034_io_card_device , ieee488_ctrl_w))
MACHINE_CONFIG_END
// device type definition
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 17031758fbf..f817c7410e9 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -757,10 +757,10 @@ const tiny_rom_entry *hp98035_io_card_device::device_rom_region() const
}
MACHINE_CONFIG_START(hp98035_io_card_device::device_add_mconfig)
- MCFG_CPU_ADD("np" , HP_NANOPROCESSOR , XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(np_program_map)
- MCFG_CPU_IO_MAP(np_io_map)
- MCFG_HP_NANO_DC_CHANGED(WRITE8(hp98035_io_card_device , dc_w))
+ MCFG_DEVICE_ADD("np" , HP_NANOPROCESSOR , XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(np_program_map)
+ MCFG_DEVICE_IO_MAP(np_io_map)
+ MCFG_HP_NANO_DC_CHANGED(WRITE8(*this, hp98035_io_card_device , dc_w))
MACHINE_CONFIG_END
// device type definition
diff --git a/src/devices/bus/hp_dio/hp98644.cpp b/src/devices/bus/hp_dio/hp98644.cpp
index d000e370129..6563ca47ca3 100644
--- a/src/devices/bus/hp_dio/hp98644.cpp
+++ b/src/devices/bus/hp_dio/hp98644.cpp
@@ -28,16 +28,16 @@ DEFINE_DEVICE_TYPE(HPDIO_98644, dio16_98644_device, "dio98644", "HP98644A Asynch
MACHINE_CONFIG_START( dio16_98644_device::device_add_mconfig )
MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL(2'457'600))
- 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))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 5a04cef0254..af6172cb178 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -305,28 +305,28 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c2031_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2031_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2031_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
MCFG_DEVICE_ADD(M6522_0_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(READ8(c2031_device, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(c2031_device, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via0_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via0_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, c2031_device, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c2031_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, c2031_device, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2031_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c2031_device, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(c2031_device, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2031_device, via1_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, soe_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(C64H156_TAG, c64h156_device, oe_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(c2031_device, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, c2031_device, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2031_device, via1_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, soe_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(C64H156_TAG, c64h156_device, oe_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, c2031_device, via1_irq_w))
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(WRITELINE(c2031_device, byte_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(*this, c2031_device, byte_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c2031_floppies, "525ssqd", c2031_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index b6dde567971..aee0f5a895c 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -452,42 +452,42 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(c2040_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2040_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c2040_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c2040_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2040_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c2040_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2040_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write))
- MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds1_w))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c2040_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds1_w))
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c2040_fdc_device, wps_r))
MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000))
- MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
- MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
- MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C2040_SYNC_CALLBACK(WRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
+ MCFG_C2040_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C2040_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":0", c2040_floppies, "525ssqd", c2040_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":1", c2040_floppies, "525ssqd", c2040_device::floppy_formats)
MACHINE_CONFIG_END
@@ -495,42 +495,42 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c3040_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2040_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c2040_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c2040_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2040_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c2040_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2040_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write))
- MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds1_w))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c2040_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds1_w))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c2040_fdc_device, wps_r))
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000))
- MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
- MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
- MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C2040_SYNC_CALLBACK(WRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
+ MCFG_C2040_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C2040_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":0", c2040_floppies, "525ssqd", c3040_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":1", c2040_floppies, "525ssqd", c3040_device::floppy_formats)
MACHINE_CONFIG_END
@@ -538,42 +538,42 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c4040_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2040_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2040_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_IN_PA_CB(READ8(c2040_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c2040_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c2040_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c2040_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c2040_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c2040_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c2040_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c2040_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(c2040_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(c2040_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c2040_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c2040_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c2040_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c2040_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c2040_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(16'000'000)/16)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c2040_fdc_device, write))
- MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c2040_fdc_device, ds1_w))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c2040_fdc_device, wps_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c2040_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c2040_fdc_device, drv_sel_w))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c2040_fdc_device, ds1_w))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c2040_fdc_device, wps_r))
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(FDC_TAG, C2040_FDC, XTAL(16'000'000))
- MCFG_C2040_SYNC_CALLBACK(DEVWRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
- MCFG_C2040_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
- MCFG_C2040_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C2040_SYNC_CALLBACK(WRITELINE(M6530_TAG, mos6530_new_device, pb6_w))
+ MCFG_C2040_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C2040_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":0", c2040_floppies, "525ssqd", c4040_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD_FIXED(FDC_TAG":1", c2040_floppies, "525ssqd", c4040_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index f97ccc61f0d..c15eebb6c14 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -533,44 +533,44 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(c8050_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8050_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
- MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r))
MCFG_MOS6530n_IN_PB6_CB(VCC) // SINGLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
- MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
- MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7))
+ MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
- MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8050_floppies, "525ssqd", c8050_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8050_floppies, "525ssqd", c8050_device::floppy_formats)
MACHINE_CONFIG_END
@@ -578,45 +578,45 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c8250_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8050_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8050_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
- MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r))
- MCFG_MOS6530n_OUT_PB4_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r))
+ MCFG_MOS6530n_OUT_PB4_CB(WRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w))
MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
- MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
- MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7))
+ MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
- MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250_device::floppy_formats)
MACHINE_CONFIG_END
@@ -624,45 +624,45 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c8250lp_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8250lp_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8250lp_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
- MCFG_MOS6530n_OUT_PB0_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r))
- MCFG_MOS6530n_OUT_PB4_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB0_CB(WRITELINE(FDC_TAG, c8050_fdc_device, drv_sel_w))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r))
+ MCFG_MOS6530n_OUT_PB4_CB(WRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w))
MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
- MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
- MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7))
+ MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
- MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", c8250_floppies, "525qd", c8250lp_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", c8250_floppies, "525qd", c8250lp_device::floppy_formats)
MACHINE_CONFIG_END
@@ -670,44 +670,44 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sfd1001_device::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(c8050_main_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(c8050_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8050_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8050_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c8050_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8050_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8050_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8050_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8050_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8050_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(sfd1001_fdc_mem)
+ MCFG_DEVICE_ADD(M6504_TAG, M6504, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(sfd1001_fdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(12'000'000)/12)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(FDC_TAG, c8050_fdc_device, read))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(c8050_device, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(FDC_TAG, c8050_fdc_device, read))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, c8050_device, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, mode_sel_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(FDC_TAG, c8050_fdc_device, rw_sel_w))
MCFG_DEVICE_ADD(M6530_TAG, MOS6530_NEW, XTAL(12'000'000)/12)
- MCFG_MOS6530n_OUT_PA_CB(DEVWRITE8(FDC_TAG, c8050_fdc_device, write))
- MCFG_MOS6530n_OUT_PB1_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
- MCFG_MOS6530n_OUT_PB2_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
- MCFG_MOS6530n_IN_PB3_CB(DEVREADLINE(FDC_TAG, c8050_fdc_device, wps_r))
- MCFG_MOS6530n_OUT_PB4_CB(DEVWRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(FDC_TAG, c8050_fdc_device, write))
+ MCFG_MOS6530n_OUT_PB1_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds0_w))
+ MCFG_MOS6530n_OUT_PB2_CB(WRITELINE(FDC_TAG, c8050_fdc_device, ds1_w))
+ MCFG_MOS6530n_IN_PB3_CB(READLINE(FDC_TAG, c8050_fdc_device, wps_r))
+ MCFG_MOS6530n_OUT_PB4_CB(WRITELINE(FDC_TAG, c8050_fdc_device, odd_hd_w))
MCFG_MOS6530n_IN_PB6_CB(GND) // DOUBLE SIDED
MCFG_MOS6530n_OUT_PB7_CB(INPUTLINE(M6504_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(FDC_TAG, C8050_FDC, XTAL(12'000'000)/2)
- MCFG_C8050_SYNC_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
- MCFG_C8050_READY_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_C8050_SYNC_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_pb7))
+ MCFG_C8050_READY_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_ca1))
MCFG_C8050_BRDY_CALLBACK(INPUTLINE(M6504_TAG, M6502_SET_OVERFLOW)) MCFG_DEVCB_XOR(1)
- MCFG_C8050_ERROR_CALLBACK(DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_C8050_ERROR_CALLBACK(WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", sfd1001_floppies, "525qd", sfd1001_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index d032491c812..4a142b625b5 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -293,22 +293,22 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c8280_device::device_add_mconfig)
- MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(c8280_main_mem)
+ MCFG_DEVICE_ADD(M6502_DOS_TAG, M6502, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(c8280_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(12'000'000)/8)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8280_device, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8280_device, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(12'000'000)/8)
- MCFG_MOS6530n_IN_PA_CB(READ8(c8280_device, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(c8280_device, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(c8280_device, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(c8280_device, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, c8280_device, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, c8280_device, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, c8280_device, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, c8280_device, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0))
- MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(c8280_fdc_mem)
+ MCFG_DEVICE_ADD(M6502_FDC_TAG, M6502, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(c8280_fdc_mem)
MCFG_FD1797_ADD(WD1797_TAG, XTAL(12'000'000)/6)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE))
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 8505b8b7da8..8618dc944cd 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -372,45 +372,45 @@ WRITE8_MEMBER( d9060_device_base::scsi_data_w )
MACHINE_CONFIG_START(d9060_device_base::device_add_mconfig)
// DOS
- MCFG_CPU_ADD(M6502_DOS_TAG, M6502, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(d9060_main_mem)
+ MCFG_DEVICE_ADD(M6502_DOS_TAG, M6502, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(d9060_main_mem)
MCFG_DEVICE_ADD(M6532_0_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
- MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, dio_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_device_base, dio_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, d9060_device_base, dio_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, d9060_device_base, dio_w))
MCFG_DEVICE_ADD(M6532_1_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
- MCFG_MOS6530n_IN_PA_CB(READ8(d9060_device_base, riot1_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(d9060_device_base, riot1_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(d9060_device_base, riot1_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(d9060_device_base, riot1_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, d9060_device_base, riot1_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, d9060_device_base, riot1_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, d9060_device_base, riot1_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, d9060_device_base, riot1_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_DOS_TAG, INPUT_LINE_IRQ0))
// controller
- MCFG_CPU_ADD(M6502_HDC_TAG, M6502, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(d9060_hdc_mem)
+ MCFG_DEVICE_ADD(M6502_HDC_TAG, M6502, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(d9060_hdc_mem)
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(4'000'000)/4)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(d9060_device_base, scsi_data_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(d9060_device_base, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(d9060_device_base, ack_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(d9060_device_base, enable_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, d9060_device_base, scsi_data_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, d9060_device_base, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, d9060_device_base, ack_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, d9060_device_base, enable_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_HDC_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
- MCFG_SCSI_REQ_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb2))
- MCFG_SCSI_BSY_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb3))
- MCFG_SCSI_IO_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb6))
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pb7))
- MCFG_SCSI_DATA0_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa0))
- MCFG_SCSI_DATA1_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa1))
- MCFG_SCSI_DATA2_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa2))
- MCFG_SCSI_DATA3_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa3))
- MCFG_SCSI_DATA4_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa4))
- MCFG_SCSI_DATA5_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa5))
- MCFG_SCSI_DATA6_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa6))
- MCFG_SCSI_DATA7_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa7))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_SCSI_CD_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb2))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb3))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb6))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pb7))
+ MCFG_SCSI_DATA0_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa0))
+ MCFG_SCSI_DATA1_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa1))
+ MCFG_SCSI_DATA2_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa2))
+ MCFG_SCSI_DATA3_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa3))
+ MCFG_SCSI_DATA4_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa4))
+ MCFG_SCSI_DATA5_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa5))
+ MCFG_SCSI_DATA6_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa6))
+ MCFG_SCSI_DATA7_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa7))
MCFG_SCSI_OUTPUT_LATCH_ADD("sasi_data_out", SASIBUS_TAG)
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index a5da9825cc9..14a2a9a16d2 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -269,21 +269,21 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
MACHINE_CONFIG_START(hardbox_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(hardbox_mem)
- MCFG_CPU_IO_MAP(hardbox_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(hardbox_mem)
+ MCFG_DEVICE_IO_MAP(hardbox_io)
// devices
MCFG_DEVICE_ADD(I8255_0_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(hardbox_device, ppi0_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(hardbox_device, ppi0_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(hardbox_device, ppi0_pc_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, hardbox_device, ppi0_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, hardbox_device, ppi0_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, hardbox_device, ppi0_pc_r))
MCFG_DEVICE_ADD(I8255_1_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(hardbox_device, ppi1_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(hardbox_device, ppi1_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(hardbox_device, ppi1_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(hardbox_device, ppi1_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, hardbox_device, ppi1_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, hardbox_device, ppi1_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, hardbox_device, ppi1_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, hardbox_device, ppi1_pc_w))
MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0)
MCFG_HARDDISK_ADD("harddisk1")
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index 565fc3ee924..6c42e64371e 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -886,22 +886,22 @@ const tiny_rom_entry *hp9895_device::device_rom_region() const
}
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)
- MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(hp9895_device , z80_m1_w))
+ MCFG_DEVICE_ADD("cpu" , Z80 , 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(z80_program_map)
+ MCFG_DEVICE_IO_MAP(z80_io_map)
+ MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(*this, hp9895_device , z80_m1_w))
MCFG_DEVICE_ADD("phi" , PHI , 0)
- MCFG_PHI_EOI_WRITE_CB(WRITELINE(hp9895_device , phi_eoi_w))
- MCFG_PHI_DAV_WRITE_CB(WRITELINE(hp9895_device , phi_dav_w))
- MCFG_PHI_NRFD_WRITE_CB(WRITELINE(hp9895_device , phi_nrfd_w))
- MCFG_PHI_NDAC_WRITE_CB(WRITELINE(hp9895_device , phi_ndac_w))
- MCFG_PHI_IFC_WRITE_CB(WRITELINE(hp9895_device , phi_ifc_w))
- MCFG_PHI_SRQ_WRITE_CB(WRITELINE(hp9895_device , phi_srq_w))
- MCFG_PHI_ATN_WRITE_CB(WRITELINE(hp9895_device , phi_atn_w))
- MCFG_PHI_REN_WRITE_CB(WRITELINE(hp9895_device , phi_ren_w))
- MCFG_PHI_DIO_READWRITE_CB(READ8(hp9895_device , phi_dio_r) , WRITE8(hp9895_device , phi_dio_w))
- MCFG_PHI_INT_WRITE_CB(WRITELINE(hp9895_device , phi_int_w))
+ MCFG_PHI_EOI_WRITE_CB(WRITELINE(*this, hp9895_device , phi_eoi_w))
+ MCFG_PHI_DAV_WRITE_CB(WRITELINE(*this, hp9895_device , phi_dav_w))
+ MCFG_PHI_NRFD_WRITE_CB(WRITELINE(*this, hp9895_device , phi_nrfd_w))
+ MCFG_PHI_NDAC_WRITE_CB(WRITELINE(*this, hp9895_device , phi_ndac_w))
+ MCFG_PHI_IFC_WRITE_CB(WRITELINE(*this, hp9895_device , phi_ifc_w))
+ MCFG_PHI_SRQ_WRITE_CB(WRITELINE(*this, hp9895_device , phi_srq_w))
+ MCFG_PHI_ATN_WRITE_CB(WRITELINE(*this, hp9895_device , phi_atn_w))
+ MCFG_PHI_REN_WRITE_CB(WRITELINE(*this, hp9895_device , phi_ren_w))
+ MCFG_PHI_DIO_READWRITE_CB(READ8(*this, hp9895_device , phi_dio_r) , WRITE8(*this, hp9895_device , phi_dio_w))
+ MCFG_PHI_INT_WRITE_CB(WRITELINE(*this, hp9895_device , phi_int_w))
MCFG_PHI_SYS_CNTRL_READ_CB(GND)
MCFG_FLOPPY_DRIVE_ADD("floppy0" , hp9895_floppies , "8dsdd" , hp9895_floppy_formats)
diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp
index ac2e1e42b94..8e2a60985ef 100644
--- a/src/devices/bus/ieee488/shark.cpp
+++ b/src/devices/bus/ieee488/shark.cpp
@@ -82,13 +82,13 @@ void mshark_device::mshark_io(address_map &map)
MACHINE_CONFIG_START(mshark_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(I8085_TAG, I8085A, 1000000)
- MCFG_CPU_PROGRAM_MAP(mshark_mem)
- MCFG_CPU_IO_MAP(mshark_io)
+ MCFG_DEVICE_ADD(I8085_TAG, I8085A, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(mshark_mem)
+ MCFG_DEVICE_IO_MAP(mshark_io)
// devices
MCFG_HARDDISK_ADD("harddisk1")
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index caad857c087..5d6be33930c 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -236,35 +236,35 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(softbox_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(softbox_mem)
- MCFG_CPU_IO_MAP(softbox_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(softbox_mem)
+ MCFG_DEVICE_IO_MAP(softbox_io)
// devices
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD(I8255_0_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(softbox_device, ppi0_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(softbox_device, ppi0_pb_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, softbox_device, ppi0_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, softbox_device, ppi0_pb_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("SW1"))
MCFG_DEVICE_ADD(I8255_1_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(softbox_device, ppi1_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(softbox_device, ppi1_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(softbox_device, ppi1_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(softbox_device, ppi1_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, softbox_device, ppi1_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, softbox_device, ppi1_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, softbox_device, ppi1_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, softbox_device, ppi1_pc_w))
MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc))
MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0)
MCFG_HARDDISK_ADD("harddisk1")
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index 245c04191c5..e826a81663f 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -343,41 +343,41 @@ WRITE8_MEMBER( imi5000h_device::pio3_pb_w )
//-------------------------------------------------
MACHINE_CONFIG_START(imi5000h_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(imi5000h_mem)
- MCFG_CPU_IO_MAP(imi5000h_io)
+ MCFG_DEVICE_PROGRAM_MAP(imi5000h_mem)
+ MCFG_DEVICE_IO_MAP(imi5000h_io)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(imi5000h_device, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(imi5000h_device, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(imi5000h_device, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, imi5000h_device, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, imi5000h_device, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, imi5000h_device, ctc_z2_w))
MCFG_DEVICE_ADD(Z80PIO_0_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio0_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio0_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE(Z80PIO_0_TAG, z80pio_device, strobe_a))
- MCFG_Z80PIO_IN_PB_CB(READ8(imi5000h_device, pio0_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio0_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(DEVWRITELINE(Z80PIO_0_TAG, z80pio_device, strobe_b))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, imi5000h_device, pio0_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, imi5000h_device, pio0_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(Z80PIO_0_TAG, z80pio_device, strobe_a))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, imi5000h_device, pio0_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, imi5000h_device, pio0_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(Z80PIO_0_TAG, z80pio_device, strobe_b))
MCFG_DEVICE_ADD(Z80PIO_2_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio2_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio2_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE(Z80PIO_2_TAG, z80pio_device, strobe_a))
- MCFG_Z80PIO_IN_PB_CB(READ8(imi5000h_device, pio2_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio2_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, imi5000h_device, pio2_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, imi5000h_device, pio2_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(Z80PIO_2_TAG, z80pio_device, strobe_a))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, imi5000h_device, pio2_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, imi5000h_device, pio2_pb_w))
MCFG_DEVICE_ADD(Z80PIO_3_TAG, Z80PIO, XTAL(8'000'000)/2)
- MCFG_Z80PIO_IN_PA_CB(READ8(imi5000h_device, pio3_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(imi5000h_device, pio3_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE(Z80PIO_3_TAG, z80pio_device, strobe_a))
- MCFG_Z80PIO_IN_PB_CB(READ8(imi5000h_device, pio3_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(imi5000h_device, pio3_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(DEVWRITELINE(Z80PIO_3_TAG, z80pio_device, strobe_b))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, imi5000h_device, pio3_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, imi5000h_device, pio3_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(Z80PIO_3_TAG, z80pio_device, strobe_a))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, imi5000h_device, pio3_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, imi5000h_device, pio3_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(Z80PIO_3_TAG, z80pio_device, strobe_b))
//MCFG_HARDDISK_ADD("harddisk1")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/intellec4/intellec4.h b/src/devices/bus/intellec4/intellec4.h
index 40b77370bb6..59bc4d6736e 100644
--- a/src/devices/bus/intellec4/intellec4.h
+++ b/src/devices/bus/intellec4/intellec4.h
@@ -114,11 +114,6 @@ to implement the card in both systems.
#pragma once
-#define MCFG_INTELLEC4_UNIV_SLOT_ADD(bus_tag, slot_tag, clock, slot_intf, def_slot) \
- MCFG_DEVICE_ADD(slot_tag, INTELLEC4_UNIV_SLOT, clock) \
- MCFG_DEVICE_SLOT_INTERFACE(slot_intf, def_slot, false) \
- downcast<bus::intellec4::univ_slot_device &>(*device).set_bus_tag(bus_tag);
-
#define MCFG_INTELLEC4_UNIV_SLOT_REMOVE(slot_tag) \
MCFG_DEVICE_REMOVE(slot_tag)
@@ -161,9 +156,16 @@ class device_univ_card_interface;
class univ_slot_device : public device_t, public device_slot_interface
{
public:
- // configuration helpers
- void set_bus_tag(char const *bus_tag) { m_bus.set_tag(bus_tag); }
-
+ template <typename T, typename U>
+ univ_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&bus_tag, U &&opts, const char *dflt)
+ : univ_slot_device(mconfig, tag, owner, clock)
+ {
+ m_bus.set_tag(std::forward<T>(bus_tag));
+ option_reset();
+ opts(*this);
+ set_default_option(dflt);
+ set_fixed(false);
+ }
univ_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
protected:
@@ -182,11 +184,11 @@ public:
friend class device_univ_card_interface;
// address space configuration
- void set_rom_space(char const *tag, int space) { m_rom_device.set_tag(tag); m_rom_space = space; }
- void set_rom_ports_space(char const *tag, int space) { m_rom_ports_device.set_tag(tag); m_rom_ports_space = space; }
- void set_memory_space(char const *tag, int space) { m_memory_device.set_tag(tag); m_memory_space = space; }
- void set_status_space(char const *tag, int space) { m_status_device.set_tag(tag); m_status_space = space; }
- void set_ram_ports_space(char const *tag, int space) { m_ram_ports_device.set_tag(tag); m_ram_ports_space = space; }
+ template <typename T> void set_rom_space(T &&tag, int space) { m_rom_device.set_tag(std::forward<T>(tag)); m_rom_space = space; }
+ template <typename T> void set_rom_ports_space(T &&tag, int space) { m_rom_ports_device.set_tag(std::forward<T>(tag)); m_rom_ports_space = space; }
+ template <typename T> void set_memory_space(T &&tag, int space) { m_memory_device.set_tag(std::forward<T>(tag)); m_memory_space = space; }
+ template <typename T> void set_status_space(T &&tag, int space) { m_status_device.set_tag(std::forward<T>(tag)); m_status_space = space; }
+ template <typename T> void set_ram_ports_space(T &&tag, int space) { m_ram_ports_device.set_tag(std::forward<T>(tag)); m_ram_ports_space = space; }
// callback configuration
template <typename Obj> devcb_base &set_stop_out_cb(Obj &&cb) { return m_stop_out_cb.set_callback(std::forward<Obj>(cb)); }
diff --git a/src/devices/bus/interpro/keyboard/hle.cpp b/src/devices/bus/interpro/keyboard/hle.cpp
index 9201cfd4206..936ac09e3f3 100644
--- a/src/devices/bus/interpro/keyboard/hle.cpp
+++ b/src/devices/bus/interpro/keyboard/hle.cpp
@@ -279,7 +279,7 @@ WRITE_LINE_MEMBER(hle_device_base::input_txd)
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_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/interpro/keyboard/lle.cpp b/src/devices/bus/interpro/keyboard/lle.cpp
index a0bb577e468..7454162c8ce 100644
--- a/src/devices/bus/interpro/keyboard/lle.cpp
+++ b/src/devices/bus/interpro/keyboard/lle.cpp
@@ -151,10 +151,10 @@ WRITE_LINE_MEMBER(lle_device_base::input_txd)
}
MACHINE_CONFIG_START(lle_device_base::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, 11_MHz_XTAL)
+ MCFG_DEVICE_ADD("mcu", I8049, 11_MHz_XTAL)
MCFG_SPEAKER_STANDARD_MONO("keyboard")
- MCFG_SOUND_ADD("bell", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("bell", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "keyboard", 0.25)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index 90f0e4abd54..3a05c6598b0 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -97,10 +97,10 @@ void intv_ecs_device::late_subslot_setup()
MACHINE_CONFIG_START(intv_ecs_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono_ecs")
- MCFG_SOUND_ADD("ay8914", AY8914, XTAL(3'579'545)/2)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("ctrl_port", intvecs_control_port_device, portA_r))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("ctrl_port", intvecs_control_port_device, portB_r))
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("ctrl_port", intvecs_control_port_device, portA_w))
+ MCFG_DEVICE_ADD("ay8914", AY8914, XTAL(3'579'545)/2)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("ctrl_port", intvecs_control_port_device, portA_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("ctrl_port", intvecs_control_port_device, portB_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("ctrl_port", intvecs_control_port_device, portA_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono_ecs", 0.33)
MCFG_INTVECS_CONTROL_PORT_ADD("ctrl_port", intvecs_control_port_devices, "keybd")
diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp
index 9494d0986c0..bc49aca12be 100644
--- a/src/devices/bus/intv/voice.cpp
+++ b/src/devices/bus/intv/voice.cpp
@@ -72,7 +72,7 @@ void intv_voice_device::late_subslot_setup()
MACHINE_CONFIG_START(intv_voice_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono_voice")
- MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000)
+ MCFG_DEVICE_ADD("sp0256_speech", SP0256, 3120000)
/* The Intellivoice uses a speaker with its own volume control so the relative volumes to use are subjective */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono_voice", 1.00)
diff --git a/src/devices/bus/iq151/grafik.cpp b/src/devices/bus/iq151/grafik.cpp
index bc1b50a8f32..68fe967ae2f 100644
--- a/src/devices/bus/iq151/grafik.cpp
+++ b/src/devices/bus/iq151/grafik.cpp
@@ -68,9 +68,9 @@ void iq151_grafik_device::device_reset()
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))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(iq151_grafik_device, control_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, iq151_grafik_device, x_write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, iq151_grafik_device, y_write))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, iq151_grafik_device, control_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/iq151/staper.cpp b/src/devices/bus/iq151/staper.cpp
index 3375e0c6693..82036a61572 100644
--- a/src/devices/bus/iq151/staper.cpp
+++ b/src/devices/bus/iq151/staper.cpp
@@ -62,9 +62,9 @@ void iq151_staper_device::device_start()
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))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(iq151_staper_device, ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, iq151_staper_device, ppi_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, iq151_staper_device, ppi_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, iq151_staper_device, ppi_portc_w))
MCFG_DEVICE_ADD("printer", PRINTER, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp
index 32151c1675d..50922872343 100644
--- a/src/devices/bus/isa/3c503.cpp
+++ b/src/devices/bus/isa/3c503.cpp
@@ -7,9 +7,9 @@
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))
- MCFG_DP8390D_MEM_WRITE_CB(WRITE8(el2_3c503_device, el2_3c503_mem_write))
+ MCFG_DP8390D_IRQ_CB(WRITELINE(*this, el2_3c503_device, el2_3c503_irq_w))
+ MCFG_DP8390D_MEM_READ_CB(READ8(*this, el2_3c503_device, el2_3c503_mem_read))
+ MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, el2_3c503_device, el2_3c503_mem_write))
MACHINE_CONFIG_END
DEFINE_DEVICE_TYPE(EL2_3C503, el2_3c503_device, "el2_3c503", "3C503 Network Adapter")
diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp
index 52a8e975f7b..de4e62b2dd8 100644
--- a/src/devices/bus/isa/adlib.cpp
+++ b/src/devices/bus/isa/adlib.cpp
@@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(ISA8_ADLIB, isa8_adlib_device, "isa_adlib", "Ad Lib Sound Car
MACHINE_CONFIG_START(isa8_adlib_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock)
+ MCFG_DEVICE_ADD("ym3812", YM3812, ym3812_StdClock)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 3.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index 51c9e1679c9..4a97c15cf2f 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -284,8 +284,8 @@ MACHINE_CONFIG_START(isa8_aga_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(isa8_aga_device, aga_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_aga_device, hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_aga_device, vsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_aga_device, hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_aga_device, vsync_changed))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index 75eae0de6e9..8e260347eee 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -176,8 +176,8 @@ const tiny_rom_entry *aha1542_device::device_rom_region() const
}
MACHINE_CONFIG_START(aha1542_device::device_add_mconfig)
- MCFG_CPU_ADD(Z84C0010_TAG, Z80, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP( z84c0010_mem )
+ MCFG_DEVICE_ADD(Z84C0010_TAG, Z80, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP( z84c0010_mem )
MACHINE_CONFIG_END
aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp
index 7d87ae853bf..04749aaba28 100644
--- a/src/devices/bus/isa/cga.cpp
+++ b/src/devices/bus/isa/cga.cpp
@@ -272,8 +272,8 @@ MACHINE_CONFIG_START(isa8_cga_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(isa8_cga_device, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_cga_device, hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_cga_device, vsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_cga_device, hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_cga_device, vsync_changed))
MCFG_MC6845_RECONFIGURE_CB(isa8_cga_device, reconfigure)
MCFG_VIDEO_SET_SCREEN(nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index d034ed600fe..9a26665f5c3 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -35,53 +35,53 @@ DEFINE_DEVICE_TYPE(ISA8_COM, isa8_com_device, "isa_com", "Communications Adapter
MACHINE_CONFIG_START(isa8_com_device::device_add_mconfig)
MCFG_DEVICE_ADD( "uart_0", INS8250, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport0", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport0", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport0", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_1))
MCFG_DEVICE_ADD( "uart_1", INS8250, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport1", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport1", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport1", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_2))
/*MCFG_DEVICE_ADD( "uart_2", INS8250, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport2", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport2", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport2", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_1))
MCFG_DEVICE_ADD( "uart_3", INS8250, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2))*/
-
- MCFG_RS232_PORT_ADD( "serport0", isa_com, "microsoft_mouse" )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, cts_w))
-
- MCFG_RS232_PORT_ADD( "serport1", isa_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, cts_w))
-
- //MCFG_RS232_PORT_ADD( "serport2", isa_com, nullptr )
- //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, rx_w))
- //MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, dcd_w))
- //MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, dsr_w))
- //MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, ri_w))
- //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, cts_w))
-
- //MCFG_RS232_PORT_ADD( "serport3", isa_com, nullptr )
- //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_2", ins8250_uart_device, rx_w))
- //MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_2", ins8250_uart_device, dcd_w))
- //MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_2", ins8250_uart_device, dsr_w))
- //MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_2", ins8250_uart_device, ri_w))
- //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_2", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport3", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport3", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport3", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_2))*/
+
+ MCFG_DEVICE_ADD( "serport0", RS232_PORT, isa_com, "microsoft_mouse" )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_0", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart_0", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_0", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart_0", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_0", ins8250_uart_device, cts_w))
+
+ MCFG_DEVICE_ADD( "serport1", RS232_PORT, isa_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_1", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart_1", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_1", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart_1", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_1", ins8250_uart_device, cts_w))
+
+ //MCFG_DEVICE_ADD( "serport2", RS232_PORT, isa_com, nullptr )
+ //MCFG_RS232_RXD_HANDLER(WRITELINE("uart_1", ins8250_uart_device, rx_w))
+ //MCFG_RS232_DCD_HANDLER(WRITELINE("uart_1", ins8250_uart_device, dcd_w))
+ //MCFG_RS232_DSR_HANDLER(WRITELINE("uart_1", ins8250_uart_device, dsr_w))
+ //MCFG_RS232_RI_HANDLER(WRITELINE("uart_1", ins8250_uart_device, ri_w))
+ //MCFG_RS232_CTS_HANDLER(WRITELINE("uart_1", ins8250_uart_device, cts_w))
+
+ //MCFG_DEVICE_ADD( "serport3", RS232_PORT, isa_com, nullptr )
+ //MCFG_RS232_RXD_HANDLER(WRITELINE("uart_2", ins8250_uart_device, rx_w))
+ //MCFG_RS232_DCD_HANDLER(WRITELINE("uart_2", ins8250_uart_device, dcd_w))
+ //MCFG_RS232_DSR_HANDLER(WRITELINE("uart_2", ins8250_uart_device, dsr_w))
+ //MCFG_RS232_RI_HANDLER(WRITELINE("uart_2", ins8250_uart_device, ri_w))
+ //MCFG_RS232_CTS_HANDLER(WRITELINE("uart_2", ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
//**************************************************************************
@@ -137,41 +137,41 @@ DEFINE_DEVICE_TYPE(ISA8_COM_AT, isa8_com_at_device, "isa_com_at", "Communication
MACHINE_CONFIG_START(isa8_com_at_device::device_add_mconfig)
MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) ) /* 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))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport0", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport0", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport0", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_1))
MCFG_DEVICE_ADD( "uart_1", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport1", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport1", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport1", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_2))
/*MCFG_DEVICE_ADD( "uart_2", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_1))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport2", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport2", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport2", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_1))
MCFG_DEVICE_ADD( "uart_3", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport3", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport3", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(isa8_com_device, pc_com_interrupt_2))*/
- MCFG_RS232_PORT_ADD( "serport0", isa_com, "microsoft_mouse" )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, cts_w))
-
- MCFG_RS232_PORT_ADD( "serport1", isa_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_1", ins8250_uart_device, cts_w))
-
-// MCFG_RS232_PORT_ADD( "serport2", isa_com, nullptr )
-// MCFG_RS232_PORT_ADD( "serport3", isa_com, nullptr )
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport3", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport3", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport3", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, isa8_com_device, pc_com_interrupt_2))*/
+ MCFG_DEVICE_ADD( "serport0", RS232_PORT, isa_com, "microsoft_mouse" )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_0", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart_0", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_0", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart_0", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_0", ins8250_uart_device, cts_w))
+
+ MCFG_DEVICE_ADD( "serport1", RS232_PORT, isa_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_1", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart_1", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_1", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart_1", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_1", ins8250_uart_device, cts_w))
+
+// MCFG_DEVICE_ADD( "serport2", RS232_PORT, isa_com, nullptr )
+// MCFG_DEVICE_ADD( "serport3", RS232_PORT, isa_com, nullptr )
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 4bba74af8a2..1b327a25534 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -158,18 +158,18 @@ const tiny_rom_entry* dectalk_isa_device::device_rom_region() const
}
MACHINE_CONFIG_START(dectalk_isa_device::device_add_mconfig)
- MCFG_CPU_ADD("dectalk_cpu", I80186, XTAL(20'000'000))
- MCFG_CPU_IO_MAP(dectalk_cpu_io)
- MCFG_CPU_PROGRAM_MAP(dectalk_cpu_map)
- MCFG_80186_TMROUT0_HANDLER(WRITELINE(dectalk_isa_device, clock_w));
+ MCFG_DEVICE_ADD("dectalk_cpu", I80186, XTAL(20'000'000))
+ MCFG_DEVICE_IO_MAP(dectalk_cpu_io)
+ MCFG_DEVICE_PROGRAM_MAP(dectalk_cpu_map)
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE(*this, dectalk_isa_device, clock_w));
- MCFG_CPU_ADD("dectalk_dsp", TMS32015, XTAL(20'000'000))
- MCFG_CPU_IO_MAP(dectalk_dsp_io)
- MCFG_TMS32010_BIO_IN_CB(READLINE(dectalk_isa_device, bio_line_r))
- MCFG_CPU_PROGRAM_MAP(dectalk_dsp_map)
+ MCFG_DEVICE_ADD("dectalk_dsp", TMS32015, XTAL(20'000'000))
+ MCFG_DEVICE_IO_MAP(dectalk_dsp_io)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, dectalk_isa_device, bio_line_r))
+ MCFG_DEVICE_PROGRAM_MAP(dectalk_dsp_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp
index 922ef1475a5..fa83aa1ebf3 100644
--- a/src/devices/bus/isa/ega.cpp
+++ b/src/devices/bus/isa/ega.cpp
@@ -540,10 +540,10 @@ MACHINE_CONFIG_START(isa8_ega_device::device_add_mconfig)
MCFG_CRTC_EGA_SET_SCREEN(EGA_SCREEN_NAME)
MCFG_CRTC_EGA_HPIXELS_PER_COLUMN(8)
MCFG_CRTC_EGA_ROW_UPDATE_CB(isa8_ega_device, ega_update_row)
- MCFG_CRTC_EGA_RES_OUT_DE_CB(WRITELINE(isa8_ega_device, de_changed))
- MCFG_CRTC_EGA_RES_OUT_HSYNC_CB(WRITELINE(isa8_ega_device, hsync_changed))
- MCFG_CRTC_EGA_RES_OUT_VSYNC_CB(WRITELINE(isa8_ega_device, vsync_changed))
- MCFG_CRTC_EGA_RES_OUT_VBLANK_CB(WRITELINE(isa8_ega_device, vblank_changed))
+ MCFG_CRTC_EGA_RES_OUT_DE_CB(WRITELINE(*this, isa8_ega_device, de_changed))
+ MCFG_CRTC_EGA_RES_OUT_HSYNC_CB(WRITELINE(*this, isa8_ega_device, hsync_changed))
+ MCFG_CRTC_EGA_RES_OUT_VSYNC_CB(WRITELINE(*this, isa8_ega_device, vsync_changed))
+ MCFG_CRTC_EGA_RES_OUT_VBLANK_CB(WRITELINE(*this, isa8_ega_device, vblank_changed))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/isa/eis_sad8852.cpp b/src/devices/bus/isa/eis_sad8852.cpp
index 4962d7cded4..dc95b80b8dd 100644
--- a/src/devices/bus/isa/eis_sad8852.cpp
+++ b/src/devices/bus/isa/eis_sad8852.cpp
@@ -200,9 +200,9 @@ ioport_constructor isa16_sad8852_device::device_input_ports() const
// Board configuration
//-------------------------------------------------
MACHINE_CONFIG_START(isa16_sad8852_device::device_add_mconfig)
- MCFG_CPU_ADD(I80188_TAG, I80188, XTAL(12'000'000) / 2) // Chip revision is 6 MHz
- MCFG_CPU_PROGRAM_MAP( sad8852_mem )
- MCFG_CPU_IO_MAP(sad8852_io)
+ MCFG_DEVICE_ADD(I80188_TAG, I80188, XTAL(12'000'000) / 2) // Chip revision is 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP( sad8852_mem )
+ MCFG_DEVICE_IO_MAP(sad8852_io)
MCFG_DEVICE_ADD("terminal", I8274_NEW, XTAL(12'000'000) / 3) // Needs verification
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp
index 8d5f5cc16e5..cf064c94963 100644
--- a/src/devices/bus/isa/fdc.cpp
+++ b/src/devices/bus/isa/fdc.cpp
@@ -84,8 +84,8 @@ isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char
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))
+ MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, irq_w))
+ MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
@@ -97,8 +97,8 @@ isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char
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))
+ MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, irq_w))
+ MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
@@ -109,8 +109,8 @@ isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const ch
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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
@@ -121,8 +121,8 @@ isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const ch
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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
@@ -133,8 +133,8 @@ isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, isa8_fdc_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp
index f221a17c35c..7eb15f2c3fc 100644
--- a/src/devices/bus/isa/finalchs.cpp
+++ b/src/devices/bus/isa/finalchs.cpp
@@ -72,8 +72,8 @@ DEFINE_DEVICE_TYPE(ISA8_FINALCHS, isa8_finalchs_device, "isa_finalchs", "Final C
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_finalchs_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu",M65C02,5000000)
- MCFG_CPU_PROGRAM_MAP(finalchs_mem)
+ MCFG_DEVICE_ADD("maincpu",M65C02,5000000)
+ MCFG_DEVICE_PROGRAM_MAP(finalchs_mem)
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp
index 9b8eb08a0b1..8617da6556b 100644
--- a/src/devices/bus/isa/gus.cpp
+++ b/src/devices/bus/isa/gus.cpp
@@ -1252,30 +1252,30 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(isa16_gus_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("gf1",GGF1,GF1_CLOCK)
+ MCFG_DEVICE_ADD("gf1",GGF1,GF1_CLOCK)
MCFG_SOUND_ROUTE(0,"lspeaker",0.50)
MCFG_SOUND_ROUTE(1,"rspeaker",0.50)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_GF1_TXIRQ_HANDLER(WRITELINE(isa16_gus_device, midi_txirq))
- MCFG_GF1_RXIRQ_HANDLER(WRITELINE(isa16_gus_device, midi_txirq))
- MCFG_GF1_WAVE_IRQ_HANDLER(WRITELINE(isa16_gus_device, wavetable_irq))
- MCFG_GF1_RAMP_IRQ_HANDLER(WRITELINE(isa16_gus_device, volumeramp_irq))
- MCFG_GF1_TIMER1_IRQ_HANDLER(WRITELINE(isa16_gus_device, timer1_irq))
- MCFG_GF1_TIMER2_IRQ_HANDLER(WRITELINE(isa16_gus_device, timer2_irq))
- MCFG_GF1_SB_IRQ_HANDLER(WRITELINE(isa16_gus_device, sb_irq))
- MCFG_GF1_DMA_IRQ_HANDLER(WRITELINE(isa16_gus_device, dma_irq))
- MCFG_GF1_DRQ1_HANDLER(WRITELINE(isa16_gus_device, drq1_w))
- MCFG_GF1_DRQ2_HANDLER(WRITELINE(isa16_gus_device, drq2_w))
- MCFG_GF1_NMI_HANDLER(WRITELINE(isa16_gus_device, nmi_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_GF1_TXIRQ_HANDLER(WRITELINE(*this, isa16_gus_device, midi_txirq))
+ MCFG_GF1_RXIRQ_HANDLER(WRITELINE(*this, isa16_gus_device, midi_txirq))
+ MCFG_GF1_WAVE_IRQ_HANDLER(WRITELINE(*this, isa16_gus_device, wavetable_irq))
+ MCFG_GF1_RAMP_IRQ_HANDLER(WRITELINE(*this, isa16_gus_device, volumeramp_irq))
+ MCFG_GF1_TIMER1_IRQ_HANDLER(WRITELINE(*this, isa16_gus_device, timer1_irq))
+ MCFG_GF1_TIMER2_IRQ_HANDLER(WRITELINE(*this, isa16_gus_device, timer2_irq))
+ MCFG_GF1_SB_IRQ_HANDLER(WRITELINE(*this, isa16_gus_device, sb_irq))
+ MCFG_GF1_DMA_IRQ_HANDLER(WRITELINE(*this, isa16_gus_device, dma_irq))
+ MCFG_GF1_DRQ1_HANDLER(WRITELINE(*this, isa16_gus_device, drq1_w))
+ MCFG_GF1_DRQ2_HANDLER(WRITELINE(*this, isa16_gus_device, drq2_w))
+ MCFG_GF1_NMI_HANDLER(WRITELINE(*this, isa16_gus_device, nmi_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("gf1", acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE("gf1", acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa16_gus_device, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, isa16_gus_device, write_acia_clock))
MACHINE_CONFIG_END
ioport_constructor isa16_gus_device::device_input_ports() const
diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp
index 15b2c66a574..2d0a6d4afa8 100644
--- a/src/devices/bus/isa/hdc.cpp
+++ b/src/devices/bus/isa/hdc.cpp
@@ -920,16 +920,16 @@ DEFINE_DEVICE_TYPE(ISA8_HDC_EC1841, isa8_hdc_ec1841_device, "isa_hdc_ec1841", "E
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))
+ MCFG_XTHDC_IRQ_HANDLER(WRITELINE(*this, isa8_hdc_device,irq_w))
+ MCFG_XTHDC_DRQ_HANDLER(WRITELINE(*this, isa8_hdc_device,drq_w))
MCFG_HARDDISK_ADD("hdc:primary")
MCFG_HARDDISK_ADD("hdc:slave")
MACHINE_CONFIG_END
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))
+ MCFG_XTHDC_IRQ_HANDLER(WRITELINE(*this, isa8_hdc_ec1841_device,irq_w))
+ MCFG_XTHDC_DRQ_HANDLER(WRITELINE(*this, isa8_hdc_ec1841_device,drq_w))
MCFG_HARDDISK_ADD("hdc:primary")
MCFG_HARDDISK_ADD("hdc:slave")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp
index cd1bce5ab5c..9040030d8fa 100644
--- a/src/devices/bus/isa/ibm_mfc.cpp
+++ b/src/devices/bus/isa/ibm_mfc.cpp
@@ -375,37 +375,37 @@ ROM_END
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig)
- MCFG_CPU_ADD("ibm_mfc", Z80, XTAL(11'800'000) / 2)
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("ibm_mfc", Z80, XTAL(11'800'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("d71055c_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(isa8_ibm_mfc_device, ppi0_i_a))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(isa8_ibm_mfc_device, ppi0_o_b))
- MCFG_I8255_IN_PORTC_CB(READ8(isa8_ibm_mfc_device, ppi0_i_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(isa8_ibm_mfc_device, ppi0_o_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, isa8_ibm_mfc_device, ppi0_i_a))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, isa8_ibm_mfc_device, ppi0_o_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, isa8_ibm_mfc_device, ppi0_i_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, isa8_ibm_mfc_device, ppi0_o_c))
MCFG_DEVICE_ADD("d71055c_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(isa8_ibm_mfc_device, ppi1_o_a))
- MCFG_I8255_IN_PORTB_CB(READ8(isa8_ibm_mfc_device, ppi1_i_b))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(isa8_ibm_mfc_device, ppi1_o_c))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, isa8_ibm_mfc_device, ppi1_o_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, isa8_ibm_mfc_device, ppi1_i_b))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, isa8_ibm_mfc_device, ppi1_o_c))
MCFG_DEVICE_ADD("d71051", I8251, 0)
MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isa8_ibm_mfc_device, write_usart_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, write_usart_clock))
MCFG_DEVICE_ADD("d8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(4'000'000) / 8)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, d8253_out0))
MCFG_PIT8253_CLK1(0)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_ibm_mfc_device, d8253_out1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, d8253_out1))
MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("d8253", pit8253_device, write_clk1))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("d8253", pit8253_device, write_clk1))
MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright")
MCFG_YM2151_ADD("ym2151", XTAL(4'000'000))
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(isa8_ibm_mfc_device, ibm_mfc_ym_irq))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, ibm_mfc_ym_irq))
MCFG_SOUND_ROUTE(0, "ymleft", 1.00)
MCFG_SOUND_ROUTE(1, "ymright", 1.00)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index 3c31fed1061..648dd451814 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -72,7 +72,7 @@ DEFINE_DEVICE_TYPE(ISA16_IDE, isa16_ide_device, "isa_ide", "IDE Fixed Drive Adap
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_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, isa16_ide_device, ide_interrupt))
MCFG_SPEAKER_STANDARD_STEREO("lheadphone", "rheadphone")
diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp
index da54d1aea5c..89ede2bfbfb 100644
--- a/src/devices/bus/isa/isa.cpp
+++ b/src/devices/bus/isa/isa.cpp
@@ -114,6 +114,9 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const
m_maincpu(*this, finder_base::DUMMY_TAG),
m_iospace(nullptr),
m_memspace(nullptr),
+ m_iowidth(0),
+ m_memwidth(0),
+ m_allocspaces(false),
m_out_irq2_cb(*this),
m_out_irq3_cb(*this),
m_out_irq4_cb(*this),
@@ -123,16 +126,11 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const
m_out_drq1_cb(*this),
m_out_drq2_cb(*this),
m_out_drq3_cb(*this),
+ m_nmi_enabled(false),
m_write_iochck(*this)
{
- for(int i=0;i<8;i++)
- {
- m_dma_device[i] = nullptr;
- m_dma_eop[i] = false;
- }
- m_nmi_enabled = false;
- m_iowidth = m_memwidth = 0;
- m_allocspaces = false;
+ std::fill(std::begin(m_dma_device), std::end(m_dma_device), nullptr);
+ std::fill(std::begin(m_dma_eop), std::end(m_dma_eop), false);
}
device_memory_interface::space_config_vector isa8_device::memory_space_config() const
diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h
index 4a8f4a21e7d..47bd9a23993 100644
--- a/src/devices/bus/isa/isa.h
+++ b/src/devices/bus/isa/isa.h
@@ -79,18 +79,10 @@
// include this in a driver to have ISA allocate it's own address spaces (e.g. non-x86)
#define MCFG_ISA8_BUS_CUSTOM_SPACES() \
downcast<isa8_device &>(*device).set_custom_spaces();
-#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) \
- downcast<isa8_slot_device &>(*device).set_isa8_slot(_isatag);
#define MCFG_ISA16_CPU(_cputag) \
downcast<isa8_device &>(*device).set_cputag(_cputag);
#define MCFG_ISA16_BUS_CUSTOM_SPACES() \
downcast<isa8_device &>(*device).set_custom_spaces();
-#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) \
- downcast<isa16_slot_device &>(*device).set_isa16_slot(_isatag);
#define MCFG_ISA_BUS_IOCHCK(_iochck) \
devcb = &downcast<isa8_device *>(device)->set_iochck_callback(DEVCB_##_iochck);
@@ -157,22 +149,28 @@
class isa8_device;
-class isa8_slot_device : public device_t,
- public device_slot_interface
+class isa8_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
+ template <typename T, typename U>
+ isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&isa_tag, U &&opts, const char *dflt, bool fixed)
+ : isa8_slot_device(mconfig, tag, owner, clock)
+ {
+ option_reset();
+ opts(*this);
+ set_default_option(dflt);
+ set_fixed(fixed);
+ m_isa_bus.set_tag(std::forward<T>(isa_tag));
+ }
isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
- virtual void device_start() override;
-
- // inline configuration
- void set_isa8_slot(const char *isa_tag) { m_isa_bus.set_tag(isa_tag); }
-
protected:
isa8_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ // device-level overrides
+ virtual void device_start() override;
+
// configuration
required_device<device_t> m_isa_bus;
};
@@ -197,7 +195,7 @@ public:
// construction/destruction
isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration
- void set_cputag(const char *tag) { m_maincpu.set_tag(tag); }
+ template <typename T> void set_cputag(T &&tag) { m_maincpu.set_tag(std::forward<T>(tag)); }
void set_custom_spaces() { m_allocspaces = true; }
template <class Object> devcb_base &set_iochck_callback(Object &&cb) { return m_write_iochck.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_out_irq2_callback(Object &&cb) { return m_out_irq2_cb.set_callback(std::forward<Object>(cb)); }
@@ -342,12 +340,21 @@ class isa16_slot_device : public isa8_slot_device
{
public:
// construction/destruction
+ template <typename T, typename U>
+ isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&isa_tag, U &&opts, const char *dflt, bool fixed)
+ : isa16_slot_device(mconfig, tag, owner, clock)
+ {
+ option_reset();
+ opts(*this);
+ set_default_option(dflt);
+ set_fixed(fixed);
+ m_isa_bus.set_tag(std::forward<T>(isa_tag));
+ }
isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
- virtual void device_start() override;
- // inline configuration
- void set_isa16_slot(const char *isa_tag) { m_isa_bus.set_tag(isa_tag); }
+protected:
+ // device-level overrides
+ virtual void device_start() override;
};
diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp
index 98da3d47ec2..3860896bf7b 100644
--- a/src/devices/bus/isa/lpt.cpp
+++ b/src/devices/bus/isa/lpt.cpp
@@ -21,7 +21,7 @@ isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag,
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))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, isa8_lpt_device, pc_cpu_line))
MACHINE_CONFIG_END
static INPUT_PORTS_START( lpt_dsw )
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 1f019bbd2b7..7915195b871 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -54,8 +54,8 @@ ROM_END
MACHINE_CONFIG_START(mc1502_fdc_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mc1502_fdc_device, mc1502_fdc_irq_drq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mc1502_fdc_device, mc1502_fdc_irq_drq))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp
index 684c105bd69..718c59735bd 100644
--- a/src/devices/bus/isa/mda.cpp
+++ b/src/devices/bus/isa/mda.cpp
@@ -121,13 +121,13 @@ MACHINE_CONFIG_START(isa8_mda_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(isa8_mda_device, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_mda_device, hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_mda_device, vsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_mda_device, hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_mda_device, vsync_changed))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcmda)
MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(isa8_mda_device, pc_cpu_line))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, isa8_mda_device, pc_cpu_line))
MACHINE_CONFIG_END
//-------------------------------------------------
@@ -549,13 +549,13 @@ MACHINE_CONFIG_START(isa8_hercules_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(9)
MCFG_MC6845_UPDATE_ROW_CB(isa8_hercules_device, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_mda_device, hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_mda_device, vsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_mda_device, hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_mda_device, vsync_changed))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pcherc)
MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(isa8_mda_device, pc_cpu_line))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, isa8_mda_device, pc_cpu_line))
MACHINE_CONFIG_END
//-------------------------------------------------
@@ -767,8 +767,8 @@ MACHINE_CONFIG_START(isa8_ec1840_0002_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(isa8_mda_device, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(isa8_mda_device, hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(isa8_mda_device, vsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, isa8_mda_device, hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, isa8_mda_device, vsync_changed))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp
index 7e71471317d..f05555f47c2 100644
--- a/src/devices/bus/isa/mpu401.cpp
+++ b/src/devices/bus/isa/mpu401.cpp
@@ -49,7 +49,7 @@ DEFINE_DEVICE_TYPE(ISA8_MPU401, isa8_mpu401_device, "isa_mpu401", "Roland MPU-40
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_mpu401_device::device_add_mconfig)
- MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(isa8_mpu401_device, mpu_irq_out))
+ MCFG_MPU401_ADD(MPU_CORE_TAG, WRITELINE(*this, 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 197a242ce15..e1c16b1b6ea 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -47,9 +47,9 @@ static void drives(device_slot_interface &device)
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))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(mufdc_device, fdc_drq_w))
+ MCFG_MCS3201_INPUT_HANDLER(READ8(*this, mufdc_device, fdc_input_r))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, mufdc_device, fdc_irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, mufdc_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", drives, "35hd", mufdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", drives, "35hd", mufdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", drives, nullptr, mufdc_device::floppy_formats)
diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp
index a5daafbe7b9..1a281971c9c 100644
--- a/src/devices/bus/isa/myb3k_com.cpp
+++ b/src/devices/bus/isa/myb3k_com.cpp
@@ -33,26 +33,26 @@ DEFINE_DEVICE_TYPE(ISA8_MYB3K_COM, isa8_myb3k_com_device, "isa8_myb3k_com", "ADP
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_myb3k_com_device::device_add_mconfig)
MCFG_DEVICE_ADD( "usart", I8251, XTAL(15'974'400) / 8 )
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("com1", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(isa8_myb3k_com_device, com_int_rx))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(isa8_myb3k_com_device, com_int_tx))
-
- MCFG_RS232_PORT_ADD( "com1", isa8_myb3k_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("usart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("usart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("usart", i8251_device, write_cts))
- MCFG_RS232_RI_HANDLER(WRITELINE(isa8_myb3k_com_device, ri_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(isa8_myb3k_com_device, dcd_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("com1", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("com1", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("com1", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, isa8_myb3k_com_device, com_int_rx))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, isa8_myb3k_com_device, com_int_tx))
+
+ MCFG_DEVICE_ADD( "com1", RS232_PORT, isa8_myb3k_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("usart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("usart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("usart", i8251_device, write_cts))
+ MCFG_RS232_RI_HANDLER(WRITELINE(*this, isa8_myb3k_com_device, ri_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, isa8_myb3k_com_device, dcd_w))
// TODO: configure RxC and TxC from RS232 connector when these are defined is rs232.h
/* Timer chip */
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(15'974'400) / 8 ) /* TxC */
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_txc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, isa8_myb3k_com_device, pit_txc))
MCFG_PIT8253_CLK1(XTAL(15'974'400) / 8 ) /* RxC */
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(isa8_myb3k_com_device, pit_rxc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, isa8_myb3k_com_device, pit_rxc))
// Timer 2 is not used/connected to anything on the schematics
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp
index 4d6349e6c77..0464d25c4ec 100644
--- a/src/devices/bus/isa/myb3k_fdc.cpp
+++ b/src/devices/bus/isa/myb3k_fdc.cpp
@@ -99,8 +99,8 @@ static void myb3k_8inch_floppies(device_slot_interface &device)
/* */
MACHINE_CONFIG_START(isa8_myb3k_fdc4710_device::device_add_mconfig)
MCFG_DEVICE_ADD("fdc", MB8876, XTAL(15'974'400) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, isa8_myb3k_fdc4710_device, irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, isa8_myb3k_fdc4710_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", myb3k_sd_floppies, "525sd", isa8_myb3k_fdc4710_device::myb3k_floppy_formats)
MACHINE_CONFIG_END
@@ -108,8 +108,8 @@ MACHINE_CONFIG_END
/* Main difference from fdc4710 is that a Hitachi HA16632AP has replaced the descrete VFO enabling 720Kb disks */
MACHINE_CONFIG_START(isa8_myb3k_fdc4711_device::device_add_mconfig)
MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, isa8_myb3k_fdc4711_device, irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, isa8_myb3k_fdc4711_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", myb3k_qd_floppies, "525qd", isa8_myb3k_fdc4711_device::myb3k_floppy_formats)
@@ -119,8 +119,8 @@ MACHINE_CONFIG_END
#if 0
MACHINE_CONFIG_START(isa8_myb3k_fdc4712_device::device_add_mconfig)
MCFG_DEVICE_ADD("fdc", FD1791, XTAL(15'974'400) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, isa8_myb3k_fdc4712_device, irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, isa8_myb3k_fdc4712_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", myb3k_8inch_floppies, "8dsdd", isa8_myb3k_fdc4712_device::myb3k_floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp
index a5359fa189d..7723ad75a88 100644
--- a/src/devices/bus/isa/ne1000.cpp
+++ b/src/devices/bus/isa/ne1000.cpp
@@ -8,9 +8,9 @@ DEFINE_DEVICE_TYPE(NE1000, ne1000_device, "ne1000", "NE1000 Network Adapter")
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))
- MCFG_DP8390D_MEM_WRITE_CB(WRITE8(ne1000_device, ne1000_mem_write))
+ MCFG_DP8390D_IRQ_CB(WRITELINE(*this, ne1000_device, ne1000_irq_w))
+ MCFG_DP8390D_MEM_READ_CB(READ8(*this, ne1000_device, ne1000_mem_read))
+ MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, ne1000_device, ne1000_mem_write))
MACHINE_CONFIG_END
ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp
index eceaad0ef24..5de941accc2 100644
--- a/src/devices/bus/isa/ne2000.cpp
+++ b/src/devices/bus/isa/ne2000.cpp
@@ -8,9 +8,9 @@ DEFINE_DEVICE_TYPE(NE2000, ne2000_device, "ne2000", "NE2000 Network Adapter")
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))
- MCFG_DP8390D_MEM_WRITE_CB(WRITE8(ne2000_device, ne2000_mem_write))
+ MCFG_DP8390D_IRQ_CB(WRITELINE(*this, ne2000_device, ne2000_irq_w))
+ MCFG_DP8390D_MEM_READ_CB(READ8(*this, ne2000_device, ne2000_mem_read))
+ MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, ne2000_device, ne2000_mem_write))
MACHINE_CONFIG_END
ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index 32ab9c6a56f..c93c76b09cf 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -248,8 +248,8 @@ MACHINE_CONFIG_START(omti8621_device::device_add_mconfig)
MCFG_DEVICE_ADD(OMTI_DISK1_TAG, OMTI_DISK, 0)
MCFG_PC_FDC_AT_ADD(OMTI_FDC_TAG)
- MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(omti8621_device, fdc_irq_w))
- MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(omti8621_device, fdc_drq_w))
+ MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(*this, omti8621_device, fdc_irq_w))
+ MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(*this, omti8621_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":0", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
// Apollo workstations never have more then 1 floppy drive
// MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":1", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 9718fc00497..e98304ae3bf 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -64,8 +64,8 @@ ROM_END
MACHINE_CONFIG_START(p1_fdc_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 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))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, p1_fdc_device, p1_fdc_irq_drq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, p1_fdc_device, p1_fdc_irq_drq))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp
index 73ce5f735af..5ef08234926 100644
--- a/src/devices/bus/isa/p1_sound.cpp
+++ b/src/devices/bus/isa/p1_sound.cpp
@@ -31,22 +31,22 @@ DEFINE_DEVICE_TYPE(P1_SOUND, p1_sound_device, "p1_sound", "Poisk-1 sound card (B
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))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(":isa", isa8_device, irq3_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("midi", i8251_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE("midi", i8251_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("d14", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(12'500'000)/10)
// sampler at 10 KHz
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(p1_sound_device, sampler_sync))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, p1_sound_device, sampler_sync))
MCFG_PIT8253_CLK1(XTAL(12'500'000)/10)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("midi", i8251_device, write_txc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("midi", i8251_device, write_txc))
MCFG_PIT8253_CLK2(XTAL(12'500'000)/10)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("midi", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("midi", i8251_device, write_rxc))
MCFG_DEVICE_ADD("d16", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(12'500'000)/10)
@@ -65,9 +65,9 @@ MACHINE_CONFIG_START(p1_sound_device::device_add_mconfig)
// MCFG_PIT8253_OUT2_HANDLER(XXX)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_FILTER_RC_ADD("filter", 0)
+ MCFG_DEVICE_ADD("filter", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp
index 4adf87ca1e7..40aa74b14e4 100644
--- a/src/devices/bus/isa/pgc.cpp
+++ b/src/devices/bus/isa/pgc.cpp
@@ -152,10 +152,10 @@ DEFINE_DEVICE_TYPE(ISA8_PGC, isa8_pgc_device, "isa_ibm_pgc", "IBM Professional G
//-------------------------------------------------
MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(pgc_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(pgc_map)
#if 0
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(isa8_pgc_device, irq_callback)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(isa8_pgc_device, irq_callback)
#endif
MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", isa8_pgc_device, scanline_callback,
@@ -169,7 +169,7 @@ MACHINE_CONFIG_START(isa8_pgc_device::device_add_mconfig)
MCFG_SCREEN_UPDATE_DRIVER(isa8_pgc_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
#if 0
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(isa8_pgc_device, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, isa8_pgc_device, vblank_irq))
#endif
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pgc)
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index 5569ae8689f..b0e0ceb75b6 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -410,22 +410,22 @@ const tiny_rom_entry *sb16_lle_device::device_rom_region() const
}
MACHINE_CONFIG_START(sb16_lle_device::device_add_mconfig)
- MCFG_CPU_ADD("sb16_cpu", I80C52, XTAL(24'000'000))
- MCFG_CPU_IO_MAP(sb16_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(sb16_lle_device, p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(sb16_lle_device, p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(sb16_lle_device, p2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(sb16_lle_device, p2_w))
+ MCFG_DEVICE_ADD("sb16_cpu", I80C52, XTAL(24'000'000))
+ MCFG_DEVICE_IO_MAP(sb16_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, sb16_lle_device, p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, sb16_lle_device, p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, sb16_lle_device, p2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, sb16_lle_device, p2_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf262", YMF262, XTAL(14'318'181))
+ MCFG_DEVICE_ADD("ymf262", YMF262, XTAL(14'318'181))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
- 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
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_PC_JOY_ADD("pc_joy")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index c073424fd8d..394f072e791 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -1142,7 +1142,7 @@ DEFINE_DEVICE_TYPE(ISA16_SOUND_BLASTER_16, isa16_sblaster16_device, "isa_sblaste
MACHINE_CONFIG_START(isa8_sblaster1_0_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock)
+ MCFG_DEVICE_ADD("ym3812", YM3812, ym3812_StdClock)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 3.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 3.00)
MCFG_SAA1099_ADD("saa1099.1", 7159090)
@@ -1152,56 +1152,56 @@ MACHINE_CONFIG_START(isa8_sblaster1_0_device::device_add_mconfig)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- 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
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_PC_JOY_ADD("pc_joy")
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, sb_device, midi_rx_w))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(DEVICE_SELF, sb_device, midi_rx_w))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isa8_sblaster1_5_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym3812", YM3812, ym3812_StdClock)
+ MCFG_DEVICE_ADD("ym3812", YM3812, ym3812_StdClock)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
/* no CM/S support (empty sockets) */
- 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
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_PC_JOY_ADD("pc_joy")
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, sb_device, midi_rx_w))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(DEVICE_SELF, sb_device, midi_rx_w))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isa16_sblaster16_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf262", YMF262, ymf262_StdClock)
+ MCFG_DEVICE_ADD("ymf262", YMF262, ymf262_StdClock)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
- 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
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_PC_JOY_ADD("pc_joy")
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, sb_device, midi_rx_w))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(DEVICE_SELF, sb_device, midi_rx_w))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index 9f13ab1c62a..1e0fa3a9883 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(ISA8_SIDE116, side116_device, "side116", "Acculogic sIDE-1/16
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))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, side116_device, ide_interrupt))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index 45adc68b34b..453c8d5125d 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -12,7 +12,7 @@ DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001
MACHINE_CONFIG_START(ssi2001_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sid6581", MOS6581, XTAL(14'318'181)/16)
+ MCFG_DEVICE_ADD("sid6581", MOS6581, XTAL(14'318'181)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_PC_JOY_ADD("pc_joy")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index 6f49baba5f0..66062702719 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -115,22 +115,22 @@ const tiny_rom_entry *stereo_fx_device::device_rom_region() const
}
MACHINE_CONFIG_START(stereo_fx_device::device_add_mconfig)
- MCFG_CPU_ADD("stereo_fx_cpu", I80C31, XTAL(30'000'000))
- MCFG_CPU_IO_MAP(stereo_fx_io)
- MCFG_CPU_PROGRAM_MAP(stereo_fx_rom)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(stereo_fx_device, p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(DEVWRITE8("ldac", dac_byte_interface, write))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(stereo_fx_device, p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(stereo_fx_device, p3_w))
+ MCFG_DEVICE_ADD("stereo_fx_cpu", I80C31, XTAL(30'000'000))
+ MCFG_DEVICE_IO_MAP(stereo_fx_io)
+ MCFG_DEVICE_PROGRAM_MAP(stereo_fx_rom)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, stereo_fx_device, p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8("ldac", dac_byte_interface, write))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, stereo_fx_device, p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, stereo_fx_device, p3_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym3812", YM3812, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym3812", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
/* no CM/S support (empty sockets) */
- MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index 6771441c886..244383a4cef 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -140,29 +140,29 @@ WRITE8_MEMBER( wdxt_gen_device::ram_w )
//-------------------------------------------------
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))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(wdxt_gen_device, wd1015_t1_r))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(wdxt_gen_device, wd1015_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(wdxt_gen_device, wd1015_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(wdxt_gen_device, wd1015_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(wdxt_gen_device, wd1015_p2_w))
+ MCFG_DEVICE_ADD(WD1015_TAG, I8049, 5000000)
+ MCFG_DEVICE_IO_MAP(wd1015_io)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(WD11C00_17_TAG, wd11c00_17_device, busy_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, wdxt_gen_device, wd1015_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, wdxt_gen_device, wd1015_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, wdxt_gen_device, wd1015_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, wdxt_gen_device, wd1015_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, wdxt_gen_device, wd1015_p2_w))
MCFG_DEVICE_ADD(WD11C00_17_TAG, WD11C00_17, 5000000)
- MCFG_WD11C00_17_OUT_IRQ5_CB(WRITELINE(wdxt_gen_device, irq5_w))
- MCFG_WD11C00_17_OUT_DRQ3_CB(WRITELINE(wdxt_gen_device, drq3_w))
- MCFG_WD11C00_17_OUT_MR_CB(WRITELINE(wdxt_gen_device, mr_w))
+ MCFG_WD11C00_17_OUT_IRQ5_CB(WRITELINE(*this, wdxt_gen_device, irq5_w))
+ MCFG_WD11C00_17_OUT_DRQ3_CB(WRITELINE(*this, wdxt_gen_device, drq3_w))
+ MCFG_WD11C00_17_OUT_MR_CB(WRITELINE(*this, wdxt_gen_device, mr_w))
MCFG_WD11C00_17_OUT_RA3_CB(INPUTLINE(WD1015_TAG, MCS48_INPUT_IRQ))
- MCFG_WD11C00_17_IN_RD322_CB(READ8(wdxt_gen_device, rd322_r))
- MCFG_WD11C00_17_IN_RAMCS_CB(READ8(wdxt_gen_device, ram_r))
- MCFG_WD11C00_17_OUT_RAMWR_CB(WRITE8(wdxt_gen_device, ram_w))
- MCFG_WD11C00_17_IN_CS1010_CB(DEVREAD8(WD2010A_TAG, wd2010_device, read))
- MCFG_WD11C00_17_OUT_CS1010_CB(DEVWRITE8(WD2010A_TAG, wd2010_device, write))
+ MCFG_WD11C00_17_IN_RD322_CB(READ8(*this, wdxt_gen_device, rd322_r))
+ MCFG_WD11C00_17_IN_RAMCS_CB(READ8(*this, wdxt_gen_device, ram_r))
+ MCFG_WD11C00_17_OUT_RAMWR_CB(WRITE8(*this, wdxt_gen_device, ram_w))
+ MCFG_WD11C00_17_IN_CS1010_CB(READ8(WD2010A_TAG, wd2010_device, read))
+ MCFG_WD11C00_17_OUT_CS1010_CB(WRITE8(WD2010A_TAG, wd2010_device, write))
MCFG_DEVICE_ADD(WD2010A_TAG, WD2010, 5000000)
- MCFG_WD2010_OUT_BCR_CB(DEVWRITELINE(WD11C00_17_TAG, wd11c00_17_device, clct_w))
- MCFG_WD2010_IN_BCS_CB(DEVREAD8(WD11C00_17_TAG, wd11c00_17_device, read))
- MCFG_WD2010_OUT_BCS_CB(DEVWRITE8(WD11C00_17_TAG, wd11c00_17_device, write))
+ MCFG_WD2010_OUT_BCR_CB(WRITELINE(WD11C00_17_TAG, wd11c00_17_device, clct_w))
+ MCFG_WD2010_IN_BCS_CB(READ8(WD11C00_17_TAG, wd11c00_17_device, read))
+ MCFG_WD2010_OUT_BCS_CB(WRITE8(WD11C00_17_TAG, wd11c00_17_device, write))
MCFG_WD2010_IN_DRDY_CB(VCC)
MCFG_WD2010_IN_INDEX_CB(VCC)
MCFG_WD2010_IN_WF_CB(VCC)
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index 5abc5ff5580..282dce9032c 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -264,7 +264,7 @@ DEFINE_DEVICE_TYPE(ISA8_XTIDE, xtide_device, "xtide", "XT-IDE Fixed Drive Adapte
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))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, xtide_device, ide_interrupt))
MCFG_EEPROM_2864_ADD("eeprom")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp
index df2e76069e6..a2300020119 100644
--- a/src/devices/bus/isbx/compis_fdc.cpp
+++ b/src/devices/bus/isbx/compis_fdc.cpp
@@ -56,8 +56,8 @@ static void compis_floppies(device_slot_interface &device)
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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, compis_fdc_device, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, compis_fdc_device, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD(I8272_TAG":0", compis_floppies, "525qd", compis_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(I8272_TAG":1", compis_floppies, "525qd", compis_fdc_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index 95f23955890..c98df25dd9d 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -56,8 +56,8 @@ static void isbc_218a_floppies(device_slot_interface &device)
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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, isbc_218a_device, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, isbc_218a_device, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD(I8272_TAG":0", isbc_218a_floppies, "525dd", isbc_218a_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/kc/d002.cpp b/src/devices/bus/kc/d002.cpp
index ebc24b06f8b..24a361a8f2d 100644
--- a/src/devices/bus/kc/d002.cpp
+++ b/src/devices/bus/kc/d002.cpp
@@ -113,35 +113,35 @@ 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")
- MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
- MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
- MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))
+ MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, kc_d002_device, out_irq_w))
+ MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(*this, kc_d002_device, out_nmi_w))
+ MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(*this, kc_d002_device, out_halt_w))
MCFG_DEVICE_ADD("m4", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_cart, nullptr, false)
MCFG_KCCART_SLOT_NEXT_SLOT("m8")
- MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
- MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
- MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))
+ MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, kc_d002_device, out_irq_w))
+ MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(*this, kc_d002_device, out_nmi_w))
+ MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(*this, kc_d002_device, out_halt_w))
MCFG_DEVICE_ADD("m8", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_cart, nullptr, false)
MCFG_KCCART_SLOT_NEXT_SLOT("mc")
- MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
- MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
- MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))
+ MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, kc_d002_device, out_irq_w))
+ MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(*this, kc_d002_device, out_nmi_w))
+ MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(*this, kc_d002_device, out_halt_w))
MCFG_DEVICE_ADD("mc", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_cart, nullptr, false)
MCFG_KCCART_SLOT_NEXT_SLOT("exp")
- MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
- MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
- MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))
+ MCFG_KCCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, kc_d002_device, out_irq_w))
+ MCFG_KCCART_SLOT_OUT_NMI_CB(WRITELINE(*this, kc_d002_device, out_nmi_w))
+ MCFG_KCCART_SLOT_OUT_HALT_CB(WRITELINE(*this, kc_d002_device, out_halt_w))
// expansion interface
MCFG_DEVICE_ADD("exp", KCCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(kc85_exp, nullptr, false)
MCFG_KCEXP_SLOT_NEXT_SLOT(nullptr)
- MCFG_KCEXP_SLOT_OUT_IRQ_CB(WRITELINE(kc_d002_device, out_irq_w))
- MCFG_KCEXP_SLOT_OUT_NMI_CB(WRITELINE(kc_d002_device, out_nmi_w))
- MCFG_KCEXP_SLOT_OUT_HALT_CB(WRITELINE(kc_d002_device, out_halt_w))
+ MCFG_KCEXP_SLOT_OUT_IRQ_CB(WRITELINE(*this, kc_d002_device, out_irq_w))
+ MCFG_KCEXP_SLOT_OUT_NMI_CB(WRITELINE(*this, kc_d002_device, out_nmi_w))
+ MCFG_KCEXP_SLOT_OUT_HALT_CB(WRITELINE(*this, kc_d002_device, out_halt_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/kc/d004.cpp b/src/devices/bus/kc/d004.cpp
index 3831c9f2eb5..8e1fd7c32bb 100644
--- a/src/devices/bus/kc/d004.cpp
+++ b/src/devices/bus/kc/d004.cpp
@@ -151,19 +151,19 @@ void kc_d004_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(kc_d004_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(kc_d004_mem)
- MCFG_CPU_IO_MAP(kc_d004_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(kc_d004_mem)
+ MCFG_DEVICE_IO_MAP(kc_d004_io)
MCFG_Z80_DAISY_CHAIN(kc_d004_daisy_chain)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, 0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg2))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg2))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(kc_d004_device, fdc_irq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, kc_d004_device, fdc_irq))
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", kc_d004_floppies, "525qd", kc_d004_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", kc_d004_floppies, "525qd", kc_d004_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":2", kc_d004_floppies, "525qd", kc_d004_device::floppy_formats)
@@ -377,8 +377,8 @@ kc_d004_gide_device::kc_d004_gide_device(const machine_config &mconfig, const ch
MACHINE_CONFIG_START(kc_d004_gide_device::device_add_mconfig)
kc_d004_device::device_add_mconfig(config);
- MCFG_CPU_MODIFY(Z80_TAG)
- MCFG_CPU_IO_MAP(kc_d004_gide_io)
+ MCFG_DEVICE_MODIFY(Z80_TAG)
+ MCFG_DEVICE_IO_MAP(kc_d004_gide_io)
MCFG_ATA_INTERFACE_ADD(ATA_TAG, ata_devices, "hdd", nullptr, false)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp
index 965fc3fe58b..8b824466d9b 100644
--- a/src/devices/bus/lpci/southbridge.cpp
+++ b/src/devices/bus/lpci/southbridge.cpp
@@ -28,87 +28,87 @@
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))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, southbridge_device, at_pit8254_out0_changed))
MCFG_PIT8253_CLK1(4772720/4) // dram refresh
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(southbridge_device, at_pit8254_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, southbridge_device, at_pit8254_out1_changed))
MCFG_PIT8253_CLK2(4772720/4) // pio port c pin 4, and speaker polling enough
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(southbridge_device, at_pit8254_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, southbridge_device, at_pit8254_out2_changed))
MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(southbridge_device, at_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(southbridge_device, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(southbridge_device, pc_dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(southbridge_device, pc_dma8237_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(southbridge_device, pc_dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(southbridge_device, pc_dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(southbridge_device, pc_dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(southbridge_device, pc_dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(southbridge_device, pc_dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(southbridge_device, pc_dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(southbridge_device, pc_dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(southbridge_device, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(southbridge_device, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(southbridge_device, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(southbridge_device, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma8237_2", am9517a_device, dreq0_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, southbridge_device, at_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, southbridge_device, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, southbridge_device, pc_dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, southbridge_device, pc_dma8237_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, southbridge_device, pc_dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, southbridge_device, pc_dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, southbridge_device, pc_dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, southbridge_device, pc_dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, southbridge_device, pc_dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, southbridge_device, pc_dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, southbridge_device, pc_dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, southbridge_device, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, southbridge_device, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, southbridge_device, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, southbridge_device, pc_dack3_w))
MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(southbridge_device, pc_dma_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(southbridge_device, pc_dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(southbridge_device, pc_dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(southbridge_device, pc_dma8237_5_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(southbridge_device, pc_dma8237_6_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(southbridge_device, pc_dma8237_7_dack_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(southbridge_device, pc_dma8237_5_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(southbridge_device, pc_dma8237_6_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(southbridge_device, pc_dma8237_7_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(southbridge_device, pc_dack4_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(southbridge_device, pc_dack5_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(southbridge_device, pc_dack6_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(southbridge_device, pc_dack7_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, southbridge_device, pc_dma_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, southbridge_device, pc_dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, southbridge_device, pc_dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, southbridge_device, pc_dma8237_5_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, southbridge_device, pc_dma8237_6_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, southbridge_device, pc_dma8237_7_dack_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, southbridge_device, pc_dma8237_5_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, southbridge_device, pc_dma8237_6_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, southbridge_device, pc_dma8237_7_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, southbridge_device, pc_dack4_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, southbridge_device, pc_dack5_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, southbridge_device, pc_dack6_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, southbridge_device, pc_dack7_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(":maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(southbridge_device, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, southbridge_device, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir6_w))
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide2", ata_devices, "cdrom", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir7_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir7_w))
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("isabus", ISA16, 0)
MCFG_ISA16_CPU(":maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
- MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq0_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
- MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq3_w))
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259_slave", pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259_master", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259_master", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259_master", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259_master", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_IRQ10_CB(WRITELINE("pic8259_slave", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ11_CB(WRITELINE("pic8259_slave", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ12_CB(WRITELINE("pic8259_slave", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ14_CB(WRITELINE("pic8259_slave", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ15_CB(WRITELINE("pic8259_slave", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ0_CB(WRITELINE("dma8237_1", am9517a_device, dreq0_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237_1", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237_1", am9517a_device, dreq3_w))
+ MCFG_ISA_OUT_DRQ5_CB(WRITELINE("dma8237_2", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ6_CB(WRITELINE("dma8237_2", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ7_CB(WRITELINE("dma8237_2", am9517a_device, dreq3_w))
MACHINE_CONFIG_END
southbridge_device::southbridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
@@ -513,22 +513,22 @@ MACHINE_CONFIG_START(southbridge_extended_device::device_add_mconfig)
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
- MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("pic8259_master", pic8259_device, ir1_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(WRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(WRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
// on board devices
- MCFG_ISA16_SLOT_ADD("isabus", "board1", pc_isa_onboard, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("isabus", "board2", pc_isa_onboard, "comat", true)
- MCFG_ISA16_SLOT_ADD("isabus", "board3", pc_isa_onboard, "lpt", true)
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "isabus", pc_isa_onboard, "fdcsmc", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "isabus", pc_isa_onboard, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "isabus", pc_isa_onboard, "lpt", true)
MACHINE_CONFIG_END
southbridge_extended_device::southbridge_extended_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/megadrive/svp.cpp b/src/devices/bus/megadrive/svp.cpp
index 053b017e92f..9207a376f93 100644
--- a/src/devices/bus/megadrive/svp.cpp
+++ b/src/devices/bus/megadrive/svp.cpp
@@ -348,9 +348,9 @@ void md_rom_svp_device::md_svp_ext_map(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD("svp", SSP1601, MASTER_CLOCK_NTSC / 7 * 3) /* ~23 MHz (guessed) */
+ MCFG_DEVICE_PROGRAM_MAP(md_svp_ssp_map)
+ MCFG_DEVICE_IO_MAP(md_svp_ext_map)
MACHINE_CONFIG_END
ioport_constructor md_rom_svp_device::device_input_ports() const
diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp
index 177d33459aa..81bbeb80f1c 100644
--- a/src/devices/bus/midi/midiinport.cpp
+++ b/src/devices/bus/midi/midiinport.cpp
@@ -22,5 +22,5 @@ midiin_port_device::midiin_port_device(const machine_config &mconfig, const char
MACHINE_CONFIG_START(midiin_port_device::device_add_mconfig)
MCFG_DEVICE_ADD("midiinimg", MIDIIN, 0)
- MCFG_MIDIIN_INPUT_CB(WRITELINE(midiin_port_device, read))
+ MCFG_MIDIIN_INPUT_CB(WRITELINE(*this, midiin_port_device, read))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/bm_012.cpp b/src/devices/bus/msx_cart/bm_012.cpp
index fcbda1a0bc4..be5eb7a60c0 100644
--- a/src/devices/bus/msx_cart/bm_012.cpp
+++ b/src/devices/bus/msx_cart/bm_012.cpp
@@ -48,29 +48,29 @@ MACHINE_CONFIG_START(msx_cart_bm_012_device::device_add_mconfig)
// - PIO
// - CGC
// - WDT
- MCFG_CPU_ADD("tmpz84c015af", TMPZ84C015, XTAL(12'000'000)/2) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(bm_012_memory_map)
+ MCFG_DEVICE_ADD("tmpz84c015af", TMPZ84C015, XTAL(12'000'000)/2) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bm_012_memory_map)
// PIO callbacks
- MCFG_TMPZ84C015_IN_PA_CB(DEVREAD8("bm012_pio", z80pio_device, pa_r))
- MCFG_TMPZ84C015_OUT_PA_CB(DEVWRITE8("bm012_pio", z80pio_device, pa_w))
- MCFG_TMPZ84C015_IN_PB_CB(DEVREAD8("bm012_pio", z80pio_device, pb_r))
- MCFG_TMPZ84C015_OUT_PB_CB(DEVWRITE8("bm012_pio", z80pio_device, pb_w))
- MCFG_TMPZ84C015_OUT_BRDY_CB(DEVWRITELINE("bm012_pio", z80pio_device, strobe_b))
+ MCFG_TMPZ84C015_IN_PA_CB(READ8("bm012_pio", z80pio_device, pa_r))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8("bm012_pio", z80pio_device, pa_w))
+ MCFG_TMPZ84C015_IN_PB_CB(READ8("bm012_pio", z80pio_device, pb_r))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8("bm012_pio", z80pio_device, pb_w))
+ MCFG_TMPZ84C015_OUT_BRDY_CB(WRITELINE("bm012_pio", z80pio_device, strobe_b))
// SIO callbacks
- MCFG_TMPZ84C015_OUT_TXDA_CB(DEVWRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_TMPZ84C015_OUT_TXDA_CB(WRITELINE("mdout", midi_port_device, write_txd))
// Sony CXK5864BSP-10L (8KB ram)
// Sharp LH0081A Z80A-PIO-0 - For communicating between the MSX and the TMP
MCFG_DEVICE_ADD("bm012_pio", Z80PIO, XTAL(3'579'545)) // ?????
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("tmpz84c015af", tmpz84c015_device, pa_w))
- MCFG_Z80PIO_IN_PA_CB(DEVREAD8("tmpz84c015af", tmpz84c015_device, pa_r))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("tmpz84c015af", tmpz84c015_device, pb_w))
- MCFG_Z80PIO_IN_PB_CB(DEVREAD8("tmpz84c015af", tmpz84c015_device, pb_r))
- MCFG_Z80PIO_OUT_BRDY_CB(DEVWRITELINE("tmpz84c015af", tmpz84c015_device, strobe_b))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("tmpz84c015af", tmpz84c015_device, pa_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8("tmpz84c015af", tmpz84c015_device, pa_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("tmpz84c015af", tmpz84c015_device, pb_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8("tmpz84c015af", tmpz84c015_device, pb_r))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE("tmpz84c015af", tmpz84c015_device, strobe_b))
// MIDI ports
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(WRITELINE(msx_cart_bm_012_device, midi_in))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(*this, msx_cart_bm_012_device, midi_in))
MCFG_MIDI_PORT_ADD("mdthru", midiout_slot, "midiout")
diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp
index 97edffd3b11..7cc7e463d65 100644
--- a/src/devices/bus/msx_cart/fmpac.cpp
+++ b/src/devices/bus/msx_cart/fmpac.cpp
@@ -32,7 +32,7 @@ msx_cart_fmpac_device::msx_cart_fmpac_device(const machine_config &mconfig, cons
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'738'635)/3)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp
index 05449ab7d42..272ee085188 100644
--- a/src/devices/bus/msx_cart/konami.cpp
+++ b/src/devices/bus/msx_cart/konami.cpp
@@ -144,7 +144,7 @@ msx_cart_konami_scc_device::msx_cart_konami_scc_device(const machine_config &mco
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'738'635)/3/2)
+ MCFG_DEVICE_ADD("k051649", K051649, XTAL(10'738'635)/3/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
@@ -475,7 +475,7 @@ msx_cart_synthesizer_device::msx_cart_synthesizer_device(const machine_config &m
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
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -548,7 +548,7 @@ msx_cart_konami_sound_device::msx_cart_konami_sound_device(const machine_config
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'738'635)/3/2)
+ MCFG_DEVICE_ADD("k052539", K051649, XTAL(10'738'635)/3/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
@@ -875,7 +875,7 @@ void msx_cart_keyboard_master_device::vlm_map(address_map &map)
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'579'545))
+ MCFG_DEVICE_ADD("vlm5030", VLM5030, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp
index e6d601473f2..5288360ee87 100644
--- a/src/devices/bus/msx_cart/majutsushi.cpp
+++ b/src/devices/bus/msx_cart/majutsushi.cpp
@@ -29,7 +29,7 @@ msx_cart_majutsushi_device::msx_cart_majutsushi_device(const machine_config &mco
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
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp
index 00b8848a0ef..d21810eb287 100644
--- a/src/devices/bus/msx_cart/moonsound.cpp
+++ b/src/devices/bus/msx_cart/moonsound.cpp
@@ -39,9 +39,9 @@ void msx_cart_moonsound_device::ymf278b_map(address_map &map)
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)
+ MCFG_DEVICE_ADD("ymf278b", YMF278B, YMF278B_STD_CLOCK)
MCFG_DEVICE_ADDRESS_MAP(0, ymf278b_map)
- MCFG_YMF278B_IRQ_HANDLER(WRITELINE(msx_cart_moonsound_device, irq_w))
+ MCFG_YMF278B_IRQ_HANDLER(WRITELINE(*this, msx_cart_moonsound_device, irq_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp
index 5184a15c2a1..8235d91aac2 100644
--- a/src/devices/bus/msx_cart/msx_audio.cpp
+++ b/src/devices/bus/msx_cart/msx_audio.cpp
@@ -83,10 +83,10 @@ msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machi
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'579'545)) // Not verified
+ MCFG_DEVICE_ADD("y8950", Y8950, XTAL(3'579'545)) // Not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
- MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
+ MCFG_Y8950_KEYBOARD_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write))
+ MCFG_Y8950_KEYBOARD_READ_HANDLER(READ8("kbdc", msx_audio_kbdc_port_device, read))
MCFG_MSX_AUDIO_KBDC_PORT_ADD("kbdc", msx_audio_keyboards, nullptr)
MACHINE_CONFIG_END
@@ -149,20 +149,20 @@ 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")
- MCFG_SOUND_ADD("y8950", Y8950, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("y8950", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
- MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
- MCFG_Y8950_IRQ_HANDLER(WRITELINE(msx_cart_msx_audio_nms1205_device, irq_write))
+ MCFG_Y8950_KEYBOARD_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write))
+ MCFG_Y8950_KEYBOARD_READ_HANDLER(READ8("kbdc", msx_audio_kbdc_port_device, read))
+ MCFG_Y8950_IRQ_HANDLER(WRITELINE(*this, msx_cart_msx_audio_nms1205_device, irq_write))
MCFG_MSX_AUDIO_KBDC_PORT_ADD("kbdc", msx_audio_keyboards, nullptr)
// There is a 2 MHz crystal on the PCB, the 6850 TX and RX clocks are derived from it
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(WRITELINE(msx_cart_msx_audio_nms1205_device, midi_in))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(*this, msx_cart_msx_audio_nms1205_device, midi_in))
MCFG_MIDI_PORT_ADD("mdthru", midiout_slot, "midiout")
@@ -249,12 +249,12 @@ msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_c
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'579'545))
+ MCFG_DEVICE_ADD("y8950", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_Y8950_KEYBOARD_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
- MCFG_Y8950_KEYBOARD_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
- MCFG_Y8950_IO_READ_HANDLER(READ8(msx_cart_msx_audio_fsca1_device, y8950_io_r))
- MCFG_Y8950_IO_WRITE_HANDLER(WRITE8(msx_cart_msx_audio_fsca1_device, y8950_io_w))
+ MCFG_Y8950_KEYBOARD_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write))
+ MCFG_Y8950_KEYBOARD_READ_HANDLER(READ8("kbdc", msx_audio_kbdc_port_device, read))
+ MCFG_Y8950_IO_READ_HANDLER(READ8(*this, msx_cart_msx_audio_fsca1_device, y8950_io_r))
+ MCFG_Y8950_IO_WRITE_HANDLER(WRITE8(*this, msx_cart_msx_audio_fsca1_device, y8950_io_w))
MCFG_MSX_AUDIO_KBDC_PORT_ADD("kbdc", msx_audio_keyboards, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp
index a8c7280fdf9..ef1d807751e 100644
--- a/src/devices/bus/msx_cart/yamaha.cpp
+++ b/src/devices/bus/msx_cart/yamaha.cpp
@@ -53,22 +53,22 @@ MACHINE_CONFIG_START(msx_cart_sfg_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(msx_cart_sfg_device, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, msx_cart_sfg_device, ym2151_irq_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MCFG_DEVICE_ADD("ym2148", YM2148, XTAL(4'000'000))
- MCFG_YM2148_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_YM2148_PORT_WRITE_HANDLER(DEVWRITE8("kbdc", msx_audio_kbdc_port_device, write))
- MCFG_YM2148_PORT_READ_HANDLER(DEVREAD8("kbdc", msx_audio_kbdc_port_device, read))
- MCFG_YM2148_IRQ_HANDLER(WRITELINE(msx_cart_sfg_device, ym2148_irq_w))
+ MCFG_YM2148_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_YM2148_PORT_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write))
+ MCFG_YM2148_PORT_READ_HANDLER(READ8("kbdc", msx_audio_kbdc_port_device, read))
+ MCFG_YM2148_IRQ_HANDLER(WRITELINE(*this, msx_cart_sfg_device, ym2148_irq_w))
MCFG_MSX_AUDIO_KBDC_PORT_ADD("kbdc", msx_audio_keyboards, nullptr)
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("ym2148", ym2148_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE("ym2148", ym2148_device, write_rxd))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/msx_slot/cartridge.cpp b/src/devices/bus/msx_slot/cartridge.cpp
index 848cacbcf65..522ea6f4548 100644
--- a/src/devices/bus/msx_slot/cartridge.cpp
+++ b/src/devices/bus/msx_slot/cartridge.cpp
@@ -169,7 +169,7 @@ image_init_result msx_slot_cartridge_device::call_load()
}
}
- m_cartridge->set_out_irq_cb(DEVCB_DEVWRITELINE(*this, msx_slot_cartridge_device, irq_out));
+ m_cartridge->set_out_irq_cb(DEVCB_WRITELINE(*this, msx_slot_cartridge_device, irq_out));
m_cartridge->initialize_cartridge();
if (m_cartridge->get_sram_size() > 0)
@@ -363,5 +363,5 @@ void msx_slot_yamaha_expansion_device::device_start()
m_irq_handler.resolve_safe();
m_cartridge = dynamic_cast<msx_cart_interface *>(get_card_device());
if (m_cartridge)
- m_cartridge->set_out_irq_cb(DEVCB_DEVWRITELINE(*this, msx_slot_cartridge_device, irq_out));
+ m_cartridge->set_out_irq_cb(DEVCB_WRITELINE(*this, msx_slot_cartridge_device, irq_out));
}
diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp
index 48c6c0bcaf1..6ce19e766aa 100644
--- a/src/devices/bus/nes/jaleco.cpp
+++ b/src/devices/bus/nes/jaleco.cpp
@@ -777,7 +777,7 @@ MACHINE_CONFIG_START(nes_jf13_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(16)
MCFG_SAMPLES_NAMES(jf13_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
@@ -788,7 +788,7 @@ MACHINE_CONFIG_START(nes_jf17_adpcm_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(20)
MCFG_SAMPLES_NAMES(jf17_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
@@ -799,7 +799,7 @@ MACHINE_CONFIG_START(nes_jf19_adpcm_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(20)
MCFG_SAMPLES_NAMES(jf19_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
@@ -810,7 +810,7 @@ MACHINE_CONFIG_START(nes_jf23_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(20)
MCFG_SAMPLES_NAMES(jf23_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
@@ -821,7 +821,7 @@ MACHINE_CONFIG_START(nes_jf24_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(jf24_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
@@ -832,7 +832,7 @@ MACHINE_CONFIG_START(nes_jf29_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(20)
MCFG_SAMPLES_NAMES(jf29_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
@@ -843,7 +843,7 @@ MACHINE_CONFIG_START(nes_jf33_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(20)
MCFG_SAMPLES_NAMES(jf33_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp
index 4f3d8644bff..d064a8d89f0 100644
--- a/src/devices/bus/nes/konami.cpp
+++ b/src/devices/bus/nes/konami.cpp
@@ -645,7 +645,7 @@ MACHINE_CONFIG_START(nes_konami_vrc6_device::device_add_mconfig)
// TODO: this is not how VRC6 clock signaling works!
// The board uses the CLK pin in reality, not hardcoded NTSC values!
- MCFG_SOUND_ADD("vrc6snd", VRC6, XTAL(21'477'272)/12)
+ MCFG_DEVICE_ADD("vrc6snd", VRC6, XTAL(21'477'272)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.5)
MACHINE_CONFIG_END
@@ -769,6 +769,6 @@ MACHINE_CONFIG_START(nes_konami_vrc7_device::device_add_mconfig)
// TODO: this is not how VRC7 clock signaling works!
// The board uses the CLK pin in reality, not hardcoded NTSC values!
- MCFG_SOUND_ADD("ym", YM2413, XTAL(21'477'272)/12)
+ MCFG_DEVICE_ADD("ym", YM2413, XTAL(21'477'272)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.5)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp
index e19bb393a77..4211a27d234 100644
--- a/src/devices/bus/nes/pt554.cpp
+++ b/src/devices/bus/nes/pt554.cpp
@@ -93,7 +93,7 @@ MACHINE_CONFIG_START(nes_bandai_pt554_device::device_add_mconfig)
// additional sound hardware
MCFG_SPEAKER_STANDARD_MONO("addon")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES, 0)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(pt554_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index bffd3b2b608..68510d7788b 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -617,6 +617,6 @@ MACHINE_CONFIG_START(nes_sunsoft_5_device::device_add_mconfig)
// TODO: this is not how Sunsoft 5B clock signaling works!
// The board uses the CLK pin in reality, not hardcoded NTSC values!
- MCFG_SOUND_ADD("ay", YM2149, (XTAL(21'477'272)/12)/2) // divide by 2 for the internal divider
+ MCFG_DEVICE_ADD("ay", YM2149, (XTAL(21'477'272)/12)/2) // divide by 2 for the internal divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 0.50)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp
index 576ce755083..6f41774f1e0 100644
--- a/src/devices/bus/nes_ctrl/miracle.cpp
+++ b/src/devices/bus/nes_ctrl/miracle.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(NES_MIRACLE, nes_miracle_device, "nes_miracle", "NES Miracle
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))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(*this, nes_miracle_device, rx_w))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp
index 7a2993252a0..65994afe2ca 100644
--- a/src/devices/bus/newbrain/eim.cpp
+++ b/src/devices/bus/newbrain/eim.cpp
@@ -70,14 +70,14 @@ const tiny_rom_entry *newbrain_eim_device::device_rom_region() const
MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig)
// devices
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/8)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_rxc))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(MC6850_TAG, acia6850_device, write_txc))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(newbrain_eim_device, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(MC6850_TAG, acia6850_device, write_rxc))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(MC6850_TAG, acia6850_device, write_txc))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, newbrain_eim_device, ctc_z2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_c2", newbrain_eim_device, ctc_c2_tick, attotime::from_hz(XTAL(16'000'000)/4/13))
MCFG_DEVICE_ADD(ADC0809_TAG, ADC0809, 500000)
- MCFG_ADC0808_EOC_CB(WRITELINE(newbrain_eim_device, adc_eoc_w))
+ MCFG_ADC0808_EOC_CB(WRITELINE(*this, newbrain_eim_device, adc_eoc_w))
MCFG_ADC0808_IN0_CB(GND)
MCFG_ADC0808_IN1_CB(GND)
MCFG_ADC0808_IN2_CB(GND)
@@ -88,8 +88,8 @@ MACHINE_CONFIG_START(newbrain_eim_device::device_add_mconfig)
MCFG_ADC0808_IN7_CB(GND)
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(newbrain_eim_device, acia_interrupt))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, newbrain_eim_device, acia_interrupt))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
MCFG_NEWBRAIN_EXPANSION_SLOT_ADD(NEWBRAIN_EXPANSION_SLOT_TAG, XTAL(16'000'000)/8, newbrain_expansion_cards, "fdc")
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp
index 524bbbbeaec..62cda208cbe 100644
--- a/src/devices/bus/newbrain/fdc.cpp
+++ b/src/devices/bus/newbrain/fdc.cpp
@@ -105,12 +105,12 @@ static void newbrain_floppies(device_slot_interface &device)
//-------------------------------------------------
MACHINE_CONFIG_START(newbrain_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(newbrain_fdc_mem)
- MCFG_CPU_IO_MAP(newbrain_fdc_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(newbrain_fdc_mem)
+ MCFG_DEVICE_IO_MAP(newbrain_fdc_io)
MCFG_UPD765A_ADD(UPD765_TAG, false, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(newbrain_fdc_device, fdc_int_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, newbrain_fdc_device, fdc_int_w))
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", newbrain_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", newbrain_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/devices/bus/nubus/bootbug.cpp b/src/devices/bus/nubus/bootbug.cpp
index e22da015577..fc87d989662 100644
--- a/src/devices/bus/nubus/bootbug.cpp
+++ b/src/devices/bus/nubus/bootbug.cpp
@@ -48,16 +48,16 @@ DEFINE_DEVICE_TYPE(NUBUS_BOOTBUG, nubus_bootbug_device, "nb_btbug", "Brigent Boo
MACHINE_CONFIG_START(nubus_bootbug_device::device_add_mconfig)
MCFG_DEVICE_ADD( "uart_0", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport0", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport0", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport0", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD( "serport0", isa_com, "terminal" )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_0", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport0", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport0", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport0", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD( "serport0", RS232_PORT, isa_com, "terminal" )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_0", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart_0", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_0", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart_0", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_0", ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index a7a16ebb194..46f9d382eb8 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -43,9 +43,9 @@ DEFINE_DEVICE_TYPE(NUBUS_APPLEENET, nubus_appleenet_device, "nb_aenet", "Apple N
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))
- MCFG_DP8390D_MEM_WRITE_CB(WRITE8(nubus_mac8390_device, dp_mem_write))
+ MCFG_DP8390D_IRQ_CB(WRITELINE(*this, nubus_mac8390_device, dp_irq_w))
+ MCFG_DP8390D_MEM_READ_CB(READ8(*this, nubus_mac8390_device, dp_mem_read))
+ MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, nubus_mac8390_device, dp_mem_write))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/nubus/quadralink.cpp b/src/devices/bus/nubus/quadralink.cpp
index 461b8e69257..a38d97256b7 100644
--- a/src/devices/bus/nubus/quadralink.cpp
+++ b/src/devices/bus/nubus/quadralink.cpp
@@ -39,32 +39,32 @@ DEFINE_DEVICE_TYPE(NUBUS_QUADRALINK, nubus_quadralink_device, "nb_qdlink", "Appl
MACHINE_CONFIG_START(nubus_quadralink_device::device_add_mconfig)
MCFG_SCC8530_ADD("scc1", XTAL(3'686'400), 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))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE("serport0", rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE("serport1", rs232_port_device, write_txd))
MCFG_SCC8530_ADD("scc2", XTAL(3'686'400), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("serport3", rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD( "serport0", isa_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("scc1", z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("scc1", z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("scc1", z80scc_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD( "serport1", isa_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("scc1", z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("scc1", z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("scc1", z80scc_device, ctsb_w))
-
- MCFG_RS232_PORT_ADD( "serport2", isa_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("scc2", z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("scc2", z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("scc2", z80scc_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD( "serport3", isa_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("scc2", z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("scc2", z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("scc2", z80scc_device, ctsb_w))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE("serport2", rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE("serport3", rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD( "serport0", RS232_PORT, isa_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("scc1", z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("scc1", z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("scc1", z80scc_device, ctsa_w))
+
+ MCFG_DEVICE_ADD( "serport1", RS232_PORT, isa_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("scc1", z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("scc1", z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("scc1", z80scc_device, ctsb_w))
+
+ MCFG_DEVICE_ADD( "serport2", RS232_PORT, isa_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("scc2", z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("scc2", z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("scc2", z80scc_device, ctsa_w))
+
+ MCFG_DEVICE_ADD( "serport3", RS232_PORT, isa_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("scc2", z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("scc2", z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("scc2", z80scc_device, ctsb_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index 8de9c816310..9d0e6816286 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -46,7 +46,7 @@ void o2_chess_device::chess_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(o2_chess_device::device_add_mconfig)
- MCFG_CPU_ADD("subcpu", NSC800, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(chess_mem)
- MCFG_CPU_IO_MAP(chess_io)
+ MCFG_DEVICE_ADD("subcpu", NSC800, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(chess_mem)
+ MCFG_DEVICE_IO_MAP(chess_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp
index 95ea242e7c1..805f3626645 100644
--- a/src/devices/bus/odyssey2/voice.cpp
+++ b/src/devices/bus/odyssey2/voice.cpp
@@ -46,8 +46,8 @@ void o2_voice_device::device_start()
MACHINE_CONFIG_START(o2_voice_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sp0256_speech", SP0256, 3120000)
- MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(o2_voice_device, lrq_callback))
+ MCFG_DEVICE_ADD("sp0256_speech", SP0256, 3120000)
+ MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, o2_voice_device, lrq_callback))
// The Voice uses a speaker with its own volume control so the relative volumes to use are subjective, these sound good
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index 7621b0adf8e..a7795cbf8e2 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -74,7 +74,7 @@ const tiny_rom_entry *jasmin_device::device_rom_region() const
MACHINE_CONFIG_START(jasmin_device::device_add_mconfig)
MCFG_WD1770_ADD("fdc", XTAL(8'000'000))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, oricext_device, irq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", jasmin_floppies, "3dsdd", jasmin_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", jasmin_floppies, nullptr, jasmin_device::floppy_formats)
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index 4254ea2b571..ea6498d0df8 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -70,9 +70,9 @@ const tiny_rom_entry *microdisc_device::device_rom_region() const
MACHINE_CONFIG_START(microdisc_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(microdisc_device, fdc_hld_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, microdisc_device, fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, microdisc_device, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, microdisc_device, fdc_hld_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", microdisc_floppies, "3dsdd", microdisc_device::floppy_formats)
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index 26af0640856..7c15a9e3f80 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -67,12 +67,12 @@ const tiny_rom_entry *ec_1841_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(ec_1841_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'460'000))
- 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))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ec_1841_keyboard_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ec_1841_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(ec_1841_keyboard_device, t1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, XTAL(5'460'000))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, ec_1841_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, ec_1841_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ec_1841_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ec_1841_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ec_1841_keyboard_device, t1_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index e2dd8a7db39..a4f456398e2 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -72,12 +72,12 @@ void iskr_1030_keyboard_device::iskr_1030_keyboard_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(iskr_1030_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(5'000'000))
- MCFG_CPU_IO_MAP(iskr_1030_keyboard_io)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(iskr_1030_keyboard_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(iskr_1030_keyboard_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(iskr_1030_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(iskr_1030_keyboard_device, t1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, XTAL(5'000'000))
+ MCFG_DEVICE_IO_MAP(iskr_1030_keyboard_io)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, iskr_1030_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, iskr_1030_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, iskr_1030_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, iskr_1030_keyboard_device, t1_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp
index 0c0f21b57d0..9eaac3e9ba5 100644
--- a/src/devices/bus/pc_kbd/keytro.cpp
+++ b/src/devices/bus/pc_kbd/keytro.cpp
@@ -422,15 +422,15 @@ void pc_kbd_keytronic_pc3270_device::device_reset()
//-------------------------------------------------
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)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(pc_kbd_keytronic_pc3270_device, p1_read))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(pc_kbd_keytronic_pc3270_device, p1_write))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(pc_kbd_keytronic_pc3270_device, p2_read))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(pc_kbd_keytronic_pc3270_device, p2_write))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(pc_kbd_keytronic_pc3270_device, p3_read))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(pc_kbd_keytronic_pc3270_device, p3_write))
+ MCFG_DEVICE_ADD("kb_keytr", I8051, 11060250)
+ MCFG_DEVICE_PROGRAM_MAP(keytronic_pc3270_program)
+ MCFG_DEVICE_IO_MAP(keytronic_pc3270_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, pc_kbd_keytronic_pc3270_device, p1_read))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, pc_kbd_keytronic_pc3270_device, p1_write))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, pc_kbd_keytronic_pc3270_device, p2_read))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, pc_kbd_keytronic_pc3270_device, p2_write))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, pc_kbd_keytronic_pc3270_device, p3_read))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, pc_kbd_keytronic_pc3270_device, p3_write))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/msnat.cpp b/src/devices/bus/pc_kbd/msnat.cpp
index 0894728a445..2adde2d83c1 100644
--- a/src/devices/bus/pc_kbd/msnat.cpp
+++ b/src/devices/bus/pc_kbd/msnat.cpp
@@ -246,13 +246,13 @@ void pc_kbd_microsoft_natural_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(pc_kbd_microsoft_natural_device::device_add_mconfig)
- MCFG_CPU_ADD("ms_natrl_cpu", I8051, XTAL(6'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(pc_kbd_microsoft_natural_device, p0_read))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(pc_kbd_microsoft_natural_device, p0_write))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(pc_kbd_microsoft_natural_device, p1_write))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(pc_kbd_microsoft_natural_device, p2_write))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(pc_kbd_microsoft_natural_device, p3_read))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(pc_kbd_microsoft_natural_device, p3_write))
+ MCFG_DEVICE_ADD("ms_natrl_cpu", I8051, XTAL(6'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, pc_kbd_microsoft_natural_device, p0_read))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, pc_kbd_microsoft_natural_device, p0_write))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, pc_kbd_microsoft_natural_device, p1_write))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, pc_kbd_microsoft_natural_device, p2_write))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, pc_kbd_microsoft_natural_device, p3_read))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, pc_kbd_microsoft_natural_device, p3_write))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index 1eb25cb0b17..eb184f15cf0 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -51,11 +51,11 @@ const tiny_rom_entry *ibm_pc_83_keyboard_device::device_rom_region() const
//-------------------------------------------------
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))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ibm_pc_83_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(ibm_pc_83_keyboard_device, t0_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20)))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, ibm_pc_83_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, ibm_pc_83_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ibm_pc_83_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, ibm_pc_83_keyboard_device, t0_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index 97b23f244cb..77ee7fd4f27 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -104,14 +104,14 @@ const tiny_rom_entry *ibm_3270pc_122_keyboard_device::device_rom_region() const
//-------------------------------------------------
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))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ibm_pc_at_84_keyboard_device, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(ibm_pc_at_84_keyboard_device, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ibm_pc_at_84_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(ibm_pc_at_84_keyboard_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(ibm_pc_at_84_keyboard_device, t1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, 5364000)
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, ibm_pc_at_84_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, ibm_pc_at_84_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ibm_pc_at_84_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, ibm_pc_at_84_keyboard_device, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ibm_pc_at_84_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, ibm_pc_at_84_keyboard_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ibm_pc_at_84_keyboard_device, t1_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index aaf731f6efd..4c358cd9cff 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -73,13 +73,13 @@ const tiny_rom_entry *ibm_pc_xt_83_keyboard_device::device_rom_region() const
//-------------------------------------------------
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))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ibm_pc_xt_83_keyboard_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ibm_pc_xt_83_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(ibm_pc_xt_83_keyboard_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(ibm_pc_xt_83_keyboard_device, t1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, MCS48_LC_CLOCK(IND_U(47), CAP_P(20.7)))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, ibm_pc_xt_83_keyboard_device, bus_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, ibm_pc_xt_83_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ibm_pc_xt_83_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ibm_pc_xt_83_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, ibm_pc_xt_83_keyboard_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ibm_pc_xt_83_keyboard_device, t1_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp
index db492cef523..f33c9ddb1c8 100644
--- a/src/devices/bus/pet/2joysnd.cpp
+++ b/src/devices/bus/pet/2joysnd.cpp
@@ -95,7 +95,7 @@ ioport_constructor pet_userport_joystick_and_sound_device::device_input_ports()
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index 1aa6e67ea8f..b9be2850378 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_CB2_SOUND_DEVICE, pet_userport_cb2_sound_device,
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index ba4a7964576..956ae52d77e 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -71,21 +71,21 @@ void superpet_device::superpet_mem(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(superpet_device::device_add_mconfig)
- MCFG_CPU_ADD(M6809_TAG, M6809, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(superpet_mem)
+ MCFG_DEVICE_ADD(M6809_TAG, M6809, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(superpet_mem)
MCFG_MOS6702_ADD(MOS6702_TAG, XTAL(16'000'000)/16)
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(superpet_device, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, superpet_device, acia_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index d698dae475d..87dce744732 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -346,28 +346,28 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(c1551_device::device_add_mconfig)
- MCFG_CPU_ADD(M6510T_TAG, M6510T, XTAL(16'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(c1551_mem)
- MCFG_M6510T_PORT_CALLBACKS(READ8(c1551_device, port_r), WRITE8(c1551_device, port_w))
+ MCFG_DEVICE_ADD(M6510T_TAG, M6510T, XTAL(16'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(c1551_mem)
+ MCFG_M6510T_PORT_CALLBACKS(READ8(*this, c1551_device, port_r), WRITE8(*this, c1551_device, port_w))
MCFG_QUANTUM_PERFECT_CPU(M6510T_TAG)
MCFG_PLS100_ADD(PLA_TAG)
MCFG_DEVICE_ADD(M6523_0_TAG, TPI6525, 0)
- MCFG_TPI6525_IN_PA_CB(READ8(c1551_device, tcbm_data_r))
- MCFG_TPI6525_OUT_PA_CB(WRITE8(c1551_device, tcbm_data_w))
- MCFG_TPI6525_IN_PB_CB(DEVREAD8(C64H156_TAG, c64h156_device, yb_r))
- MCFG_TPI6525_OUT_PB_CB(DEVWRITE8(C64H156_TAG, c64h156_device, yb_w))
- MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi0_pc_r))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi0_pc_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, c1551_device, tcbm_data_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, c1551_device, tcbm_data_w))
+ MCFG_TPI6525_IN_PB_CB(READ8(C64H156_TAG, c64h156_device, yb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(C64H156_TAG, c64h156_device, yb_w))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, c1551_device, tpi0_pc_r))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, c1551_device, tpi0_pc_w))
MCFG_DEVICE_ADD(M6523_1_TAG, TPI6525, 0)
- MCFG_TPI6525_IN_PA_CB(READ8(c1551_device, tcbm_data_r))
- MCFG_TPI6525_OUT_PA_CB(WRITE8(c1551_device, tcbm_data_w))
- MCFG_TPI6525_IN_PB_CB(READ8(c1551_device, tpi1_pb_r))
- MCFG_TPI6525_IN_PC_CB(READ8(c1551_device, tpi1_pc_r))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(c1551_device, tpi1_pc_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, c1551_device, tcbm_data_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, c1551_device, tcbm_data_w))
+ MCFG_TPI6525_IN_PB_CB(READ8(*this, c1551_device, tpi1_pb_r))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, c1551_device, tpi1_pc_r))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, c1551_device, tpi1_pc_w))
MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL(16'000'000))
- MCFG_64H156_BYTE_CALLBACK(DEVWRITELINE(C64H156_TAG, c64h156_device, atni_w))
+ MCFG_64H156_BYTE_CALLBACK(WRITELINE(C64H156_TAG, c64h156_device, atni_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED(C64H156_TAG":0", c1551_floppies, "525ssqd", c1551_device::floppy_formats)
MCFG_PLUS4_PASSTHRU_EXPANSION_SLOT_ADD()
diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
index 9aa7be4d74d..09fc78e3b23 100644
--- a/src/devices/bus/plus4/exp.h
+++ b/src/devices/bus/plus4/exp.h
@@ -60,10 +60,10 @@
#define MCFG_PLUS4_PASSTHRU_EXPANSION_SLOT_ADD() \
MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, 0, plus4_expansion_cards, nullptr) \
- MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, irq_w)) \
- MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(DEVREAD8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_r)) \
- MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(DEVWRITE8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_w)) \
- MCFG_PLUS4_EXPANSION_SLOT_AEC_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, aec_w))
+ MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, irq_w)) \
+ MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_r)) \
+ MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(DEVICE_SELF_OWNER, plus4_expansion_slot_device, dma_cd_w)) \
+ MCFG_PLUS4_EXPANSION_SLOT_AEC_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, plus4_expansion_slot_device, aec_w))
#define MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(_write) \
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index ffecc19bdb5..1b1e3b0ca7e 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -66,7 +66,7 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const
MACHINE_CONFIG_START(plus4_sid_cartridge_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS8580_TAG, MOS8580, XTAL(17'734'470)/20)
+ MCFG_DEVICE_ADD(MOS8580_TAG, MOS8580, XTAL(17'734'470)/20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp
index 42a207c7f89..9ae8da270d7 100644
--- a/src/devices/bus/pofo/hpc101.cpp
+++ b/src/devices/bus/pofo/hpc101.cpp
@@ -35,25 +35,25 @@ DEFINE_DEVICE_TYPE(POFO_HPC101, pofo_hpc101_device, "pofo_hpc101", "Atari Portfo
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))
- MCFG_I8255_IN_PORTC_CB(DEVREAD8("cent_status_in", input_buffer_device, read))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_ctrl_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTC_CB(READ8("cent_status_in", input_buffer_device, read))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4))
- MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit3))
- MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit0))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit3))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit0))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("cent_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_autofd))
- MCFG_OUTPUT_LATCH_BIT2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_init))
- MCFG_OUTPUT_LATCH_BIT3_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_select_in))
+ MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_autofd))
+ MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_init))
+ MCFG_OUTPUT_LATCH_BIT3_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_select_in))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp
index 3955eafd5c2..0ad264a9051 100644
--- a/src/devices/bus/pofo/hpc102.cpp
+++ b/src/devices/bus/pofo/hpc102.cpp
@@ -35,17 +35,17 @@ DEFINE_DEVICE_TYPE(POFO_HPC102, pofo_hpc102_device, "pofo_hpc102", "Atari Portfo
MACHINE_CONFIG_START(pofo_hpc102_device::device_add_mconfig)
MCFG_DEVICE_ADD(M82C50A_TAG, INS8250, XTAL(1'843'200)) // 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))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(device_portfolio_expansion_slot_interface, eint_w))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(M82C50A_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(M82C50A_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(M82C50A_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(M82C50A_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(M82C50A_TAG, ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, device_portfolio_expansion_slot_interface, eint_w))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(M82C50A_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(M82C50A_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(M82C50A_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(M82C50A_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(M82C50A_TAG, ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp
index 580f1e602b8..a6de6852e78 100644
--- a/src/devices/bus/pofo/hpc104.cpp
+++ b/src/devices/bus/pofo/hpc104.cpp
@@ -35,9 +35,9 @@ 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'915'200), portfolio_expansion_cards, nullptr)
- MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, eint_w))
- MCFG_PORTFOLIO_EXPANSION_SLOT_NMIO_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, nmio_w))
- MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, wake_w))
+ MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, eint_w))
+ MCFG_PORTFOLIO_EXPANSION_SLOT_NMIO_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, nmio_w))
+ MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, portfolio_expansion_slot_device, wake_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/psi_kbd/ergoline.cpp b/src/devices/bus/psi_kbd/ergoline.cpp
index d18ad844670..20c02052221 100644
--- a/src/devices/bus/psi_kbd/ergoline.cpp
+++ b/src/devices/bus/psi_kbd/ergoline.cpp
@@ -59,9 +59,9 @@ const tiny_rom_entry *ergoline_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(ergoline_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", I8031, XTAL(5'529'600))
- MCFG_CPU_PROGRAM_MAP(kbd_mem)
- MCFG_CPU_IO_MAP(kbd_io)
+ MCFG_DEVICE_ADD("maincpu", I8031, XTAL(5'529'600))
+ MCFG_DEVICE_PROGRAM_MAP(kbd_mem)
+ MCFG_DEVICE_IO_MAP(kbd_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp
index f34b504ac51..2420c8d8ecc 100644
--- a/src/devices/bus/ql/cst_q_plus4.cpp
+++ b/src/devices/bus/ql/cst_q_plus4.cpp
@@ -54,16 +54,16 @@ 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)
- MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(cst_q_plus4_device, exp1_extintl_w))
+ MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp1_extintl_w))
MCFG_QL_EXPANSION_SLOT_ADD("exp2", ql_expansion_cards, nullptr)
- MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(cst_q_plus4_device, exp2_extintl_w))
+ MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp2_extintl_w))
MCFG_QL_EXPANSION_SLOT_ADD("exp3", ql_expansion_cards, nullptr)
- MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(cst_q_plus4_device, exp3_extintl_w))
+ MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp3_extintl_w))
MCFG_QL_EXPANSION_SLOT_ADD("exp4", ql_expansion_cards, nullptr)
- MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(cst_q_plus4_device, exp4_extintl_w))
+ MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, cst_q_plus4_device, exp4_extintl_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp
index b224ae8afc0..dfbeec4d695 100644
--- a/src/devices/bus/ql/sandy_superdisk.cpp
+++ b/src/devices/bus/ql/sandy_superdisk.cpp
@@ -88,7 +88,7 @@ MACHINE_CONFIG_START(sandy_super_disk_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, nullptr, sandy_super_disk_device::floppy_formats)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sandy_super_disk_device, busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sandy_super_disk_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD(TTL74273_TAG, CENTRONICS_TAG)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index 92d4435aeb3..343b51402a0 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -109,7 +109,7 @@ MACHINE_CONFIG_START(sandy_superqboard_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, nullptr, sandy_superqboard_device::floppy_formats)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sandy_superqboard_device, busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sandy_superqboard_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD(TTL74273_TAG, CENTRONICS_TAG)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp
index 67974677054..b8b1ec87d34 100644
--- a/src/devices/bus/rs232/printer.cpp
+++ b/src/devices/bus/rs232/printer.cpp
@@ -18,7 +18,7 @@ serial_printer_device::serial_printer_device(const machine_config &mconfig, cons
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))
+ MCFG_PRINTER_ONLINE_CB(WRITELINE(*this, serial_printer_device, printer_online))
MACHINE_CONFIG_END
static INPUT_PORTS_START(serial_printer)
diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h
index 1f459ec3860..56c8ec7b896 100644
--- a/src/devices/bus/rs232/rs232.h
+++ b/src/devices/bus/rs232/rs232.h
@@ -6,10 +6,6 @@
#pragma once
-#define MCFG_RS232_PORT_ADD(_tag, _slot_intf, _def_slot) \
- MCFG_DEVICE_ADD(_tag, RS232_PORT, 0) \
- MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false)
-
#define MCFG_RS232_RXD_HANDLER(_devcb) \
devcb = &downcast<rs232_port_device &>(*device).set_rxd_handler(DEVCB_##_devcb);
diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp
index 59083fda039..f54e48812b2 100644
--- a/src/devices/bus/rs232/sun_kbd.cpp
+++ b/src/devices/bus/rs232/sun_kbd.cpp
@@ -24,7 +24,7 @@ sun_keyboard_adaptor_device::~sun_keyboard_adaptor_device()
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))
+ MCFG_SUNKBD_RXD_HANDLER(WRITELINE(*this, sun_keyboard_adaptor_device, output_rxd))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index 808abeb5a0b..57d063f91d7 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -104,11 +104,11 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w )
MACHINE_CONFIG_START(s100_dj2db_device::device_add_mconfig)
MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, s100_dj2db_device, fr_w))
MCFG_MB8866_ADD(MB8866_TAG, XTAL(10'000'000)/5)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, s100_dj2db_device, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, s100_dj2db_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":0", s100_dj2db_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":1", s100_dj2db_floppies, nullptr, floppy_image_device::default_floppy_formats)
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index 51cc5104e7d..89bbed40e2a 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -79,9 +79,9 @@ void s100_djdma_device::djdma_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(s100_djdma_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(djdma_mem)
- MCFG_CPU_IO_MAP(djdma_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(djdma_mem)
+ MCFG_DEVICE_IO_MAP(djdma_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index 7e69c845be1..a327bfa3966 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -89,50 +89,50 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w )
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_OUT_INT_CB(WRITELINE(*this, s100_wunderbus_device, pic_int_w))
MCFG_PIC8259_IN_SP_CB(VCC)
MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL(18'432'000)/10)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir3_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir3_w))
MCFG_DEVICE_ADD(INS8250_2_TAG, INS8250, XTAL(18'432'000)/10)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir4_w))
MCFG_DEVICE_ADD(INS8250_3_TAG, INS8250, XTAL(18'432'000)/10)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir5_w))
-
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8250_1_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INS8250_1_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8250_1_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_1_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_1_TAG, ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_C_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_C_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_C_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir5_w))
+
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8250_1_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INS8250_1_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8250_1_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(INS8250_1_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INS8250_1_TAG, ins8250_uart_device, cts_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8250_2_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INS8250_2_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8250_2_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_2_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_2_TAG, ins8250_uart_device, cts_w))
-
- MCFG_RS232_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_3_TAG, ins8250_uart_device, cts_w))
-
- MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL(32'768), NOOP, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8250_2_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INS8250_2_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8250_2_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(INS8250_2_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INS8250_2_TAG, ins8250_uart_device, cts_w))
+
+ MCFG_DEVICE_ADD(RS232_C_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8250_3_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INS8250_3_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8250_3_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(INS8250_3_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INS8250_3_TAG, ins8250_uart_device, cts_w))
+
+ MCFG_UPD1990A_ADD(UPD1990C_TAG, XTAL(32'768), NOOP, WRITELINE(DEVICE_SELF, s100_wunderbus_device, rtc_tp_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index 67637f3b7fc..e05cfe73014 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -166,9 +166,9 @@ void s1410_device::s1410_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(s1410_device::device_add_mconfig)
- MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(s1410_mem)
- MCFG_CPU_IO_MAP(s1410_io)
+ MCFG_DEVICE_ADD(Z8400A_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(s1410_mem)
+ MCFG_DEVICE_IO_MAP(s1410_io)
MCFG_DEVICE_DISABLE()
MCFG_HARDDISK_ADD("image")
diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h
index 5ed0f8ab019..d6c93129667 100644
--- a/src/devices/bus/scsi/scsi.h
+++ b/src/devices/bus/scsi/scsi.h
@@ -70,24 +70,24 @@
#define MCFG_SCSI_OUTPUT_LATCH_ADD(_tag, scsi_port_tag) \
MCFG_DEVICE_ADD(_tag, OUTPUT_LATCH, 0) \
- MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data0)) \
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data1)) \
- MCFG_OUTPUT_LATCH_BIT2_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data2)) \
- MCFG_OUTPUT_LATCH_BIT3_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data3)) \
- MCFG_OUTPUT_LATCH_BIT4_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data4)) \
- MCFG_OUTPUT_LATCH_BIT5_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data5)) \
- MCFG_OUTPUT_LATCH_BIT6_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data6)) \
- MCFG_OUTPUT_LATCH_BIT7_HANDLER(DEVWRITELINE(scsi_port_tag, scsi_port_device, write_data7))
+ MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data0)) \
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data1)) \
+ MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data2)) \
+ MCFG_OUTPUT_LATCH_BIT3_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data3)) \
+ MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data4)) \
+ MCFG_OUTPUT_LATCH_BIT5_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data5)) \
+ MCFG_OUTPUT_LATCH_BIT6_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data6)) \
+ MCFG_OUTPUT_LATCH_BIT7_HANDLER(WRITELINE(scsi_port_tag, scsi_port_device, write_data7))
#define MCFG_SCSI_DATA_INPUT_BUFFER(_tag) \
- MCFG_SCSI_DATA0_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit0)) \
- MCFG_SCSI_DATA1_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit1)) \
- MCFG_SCSI_DATA2_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit2)) \
- MCFG_SCSI_DATA3_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit3)) \
- MCFG_SCSI_DATA4_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit4)) \
- MCFG_SCSI_DATA5_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit5)) \
- MCFG_SCSI_DATA6_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit6)) \
- MCFG_SCSI_DATA7_HANDLER(DEVWRITELINE(_tag, input_buffer_device, write_bit7))
+ MCFG_SCSI_DATA0_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit0)) \
+ MCFG_SCSI_DATA1_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit1)) \
+ MCFG_SCSI_DATA2_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit2)) \
+ MCFG_SCSI_DATA3_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit3)) \
+ MCFG_SCSI_DATA4_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit4)) \
+ MCFG_SCSI_DATA5_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit5)) \
+ MCFG_SCSI_DATA6_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit6)) \
+ MCFG_SCSI_DATA7_HANDLER(WRITELINE(_tag, input_buffer_device, write_bit7))
class scsi_port_slot_device;
class scsi_port_interface;
diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp
index 42da6f2fc6c..1a5e6f8002d 100644
--- a/src/devices/bus/scsi/scsicd.cpp
+++ b/src/devices/bus/scsi/scsicd.cpp
@@ -33,5 +33,5 @@ void scsicd_device::device_start()
MACHINE_CONFIG_START(scsicd_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
- MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index c43b143248c..ab759994f30 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -51,7 +51,7 @@ DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 F
MACHINE_CONFIG_START(sega_fm_unit_device::device_add_mconfig)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/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.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 1.00)
diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp
index 89e4338ff28..c3b1c89d981 100644
--- a/src/devices/bus/sg1000_exp/sk1100.cpp
+++ b/src/devices/bus/sg1000_exp/sk1100.cpp
@@ -157,9 +157,9 @@ ioport_constructor sega_sk1100_device::device_input_ports() const
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))
- MCFG_I8255_IN_PORTB_CB(READ8(sega_sk1100_device, ppi_pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sega_sk1100_device, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, sega_sk1100_device, ppi_pa_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, sega_sk1100_device, ppi_pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sega_sk1100_device, ppi_pc_w))
// MCFG_PRINTER_ADD("sp400") /* serial printer */
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index 630aa2b8f96..56e7144cbd5 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -133,11 +133,11 @@ 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")
- MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_multitap_device, pixel_r))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r))
MCFG_SMS_CONTROL_PORT_ADD("ctrl2", sms_control_port_devices, "joypad")
- MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_multitap_device, pixel_r))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r))
MCFG_SMS_CONTROL_PORT_ADD("ctrl3", sms_control_port_devices, "joypad")
- MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_multitap_device, pixel_r))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r))
MCFG_SMS_CONTROL_PORT_ADD("ctrl4", sms_control_port_devices, "joypad")
- MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_multitap_device, pixel_r))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_multitap_device, pixel_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index c0599cf0286..7b51da5983a 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -140,6 +140,6 @@ READ32_MEMBER( sms_rapid_fire_device::pixel_r )
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))
+ MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_rapid_fire_device, th_pin_w))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_rapid_fire_device, pixel_r))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index 4095df98bfd..387536ecb88 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -222,9 +222,9 @@ void sns_pfest94_device::dsp_data_map_lorom(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp
index 576eb70505b..852fe6a23f8 100644
--- a/src/devices/bus/snes/sa1.cpp
+++ b/src/devices/bus/snes/sa1.cpp
@@ -1144,6 +1144,6 @@ void sns_sa1_device::sa1_map(address_map &map)
MACHINE_CONFIG_START(sns_sa1_device::device_add_mconfig)
- MCFG_CPU_ADD("sa1cpu", G65816, 10000000)
- MCFG_CPU_PROGRAM_MAP(sa1_map)
+ MCFG_DEVICE_ADD("sa1cpu", G65816, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(sa1_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/sfx.cpp b/src/devices/bus/snes/sfx.cpp
index d02e811754e..f8667f199e0 100644
--- a/src/devices/bus/snes/sfx.cpp
+++ b/src/devices/bus/snes/sfx.cpp
@@ -87,9 +87,9 @@ WRITE_LINE_MEMBER(sns_rom_superfx_device::snes_extern_irq_w)
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 */
+ MCFG_DEVICE_ADD("superfx", SUPERFX, 21480000) /* 21.48MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sfx_map)
+ MCFG_SUPERFX_OUT_IRQ(WRITELINE(*this, sns_rom_superfx_device, snes_extern_irq_w)) /* IRQ line from cart */
MACHINE_CONFIG_END
READ8_MEMBER( sns_rom_superfx_device::chip_read )
diff --git a/src/devices/bus/snes/sgb.cpp b/src/devices/bus/snes/sgb.cpp
index f3f150e47a3..7f5cd1d5eee 100644
--- a/src/devices/bus/snes/sgb.cpp
+++ b/src/devices/bus/snes/sgb.cpp
@@ -162,14 +162,14 @@ static void supergb_cart(device_slot_interface &device)
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))
+ MCFG_DEVICE_ADD("sgb_cpu", LR35902, 4295454) /* 4.295454 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(supergb_map)
+ MCFG_LR35902_TIMER_CB(WRITE8(*this, sns_rom_sgb_device, gb_timer_callback))
MCFG_LR35902_HALT_BUG
MCFG_SGB_PPU_ADD("sgb_ppu", "sgb_cpu")
- MCFG_SOUND_ADD("sgb_apu", DMG_APU, 4295454)
+ MCFG_DEVICE_ADD("sgb_apu", DMG_APU, 4295454)
MCFG_GB_CARTRIDGE_ADD("gb_slot", supergb_cart, nullptr)
MACHINE_CONFIG_END
@@ -188,14 +188,14 @@ const tiny_rom_entry *sns_rom_sgb1_device::device_rom_region() const
MACHINE_CONFIG_START(sns_rom_sgb2_device::device_add_mconfig)
- MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL(4'194'304)) /* 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))
+ MCFG_DEVICE_ADD("sgb_cpu", LR35902, XTAL(4'194'304)) /* 4.194MHz derived from clock on sgb2 pcb */
+ MCFG_DEVICE_PROGRAM_MAP(supergb_map)
+ MCFG_LR35902_TIMER_CB(WRITE8(*this, sns_rom_sgb_device, gb_timer_callback))
MCFG_LR35902_HALT_BUG
MCFG_SGB_PPU_ADD("sgb_ppu", "sgb_cpu")
- MCFG_SOUND_ADD("sgb_apu", DMG_APU, XTAL(4'194'304))
+ MCFG_DEVICE_ADD("sgb_apu", DMG_APU, XTAL(4'194'304))
MCFG_GB_CARTRIDGE_ADD("gb_slot", supergb_cart, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes/upd.cpp b/src/devices/bus/snes/upd.cpp
index 8ffa69aa197..ec5fdf60adc 100644
--- a/src/devices/bus/snes/upd.cpp
+++ b/src/devices/bus/snes/upd.cpp
@@ -133,9 +133,9 @@ void sns_rom20_necdsp_device::dsp_data_map_lorom(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
READ8_MEMBER( sns_rom20_necdsp_device::chip_read )
@@ -190,9 +190,9 @@ void sns_rom21_necdsp_device::dsp_data_map_hirom(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_hirom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_hirom)
MACHINE_CONFIG_END
READ8_MEMBER( sns_rom21_necdsp_device::chip_read )
@@ -301,16 +301,16 @@ void sns_rom_setadsp_device::st01x_data_map(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(st01x_prg_map)
+ MCFG_DEVICE_DATA_MAP(st01x_data_map)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 15000000)
+ MCFG_DEVICE_PROGRAM_MAP(st01x_prg_map)
+ MCFG_DEVICE_DATA_MAP(st01x_data_map)
MACHINE_CONFIG_END
@@ -412,51 +412,51 @@ sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_c
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_hirom)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map_hirom)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(st01x_prg_map)
+ MCFG_DEVICE_DATA_MAP(st01x_data_map)
MACHINE_CONFIG_END
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)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 15000000)
+ MCFG_DEVICE_PROGRAM_MAP(st01x_prg_map)
+ MCFG_DEVICE_DATA_MAP(st01x_data_map)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp
index de605138d78..a20a6743709 100644
--- a/src/devices/bus/snes_ctrl/miracle.cpp
+++ b/src/devices/bus/snes_ctrl/miracle.cpp
@@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(SNES_MIRACLE, snes_miracle_device, "snes_miracle", "Miracle P
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))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(*this, snes_miracle_device, rx_w))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp
index 21d28f2710a..f59ddf0d4e5 100644
--- a/src/devices/bus/spc1000/fdd.cpp
+++ b/src/devices/bus/spc1000/fdd.cpp
@@ -83,16 +83,16 @@ static void sd725_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(spc1000_fdd_exp_device::device_add_mconfig)
// sub CPU (5 inch floppy drive)
- MCFG_CPU_ADD("fdccpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(sd725_mem)
- MCFG_CPU_IO_MAP(sd725_io)
+ MCFG_DEVICE_ADD("fdccpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sd725_mem)
+ MCFG_DEVICE_IO_MAP(sd725_io)
MCFG_DEVICE_ADD("d8255_master", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("d8255_master", i8255_device, pb_r))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("d8255_master", i8255_device, pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spc1000_fdd_exp_device, i8255_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(spc1000_fdd_exp_device, i8255_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spc1000_fdd_exp_device, i8255_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("d8255_master", i8255_device, pb_r))
+ MCFG_I8255_IN_PORTB_CB(READ8("d8255_master", i8255_device, pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spc1000_fdd_exp_device, i8255_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, spc1000_fdd_exp_device, i8255_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spc1000_fdd_exp_device, i8255_c_w))
// floppy disk controller
MCFG_UPD765A_ADD("upd765", true, true)
diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp
index a65594e5e68..30ca2b63164 100644
--- a/src/devices/bus/spc1000/vdp.cpp
+++ b/src/devices/bus/spc1000/vdp.cpp
@@ -27,7 +27,7 @@ MACHINE_CONFIG_START(spc1000_vdp_exp_device::device_add_mconfig)
MCFG_DEVICE_ADD("tms", TMS9928A, XTAL(10'738'635) / 2) // TODO: which clock?
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(spc1000_vdp_exp_device, vdp_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, spc1000_vdp_exp_device, vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC("tms_screen")
MCFG_SCREEN_UPDATE_DEVICE("tms", tms9928a_device, screen_update)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/spectrum/exp.h b/src/devices/bus/spectrum/exp.h
index 80c6859fdda..f868853bdf4 100644
--- a/src/devices/bus/spectrum/exp.h
+++ b/src/devices/bus/spectrum/exp.h
@@ -62,8 +62,8 @@
#define MCFG_SPECTRUM_PASSTHRU_EXPANSION_SLOT_ADD() \
MCFG_SPECTRUM_EXPANSION_SLOT_ADD(SPECTRUM_EXPANSION_SLOT_TAG, spectrum_expansion_devices, nullptr) \
- MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, irq_w)) \
- MCFG_SPECTRUM_EXPANSION_SLOT_NMI_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, nmi_w))
+ MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, irq_w)) \
+ MCFG_SPECTRUM_EXPANSION_SLOT_NMI_HANDLER(WRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, nmi_w))
#define MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(_devcb) \
devcb = &downcast<spectrum_expansion_slot_device &>(*device).set_irq_handler(DEVCB_##_devcb);
diff --git a/src/devices/bus/spectrum/fuller.cpp b/src/devices/bus/spectrum/fuller.cpp
index 46419753217..48051b7a846 100644
--- a/src/devices/bus/spectrum/fuller.cpp
+++ b/src/devices/bus/spectrum/fuller.cpp
@@ -47,7 +47,7 @@ ioport_constructor spectrum_fuller_device::device_input_ports() const
MACHINE_CONFIG_START(spectrum_fuller_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) // unverified clock
+ MCFG_DEVICE_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) // unverified clock
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* passthru */
diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp
index 514ebd3535c..113844820cf 100644
--- a/src/devices/bus/spectrum/intf1.cpp
+++ b/src/devices/bus/spectrum/intf1.cpp
@@ -41,11 +41,11 @@ ROM_END
MACHINE_CONFIG_START(spectrum_intf1_device::device_add_mconfig)
/* rs232 */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
/* microdrive */
MCFG_MICRODRIVE_ADD("mdv1")
- MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(DEVWRITELINE("mdv2", microdrive_image_device, comms_in_w))
+ MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(WRITELINE("mdv2", microdrive_image_device, comms_in_w))
MCFG_MICRODRIVE_ADD("mdv2")
/* passthru */
diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp
index 6395427501e..28e5ac90c9e 100644
--- a/src/devices/bus/spectrum/melodik.cpp
+++ b/src/devices/bus/spectrum/melodik.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_MELODIK, spectrum_melodik_device, "spectrum_melodik"
MACHINE_CONFIG_START(spectrum_melodik_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL(3'579'545) / 2)
+ MCFG_DEVICE_ADD("ay8912", AY8912, XTAL(3'579'545) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* passthru */
diff --git a/src/devices/bus/spectrum/uslot.cpp b/src/devices/bus/spectrum/uslot.cpp
index 5fa065f9dfe..178f8ab0941 100644
--- a/src/devices/bus/spectrum/uslot.cpp
+++ b/src/devices/bus/spectrum/uslot.cpp
@@ -23,12 +23,12 @@ DEFINE_DEVICE_TYPE(SPECTRUM_USLOT, spectrum_uslot_device, "spectrum_uslot", "Spe
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))
- MCFG_SPECTRUM_EXPANSION_SLOT_NMI_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, nmi_w))
+ MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, irq_w))
+ MCFG_SPECTRUM_EXPANSION_SLOT_NMI_HANDLER(WRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, nmi_w))
MCFG_SPECTRUM_EXPANSION_SLOT_ADD("exp2", spectrum_expansion_devices, nullptr)
- MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, irq_w))
- MCFG_SPECTRUM_EXPANSION_SLOT_NMI_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, nmi_w))
+ MCFG_SPECTRUM_EXPANSION_SLOT_IRQ_HANDLER(WRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, irq_w))
+ MCFG_SPECTRUM_EXPANSION_SLOT_NMI_HANDLER(WRITELINE(DEVICE_SELF_OWNER, spectrum_expansion_slot_device, nmi_w))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp
index 745e87ef2b0..8e6e1cf1694 100644
--- a/src/devices/bus/spectrum/uspeech.cpp
+++ b/src/devices/bus/spectrum/uspeech.cpp
@@ -55,7 +55,7 @@ const tiny_rom_entry *spectrum_uspeech_device::device_rom_region() const
MACHINE_CONFIG_START(spectrum_uspeech_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SP0256_TAG, SP0256, XTAL(14'000'000) / 4)
+ MCFG_DEVICE_ADD(SP0256_TAG, SP0256, XTAL(14'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp
index 146556fc853..40fbf4a76de 100644
--- a/src/devices/bus/ss50/mpc.cpp
+++ b/src/devices/bus/ss50/mpc.cpp
@@ -102,24 +102,24 @@ DEVICE_INPUT_DEFAULTS_END
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))
+ MCFG_PIA_WRITEPA_HANDLER(WRITELINE("outgate", input_merger_device, in_w<0>)) MCFG_DEVCB_BIT(0)
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, ss50_mpc_device, reader_control_w))
MCFG_PIA_READPB_HANDLER(IOPORT("STOP")) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_INPUT(READLINE(ss50_mpc_device, count_r)) MCFG_DEVCB_BIT(7)
- MCFG_PIA_WRITEPB_HANDLER(WRITELINE(ss50_mpc_device, count_select_w)) MCFG_DEVCB_BIT(2)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("counter", ripple_counter_device, reset_w)) MCFG_DEVCB_BIT(0)
- //MCFG_PIA_IRQA_HANDLER(WRITELINE(ss50_mpc_device, pia_irq_w))
- //MCFG_PIA_IRQB_HANDLER(WRITELINE(ss50_mpc_device, pia_irq_w))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(WRITELINE(ss50_mpc_device, serial_input_w))
+ MCFG_DEVCB_CHAIN_INPUT(READLINE(*this, ss50_mpc_device, count_r)) MCFG_DEVCB_BIT(7)
+ MCFG_PIA_WRITEPB_HANDLER(WRITELINE(*this, ss50_mpc_device, count_select_w)) MCFG_DEVCB_BIT(2)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("counter", ripple_counter_device, reset_w)) MCFG_DEVCB_BIT(0)
+ //MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, ss50_mpc_device, pia_irq_w))
+ //MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, ss50_mpc_device, pia_irq_w))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, ss50_mpc_device, serial_input_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_INPUT_MERGER_ALL_HIGH("outgate")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_INPUT_MERGER_ANY_HIGH("loopback")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(DEVWRITELINE("outgate", input_merger_device, in_w<1>))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("outgate", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("counter", RIPPLE_COUNTER, 0) // CD4024AE (IC3)
MCFG_RIPPLE_COUNTER_STAGES(7) // only Q5 (÷32) and Q4 (÷16) are actually used
diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp
index 1650ddc89c9..d15b7288ba0 100644
--- a/src/devices/bus/ss50/mps.cpp
+++ b/src/devices/bus/ss50/mps.cpp
@@ -98,12 +98,12 @@ DEVICE_INPUT_DEFAULTS_END
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))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(ss50_mps_device, acia_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_ACIA6850_RTS_HANDLER(WRITELINE(*this, ss50_mps_device, reader_control_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, ss50_mps_device, acia_irq_w))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp
index 7a3b01ee219..cc45f3b005f 100644
--- a/src/devices/bus/sunkbd/hlekbd.cpp
+++ b/src/devices/bus/sunkbd/hlekbd.cpp
@@ -789,7 +789,7 @@ WRITE_LINE_MEMBER( hle_device_base::input_txd )
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_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp
index 9571a43d9d0..51a51241897 100644
--- a/src/devices/bus/svi3x8/expander/sv601.cpp
+++ b/src/devices/bus/svi3x8/expander/sv601.cpp
@@ -22,9 +22,9 @@ DEFINE_DEVICE_TYPE(SV601, sv601_device, "sv601", "SV-601 Super Expander")
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))
- MCFG_SVI_SLOT_RAMDIS_HANDLER(WRITELINE(sv601_device, ramdis_w))
+ MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(*this, sv601_device, int_w))
+ MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(*this, sv601_device, romdis_w))
+ MCFG_SVI_SLOT_RAMDIS_HANDLER(WRITELINE(*this, sv601_device, ramdis_w))
MCFG_SVI_SLOT_ADD("0", svi_slot_cards, nullptr)
MCFG_SVI_SLOT_ADD("1", svi_slot_cards, nullptr)
MCFG_SVI_SLOT_ADD("2", svi_slot_cards, nullptr)
diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp
index 59a1e14d458..b7c657bddce 100644
--- a/src/devices/bus/svi3x8/expander/sv602.cpp
+++ b/src/devices/bus/svi3x8/expander/sv602.cpp
@@ -22,9 +22,9 @@ DEFINE_DEVICE_TYPE(SV602, sv602_device, "sv602", "SV-602 Single Slot Expander")
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))
- MCFG_SVI_SLOT_RAMDIS_HANDLER(WRITELINE(sv602_device, ramdis_w))
+ MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(*this, sv602_device, int_w))
+ MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(*this, sv602_device, romdis_w))
+ MCFG_SVI_SLOT_RAMDIS_HANDLER(WRITELINE(*this, sv602_device, ramdis_w))
MCFG_SVI_SLOT_ADD("0", sv602_slot_cards, nullptr)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp
index f2adbdd584a..d3b5a587411 100644
--- a/src/devices/bus/svi3x8/expander/sv603.cpp
+++ b/src/devices/bus/svi3x8/expander/sv603.cpp
@@ -39,7 +39,7 @@ const tiny_rom_entry *sv603_device::device_rom_region() const
MACHINE_CONFIG_START(sv603_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snd", SN76489A, XTAL(10'738'635) / 3)
+ MCFG_DEVICE_ADD("snd", SN76489A, XTAL(10'738'635) / 3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// cartridge slot
diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp
index c47bdaf370f..b89f7fffede 100644
--- a/src/devices/bus/svi3x8/slot/sv801.cpp
+++ b/src/devices/bus/svi3x8/slot/sv801.cpp
@@ -33,8 +33,8 @@ static void svi_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(sv801_device::device_add_mconfig)
MCFG_FD1793_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(sv801_device, intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(sv801_device, drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, sv801_device, intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, sv801_device, drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", svi_floppies, "dd", sv801_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", svi_floppies, "dd", sv801_device::floppy_formats)
diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp
index a8428a32e4b..f6213b0b5aa 100644
--- a/src/devices/bus/svi3x8/slot/sv802.cpp
+++ b/src/devices/bus/svi3x8/slot/sv802.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(SV802, sv802_device, "sv802", "SV-802 Centronics Printer Inte
MACHINE_CONFIG_START(sv802_device::device_add_mconfig)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sv802_device, busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sv802_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp
index a3d994e549f..4bdbd583c97 100644
--- a/src/devices/bus/svi3x8/slot/sv805.cpp
+++ b/src/devices/bus/svi3x8/slot/sv805.cpp
@@ -22,16 +22,16 @@ DEFINE_DEVICE_TYPE(SV805, sv805_device, "sv805", "SV-805 RS-232 Interface")
MACHINE_CONFIG_START(sv805_device::device_add_mconfig)
MCFG_DEVICE_ADD("uart", INS8250, XTAL(3'072'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(sv805_device, uart_intr_w))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", ins8250_uart_device, dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, sv805_device, uart_intr_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", ins8250_uart_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti8x/graphlinkhle.cpp b/src/devices/bus/ti8x/graphlinkhle.cpp
index 675fa9b87ed..4e364f644ed 100644
--- a/src/devices/bus/ti8x/graphlinkhle.cpp
+++ b/src/devices/bus/ti8x/graphlinkhle.cpp
@@ -50,8 +50,8 @@ void graph_link_hle_device::device_reset()
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))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, 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 cabe956b9da..65a3c716cc7 100644
--- a/src/devices/bus/ti8x/teeconn.cpp
+++ b/src/devices/bus/ti8x/teeconn.cpp
@@ -63,12 +63,12 @@ WRITE_LINE_MEMBER(tee_connector_device::ring_b_w)
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))
+ MCFG_TI8X_LINK_TIP_HANDLER(WRITELINE(*this, tee_connector_device, tip_a_w))
+ MCFG_TI8X_LINK_RING_HANDLER(WRITELINE(*this, tee_connector_device, ring_a_w))
MCFG_TI8X_LINK_PORT_ADD("b", default_ti8x_link_devices, nullptr)
- MCFG_TI8X_LINK_TIP_HANDLER(WRITELINE(tee_connector_device, tip_b_w))
- MCFG_TI8X_LINK_RING_HANDLER(WRITELINE(tee_connector_device, ring_b_w))
+ MCFG_TI8X_LINK_TIP_HANDLER(WRITELINE(*this, tee_connector_device, tip_b_w))
+ MCFG_TI8X_LINK_RING_HANDLER(WRITELINE(*this, tee_connector_device, ring_b_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti8x/tispeaker.cpp b/src/devices/bus/ti8x/tispeaker.cpp
index c3439f56c05..84cd9638e27 100644
--- a/src/devices/bus/ti8x/tispeaker.cpp
+++ b/src/devices/bus/ti8x/tispeaker.cpp
@@ -29,10 +29,10 @@ stereo_speaker_device::stereo_speaker_device(
MACHINE_CONFIG_START(stereo_speaker_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("outl", "outr")
- MCFG_SOUND_ADD("lspkr", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("lspkr", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outl", 0.50)
- MCFG_SOUND_ADD("rspkr", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("rspkr", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outr", 0.50)
MACHINE_CONFIG_END
@@ -72,7 +72,7 @@ mono_speaker_device::mono_speaker_device(
MACHINE_CONFIG_START(mono_speaker_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("spkr", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("spkr", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti99/gromport/cartridges.cpp b/src/devices/bus/ti99/gromport/cartridges.cpp
index fd1180bbaa5..23303650f8f 100644
--- a/src/devices/bus/ti99/gromport/cartridges.cpp
+++ b/src/devices/bus/ti99/gromport/cartridges.cpp
@@ -397,11 +397,11 @@ void ti99_cartridge_device::device_config_complete()
5 GROMs that may be contained in a cartridge
*/
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))
- MCFG_GROM_ADD( GROM6_TAG, 6, CARTGROM_TAG, 0x6000, WRITELINE(ti99_cartridge_device, ready_line))
- MCFG_GROM_ADD( GROM7_TAG, 7, CARTGROM_TAG, 0x8000, WRITELINE(ti99_cartridge_device, ready_line))
+ MCFG_GROM_ADD( GROM3_TAG, 3, CARTGROM_TAG, 0x0000, WRITELINE(*this, ti99_cartridge_device, ready_line))
+ MCFG_GROM_ADD( GROM4_TAG, 4, CARTGROM_TAG, 0x2000, WRITELINE(*this, ti99_cartridge_device, ready_line))
+ MCFG_GROM_ADD( GROM5_TAG, 5, CARTGROM_TAG, 0x4000, WRITELINE(*this, ti99_cartridge_device, ready_line))
+ MCFG_GROM_ADD( GROM6_TAG, 6, CARTGROM_TAG, 0x6000, WRITELINE(*this, ti99_cartridge_device, ready_line))
+ MCFG_GROM_ADD( GROM7_TAG, 7, CARTGROM_TAG, 0x8000, WRITELINE(*this, ti99_cartridge_device, ready_line))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti99/peb/bwg.cpp b/src/devices/bus/ti99/peb/bwg.cpp
index 36cd378860f..6e6e81661ae 100644
--- a/src/devices/bus/ti99/peb/bwg.cpp
+++ b/src/devices/bus/ti99/peb/bwg.cpp
@@ -696,8 +696,8 @@ ROM_END
MACHINE_CONFIG_START(snug_bwg_device::device_add_mconfig)
MCFG_WD1773_ADD(FDC_TAG, XTAL(8'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, snug_bwg_device, fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, snug_bwg_device, fdc_drq_w))
MCFG_DEVICE_ADD(CLOCK_TAG, MM58274C, 0)
MCFG_MM58274C_MODE24(1) // 24 hour
diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp
index 98fbf5187ff..f4c3f489404 100644
--- a/src/devices/bus/ti99/peb/evpc.cpp
+++ b/src/devices/bus/ti99/peb/evpc.cpp
@@ -481,14 +481,14 @@ ioport_constructor snug_enhanced_video_device::device_input_ports() const
MACHINE_CONFIG_START(snug_enhanced_video_device::device_add_mconfig)
// video hardware
MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL(21'477'272)) /* typical 9938 clock, not verified */
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, snug_enhanced_video_device, video_interrupt_in))
MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL(21'477'272))
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("sound_out")
- MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
- MCFG_SN76496_READY_HANDLER( WRITELINE(snug_enhanced_video_device, ready_line) )
+ MCFG_SN76496_READY_HANDLER( WRITELINE(*this, snug_enhanced_video_device, ready_line) )
// Mouse connected to the color bus of the v9938
MCFG_COLORBUS_MOUSE_ADD( COLORBUS_TAG )
diff --git a/src/devices/bus/ti99/peb/hfdc.cpp b/src/devices/bus/ti99/peb/hfdc.cpp
index 0721f0d6a3b..c475dbb0b5f 100644
--- a/src/devices/bus/ti99/peb/hfdc.cpp
+++ b/src/devices/bus/ti99/peb/hfdc.cpp
@@ -1075,12 +1075,12 @@ ROM_END
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))
- MCFG_HDC92X4_AUXBUS_OUT_CALLBACK(WRITE8(myarc_hfdc_device, auxbus_out))
- MCFG_HDC92X4_DMARQ_CALLBACK(WRITELINE(myarc_hfdc_device, dmarq_w))
- MCFG_HDC92X4_DMA_IN_CALLBACK(READ8(myarc_hfdc_device, read_buffer))
- MCFG_HDC92X4_DMA_OUT_CALLBACK(WRITE8(myarc_hfdc_device, write_buffer))
+ MCFG_HDC92X4_INTRQ_CALLBACK(WRITELINE(*this, myarc_hfdc_device, intrq_w))
+ MCFG_HDC92X4_DIP_CALLBACK(WRITELINE(*this, myarc_hfdc_device, dip_w))
+ MCFG_HDC92X4_AUXBUS_OUT_CALLBACK(WRITE8(*this, myarc_hfdc_device, auxbus_out))
+ MCFG_HDC92X4_DMARQ_CALLBACK(WRITELINE(*this, myarc_hfdc_device, dmarq_w))
+ MCFG_HDC92X4_DMA_IN_CALLBACK(READ8(*this, myarc_hfdc_device, read_buffer))
+ MCFG_HDC92X4_DMA_OUT_CALLBACK(WRITE8(*this, myarc_hfdc_device, write_buffer))
MCFG_FLOPPY_DRIVE_ADD("f1", hfdc_floppies, "525dd", myarc_hfdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/devices/bus/ti99/peb/pcode.cpp b/src/devices/bus/ti99/peb/pcode.cpp
index 0301b709524..0832bcfeba2 100644
--- a/src/devices/bus/ti99/peb/pcode.cpp
+++ b/src/devices/bus/ti99/peb/pcode.cpp
@@ -354,18 +354,18 @@ ROM_START( ti99_pcode )
ROM_END
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))
- MCFG_GROM_ADD( PGROM3_TAG, 3, PCODE_GROM_TAG, 0x6000, WRITELINE(ti_pcode_card_device, ready_line))
- MCFG_GROM_ADD( PGROM4_TAG, 4, PCODE_GROM_TAG, 0x8000, WRITELINE(ti_pcode_card_device, ready_line))
- MCFG_GROM_ADD( PGROM5_TAG, 5, PCODE_GROM_TAG, 0xa000, WRITELINE(ti_pcode_card_device, ready_line))
- MCFG_GROM_ADD( PGROM6_TAG, 6, PCODE_GROM_TAG, 0xc000, WRITELINE(ti_pcode_card_device, ready_line))
- MCFG_GROM_ADD( PGROM7_TAG, 7, PCODE_GROM_TAG, 0xe000, WRITELINE(ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM0_TAG, 0, PCODE_GROM_TAG, 0x0000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM1_TAG, 1, PCODE_GROM_TAG, 0x2000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM2_TAG, 2, PCODE_GROM_TAG, 0x4000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM3_TAG, 3, PCODE_GROM_TAG, 0x6000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM4_TAG, 4, PCODE_GROM_TAG, 0x8000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM5_TAG, 5, PCODE_GROM_TAG, 0xa000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM6_TAG, 6, PCODE_GROM_TAG, 0xc000, WRITELINE(*this, ti_pcode_card_device, ready_line))
+ MCFG_GROM_ADD( PGROM7_TAG, 7, PCODE_GROM_TAG, 0xe000, WRITELINE(*this, ti_pcode_card_device, ready_line))
MCFG_DEVICE_ADD("crulatch", LS259, 0) // U12
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(ti_pcode_card_device, pcpage_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ti_pcode_card_device, ekrpg_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, ti_pcode_card_device, pcpage_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ti_pcode_card_device, ekrpg_w))
MACHINE_CONFIG_END
const tiny_rom_entry *ti_pcode_card_device::device_rom_region() const
diff --git a/src/devices/bus/ti99/peb/samsmem.cpp b/src/devices/bus/ti99/peb/samsmem.cpp
index ebbd9e11169..290ad9f20e2 100644
--- a/src/devices/bus/ti99/peb/samsmem.cpp
+++ b/src/devices/bus/ti99/peb/samsmem.cpp
@@ -126,8 +126,8 @@ MACHINE_CONFIG_START(sams_memory_expansion_device::device_add_mconfig)
MCFG_RAM_DEFAULT_VALUE(0)
MCFG_DEVICE_ADD("crulatch", LS259, 0) // U8
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(sams_memory_expansion_device, access_mapper_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(sams_memory_expansion_device, map_mode_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, sams_memory_expansion_device, access_mapper_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, sams_memory_expansion_device, map_mode_w))
MACHINE_CONFIG_END
void sams_memory_expansion_device::device_start()
diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp
index 4c2b96ece0d..f1691820fa0 100644
--- a/src/devices/bus/ti99/peb/spchsyn.cpp
+++ b/src/devices/bus/ti99/peb/spchsyn.cpp
@@ -163,8 +163,8 @@ MACHINE_CONFIG_START(ti_speech_synthesizer_device::device_add_mconfig)
MCFG_DEVICE_ADD("vsm", SPEECHROM, 0)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speechsyn", CD2501E, 640000L)
- MCFG_TMS52XX_READYQ_HANDLER(WRITELINE(ti_speech_synthesizer_device, speech_ready))
+ MCFG_DEVICE_ADD("speechsyn", CD2501E, 640000L)
+ MCFG_TMS52XX_READYQ_HANDLER(WRITELINE(*this, ti_speech_synthesizer_device, speech_ready))
MCFG_TMS52XX_SPEECHROM("vsm")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/ti99/peb/ti_fdc.cpp b/src/devices/bus/ti99/peb/ti_fdc.cpp
index 3bc4e297c28..defbcfda7da 100644
--- a/src/devices/bus/ti99/peb/ti_fdc.cpp
+++ b/src/devices/bus/ti99/peb/ti_fdc.cpp
@@ -452,8 +452,8 @@ ROM_END
MACHINE_CONFIG_START(ti_fdc_device::device_add_mconfig)
MCFG_FD1771_ADD(FDC_TAG, XTAL(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, ti_fdc_device, fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, ti_fdc_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("0", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("1", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats)
@@ -462,14 +462,14 @@ MACHINE_CONFIG_START(ti_fdc_device::device_add_mconfig)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD("crulatch", LS259, 0) // U23
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(ti_fdc_device, dskpgena_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(ti_fdc_device, kaclk_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(ti_fdc_device, waiten_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(ti_fdc_device, hlt_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ti_fdc_device, dsel_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ti_fdc_device, dsel_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ti_fdc_device, dsel_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ti_fdc_device, sidsel_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, ti_fdc_device, dskpgena_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, ti_fdc_device, kaclk_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, ti_fdc_device, waiten_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, ti_fdc_device, hlt_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ti_fdc_device, dsel_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ti_fdc_device, dsel_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ti_fdc_device, dsel_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ti_fdc_device, sidsel_w))
MACHINE_CONFIG_END
const tiny_rom_entry *ti_fdc_device::device_rom_region() const
diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp
index 4c4a9de2ff5..3ea68fed5ed 100644
--- a/src/devices/bus/ti99/peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99/peb/ti_rs232.cpp
@@ -1142,28 +1142,28 @@ INPUT_PORTS_END
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 */
- MCFG_TMS9902_XMIT_CB(WRITE8(ti_rs232_pio_device, xmit0_callback)) /* called when a character is transmitted */
- MCFG_TMS9902_CTRL_CB(WRITE8(ti_rs232_pio_device, ctrl0_callback))
+ MCFG_TMS9902_INT_CB(WRITELINE(*this, ti_rs232_pio_device, int0_callback)) /* called when interrupt pin state changes */
+ MCFG_TMS9902_RCV_CB(WRITELINE(*this, ti_rs232_pio_device, rcv0_callback)) /* called when a character is received */
+ MCFG_TMS9902_XMIT_CB(WRITE8(*this, ti_rs232_pio_device, xmit0_callback)) /* called when a character is transmitted */
+ MCFG_TMS9902_CTRL_CB(WRITE8(*this, ti_rs232_pio_device, ctrl0_callback))
MCFG_DEVICE_ADD("tms9902_1", TMS9902, 3000000)
- MCFG_TMS9902_INT_CB(WRITELINE(ti_rs232_pio_device, int1_callback)) /* called when interrupt pin state changes */
- MCFG_TMS9902_RCV_CB(WRITELINE(ti_rs232_pio_device, rcv1_callback)) /* called when a character is received */
- MCFG_TMS9902_XMIT_CB(WRITE8(ti_rs232_pio_device, xmit1_callback)) /* called when a character is transmitted */
- MCFG_TMS9902_CTRL_CB(WRITE8(ti_rs232_pio_device, ctrl1_callback))
+ MCFG_TMS9902_INT_CB(WRITELINE(*this, ti_rs232_pio_device, int1_callback)) /* called when interrupt pin state changes */
+ MCFG_TMS9902_RCV_CB(WRITELINE(*this, ti_rs232_pio_device, rcv1_callback)) /* called when a character is received */
+ MCFG_TMS9902_XMIT_CB(WRITE8(*this, ti_rs232_pio_device, xmit1_callback)) /* called when a character is transmitted */
+ MCFG_TMS9902_CTRL_CB(WRITE8(*this, ti_rs232_pio_device, ctrl1_callback))
MCFG_DEVICE_ADD("serdev0", TI99_RS232_DEV, 0)
MCFG_DEVICE_ADD("serdev1", TI99_RS232_DEV, 0)
MCFG_DEVICE_ADD("piodev", TI99_PIO_DEV, 0)
MCFG_DEVICE_ADD("crulatch", LS259, 0) // U12
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(ti_rs232_pio_device, selected_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(ti_rs232_pio_device, pio_direction_in_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(ti_rs232_pio_device, pio_handshake_out_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(ti_rs232_pio_device, pio_spareout_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ti_rs232_pio_device, flag0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ti_rs232_pio_device, cts0_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ti_rs232_pio_device, cts1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ti_rs232_pio_device, led_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, selected_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, pio_direction_in_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, pio_handshake_out_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, pio_spareout_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, flag0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, cts0_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, cts1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ti_rs232_pio_device, led_w))
MACHINE_CONFIG_END
const tiny_rom_entry *ti_rs232_pio_device::device_rom_region() const
diff --git a/src/devices/bus/ti99/peb/tn_ide.cpp b/src/devices/bus/ti99/peb/tn_ide.cpp
index d1adadfbe86..f512c722635 100644
--- a/src/devices/bus/ti99/peb/tn_ide.cpp
+++ b/src/devices/bus/ti99/peb/tn_ide.cpp
@@ -368,9 +368,9 @@ INPUT_PORTS_END
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_RTC65271_INTERRUPT_CB(WRITELINE(*this, nouspikel_ide_interface_device, clock_interrupt_callback))
MCFG_ATA_INTERFACE_ADD( "ata", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(nouspikel_ide_interface_device, ide_interrupt_callback))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, nouspikel_ide_interface_device, ide_interrupt_callback))
MCFG_RAM_ADD(RAMREGION)
MCFG_RAM_DEFAULT_SIZE("512K")
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp
index 102a5c7c831..b7439b262bb 100644
--- a/src/devices/bus/tiki100/8088.cpp
+++ b/src/devices/bus/tiki100/8088.cpp
@@ -68,9 +68,9 @@ void tiki100_8088_device::i8088_io(address_map &map)
//-------------------------------------------------
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)
+ MCFG_DEVICE_ADD(I8088_TAG, I8088, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(i8088_mem)
+ MCFG_DEVICE_IO_MAP(i8088_io)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vcs/harmony_melody.cpp b/src/devices/bus/vcs/harmony_melody.cpp
index c22670d15c5..38f2b92dd94 100644
--- a/src/devices/bus/vcs/harmony_melody.cpp
+++ b/src/devices/bus/vcs/harmony_melody.cpp
@@ -83,8 +83,8 @@ void a26_rom_harmony_device::harmony_arm7_map(address_map &map)
}
MACHINE_CONFIG_START(a26_rom_harmony_device::device_add_mconfig)
- MCFG_CPU_ADD("arm", LPC2103, 70000000)
- MCFG_CPU_PROGRAM_MAP(harmony_arm7_map)
+ MCFG_DEVICE_ADD("arm", LPC2103, 70000000)
+ MCFG_DEVICE_PROGRAM_MAP(harmony_arm7_map)
MACHINE_CONFIG_END
// actually if the ARM code is doing this and providing every opcode to the main CPU based
diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp
index 7bd09ca74f8..242af9b152e 100644
--- a/src/devices/bus/vic20/exp.cpp
+++ b/src/devices/bus/vic20/exp.cpp
@@ -66,6 +66,7 @@ vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &m
m_write_res(*this),
m_card(nullptr)
{
+ set_default_clock(DERIVED_CLOCK(1, 1));
}
@@ -230,6 +231,6 @@ void vic20_expansion_cards(device_slot_interface &device)
// the following need ROMs from the software list
device.option_add_internal("standard", VIC20_STD);
- device.option_add_internal("ieee488", VIC1112).clock(DERIVED_CLOCK(1, 1));
+ device.option_add_internal("ieee488", VIC1112);
device.option_add_internal("megacart", VIC20_MEGACART);
}
diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
index fddc500e665..717a2d8c92c 100644
--- a/src/devices/bus/vic20/exp.h
+++ b/src/devices/bus/vic20/exp.h
@@ -57,9 +57,9 @@
#define MCFG_VIC20_PASSTHRU_EXPANSION_SLOT_ADD(_tag) \
MCFG_VIC20_EXPANSION_SLOT_ADD(_tag, 0, vic20_expansion_cards, nullptr) \
- MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, irq_w)) \
- MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, nmi_w)) \
- MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(DEVWRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, res_w))
+ MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, irq_w)) \
+ MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, nmi_w)) \
+ MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(DEVICE_SELF_OWNER, vic20_expansion_slot_device, res_w))
#define MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(_write) \
diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp
index 261ec6a43ef..d6a7dab07ee 100644
--- a/src/devices/bus/vic20/speakeasy.cpp
+++ b/src/devices/bus/vic20/speakeasy.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(VIC20_SPEAKEASY, vic20_speakeasy_device, "vic20_speakeasy", "
MACHINE_CONFIG_START(vic20_speakeasy_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SC01A_TAG, VOTRAX_SC01, 720000)
+ MCFG_DEVICE_ADD(SC01A_TAG, VOTRAX_SC01, 720000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index 052c37e5e42..cb136d4a0a4 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -31,11 +31,11 @@ DEFINE_DEVICE_TYPE(VIC1011, vic1011_device, "vic1011", "VIC-1011 RS-232C")
//-------------------------------------------------
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)
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(DEVICE_SELF, vic1011_device, output_k)) MCFG_DEVCB_XOR(1)
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(DEVICE_SELF, vic1011_device, output_l)) MCFG_DEVCB_XOR(1)
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(DEVICE_SELF, vic1011_device, output_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(DEVICE_SELF, vic1011_device, output_h)) MCFG_DEVCB_XOR(1)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(DEVICE_SELF, vic1011_device, output_k)) MCFG_DEVCB_XOR(1)
+ MCFG_RS232_DSR_HANDLER(WRITELINE(DEVICE_SELF, vic1011_device, output_l)) MCFG_DEVCB_XOR(1)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 68f34c644b4..5266e430ab3 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -99,19 +99,19 @@ WRITE_LINE_MEMBER( vic1112_device::via1_irq_w )
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))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(vic1112_device, via0_irq_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, vic1112_device, via0_pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, vic1112_device, via0_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, vic1112_device, via0_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, DERIVED_CLOCK(1, 1))
- MCFG_VIA6522_READPB_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(vic1112_device, via1_irq_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, vic1112_device, via1_irq_w))
MCFG_CBM_IEEE488_ADD(nullptr)
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_cb1))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_cb1))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 544481760af..6505e2938ed 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -47,29 +47,29 @@ void vp575_device::update_interrupts()
MACHINE_CONFIG_START(vp575_device::device_add_mconfig)
MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL(3'521'280)/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))
- MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp1_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vp575_device, exp1_int_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vp575_device, exp1_dma_out_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vp575_device, exp1_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp2", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
- MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp2_int_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp2_dma_out_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp2_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vp575_device, exp2_int_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vp575_device, exp2_dma_out_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vp575_device, exp2_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp3", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
- MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp3_int_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp3_dma_out_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp3_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vp575_device, exp3_int_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vp575_device, exp3_dma_out_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vp575_device, exp3_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp4", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
- MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp4_int_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp4_dma_out_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp4_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vp575_device, exp4_int_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vp575_device, exp4_dma_out_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vp575_device, exp4_dma_in_w))
MCFG_VIP_EXPANSION_SLOT_ADD("exp5", XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
- MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp5_int_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp5_dma_out_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vp575_device, exp5_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vp575_device, exp5_int_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vp575_device, exp5_dma_out_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vp575_device, exp5_dma_in_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index 0a867628fb4..7f591f95345 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -55,9 +55,9 @@ READ_LINE_MEMBER( vp590_device::gd_r )
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))
- MCFG_CDP1861_GD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, gd_r))
+ MCFG_CDP1861_RD_CALLBACK(READLINE(DEVICE_SELF, vp590_device, rd_r))
+ MCFG_CDP1861_BD_CALLBACK(READLINE(DEVICE_SELF, vp590_device, bd_r))
+ MCFG_CDP1861_GD_CALLBACK(READLINE(DEVICE_SELF, vp590_device, gd_r))
MCFG_CDP1862_LUMINANCE(RES_R(510), RES_R(360), RES_K(1), RES_K(1.5)) // R3, R4, R5, R6
MCFG_CDP1862_CHROMINANCE(RES_K(3.9), RES_K(10), RES_K(2), RES_K(3.3)) // R7, R8, R9, R10
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
diff --git a/src/devices/bus/vme/vme_fccpu20.cpp b/src/devices/bus/vme/vme_fccpu20.cpp
index 1705edf695f..28a58f6a221 100644
--- a/src/devices/bus/vme/vme_fccpu20.cpp
+++ b/src/devices/bus/vme/vme_fccpu20.cpp
@@ -245,20 +245,20 @@ void vme_fccpu20_device::cpu20_mem(address_map &map)
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)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("bim", bim68153_device, iack)
+ MCFG_DEVICE_ADD ("maincpu", M68020, CLOCK50 / 3) /* Crytstal verified from picture HCI */
+ MCFG_DEVICE_PROGRAM_MAP (cpu20_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("bim", bim68153_device, iack)
/* PIT Parallel Interface and Timer device, assumed strapped for on board clock */
MCFG_DEVICE_ADD ("pit", PIT68230, CLOCK32 / 4) /* Crystal not verified */
- MCFG_PIT68230_PA_INPUT_CB(READ8(vme_fccpu20_device, pita_r))
- MCFG_PIT68230_PB_INPUT_CB(READ8(vme_fccpu20_device, pitb_r))
- MCFG_PIT68230_PC_INPUT_CB(READ8(vme_fccpu20_device, pitc_r))
- MCFG_PIT68230_TIMER_IRQ_CB(DEVWRITELINE("bim", bim68153_device, int2_w))
+ MCFG_PIT68230_PA_INPUT_CB(READ8(*this, vme_fccpu20_device, pita_r))
+ MCFG_PIT68230_PB_INPUT_CB(READ8(*this, vme_fccpu20_device, pitb_r))
+ MCFG_PIT68230_PC_INPUT_CB(READ8(*this, vme_fccpu20_device, pitc_r))
+ MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE("bim", bim68153_device, int2_w))
/* BIM */
MCFG_MC68153_ADD("bim", CLOCK32 / 8)
- MCFG_BIM68153_OUT_INT_CB(WRITELINE(vme_fccpu20_device, bim_irq_callback))
+ MCFG_BIM68153_OUT_INT_CB(WRITELINE(*this, vme_fccpu20_device, bim_irq_callback))
/*INT0 - Abort switch */
/*INT1 - MPCC@8.064 MHz aswell */
/*INT2 - PI/T timer */
@@ -270,40 +270,40 @@ MACHINE_CONFIG_START(vme_fccpu20_device::device_add_mconfig)
#define RS232P3_TAG "rs232p3"
// MPCC
MCFG_MPCC68561_ADD ("mpcc", CLOCK32 / 4, 0, 0)
- MCFG_MPCC_OUT_TXD_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
- MCFG_MPCC_OUT_DTR_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
- MCFG_MPCC_OUT_RTS_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
- MCFG_MPCC_OUT_INT_CB(DEVWRITELINE("bim", bim68153_device, int1_w))
+ MCFG_MPCC_OUT_TXD_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
+ MCFG_MPCC_OUT_DTR_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
+ MCFG_MPCC_OUT_RTS_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
+ MCFG_MPCC_OUT_INT_CB(WRITELINE("bim", bim68153_device, int1_w))
/* Additional MPCC sits on FLME boards like SRAM-22,
TODO: install MPCC2/MPCC3 in FLME slot device */
// MPCC2
MCFG_MPCC68561_ADD ("mpcc2", CLOCK32 / 4, 0, 0)
- MCFG_MPCC_OUT_TXD_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
- MCFG_MPCC_OUT_DTR_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
- MCFG_MPCC_OUT_RTS_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
- MCFG_MPCC_OUT_INT_CB(DEVWRITELINE("bim", bim68153_device, int3_w))
+ MCFG_MPCC_OUT_TXD_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
+ MCFG_MPCC_OUT_DTR_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
+ MCFG_MPCC_OUT_RTS_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
+ MCFG_MPCC_OUT_INT_CB(WRITELINE("bim", bim68153_device, int3_w))
// MPCC3
MCFG_MPCC68561_ADD ("mpcc3", CLOCK32 / 4, 0, 0)
- MCFG_MPCC_OUT_TXD_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_txd))
- MCFG_MPCC_OUT_DTR_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_dtr))
- MCFG_MPCC_OUT_RTS_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_rts))
- MCFG_MPCC_OUT_INT_CB(DEVWRITELINE("bim", bim68153_device, int3_w))
+ MCFG_MPCC_OUT_TXD_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_txd))
+ MCFG_MPCC_OUT_DTR_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_dtr))
+ MCFG_MPCC_OUT_RTS_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_rts))
+ MCFG_MPCC_OUT_INT_CB(WRITELINE("bim", bim68153_device, int3_w))
// MPCC - RS232
- MCFG_RS232_PORT_ADD (RS232P1_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("mpcc", mpcc68561_device, write_rx))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("mpcc", mpcc68561_device, cts_w))
+ MCFG_DEVICE_ADD (RS232P1_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("mpcc", mpcc68561_device, write_rx))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("mpcc", mpcc68561_device, cts_w))
// MPCC2 - RS232
- MCFG_RS232_PORT_ADD (RS232P2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("mpcc2", mpcc68561_device, write_rx))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("mpcc2", mpcc68561_device, cts_w))
+ MCFG_DEVICE_ADD (RS232P2_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("mpcc2", mpcc68561_device, write_rx))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("mpcc2", mpcc68561_device, cts_w))
// MPCC3 - RS232
- MCFG_RS232_PORT_ADD (RS232P3_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("mpcc3", mpcc68561_device, write_rx))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("mpcc3", mpcc68561_device, cts_w))
+ MCFG_DEVICE_ADD (RS232P3_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("mpcc3", mpcc68561_device, write_rx))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("mpcc3", mpcc68561_device, cts_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vme_fccpu20_card_device::device_add_mconfig)
diff --git a/src/devices/bus/vme/vme_fcisio.cpp b/src/devices/bus/vme/vme_fcisio.cpp
index d7e4a97657a..86b0738ec25 100644
--- a/src/devices/bus/vme/vme_fcisio.cpp
+++ b/src/devices/bus/vme/vme_fcisio.cpp
@@ -277,8 +277,8 @@ ROM_END
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)
+ MCFG_DEVICE_ADD ("maincpu", M68010, CPU_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP (fcisio1_mem)
/* DUSCC channels */
#define RS232P1_TAG "rs232p1"
@@ -292,78 +292,78 @@ MACHINE_CONFIG_START(vme_fcisio1_card_device::device_add_mconfig)
MCFG_DUSCC68562_ADD("duscc0", DUSCC_CLOCK, 0, 0, 0, 0 )
/* Port 1 on DUSCC 0 Port A */
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
/* Port 2 on DUSCC 0 Port B */
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
/* RS232 for DUSCC 0 */
- MCFG_RS232_PORT_ADD (RS232P1_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc0", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc0", duscc68562_device, ctsa_w))
+ MCFG_DEVICE_ADD (RS232P1_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc0", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc0", duscc68562_device, ctsa_w))
- MCFG_RS232_PORT_ADD (RS232P2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc0", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc0", duscc68562_device, ctsb_w))
+ MCFG_DEVICE_ADD (RS232P2_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc0", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc0", duscc68562_device, ctsb_w))
MCFG_DUSCC68562_ADD("duscc1", DUSCC_CLOCK, 0, 0, 0, 0 )
/* Port 3 on DUSCC 1 Port A */
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_rts))
/* Port 4 on DUSCC 1 Port B */
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P4_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P4_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P4_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P4_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P4_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P4_TAG, rs232_port_device, write_rts))
/* RS232 for DUSCC 1 */
- MCFG_RS232_PORT_ADD (RS232P3_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc1", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc1", duscc68562_device, ctsa_w))
+ MCFG_DEVICE_ADD (RS232P3_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc1", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc1", duscc68562_device, ctsa_w))
- MCFG_RS232_PORT_ADD (RS232P4_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc1", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc1", duscc68562_device, ctsb_w))
+ MCFG_DEVICE_ADD (RS232P4_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc1", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc1", duscc68562_device, ctsb_w))
MCFG_DUSCC68562_ADD("duscc2", DUSCC_CLOCK, 0, 0, 0, 0 )
/* Port 5 on DUSCC 2 Port A */
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P5_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P5_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P5_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P5_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P5_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P5_TAG, rs232_port_device, write_rts))
/* Port 6 on DUSCC 2 Port B */
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P6_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P6_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P6_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P6_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P6_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P6_TAG, rs232_port_device, write_rts))
/* RS232 for DUSCC 2 */
- MCFG_RS232_PORT_ADD (RS232P5_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, ctsa_w))
+ MCFG_DEVICE_ADD (RS232P5_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc2", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc2", duscc68562_device, ctsa_w))
- MCFG_RS232_PORT_ADD (RS232P6_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, ctsb_w))
+ MCFG_DEVICE_ADD (RS232P6_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc2", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc2", duscc68562_device, ctsb_w))
MCFG_DUSCC68562_ADD("duscc3", DUSCC_CLOCK, 0, 0, 0, 0 )
/* Port 7 on DUSCC 3 Port A */
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P7_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P7_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P7_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P7_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P7_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P7_TAG, rs232_port_device, write_rts))
/* Port 8 on DUSCC 3 Port B */
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P8_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P8_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P8_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P8_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P8_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P8_TAG, rs232_port_device, write_rts))
/* RS232 for DUSCC 4 */
- MCFG_RS232_PORT_ADD (RS232P7_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, ctsa_w))
+ MCFG_DEVICE_ADD (RS232P7_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc3", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc3", duscc68562_device, ctsa_w))
- MCFG_RS232_PORT_ADD (RS232P8_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc3", duscc68562_device, ctsb_w))
+ MCFG_DEVICE_ADD (RS232P8_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc3", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc3", duscc68562_device, ctsb_w))
MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(20'000'000) / 2)
- MCFG_PIT68230_PB_INPUT_CB(READ8(vme_fcisio1_card_device, config_rd))
+ MCFG_PIT68230_PB_INPUT_CB(READ8(*this, vme_fcisio1_card_device, config_rd))
MCFG_MC68153_ADD("bim", XTAL(20'000'000) / 2)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vme/vme_fcscsi.cpp b/src/devices/bus/vme/vme_fcscsi.cpp
index 9cc50e5eb76..f1e3aedf23d 100644
--- a/src/devices/bus/vme/vme_fcscsi.cpp
+++ b/src/devices/bus/vme/vme_fcscsi.cpp
@@ -230,14 +230,14 @@ ROM_END
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)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vme_fcscsi1_card_device, maincpu_irq_acknowledge_callback)
+ MCFG_DEVICE_ADD ("maincpu", M68010, CPU_CRYSTAL / 2) /* 7474 based frequency divide by 2 */
+ MCFG_DEVICE_PROGRAM_MAP (fcscsi1_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vme_fcscsi1_card_device, maincpu_irq_acknowledge_callback)
/* FDC */
MCFG_WD1772_ADD("fdc", PIT_CRYSTAL / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(vme_fcscsi1_card_device, fdc_irq))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("mc68450", hd63450_device, drq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(*this, vme_fcscsi1_card_device, fdc_irq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("mc68450", hd63450_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", fcscsi_floppies, "525qd", vme_fcscsi1_card_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", fcscsi_floppies, "525qd", vme_fcscsi1_card_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", fcscsi_floppies, "525qd", vme_fcscsi1_card_device::floppy_formats)
@@ -245,19 +245,19 @@ MACHINE_CONFIG_START(vme_fcscsi1_card_device::device_add_mconfig)
/* PIT Parallel Interface and Timer device */
MCFG_DEVICE_ADD ("pit", PIT68230, PIT_CRYSTAL / 2) /* 7474 based frequency divide by 2 */
- MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(vme_fcscsi1_card_device, led_w))
+ MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(*this, vme_fcscsi1_card_device, led_w))
/* DMAC it is really a M68450 but the HD63850 is upwards compatible */
MCFG_DEVICE_ADD("mc68450", HD63450, 0) // MC68450 compatible
MCFG_HD63450_CPU("maincpu") // CPU - 68010
MCFG_HD63450_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2))
MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50))
- MCFG_HD63450_DMA_END_CB(WRITE8(vme_fcscsi1_card_device, dma_end))
- MCFG_HD63450_DMA_ERROR_CB(WRITE8(vme_fcscsi1_card_device, dma_error))
- //MCFG_HD63450_DMA_READ_0_CB(READ8(vme_fcscsi1_card_device, scsi_read_byte)) // ch 0 = SCSI
- //MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(vme_fcscsi1_card_device, scsi_write_byte))
- MCFG_HD63450_DMA_READ_1_CB(READ8(vme_fcscsi1_card_device, fdc_read_byte)) // ch 1 = fdc
- MCFG_HD63450_DMA_WRITE_1_CB(WRITE8(vme_fcscsi1_card_device, fdc_write_byte))
+ MCFG_HD63450_DMA_END_CB(WRITE8(*this, vme_fcscsi1_card_device, dma_end))
+ MCFG_HD63450_DMA_ERROR_CB(WRITE8(*this, vme_fcscsi1_card_device, dma_error))
+ //MCFG_HD63450_DMA_READ_0_CB(READ8(*this, vme_fcscsi1_card_device, scsi_read_byte)) // ch 0 = SCSI
+ //MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(*this, vme_fcscsi1_card_device, scsi_write_byte))
+ MCFG_HD63450_DMA_READ_1_CB(READ8(*this, vme_fcscsi1_card_device, fdc_read_byte)) // ch 1 = fdc
+ MCFG_HD63450_DMA_WRITE_1_CB(WRITE8(*this, vme_fcscsi1_card_device, fdc_write_byte))
MACHINE_CONFIG_END
const tiny_rom_entry *vme_fcscsi1_card_device::device_rom_region() const
diff --git a/src/devices/bus/vme/vme_hcpu30.cpp b/src/devices/bus/vme/vme_hcpu30.cpp
index 1e2818f2623..2c2137c4e54 100644
--- a/src/devices/bus/vme/vme_hcpu30.cpp
+++ b/src/devices/bus/vme/vme_hcpu30.cpp
@@ -123,25 +123,25 @@ ioport_constructor vme_hcpu30_card_device::device_input_ports() const
//-------------------------------------------------
MACHINE_CONFIG_START(vme_hcpu30_card_device::device_add_mconfig)
- MCFG_CPU_ADD("maincpu", M68030, 2*16670000)
- MCFG_CPU_PROGRAM_MAP(hcpu30_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, 2*16670000)
+ MCFG_DEVICE_PROGRAM_MAP(hcpu30_mem)
MCFG_DUSCC68562_ADD("duscc", DUSCC_CLOCK, 0, 0, 0, 0)
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
-// MCFG_DUSCC_OUT_INT_CB(DEVWRITELINE()
-
- MCFG_RS232_PORT_ADD (RS232P1_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD (RS232P2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, ctsb_w))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
+// MCFG_DUSCC_OUT_INT_CB(WRITELINE()
+
+ MCFG_DEVICE_ADD (RS232P1_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc", duscc68562_device, ctsa_w))
+
+ MCFG_DEVICE_ADD (RS232P2_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc", duscc68562_device, ctsb_w))
MACHINE_CONFIG_END
/* Boot vector handler, the PCB hardwires the first 8 bytes from 0xff800000 to 0x0 at reset */
diff --git a/src/devices/bus/vme/vme_mvme350.cpp b/src/devices/bus/vme/vme_mvme350.cpp
index 01d61e693f4..f1bb9d5dc46 100644
--- a/src/devices/bus/vme/vme_mvme350.cpp
+++ b/src/devices/bus/vme/vme_mvme350.cpp
@@ -191,8 +191,8 @@ ROM_END
MACHINE_CONFIG_START(vme_mvme350_card_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD (MVME350_CPU_TAG, M68010, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP (mvme350_mem)
+ MCFG_DEVICE_ADD (MVME350_CPU_TAG, M68010, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP (mvme350_mem)
/* PIT Parallel Interface and Timer device, assuming strapped for on board clock */
MCFG_DEVICE_ADD("pit", PIT68230, XTAL(16'000'000) / 2)
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vme/vme_mzr8105.cpp b/src/devices/bus/vme/vme_mzr8105.cpp
index c0d863635ac..985f6bad905 100644
--- a/src/devices/bus/vme/vme_mzr8105.cpp
+++ b/src/devices/bus/vme/vme_mzr8105.cpp
@@ -38,8 +38,8 @@ DEFINE_DEVICE_TYPE(VME_MZR8105, vme_mzr8105_card_device, "mzr8105", "Mizar 8105
MACHINE_CONFIG_START(vme_mzr8105_card_device::device_add_mconfig)
{
- MCFG_CPU_ADD ("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP (mzr8105_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP (mzr8105_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_BUS_OWNER_SPACES()
MCFG_VME_SLOT_ADD ("vme", 1, mzr8105_vme_cards, "mzr8300")
diff --git a/src/devices/bus/vme/vme_mzr8300.cpp b/src/devices/bus/vme/vme_mzr8300.cpp
index 7f643075b15..c5a94ca1b8e 100644
--- a/src/devices/bus/vme/vme_mzr8300.cpp
+++ b/src/devices/bus/vme/vme_mzr8300.cpp
@@ -126,25 +126,25 @@ DEFINE_DEVICE_TYPE(VME_MZR8300, vme_mzr8300_card_device, "mzr8300", "Mizar 8300
MACHINE_CONFIG_START(vme_mzr8300_card_device::device_add_mconfig)
MCFG_DEVICE_ADD("sio0", UPD7201_NEW, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232p1", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232p1", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232p1", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232p1", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("sio1", UPD7201_NEW, XTAL(4'000'000))
- MCFG_RS232_PORT_ADD("rs232p1", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio0", upd7201_new_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio0", upd7201_new_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232p1", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio0", upd7201_new_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio0", upd7201_new_device, ctsb_w))
MCFG_DEVICE_ADD("stc", AM9513, XTAL(4'000'000))
- MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio0", upd7201_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio0", upd7201_new_device, txca_w))
- MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio0", upd7201_new_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio0", upd7201_new_device, txcb_w))
- MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("sio1", upd7201_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", upd7201_new_device, txca_w))
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("sio1", upd7201_new_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", upd7201_new_device, txcb_w))
+ MCFG_AM9513_OUT1_CALLBACK(WRITELINE("sio0", upd7201_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio0", upd7201_new_device, txca_w))
+ MCFG_AM9513_OUT2_CALLBACK(WRITELINE("sio0", upd7201_new_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio0", upd7201_new_device, txcb_w))
+ MCFG_AM9513_OUT3_CALLBACK(WRITELINE("sio1", upd7201_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", upd7201_new_device, txca_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("sio1", upd7201_new_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", upd7201_new_device, txcb_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index f672aaa5973..2c8e8498c4a 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(VTECH_PRINTER_INTERFACE, vtech_printer_interface_device, "vte
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_BUSY_HANDLER(WRITELINE(*this, vtech_printer_interface_device, busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("latch", "centronics")
MACHINE_CONFIG_END
diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp
index a7289604dda..ad8504c5d0c 100644
--- a/src/devices/bus/vtech/memexp/rs232.cpp
+++ b/src/devices/bus/vtech/memexp/rs232.cpp
@@ -35,8 +35,8 @@ const tiny_rom_entry *vtech_rs232_interface_device::device_rom_region() const
//-------------------------------------------------
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))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, vtech_rs232_interface_device, rs232_rx_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index c7709ee97a9..630301ca2d9 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -128,7 +128,7 @@ MACHINE_CONFIG_START(wangpc_lvc_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(wangpc_lvc_device, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(wangpc_lvc_device, vsync_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, wangpc_lvc_device, vsync_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index c2a5b1af0dc..344fa6f9ab8 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -148,7 +148,7 @@ MACHINE_CONFIG_START(wangpc_mvc_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(wangpc_mvc_device, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(wangpc_mvc_device, vsync_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, wangpc_mvc_device, vsync_w))
MACHINE_CONFIG_END
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index 6fb20379250..794510e142b 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -106,10 +106,10 @@ static const z80_daisy_config wangpc_rtc_daisy_chain[] =
//-------------------------------------------------
MACHINE_CONFIG_START(wangpc_rtc_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, 2000000)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 2000000)
MCFG_Z80_DAISY_CHAIN(wangpc_rtc_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(wangpc_rtc_mem)
- MCFG_CPU_IO_MAP(wangpc_rtc_io)
+ MCFG_DEVICE_PROGRAM_MAP(wangpc_rtc_mem)
+ MCFG_DEVICE_IO_MAP(wangpc_rtc_io)
MCFG_DEVICE_ADD(AM9517A_TAG, AM9517A, 2000000)
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index 9408b8d07f2..bbe838d07a1 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -93,10 +93,10 @@ void wangpc_wdc_device::wangpc_wdc_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(wangpc_wdc_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL(10'000'000) / ?
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 2000000) // XTAL(10'000'000) / ?
//MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(wangpc_wdc_mem)
- MCFG_CPU_IO_MAP(wangpc_wdc_io)
+ MCFG_DEVICE_PROGRAM_MAP(wangpc_wdc_mem)
+ MCFG_DEVICE_IO_MAP(wangpc_wdc_io)
MCFG_DEVICE_ADD(MK3882_TAG, Z80CTC, 2000000)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
diff --git a/src/devices/bus/x68k/x68k_midi.cpp b/src/devices/bus/x68k/x68k_midi.cpp
index 91bb5713715..be26ef9f1df 100644
--- a/src/devices/bus/x68k/x68k_midi.cpp
+++ b/src/devices/bus/x68k/x68k_midi.cpp
@@ -19,8 +19,8 @@ DEFINE_DEVICE_TYPE(X68K_MIDI, x68k_midi_device, "x68k_midi", "X68000 MIDI Interf
MACHINE_CONFIG_START(x68k_midi_device::device_add_mconfig)
MCFG_DEVICE_ADD("midi", YM3802, XTAL(1'000'000)) // clock is unknown
- MCFG_YM3802_TXD_HANDLER(DEVWRITELINE("mdout",midi_port_device,write_txd))
- MCFG_YM3802_IRQ_HANDLER(WRITELINE(x68k_midi_device,irq_w))
+ MCFG_YM3802_TXD_HANDLER(WRITELINE("mdout",midi_port_device,write_txd))
+ MCFG_YM3802_IRQ_HANDLER(WRITELINE(*this, x68k_midi_device,irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
// MCFG_MIDI_PORT_ADD("mdthru", midiout_slot, "midiout")
diff --git a/src/devices/bus/x68k/x68k_neptunex.cpp b/src/devices/bus/x68k/x68k_neptunex.cpp
index 6e72a3908a4..4c77c32061c 100644
--- a/src/devices/bus/x68k/x68k_neptunex.cpp
+++ b/src/devices/bus/x68k/x68k_neptunex.cpp
@@ -19,9 +19,9 @@ DEFINE_DEVICE_TYPE(X68K_NEPTUNEX, x68k_neptune_device, "x68k_neptunex", "Neptune
// device machine config
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))
- MCFG_DP8390D_MEM_WRITE_CB(WRITE8(x68k_neptune_device, x68k_neptune_mem_write))
+ MCFG_DP8390D_IRQ_CB(WRITELINE(*this, x68k_neptune_device, x68k_neptune_irq_w))
+ MCFG_DP8390D_MEM_READ_CB(READ8(*this, x68k_neptune_device, x68k_neptune_mem_read))
+ MCFG_DP8390D_MEM_WRITE_CB(WRITE8(*this, x68k_neptune_device, x68k_neptune_mem_write))
MACHINE_CONFIG_END
x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/x68k/x68k_scsiext.cpp b/src/devices/bus/x68k/x68k_scsiext.cpp
index 464bf40bfbe..1ab4c275153 100644
--- a/src/devices/bus/x68k/x68k_scsiext.cpp
+++ b/src/devices/bus/x68k/x68k_scsiext.cpp
@@ -49,8 +49,8 @@ MACHINE_CONFIG_START(x68k_scsiext_device::device_add_mconfig)
MCFG_DEVICE_ADD("mb89352", MB89352A, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_MB89352A_IRQ_CB(WRITELINE(x68k_scsiext_device, irq_w))
- MCFG_MB89352A_DRQ_CB(WRITELINE(x68k_scsiext_device, drq_w))
+ MCFG_MB89352A_IRQ_CB(WRITELINE(*this, x68k_scsiext_device, irq_w))
+ MCFG_MB89352A_DRQ_CB(WRITELINE(*this, x68k_scsiext_device, drq_w))
MACHINE_CONFIG_END
x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index df577224e78..c99fe209aba 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -210,9 +210,9 @@ void i8089_device::state_string_export(const device_state_entry &entry, std::str
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_SINTR(WRITELINE(*this, i8089_device, ch1_sintr_w))
MCFG_I8089_CHANNEL_ADD("2")
- MCFG_I8089_CHANNEL_SINTR(WRITELINE(i8089_device, ch2_sintr_w))
+ MCFG_I8089_CHANNEL_SINTR(WRITELINE(*this, i8089_device, ch2_sintr_w))
MACHINE_CONFIG_END
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index 4990073114b..9eaa635f63f 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -88,9 +88,9 @@ READ8_MEMBER(n2a03_device::apu_read_mem)
}
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))
+ MCFG_DEVICE_ADD("nesapu", NES_APU, DERIVED_CLOCK(1,1) )
+ MCFG_NES_APU_IRQ_HANDLER(WRITELINE(*this, n2a03_device, apu_irq))
+ MCFG_NES_APU_MEM_READ_CALLBACK(READ8(*this, n2a03_device, apu_read_mem))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 0.50)
diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp
index be40fa3d946..cd26e6e774d 100644
--- a/src/devices/cpu/nec/v53.cpp
+++ b/src/devices/cpu/nec/v53.cpp
@@ -492,45 +492,45 @@ MACHINE_CONFIG_START(v53_base_device::device_add_mconfig)
MCFG_PIT8253_CLK0(16000000) // manual implicitly claims that these runs at same speed as the CPU
MCFG_PIT8253_CLK1(16000000)
MCFG_PIT8253_CLK2(16000000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE( v53_base_device, tcu_out0_trampoline_cb ))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE( v53_base_device, tcu_out1_trampoline_cb ))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE( v53_base_device, tcu_out2_trampoline_cb ))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE( *this, v53_base_device, tcu_out0_trampoline_cb ))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE( *this, v53_base_device, tcu_out1_trampoline_cb ))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE( *this, v53_base_device, tcu_out2_trampoline_cb ))
MCFG_DEVICE_ADD("upd71071dma", V53_DMAU, 4000000)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(v53_base_device, hreq_trampoline_cb))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(v53_base_device, eop_trampoline_cb))
- MCFG_AM9517A_IN_MEMR_CB(READ8(v53_base_device, dma_memr_trampoline_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(v53_base_device, dma_memw_trampoline_w))
- MCFG_AM9517A_IN_IOR_0_CB(READ8(v53_base_device, dma_io_0_trampoline_r))
- MCFG_AM9517A_IN_IOR_1_CB(READ8(v53_base_device, dma_io_1_trampoline_r))
- MCFG_AM9517A_IN_IOR_2_CB(READ8(v53_base_device, dma_io_2_trampoline_r))
- MCFG_AM9517A_IN_IOR_3_CB(READ8(v53_base_device, dma_io_3_trampoline_r))
- MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(v53_base_device, dma_io_0_trampoline_w))
- MCFG_AM9517A_OUT_IOW_1_CB(WRITE8(v53_base_device, dma_io_1_trampoline_w))
- MCFG_AM9517A_OUT_IOW_2_CB(WRITE8(v53_base_device, dma_io_2_trampoline_w))
- MCFG_AM9517A_OUT_IOW_3_CB(WRITE8(v53_base_device, dma_io_3_trampoline_w))
- MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(v53_base_device, dma_dack0_trampoline_w))
- MCFG_AM9517A_OUT_DACK_1_CB(WRITELINE(v53_base_device, dma_dack1_trampoline_w))
- MCFG_AM9517A_OUT_DACK_2_CB(WRITELINE(v53_base_device, dma_dack2_trampoline_w))
- MCFG_AM9517A_OUT_DACK_3_CB(WRITELINE(v53_base_device, dma_dack3_trampoline_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, v53_base_device, hreq_trampoline_cb))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, v53_base_device, eop_trampoline_cb))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, v53_base_device, dma_memr_trampoline_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, v53_base_device, dma_memw_trampoline_w))
+ MCFG_AM9517A_IN_IOR_0_CB(READ8(*this, v53_base_device, dma_io_0_trampoline_r))
+ MCFG_AM9517A_IN_IOR_1_CB(READ8(*this, v53_base_device, dma_io_1_trampoline_r))
+ MCFG_AM9517A_IN_IOR_2_CB(READ8(*this, v53_base_device, dma_io_2_trampoline_r))
+ MCFG_AM9517A_IN_IOR_3_CB(READ8(*this, v53_base_device, dma_io_3_trampoline_r))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(*this, v53_base_device, dma_io_0_trampoline_w))
+ MCFG_AM9517A_OUT_IOW_1_CB(WRITE8(*this, v53_base_device, dma_io_1_trampoline_w))
+ MCFG_AM9517A_OUT_IOW_2_CB(WRITE8(*this, v53_base_device, dma_io_2_trampoline_w))
+ MCFG_AM9517A_OUT_IOW_3_CB(WRITE8(*this, v53_base_device, dma_io_3_trampoline_w))
+ MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(*this, v53_base_device, dma_dack0_trampoline_w))
+ MCFG_AM9517A_OUT_DACK_1_CB(WRITELINE(*this, v53_base_device, dma_dack1_trampoline_w))
+ MCFG_AM9517A_OUT_DACK_2_CB(WRITELINE(*this, v53_base_device, dma_dack2_trampoline_w))
+ MCFG_AM9517A_OUT_DACK_3_CB(WRITELINE(*this, v53_base_device, dma_dack3_trampoline_w))
MCFG_DEVICE_ADD("upd71059pic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(v53_base_device, internal_irq_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, v53_base_device, internal_irq_w))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(v53_base_device, get_pic_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, v53_base_device, get_pic_ack))
MCFG_DEVICE_ADD("v53scu", V53_SCU, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(v53_base_device, scu_txd_trampoline_cb))
- MCFG_I8251_DTR_HANDLER(WRITELINE(v53_base_device, scu_dtr_trampoline_cb))
- MCFG_I8251_RTS_HANDLER(WRITELINE(v53_base_device, scu_rts_trampoline_cb))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(v53_base_device,scu_rxrdy_trampoline_cb))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(v53_base_device,scu_txrdy_trampoline_cb))
- MCFG_I8251_TXEMPTY_HANDLER(WRITELINE(v53_base_device, scu_txempty_trampoline_cb))
- MCFG_I8251_SYNDET_HANDLER(WRITELINE(v53_base_device, scu_syndet_trampoline_cb))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, v53_base_device, scu_txd_trampoline_cb))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(*this, v53_base_device, scu_dtr_trampoline_cb))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(*this, v53_base_device, scu_rts_trampoline_cb))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, v53_base_device,scu_rxrdy_trampoline_cb))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, v53_base_device,scu_txrdy_trampoline_cb))
+ MCFG_I8251_TXEMPTY_HANDLER(WRITELINE(*this, v53_base_device, scu_txempty_trampoline_cb))
+ MCFG_I8251_SYNDET_HANDLER(WRITELINE(*this, v53_base_device, scu_syndet_trampoline_cb))
MACHINE_CONFIG_END
diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp
index bef58c4c856..534eb5c07f2 100644
--- a/src/devices/cpu/psx/psx.cpp
+++ b/src/devices/cpu/psx/psx.cpp
@@ -3433,22 +3433,22 @@ MACHINE_CONFIG_START(psxcpu_device::device_add_mconfig)
MCFG_PSX_IRQ_HANDLER( INPUTLINE( DEVICE_SELF, PSXCPU_IRQ0 ) )
MCFG_DEVICE_ADD( "dma", PSX_DMA, 0 )
- MCFG_PSX_DMA_IRQ_HANDLER( DEVWRITELINE("irq", psxirq_device, intin3 ) )
+ MCFG_PSX_DMA_IRQ_HANDLER( WRITELINE("irq", psxirq_device, intin3 ) )
MCFG_DEVICE_ADD( "mdec", PSX_MDEC, 0 )
MCFG_PSX_DMA_CHANNEL_WRITE( DEVICE_SELF, 0, psxdma_device::write_delegate(&psxmdec_device::dma_write, (psxmdec_device *) device ) )
MCFG_PSX_DMA_CHANNEL_READ( DEVICE_SELF, 1, psxdma_device::read_delegate(&psxmdec_device::dma_read, (psxmdec_device *) device ) )
MCFG_DEVICE_ADD( "rcnt", PSX_RCNT, 0 )
- MCFG_PSX_RCNT_IRQ0_HANDLER( DEVWRITELINE( "irq", psxirq_device, intin4 ) )
- MCFG_PSX_RCNT_IRQ1_HANDLER( DEVWRITELINE( "irq", psxirq_device, intin5 ) )
- MCFG_PSX_RCNT_IRQ2_HANDLER( DEVWRITELINE( "irq", psxirq_device, intin6 ) )
+ MCFG_PSX_RCNT_IRQ0_HANDLER( WRITELINE( "irq", psxirq_device, intin4 ) )
+ MCFG_PSX_RCNT_IRQ1_HANDLER( WRITELINE( "irq", psxirq_device, intin5 ) )
+ MCFG_PSX_RCNT_IRQ2_HANDLER( WRITELINE( "irq", psxirq_device, intin6 ) )
MCFG_DEVICE_ADD( "sio0", PSX_SIO0, 0 )
- MCFG_PSX_SIO_IRQ_HANDLER( DEVWRITELINE( "irq", psxirq_device, intin7 ) )
+ MCFG_PSX_SIO_IRQ_HANDLER( WRITELINE( "irq", psxirq_device, intin7 ) )
MCFG_DEVICE_ADD( "sio1", PSX_SIO1, 0 )
- MCFG_PSX_SIO_IRQ_HANDLER( DEVWRITELINE( "irq", psxirq_device, intin8 ) )
+ MCFG_PSX_SIO_IRQ_HANDLER( WRITELINE( "irq", psxirq_device, intin8 ) )
MCFG_RAM_ADD( "ram" )
MCFG_RAM_DEFAULT_VALUE( 0x00 )
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index 12625413f9e..ee4fe94ad66 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -121,7 +121,7 @@ void tmpz84c011_device::device_reset()
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))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(tmpz84c011_device, zc1_cb_trampoline_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(tmpz84c011_device, zc2_cb_trampoline_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, tmpz84c011_device, zc0_cb_trampoline_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, tmpz84c011_device, zc1_cb_trampoline_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, tmpz84c011_device, zc2_cb_trampoline_w))
MACHINE_CONFIG_END
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index e5bc6e68a5b..8f5e3b6b716 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -186,38 +186,38 @@ MACHINE_CONFIG_START(tmpz84c015_device::device_add_mconfig)
MCFG_DEVICE_ADD("tmpz84c015_sio", Z80SIO0, DERIVED_CLOCK(1,1))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0))
- MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(tmpz84c015_device, out_txda_cb_trampoline_w))
- MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(tmpz84c015_device, out_dtra_cb_trampoline_w))
- MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(tmpz84c015_device, out_rtsa_cb_trampoline_w))
- MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(tmpz84c015_device, out_wrdya_cb_trampoline_w))
- MCFG_Z80DART_OUT_SYNCA_CB(WRITELINE(tmpz84c015_device, out_synca_cb_trampoline_w))
-
- MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(tmpz84c015_device, out_txdb_cb_trampoline_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(tmpz84c015_device, out_dtrb_cb_trampoline_w))
- MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(tmpz84c015_device, out_rtsb_cb_trampoline_w))
- MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(tmpz84c015_device, out_wrdyb_cb_trampoline_w))
- MCFG_Z80DART_OUT_SYNCB_CB(WRITELINE(tmpz84c015_device, out_syncb_cb_trampoline_w))
-
- MCFG_Z80DART_OUT_RXDRQA_CB(WRITELINE(tmpz84c015_device, out_rxdrqa_cb_trampoline_w))
- MCFG_Z80DART_OUT_TXDRQA_CB(WRITELINE(tmpz84c015_device, out_txdrqa_cb_trampoline_w))
- MCFG_Z80DART_OUT_RXDRQB_CB(WRITELINE(tmpz84c015_device, out_rxdrqb_cb_trampoline_w))
- MCFG_Z80DART_OUT_TXDRQB_CB(WRITELINE(tmpz84c015_device, out_txdrqb_cb_trampoline_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(*this, tmpz84c015_device, out_txda_cb_trampoline_w))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(*this, tmpz84c015_device, out_dtra_cb_trampoline_w))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(*this, tmpz84c015_device, out_rtsa_cb_trampoline_w))
+ MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(*this, tmpz84c015_device, out_wrdya_cb_trampoline_w))
+ MCFG_Z80DART_OUT_SYNCA_CB(WRITELINE(*this, tmpz84c015_device, out_synca_cb_trampoline_w))
+
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(*this, tmpz84c015_device, out_txdb_cb_trampoline_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, tmpz84c015_device, out_dtrb_cb_trampoline_w))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(*this, tmpz84c015_device, out_rtsb_cb_trampoline_w))
+ MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(*this, tmpz84c015_device, out_wrdyb_cb_trampoline_w))
+ MCFG_Z80DART_OUT_SYNCB_CB(WRITELINE(*this, tmpz84c015_device, out_syncb_cb_trampoline_w))
+
+ MCFG_Z80DART_OUT_RXDRQA_CB(WRITELINE(*this, tmpz84c015_device, out_rxdrqa_cb_trampoline_w))
+ MCFG_Z80DART_OUT_TXDRQA_CB(WRITELINE(*this, tmpz84c015_device, out_txdrqa_cb_trampoline_w))
+ MCFG_Z80DART_OUT_RXDRQB_CB(WRITELINE(*this, tmpz84c015_device, out_rxdrqb_cb_trampoline_w))
+ MCFG_Z80DART_OUT_TXDRQB_CB(WRITELINE(*this, tmpz84c015_device, out_txdrqb_cb_trampoline_w))
MCFG_DEVICE_ADD("tmpz84c015_ctc", Z80CTC, DERIVED_CLOCK(1,1) )
MCFG_Z80CTC_INTR_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(tmpz84c015_device, zc0_cb_trampoline_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(tmpz84c015_device, zc1_cb_trampoline_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(tmpz84c015_device, zc2_cb_trampoline_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, tmpz84c015_device, zc0_cb_trampoline_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, tmpz84c015_device, zc1_cb_trampoline_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, tmpz84c015_device, zc2_cb_trampoline_w))
MCFG_DEVICE_ADD("tmpz84c015_pio", Z80PIO, DERIVED_CLOCK(1,1) )
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(DEVICE_SELF, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(tmpz84c015_device, in_pa_cb_trampoline_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(tmpz84c015_device, out_pa_cb_trampoline_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(tmpz84c015_device, out_ardy_cb_trampoline_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, tmpz84c015_device, in_pa_cb_trampoline_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, tmpz84c015_device, out_pa_cb_trampoline_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, tmpz84c015_device, out_ardy_cb_trampoline_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(tmpz84c015_device, in_pb_cb_trampoline_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(tmpz84c015_device, out_pb_cb_trampoline_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(tmpz84c015_device, out_brdy_cb_trampoline_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, tmpz84c015_device, in_pb_cb_trampoline_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, tmpz84c015_device, out_pb_cb_trampoline_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, tmpz84c015_device, out_brdy_cb_trampoline_w))
MACHINE_CONFIG_END
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp
index 172b268330a..61d811591b1 100644
--- a/src/devices/imagedev/floppy.cpp
+++ b/src/devices/imagedev/floppy.cpp
@@ -1363,7 +1363,7 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
MACHINE_CONFIG_START(floppy_image_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO(FLOPSPK)
- MCFG_SOUND_ADD(FLOPSND_TAG, FLOPPYSOUND, 44100)
+ MCFG_DEVICE_ADD(FLOPSND_TAG, FLOPPYSOUND, 44100)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, FLOPSPK, 0.5)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp
index b173fe4e232..6b1cd85837c 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -42,11 +42,11 @@ void m68307_cpu_device::m68307_internal_map(address_map &map)
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))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(m68307_cpu_device, m68307_duart_txb))
- MCFG_MC68681_INPORT_CALLBACK(READ8(m68307_cpu_device, m68307_duart_input_r))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(m68307_cpu_device, m68307_duart_output_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, m68307_cpu_device, m68307_duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, m68307_cpu_device, m68307_duart_txa))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, m68307_cpu_device, m68307_duart_txb))
+ MCFG_MC68681_INPORT_CALLBACK(READ8(*this, m68307_cpu_device, m68307_duart_input_r))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, m68307_cpu_device, m68307_duart_output_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp
index 0dba3c2f714..c4dad1ad015 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -121,7 +121,7 @@ void m68340_cpu_device::m68340_internal_map(address_map &map)
//-------------------------------------------------
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_MC68340SER_IRQ_CALLBACK(WRITELINE("serial", mc68340_serial_module_device, irq_w))
MCFG_DEVICE_ADD("timer1", MC68340_TIMER_MODULE, 0)
MCFG_DEVICE_ADD("timer2", MC68340_TIMER_MODULE, 0)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index 41001422ad6..44927c1433c 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -209,7 +209,7 @@ kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag,
}
MACHINE_CONFIG_START(kbdc8042_device::device_add_mconfig)
- MCFG_AT_KEYB_ADD("at_keyboard", 1, WRITELINE(kbdc8042_device, keyboard_w))
+ MCFG_AT_KEYB_ADD("at_keyboard", 1, WRITELINE(*this, kbdc8042_device, keyboard_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/at_keybc.cpp b/src/devices/machine/at_keybc.cpp
index e8d8d2b1b9e..1c98e8cd43b 100644
--- a/src/devices/machine/at_keybc.cpp
+++ b/src/devices/machine/at_keybc.cpp
@@ -79,12 +79,12 @@ ioport_constructor at_keyboard_controller_device::device_input_ports() const
//-------------------------------------------------
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))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(at_keyboard_controller_device, p1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(at_keyboard_controller_device, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(at_keyboard_controller_device, p2_w))
+ MCFG_DEVICE_ADD("at_keybc", I8042, DERIVED_CLOCK(1,1))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, at_keyboard_controller_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, at_keyboard_controller_device, t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, at_keyboard_controller_device, p1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, at_keyboard_controller_device, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, at_keyboard_controller_device, p2_w))
MACHINE_CONFIG_END
/*-------------------------------------------------
diff --git a/src/devices/machine/ataintf.cpp b/src/devices/machine/ataintf.cpp
index 972dadd94d3..8cf2d77228c 100644
--- a/src/devices/machine/ataintf.cpp
+++ b/src/devices/machine/ataintf.cpp
@@ -251,17 +251,17 @@ void abstract_ata_interface_device::device_start()
{
if (i == 0)
{
- dev->m_irq_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, irq0_write_line));
- dev->m_dmarq_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, dmarq0_write_line));
- dev->m_dasp_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, dasp0_write_line));
- dev->m_pdiag_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, pdiag0_write_line));
+ dev->m_irq_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, irq0_write_line));
+ dev->m_dmarq_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, dmarq0_write_line));
+ dev->m_dasp_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, dasp0_write_line));
+ dev->m_pdiag_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, pdiag0_write_line));
}
else
{
- dev->m_irq_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, irq1_write_line));
- dev->m_dmarq_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, dmarq1_write_line));
- dev->m_dasp_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, dasp1_write_line));
- dev->m_pdiag_handler.set_callback(DEVCB_DEVWRITELINE(*this, abstract_ata_interface_device, pdiag1_write_line));
+ dev->m_irq_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, irq1_write_line));
+ dev->m_dmarq_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, dmarq1_write_line));
+ dev->m_dasp_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, dasp1_write_line));
+ dev->m_pdiag_handler.set_callback(DEVCB_WRITELINE(*this, abstract_ata_interface_device, pdiag1_write_line));
}
dev->write_csel(i);
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp
index 81799b89ff3..c13b6ff001e 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -33,7 +33,7 @@ atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig
MACHINE_CONFIG_START(atapi_cdrom_device::device_add_mconfig)
MCFG_CDROM_ADD("image")
MCFG_CDROM_INTERFACE("cdrom")
- MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
MACHINE_CONFIG_END
void atapi_cdrom_device::device_start()
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index 820de5f9793..066f08575ac 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(CR511B, cr511b_device, "cr511b", "CR-511-B CD-ROM drive")
MACHINE_CONFIG_START(cr511b_device::device_add_mconfig)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("cdrom")
- MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
MCFG_SOUND_ROUTE(0, ":lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, ":rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp
index 6d69229b50e..a6fd49a4b08 100644
--- a/src/devices/machine/cs4031.cpp
+++ b/src/devices/machine/cs4031.cpp
@@ -98,56 +98,56 @@ const float cs4031_device::m_dma_clock_divider[] =
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))
- MCFG_I8237_IN_MEMR_CB(READ8(cs4031_device, dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(cs4031_device, dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(cs4031_device, dma1_ior0_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(cs4031_device, dma1_ior1_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(cs4031_device, dma1_ior2_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(cs4031_device, dma1_ior3_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(cs4031_device, dma1_iow0_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(cs4031_device, dma1_iow1_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(cs4031_device, dma1_iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(cs4031_device, dma1_iow3_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(cs4031_device, dma1_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(cs4031_device, dma1_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(cs4031_device, dma1_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(cs4031_device, dma1_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma2", am9517a_device, dreq0_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, cs4031_device, dma1_eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, cs4031_device, dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, cs4031_device, dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, cs4031_device, dma1_ior0_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, cs4031_device, dma1_ior1_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, cs4031_device, dma1_ior2_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, cs4031_device, dma1_ior3_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, cs4031_device, dma1_iow0_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, cs4031_device, dma1_iow1_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, cs4031_device, dma1_iow2_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, cs4031_device, dma1_iow3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, cs4031_device, dma1_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, cs4031_device, dma1_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, cs4031_device, dma1_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, cs4031_device, dma1_dack3_w))
MCFG_DEVICE_ADD("dma2", AM9517A, 0)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(cs4031_device, dma2_hreq_w))
- MCFG_I8237_IN_MEMR_CB(READ8(cs4031_device, dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(cs4031_device, dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(cs4031_device, dma2_ior1_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(cs4031_device, dma2_ior2_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(cs4031_device, dma2_ior3_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(cs4031_device, dma2_iow1_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(cs4031_device, dma2_iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(cs4031_device, dma2_iow3_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(cs4031_device, dma2_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(cs4031_device, dma2_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(cs4031_device, dma2_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(cs4031_device, dma2_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, cs4031_device, dma2_hreq_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, cs4031_device, dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, cs4031_device, dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, cs4031_device, dma2_ior1_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, cs4031_device, dma2_ior2_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, cs4031_device, dma2_ior3_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, cs4031_device, dma2_iow1_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, cs4031_device, dma2_iow2_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, cs4031_device, dma2_iow3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, cs4031_device, dma2_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, cs4031_device, dma2_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, cs4031_device, dma2_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, cs4031_device, dma2_dack3_w))
MCFG_DEVICE_ADD("intc1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(cs4031_device, intc1_int_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, cs4031_device, intc1_int_w))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(cs4031_device, intc1_slave_ack_r))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, cs4031_device, intc1_slave_ack_r))
MCFG_DEVICE_ADD("intc2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("intc1", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("intc1", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("ctc", PIT8254, 0)
MCFG_PIT8253_CLK0(XTAL(14'318'181) / 12.0)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("intc1", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("intc1", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(14'318'181) / 12.0)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(cs4031_device, ctc_out1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, cs4031_device, ctc_out1_w))
MCFG_PIT8253_CLK2(XTAL(14'318'181) / 12.0)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(cs4031_device, ctc_out2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, cs4031_device, ctc_out2_w))
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(cs4031_device, rtc_irq_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, cs4031_device, rtc_irq_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp
index 9ddd01fd8d1..321504e66dd 100644
--- a/src/devices/machine/fdc37c93x.cpp
+++ b/src/devices/machine/fdc37c93x.cpp
@@ -235,23 +235,23 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(fdc37c93x_device::device_add_mconfig)
// floppy disc controller
MCFG_SMC37C78_ADD("fdc")
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(fdc37c93x_device, irq_floppy_w))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(fdc37c93x_device, drq_floppy_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, fdc37c93x_device, irq_floppy_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, fdc37c93x_device, drq_floppy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pc_hd_floppies, "35hd", fdc37c93x_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pc_hd_floppies, "35hd", fdc37c93x_device::floppy_formats)
// parallel port
MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(fdc37c93x_device, irq_parallel_w))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, fdc37c93x_device, irq_parallel_w))
// RTC
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(fdc37c93x_device, irq_rtc_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, fdc37c93x_device, irq_rtc_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
// keyboard
MCFG_DEVICE_ADD("pc_kbdc", KBDC8042, 0)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_PS2)
- MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(fdc37c93x_device, irq_keyboard_w))
- MCFG_KBDC8042_SYSTEM_RESET_CB(WRITELINE(fdc37c93x_device, kbdp20_gp20_reset_w))
- MCFG_KBDC8042_GATE_A20_CB(WRITELINE(fdc37c93x_device, kbdp21_gp25_gatea20_w))
+ MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(*this, fdc37c93x_device, irq_keyboard_w))
+ MCFG_KBDC8042_SYSTEM_RESET_CB(WRITELINE(*this, fdc37c93x_device, kbdp20_gp20_reset_w))
+ MCFG_KBDC8042_GATE_A20_CB(WRITELINE(*this, fdc37c93x_device, kbdp21_gp25_gatea20_w))
MACHINE_CONFIG_END
WRITE_LINE_MEMBER(fdc37c93x_device::irq_floppy_w)
diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp
index 132656b287e..659fdf0d1ec 100644
--- a/src/devices/machine/genpc.cpp
+++ b/src/devices/machine/genpc.cpp
@@ -408,56 +408,56 @@ DEFINE_DEVICE_TYPE(IBM5160_MOTHERBOARD, ibm5160_mb_device, "ibm5160_mb", "IBM 51
MACHINE_CONFIG_START(ibm5160_mb_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(14'318'181)/12.0) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(14'318'181)/12.0) /* dram refresh */
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, ibm5160_mb_device, pc_pit8253_out1_changed))
MCFG_PIT8253_CLK2(XTAL(14'318'181)/12.0) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ibm5160_mb_device, pc_pit8253_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ibm5160_mb_device, pc_pit8253_out2_changed))
MCFG_DEVICE_ADD( "dma8237", AM9517A, XTAL(14'318'181)/3.0 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(ibm5160_mb_device, pc_dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(ibm5160_mb_device, pc_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(ibm5160_mb_device, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(ibm5160_mb_device, pc_dma_write_byte))
- MCFG_I8237_IN_IOR_1_CB(READ8(ibm5160_mb_device, pc_dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(ibm5160_mb_device, pc_dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(ibm5160_mb_device, pc_dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(ibm5160_mb_device, pc_dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(ibm5160_mb_device, pc_dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(ibm5160_mb_device, pc_dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(ibm5160_mb_device, pc_dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(ibm5160_mb_device, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(ibm5160_mb_device, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(ibm5160_mb_device, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(ibm5160_mb_device, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, ibm5160_mb_device, pc_dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, ibm5160_mb_device, pc_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, ibm5160_mb_device, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, ibm5160_mb_device, pc_dma_write_byte))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, ibm5160_mb_device, pc_dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, ibm5160_mb_device, pc_dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, ibm5160_mb_device, pc_dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, ibm5160_mb_device, pc_dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, ibm5160_mb_device, pc_dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, ibm5160_mb_device, pc_dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, ibm5160_mb_device, pc_dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, ibm5160_mb_device, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, ibm5160_mb_device, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, ibm5160_mb_device, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, ibm5160_mb_device, pc_dack3_w))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(ibm5160_mb_device, pic_int_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, ibm5160_mb_device, pic_int_w))
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ibm5160_mb_device, pc_ppi_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ibm5160_mb_device, pc_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(ibm5160_mb_device, pc_ppi_portc_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ibm5160_mb_device, pc_ppi_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ibm5160_mb_device, pc_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ibm5160_mb_device, pc_ppi_portc_r))
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU(":maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237", am9517a_device, dreq3_w))
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237", am9517a_device, dreq3_w))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(ibm5160_mb_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(ibm5160_mb_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, ibm5160_mb_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, ibm5160_mb_device, keyboard_data_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -595,11 +595,11 @@ MACHINE_CONFIG_START(ibm5150_mb_device::device_add_mconfig)
ibm5160_mb_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("pc_kbdc")
- MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(ibm5150_mb_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, ibm5150_mb_device, keyboard_clock_w))
MCFG_DEVICE_MODIFY("ppi8255")
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ibm5150_mb_device, pc_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(ibm5150_mb_device, pc_ppi_portc_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ibm5150_mb_device, pc_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ibm5150_mb_device, pc_ppi_portc_r))
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
@@ -773,11 +773,11 @@ MACHINE_CONFIG_START(ec1841_mb_device::device_add_mconfig)
ibm5160_mb_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("ppi8255")
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ec1841_mb_device, pc_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(ec1841_mb_device, pc_ppi_portc_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ec1841_mb_device, pc_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ec1841_mb_device, pc_ppi_portc_r))
MCFG_DEVICE_MODIFY("pc_kbdc")
- MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(ec1841_mb_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, ec1841_mb_device, keyboard_clock_w))
MACHINE_CONFIG_END
static INPUT_PORTS_START( ec1841_mb )
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index 880c2c2d50c..de25b2dec6b 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -102,15 +102,15 @@ const tiny_rom_entry *i80130_device::device_rom_region() const
MACHINE_CONFIG_START(i80130_device::device_add_mconfig)
MCFG_DEVICE_ADD("pic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(i80130_device, irq_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, i80130_device, irq_w))
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(0)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i80130_device, systick_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, i80130_device, systick_w))
MCFG_PIT8253_CLK1(0)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(i80130_device, delay_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, i80130_device, delay_w))
MCFG_PIT8253_CLK2(0)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(i80130_device, baud_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, i80130_device, baud_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp
index cc83b093f68..f4ae29930d7 100644
--- a/src/devices/machine/i82371sb.cpp
+++ b/src/devices/machine/i82371sb.cpp
@@ -61,102 +61,102 @@ void i82371sb_isa_device::internal_io_map(address_map &map)
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))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, i82371sb_isa_device, at_pit8254_out0_changed))
MCFG_PIT8253_CLK1(4772720/4) /* dram refresh */
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(i82371sb_isa_device, at_pit8254_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, i82371sb_isa_device, at_pit8254_out1_changed))
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(i82371sb_isa_device, at_pit8254_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, i82371sb_isa_device, at_pit8254_out2_changed))
MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(i82371sb_isa_device, at_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(i82371sb_isa_device, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(i82371sb_isa_device, pc_dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(i82371sb_isa_device, pc_dma8237_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(i82371sb_isa_device, pc_dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(i82371sb_isa_device, pc_dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(i82371sb_isa_device, pc_dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(i82371sb_isa_device, pc_dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(i82371sb_isa_device, pc_dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(i82371sb_isa_device, pc_dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(i82371sb_isa_device, pc_dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(i82371sb_isa_device, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(i82371sb_isa_device, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(i82371sb_isa_device, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(i82371sb_isa_device, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma8237_2", am9517a_device, dreq0_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, i82371sb_isa_device, at_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, i82371sb_isa_device, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, i82371sb_isa_device, pc_dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack3_w))
MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(i82371sb_isa_device, pc_dma_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(i82371sb_isa_device, pc_dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(i82371sb_isa_device, pc_dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(i82371sb_isa_device, pc_dma8237_5_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(i82371sb_isa_device, pc_dma8237_6_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(i82371sb_isa_device, pc_dma8237_7_dack_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(i82371sb_isa_device, pc_dma8237_5_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(i82371sb_isa_device, pc_dma8237_6_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(i82371sb_isa_device, pc_dma8237_7_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(i82371sb_isa_device, pc_dack4_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(i82371sb_isa_device, pc_dack5_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(i82371sb_isa_device, pc_dack6_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(i82371sb_isa_device, pc_dack7_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, i82371sb_isa_device, pc_dma_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, i82371sb_isa_device, pc_dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, i82371sb_isa_device, pc_dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_5_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_6_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, i82371sb_isa_device, pc_dma8237_7_dack_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_5_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_6_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, i82371sb_isa_device, pc_dma8237_7_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack4_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack5_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack6_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, i82371sb_isa_device, pc_dack7_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(":maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(i82371sb_isa_device, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, i82371sb_isa_device, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
- MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("pic8259_master", pic8259_device, ir1_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(WRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(WRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
// MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, false)
-// MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir6_w))
+// MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir6_w))
// MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
//
// MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide2", ata_devices, "cdrom", nullptr, false)
-// MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir7_w))
+// MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir7_w))
// MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
//
// MCFG_DEVICE_ADD("isabus", ISA16, 0)
// MCFG_ISA16_CPU(":maincpu")
-// MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
-// MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir3_w))
-// MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir4_w))
-// MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir5_w))
-// MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir6_w))
-// MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
-// MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w))
-// MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir4_w))
-// MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir5_w))
-// MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir6_w))
-// MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir7_w))
-// MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq0_w))
-// MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
-// MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
-// MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
-// MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq1_w))
-// MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq2_w))
-// MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq3_w))
+// MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259_slave", pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
+// MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259_master", pic8259_device, ir3_w))
+// MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259_master", pic8259_device, ir4_w))
+// MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259_master", pic8259_device, ir5_w))
+// MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259_master", pic8259_device, ir6_w))
+// MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w))
+// MCFG_ISA_OUT_IRQ10_CB(WRITELINE("pic8259_slave", pic8259_device, ir3_w))
+// MCFG_ISA_OUT_IRQ11_CB(WRITELINE("pic8259_slave", pic8259_device, ir4_w))
+// MCFG_ISA_OUT_IRQ12_CB(WRITELINE("pic8259_slave", pic8259_device, ir5_w))
+// MCFG_ISA_OUT_IRQ14_CB(WRITELINE("pic8259_slave", pic8259_device, ir6_w))
+// MCFG_ISA_OUT_IRQ15_CB(WRITELINE("pic8259_slave", pic8259_device, ir7_w))
+// MCFG_ISA_OUT_DRQ0_CB(WRITELINE("dma8237_1", am9517a_device, dreq0_w))
+// MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237_1", am9517a_device, dreq1_w))
+// MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
+// MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237_1", am9517a_device, dreq3_w))
+// MCFG_ISA_OUT_DRQ5_CB(WRITELINE("dma8237_2", am9517a_device, dreq1_w))
+// MCFG_ISA_OUT_DRQ6_CB(WRITELINE("dma8237_2", am9517a_device, dreq2_w))
+// MCFG_ISA_OUT_DRQ7_CB(WRITELINE("dma8237_2", am9517a_device, dreq3_w))
// // on board devices
// MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa_onboard, "fdcsmc", true)
// MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa_onboard, "comat", true)
diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp
index 8449a72c53e..a0016e5655e 100644
--- a/src/devices/machine/ie15.cpp
+++ b/src/devices/machine/ie15.cpp
@@ -568,21 +568,21 @@ GFXDECODE_END
MACHINE_CONFIG_START(ie15_device::ie15core)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", IE15_CPU, XTAL(30'800'000)/10)
- MCFG_CPU_PROGRAM_MAP(ie15_mem)
- MCFG_CPU_IO_MAP(ie15_io)
+ MCFG_DEVICE_ADD("maincpu", IE15_CPU, XTAL(30'800'000)/10)
+ MCFG_DEVICE_PROGRAM_MAP(ie15_mem)
+ MCFG_DEVICE_IO_MAP(ie15_io)
MCFG_DEFAULT_LAYOUT(layout_ie15)
/* Devices */
MCFG_DEVICE_ADD("keyboard", IE15_KEYBOARD, 0)
- MCFG_IE15_KEYBOARD_CB(WRITE16(ie15_device, kbd_put))
+ MCFG_IE15_KEYBOARD_CB(WRITE16(*this, ie15_device, kbd_put))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(WRITELINE(ie15_device, serial_rx_callback))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, ie15_device, serial_rx_callback))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2400)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
index 7fa6e0f5a95..03e73f3ac05 100644
--- a/src/devices/machine/keyboard.cpp
+++ b/src/devices/machine/keyboard.cpp
@@ -12,7 +12,7 @@ Example of usage in a driver.
In MACHINE_CONFIG
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(xxx_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(WRITE8(*this, xxx_state, kbd_put))
In the code:
diff --git a/src/devices/machine/ldpr8210.cpp b/src/devices/machine/ldpr8210.cpp
index 76304a9b5d2..4767c840743 100644
--- a/src/devices/machine/ldpr8210.cpp
+++ b/src/devices/machine/ldpr8210.cpp
@@ -374,13 +374,13 @@ const tiny_rom_entry *pioneer_pr8210_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(pioneer_pr8210_device::device_add_mconfig)
- MCFG_CPU_ADD("pr8210", I8049, XTAL(4'410'000))
- MCFG_CPU_IO_MAP(pr8210_portmap)
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(pioneer_pr8210_device, i8049_bus_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pioneer_pr8210_device, i8049_port1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pioneer_pr8210_device, i8049_port2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(pioneer_pr8210_device, i8049_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(pioneer_pr8210_device, i8049_t1_r))
+ MCFG_DEVICE_ADD("pr8210", I8049, XTAL(4'410'000))
+ MCFG_DEVICE_IO_MAP(pr8210_portmap)
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, pioneer_pr8210_device, i8049_bus_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, pioneer_pr8210_device, i8049_port1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pioneer_pr8210_device, i8049_port2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, pioneer_pr8210_device, i8049_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, pioneer_pr8210_device, i8049_t1_r))
MACHINE_CONFIG_END
@@ -1002,11 +1002,11 @@ const tiny_rom_entry *simutrek_special_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(simutrek_special_device::device_add_mconfig)
- MCFG_CPU_ADD("simutrek", I8748, XTAL(6'000'000))
- MCFG_CPU_IO_MAP(simutrek_portmap)
- MCFG_MCS48_PORT_P2_IN_CB(READ8(simutrek_special_device, i8748_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(simutrek_special_device, i8748_port2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(simutrek_special_device, i8748_t0_r))
+ MCFG_DEVICE_ADD("simutrek", I8748, XTAL(6'000'000))
+ MCFG_DEVICE_IO_MAP(simutrek_portmap)
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, simutrek_special_device, i8748_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, simutrek_special_device, i8748_port2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, simutrek_special_device, i8748_t0_r))
pioneer_pr8210_device::device_add_mconfig(config);
MACHINE_CONFIG_END
diff --git a/src/devices/machine/ldv1000.cpp b/src/devices/machine/ldv1000.cpp
index 50da39d2303..ad53d21a099 100644
--- a/src/devices/machine/ldv1000.cpp
+++ b/src/devices/machine/ldv1000.cpp
@@ -273,24 +273,24 @@ const tiny_rom_entry *pioneer_ldv1000_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(pioneer_ldv1000_device::device_add_mconfig)
- MCFG_CPU_ADD("ldv1000", Z80, XTAL(5'000'000)/2)
+ MCFG_DEVICE_ADD("ldv1000", Z80, XTAL(5'000'000)/2)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(ldv1000_map)
- MCFG_CPU_IO_MAP(ldv1000_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(ldv1000_map)
+ MCFG_DEVICE_IO_MAP(ldv1000_portmap)
MCFG_DEVICE_ADD("ldvctc", Z80CTC, XTAL(5'000'000)/2)
- MCFG_Z80CTC_INTR_CB(WRITELINE(pioneer_ldv1000_device, ctc_interrupt))
+ MCFG_Z80CTC_INTR_CB(WRITELINE(*this, pioneer_ldv1000_device, ctc_interrupt))
MCFG_DEVICE_ADD("ldvppi0", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pioneer_ldv1000_device, ppi0_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pioneer_ldv1000_device, ppi0_portb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(pioneer_ldv1000_device, ppi0_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pioneer_ldv1000_device, ppi0_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pioneer_ldv1000_device, ppi0_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pioneer_ldv1000_device, ppi0_portb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pioneer_ldv1000_device, ppi0_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pioneer_ldv1000_device, ppi0_portc_w))
MCFG_DEVICE_ADD("ldvppi1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pioneer_ldv1000_device, ppi1_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pioneer_ldv1000_device, ppi1_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pioneer_ldv1000_device, ppi1_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pioneer_ldv1000_device, ppi1_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pioneer_ldv1000_device, ppi1_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pioneer_ldv1000_device, ppi1_portc_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/ldvp931.cpp b/src/devices/machine/ldvp931.cpp
index e0d96190ca3..22657e3af13 100644
--- a/src/devices/machine/ldvp931.cpp
+++ b/src/devices/machine/ldvp931.cpp
@@ -287,14 +287,14 @@ const tiny_rom_entry *phillips_22vp931_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(phillips_22vp931_device::device_add_mconfig)
- MCFG_CPU_ADD("vp931", I8049, XTAL(11'000'000))
- MCFG_CPU_IO_MAP(vp931_portmap)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(phillips_22vp931_device, i8049_port1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(phillips_22vp931_device, i8049_port1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(phillips_22vp931_device, i8049_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(phillips_22vp931_device, i8049_port2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(phillips_22vp931_device, i8049_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(phillips_22vp931_device, i8049_t1_r))
+ MCFG_DEVICE_ADD("vp931", I8049, XTAL(11'000'000))
+ MCFG_DEVICE_IO_MAP(vp931_portmap)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, phillips_22vp931_device, i8049_port1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, phillips_22vp931_device, i8049_port1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, phillips_22vp931_device, i8049_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, phillips_22vp931_device, i8049_port2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, phillips_22vp931_device, i8049_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, phillips_22vp931_device, i8049_t1_r))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp
index 223e770a63f..d2c79b36c5f 100644
--- a/src/devices/machine/mb89363b.cpp
+++ b/src/devices/machine/mb89363b.cpp
@@ -136,20 +136,20 @@ WRITE8_MEMBER( mb89363b_device::write )
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))
- MCFG_I8255_IN_PORTC_CB(READ8(mb89363b_device, i8255_a_port_c_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mb89363b_device, i8255_a_port_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mb89363b_device, i8255_a_port_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mb89363b_device, i8255_a_port_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mb89363b_device, i8255_a_port_a_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mb89363b_device, i8255_a_port_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mb89363b_device, i8255_a_port_c_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mb89363b_device, i8255_a_port_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mb89363b_device, i8255_a_port_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mb89363b_device, i8255_a_port_c_w))
MCFG_DEVICE_ADD("i8255_b", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mb89363b_device, i8255_b_port_a_r))
- MCFG_I8255_IN_PORTB_CB(READ8(mb89363b_device, i8255_b_port_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(mb89363b_device, i8255_b_port_c_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mb89363b_device, i8255_b_port_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mb89363b_device, i8255_b_port_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mb89363b_device, i8255_b_port_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mb89363b_device, i8255_b_port_a_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mb89363b_device, i8255_b_port_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mb89363b_device, i8255_b_port_c_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mb89363b_device, i8255_b_port_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mb89363b_device, i8255_b_port_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mb89363b_device, i8255_b_port_c_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 2b2a2dd7208..37bb874aaf4 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -65,7 +65,7 @@ const int mos6551_device::transmitter_controls[4][3] =
MACHINE_CONFIG_START(mos6551_device::device_add_mconfig)
MCFG_DEVICE_ADD("clock", CLOCK, 0)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(mos6551_device, internal_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, mos6551_device, internal_clock))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp
index d9c4a350557..81554358dbd 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -88,13 +88,13 @@ DEFINE_DEVICE_TYPE(MPU401, mpu401_device, "mpu401", "Roland MPU-401 I/O box")
//-------------------------------------------------
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)
- MCFG_M6801_SER_TX(DEVWRITELINE(MIDIOUT_TAG, midi_port_device, write_txd))
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, 4000000) /* 4 MHz as per schematics */
+ MCFG_DEVICE_PROGRAM_MAP(mpu401_map)
+ MCFG_DEVICE_IO_MAP(mpu401_io_map)
+ MCFG_M6801_SER_TX(WRITELINE(MIDIOUT_TAG, midi_port_device, write_txd))
MCFG_MIDI_PORT_ADD(MIDIIN_TAG, midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(DEVICE_SELF, mpu401_device, midi_rx_w))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(DEVICE_SELF, mpu401_device, midi_rx_w))
MCFG_MIDI_PORT_ADD(MIDIOUT_TAG, midiout_slot, "midiout")
MACHINE_CONFIG_END
diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp
index 70f3a87f681..9d6acf72826 100644
--- a/src/devices/machine/pc_fdc.cpp
+++ b/src/devices/machine/pc_fdc.cpp
@@ -66,8 +66,8 @@ void pc_fdc_family_device::dma_w(uint8_t data)
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))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pc_fdc_family_device, irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, pc_fdc_family_device, drq_w))
MACHINE_CONFIG_END
void pc_fdc_family_device::device_start()
diff --git a/src/devices/machine/pc_lpt.cpp b/src/devices/machine/pc_lpt.cpp
index c67bd71e4e3..01b9f08ddc7 100644
--- a/src/devices/machine/pc_lpt.cpp
+++ b/src/devices/machine/pc_lpt.cpp
@@ -49,16 +49,16 @@ void pc_lpt_device::device_reset()
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))
- MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc_lpt_device, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit3))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc_lpt_device, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
- MCFG_CENTRONICS_STROBE_HANDLER(DEVWRITELINE("cent_ctrl_in", input_buffer_device, write_bit0))
- MCFG_CENTRONICS_AUTOFD_HANDLER(DEVWRITELINE("cent_ctrl_in", input_buffer_device, write_bit1))
- MCFG_CENTRONICS_INIT_HANDLER(DEVWRITELINE("cent_ctrl_in", input_buffer_device, write_bit2))
- MCFG_CENTRONICS_SELECT_IN_HANDLER(DEVWRITELINE("cent_ctrl_in", input_buffer_device, write_bit3))
+ MCFG_CENTRONICS_STROBE_HANDLER(WRITELINE("cent_ctrl_in", input_buffer_device, write_bit0))
+ MCFG_CENTRONICS_AUTOFD_HANDLER(WRITELINE("cent_ctrl_in", input_buffer_device, write_bit1))
+ MCFG_CENTRONICS_INIT_HANDLER(WRITELINE("cent_ctrl_in", input_buffer_device, write_bit2))
+ MCFG_CENTRONICS_SELECT_IN_HANDLER(WRITELINE("cent_ctrl_in", input_buffer_device, write_bit3))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("cent_ctrl_in", INPUT_BUFFER, 0)
@@ -67,11 +67,11 @@ MACHINE_CONFIG_START(pc_lpt_device::device_add_mconfig)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE("centronics", centronics_device, write_autofd))
- MCFG_OUTPUT_LATCH_BIT2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_init))
- MCFG_OUTPUT_LATCH_BIT3_HANDLER(DEVWRITELINE("centronics", centronics_device, write_select_in))
- MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(pc_lpt_device, write_irq_enabled))
+ MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE("centronics", centronics_device, write_autofd))
+ MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE("centronics", centronics_device, write_init))
+ MCFG_OUTPUT_LATCH_BIT3_HANDLER(WRITELINE("centronics", centronics_device, write_select_in))
+ MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(*this, pc_lpt_device, write_irq_enabled))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp
index e775599fbc7..4d0dae5c0ca 100644
--- a/src/devices/machine/pci-ide.cpp
+++ b/src/devices/machine/pci-ide.cpp
@@ -55,11 +55,11 @@ void ide_pci_device::bus_master_map(address_map &map)
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_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, ide_pci_device, ide_interrupt))
//MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":pci:00.0", AS_DATA)
MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide2", ata_devices, "hdd", "cdrom", true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(ide_pci_device, ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, ide_pci_device, ide_interrupt))
//MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM)
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":pci:00.0", AS_DATA)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 0c828df743d..894a3baa61f 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -257,15 +257,15 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(pdc_device::device_add_mconfig)
/* CPU - Zilog Z0840006PSC */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(pdc_mem)
- MCFG_CPU_IO_MAP(pdc_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(10'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(pdc_mem)
+ MCFG_DEVICE_IO_MAP(pdc_io)
//MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
/* Floppy Disk Controller - uPD765a - NEC D765AC-2 */
MCFG_UPD765A_ADD(FDC_TAG, true, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pdc_device, fdc_irq))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(FDCDMA_TAG, am9517a_device, dreq0_w)) //MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pdc_device, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(FDCDMA_TAG, am9517a_device, dreq0_w)) //MCFG_DEVCB_INVERT
// Floppy disk drive
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", pdc_floppies, "35hd", pdc_device::floppy_formats)
@@ -274,14 +274,14 @@ MACHINE_CONFIG_START(pdc_device::device_add_mconfig)
/* Channel 0: uPD765a Floppy Disk Controller */
/* Channel 1: M68K main system memory */
MCFG_DEVICE_ADD(FDCDMA_TAG, AM9517A, XTAL(10'000'000) / 2)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(pdc_device, i8237_hreq_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(pdc_device, i8237_eop_w))
- MCFG_I8237_IN_MEMR_CB(READ8(pdc_device, i8237_dma_mem_r))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(pdc_device, i8237_dma_mem_w))
- MCFG_I8237_IN_IOR_0_CB(READ8(pdc_device, i8237_fdc_dma_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(pdc_device, i8237_fdc_dma_w))
- MCFG_I8237_IN_IOR_1_CB(READ8(pdc_device, m68k_dma_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(pdc_device, m68k_dma_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, pdc_device, i8237_hreq_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, pdc_device, i8237_eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, pdc_device, i8237_dma_mem_r))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, pdc_device, i8237_dma_mem_w))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, pdc_device, i8237_fdc_dma_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, pdc_device, i8237_fdc_dma_w))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, pdc_device, m68k_dma_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, pdc_device, m68k_dma_w))
/* Hard Disk Controller - HDC9224 */
MCFG_DEVICE_ADD(HDC_TAG, HDC9224, 0)
diff --git a/src/devices/machine/rf5c296.cpp b/src/devices/machine/rf5c296.cpp
index ee6d3e0ea54..b3582f6bfa3 100644
--- a/src/devices/machine/rf5c296.cpp
+++ b/src/devices/machine/rf5c296.cpp
@@ -10,14 +10,12 @@ DEFINE_DEVICE_TYPE(RF5C296, rf5c296_device, "rf5c296", "RF5C296 PC Card controll
rf5c296_device::rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, RF5C296, tag, owner, clock)
, m_rf5c296_reg(0)
- , m_pccard(nullptr)
- , m_pccard_name(nullptr)
+ , m_pccard(*this, finder_base::DUMMY_TAG)
{
}
void rf5c296_device::device_start()
{
- m_pccard = machine().device<pccard_slot_device>(m_pccard_name);
}
void rf5c296_device::reg_w(ATTR_UNUSED uint8_t reg, uint8_t data)
diff --git a/src/devices/machine/rf5c296.h b/src/devices/machine/rf5c296.h
index 47ebf683cf3..fc95d3fdc4f 100644
--- a/src/devices/machine/rf5c296.h
+++ b/src/devices/machine/rf5c296.h
@@ -8,7 +8,7 @@
#include "pccard.h"
#define MCFG_RF5C296_SLOT(name) \
- downcast<rf5c296_device &>(*device).set_pccard_name(name);
+ downcast<rf5c296_device &>(*device).set_pccard(name);
class rf5c296_device : public device_t
{
@@ -16,7 +16,7 @@ public:
rf5c296_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// configuration helpers
- void set_pccard_name(const char *name) { m_pccard_name = name; }
+ template <typename T> void set_pccard(T &&tag) { m_pccard.set_tag(std::forward<T>(tag)); }
DECLARE_WRITE16_MEMBER(io_w);
DECLARE_READ16_MEMBER(io_r);
@@ -32,8 +32,7 @@ private:
uint8_t reg_r(ATTR_UNUSED uint8_t reg);
unsigned char m_rf5c296_reg;
- pccard_slot_device *m_pccard;
- const char *m_pccard_name;
+ required_device<pccard_slot_device> m_pccard;
};
DECLARE_DEVICE_TYPE(RF5C296, rf5c296_device)
diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp
index 2582557d1fb..a0c46f73a62 100644
--- a/src/devices/machine/sega_scu.cpp
+++ b/src/devices/machine/sega_scu.cpp
@@ -178,10 +178,10 @@ WRITE16_MEMBER(sega_scu_device::scudsp_dma_w)
}
MACHINE_CONFIG_START(sega_scu_device::device_add_mconfig)
- MCFG_CPU_ADD("scudsp", SCUDSP, XTAL(57'272'727)/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))
- MCFG_SCUDSP_OUT_DMA_CB(WRITE16(sega_scu_device, scudsp_dma_w))
+ MCFG_DEVICE_ADD("scudsp", SCUDSP, XTAL(57'272'727)/4) // 14 MHz
+ MCFG_SCUDSP_OUT_IRQ_CB(WRITELINE(DEVICE_SELF, sega_scu_device, scudsp_end_w))
+ MCFG_SCUDSP_IN_DMA_CB(READ16(*this, sega_scu_device, scudsp_dma_r))
+ MCFG_SCUDSP_OUT_DMA_CB(WRITE16(*this, sega_scu_device, scudsp_dma_w))
MACHINE_CONFIG_END
diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp
index c2068efa63d..3c0a4b71140 100644
--- a/src/devices/machine/sis85c496.cpp
+++ b/src/devices/machine/sis85c496.cpp
@@ -48,72 +48,72 @@ void sis85c496_host_device::internal_io_map(address_map &map)
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))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, sis85c496_host_device, at_pit8254_out0_changed))
MCFG_PIT8253_CLK1(4772720/4) /* dram refresh */
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(sis85c496_host_device, at_pit8254_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, sis85c496_host_device, at_pit8254_out1_changed))
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sis85c496_host_device, at_pit8254_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, sis85c496_host_device, at_pit8254_out2_changed))
MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(sis85c496_host_device, at_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(sis85c496_host_device, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(sis85c496_host_device, pc_dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(sis85c496_host_device, pc_dma8237_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(sis85c496_host_device, pc_dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(sis85c496_host_device, pc_dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(sis85c496_host_device, pc_dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(sis85c496_host_device, pc_dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(sis85c496_host_device, pc_dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(sis85c496_host_device, pc_dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(sis85c496_host_device, pc_dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(sis85c496_host_device, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(sis85c496_host_device, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(sis85c496_host_device, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(sis85c496_host_device, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma8237_2", am9517a_device, dreq0_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, sis85c496_host_device, at_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, sis85c496_host_device, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, sis85c496_host_device, pc_dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, sis85c496_host_device, pc_dma8237_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, sis85c496_host_device, pc_dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, sis85c496_host_device, pc_dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, sis85c496_host_device, pc_dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, sis85c496_host_device, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, sis85c496_host_device, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, sis85c496_host_device, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, sis85c496_host_device, pc_dack3_w))
MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(sis85c496_host_device, pc_dma_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(sis85c496_host_device, pc_dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(sis85c496_host_device, pc_dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(sis85c496_host_device, pc_dma8237_5_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(sis85c496_host_device, pc_dma8237_6_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(sis85c496_host_device, pc_dma8237_7_dack_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(sis85c496_host_device, pc_dma8237_5_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(sis85c496_host_device, pc_dma8237_6_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(sis85c496_host_device, pc_dma8237_7_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(sis85c496_host_device, pc_dack4_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(sis85c496_host_device, pc_dack5_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(sis85c496_host_device, pc_dack6_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(sis85c496_host_device, pc_dack7_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, sis85c496_host_device, pc_dma_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, sis85c496_host_device, pc_dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, sis85c496_host_device, pc_dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, sis85c496_host_device, pc_dma8237_5_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, sis85c496_host_device, pc_dma8237_6_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, sis85c496_host_device, pc_dma8237_7_dack_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_5_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_6_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, sis85c496_host_device, pc_dma8237_7_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, sis85c496_host_device, pc_dack4_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, sis85c496_host_device, pc_dack5_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, sis85c496_host_device, pc_dack6_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, sis85c496_host_device, pc_dack7_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(":maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(sis85c496_host_device, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, sis85c496_host_device, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
- MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("pic8259_master", pic8259_device, ir1_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(WRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(WRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp
index 8097594920b..f0407096e0b 100644
--- a/src/devices/machine/smioc.cpp
+++ b/src/devices/machine/smioc.cpp
@@ -112,26 +112,17 @@ void smioc_device::smioc_mem(address_map &map)
MACHINE_CONFIG_START(smioc_device::device_add_mconfig)
/* CPU - Intel 80C188 */
- MCFG_CPU_ADD(I188_TAG, I80188, XTAL(20'000'000) / 2) // Clock division unknown
- MCFG_CPU_PROGRAM_MAP(smioc_mem)
+ MCFG_DEVICE_ADD(I188_TAG, I80188, XTAL(20'000'000) / 2) // Clock division unknown
+ MCFG_DEVICE_PROGRAM_MAP(smioc_mem)
/* DMA */
- MCFG_DEVICE_ADD("dma8237_1", AM9517A, XTAL(20'000'000) / 4) // Clock division unknown
- MCFG_DEVICE_ADD("dma8237_2", AM9517A, XTAL(20'000'000) / 4)
- MCFG_DEVICE_ADD("dma8237_3", AM9517A, XTAL(20'000'000) / 4)
- MCFG_DEVICE_ADD("dma8237_4", AM9517A, XTAL(20'000'000) / 4)
- MCFG_DEVICE_ADD("dma8237_5", AM9517A, XTAL(20'000'000) / 4)
+ for (required_device<am9517a_device> &dma : m_dma8237)
+ AM9517A(config, dma, 20_MHz_XTAL / 4); // Clock division unknown
/* RS232 */
/* Port 1: Console */
- MCFG_RS232_PORT_ADD("rs232_p1", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p2", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p3", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p4", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p5", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p6", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p7", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("rs232_p8", default_rs232_devices, nullptr)
+ for (required_device<rs232_port_device> &rs232_port : m_rs232_p)
+ RS232_PORT(config, rs232_port, default_rs232_devices, nullptr);
MACHINE_CONFIG_END
//**************************************************************************
@@ -145,19 +136,8 @@ MACHINE_CONFIG_END
smioc_device::smioc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SMIOC, tag, owner, clock),
m_smioccpu(*this, I188_TAG),
- m_dma8237_1(*this, "dma8237_1"),
- m_dma8237_2(*this, "dma8237_2"),
- m_dma8237_3(*this, "dma8237_3"),
- m_dma8237_4(*this, "dma8237_4"),
- m_dma8237_5(*this, "dma8237_5"),
- m_rs232_p1(*this, "rs232_p1"),
- m_rs232_p2(*this, "rs232_p2"),
- m_rs232_p3(*this, "rs232_p3"),
- m_rs232_p4(*this, "rs232_p4"),
- m_rs232_p5(*this, "rs232_p5"),
- m_rs232_p6(*this, "rs232_p6"),
- m_rs232_p7(*this, "rs232_p7"),
- m_rs232_p8(*this, "rs232_p8"),
+ m_dma8237(*this, "dma8237_%u", 1),
+ m_rs232_p(*this, "rs232_p%u", 1),
m_smioc_ram(*this, "smioc_ram")
{
}
diff --git a/src/devices/machine/smioc.h b/src/devices/machine/smioc.h
index 0700185723c..39cdb5611c6 100644
--- a/src/devices/machine/smioc.h
+++ b/src/devices/machine/smioc.h
@@ -43,20 +43,9 @@ private:
/* Attached devices */
required_device<cpu_device> m_smioccpu;
- required_device<am9517a_device> m_dma8237_1;
- required_device<am9517a_device> m_dma8237_2;
- required_device<am9517a_device> m_dma8237_3;
- required_device<am9517a_device> m_dma8237_4;
- required_device<am9517a_device> m_dma8237_5;
-
- required_device<rs232_port_device> m_rs232_p1;
- required_device<rs232_port_device> m_rs232_p2;
- required_device<rs232_port_device> m_rs232_p3;
- required_device<rs232_port_device> m_rs232_p4;
- required_device<rs232_port_device> m_rs232_p5;
- required_device<rs232_port_device> m_rs232_p6;
- required_device<rs232_port_device> m_rs232_p7;
- required_device<rs232_port_device> m_rs232_p8;
+ required_device_array<am9517a_device, 5> m_dma8237;
+
+ required_device_array<rs232_port_device, 8> m_rs232_p;
required_shared_ptr<uint8_t> m_smioc_ram;
diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp
index ef3333e9773..fe6343e602c 100644
--- a/src/devices/machine/stvcd.cpp
+++ b/src/devices/machine/stvcd.cpp
@@ -84,7 +84,7 @@ MACHINE_CONFIG_START(stvcd_device::device_add_mconfig)
MCFG_TIMER_DRIVER_ADD("sector_timer", stvcd_device, stv_sector_cb)
MCFG_TIMER_DRIVER_ADD("sh1_cmd", stvcd_device, stv_sh1_sim)
- MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
// FIXME: these outputs should not be hardcoded
MCFG_SOUND_ROUTE(0, ":lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, ":rspeaker", 1.0)
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp
index 7ef680e9f6c..df13e3e402a 100644
--- a/src/devices/machine/terminal.cpp
+++ b/src/devices/machine/terminal.cpp
@@ -338,7 +338,7 @@ MACHINE_CONFIG_START(generic_terminal_device::device_add_mconfig)
MCFG_GENERIC_KEYBOARD_CB(PUT(generic_terminal_device, kbd_put))
MCFG_SPEAKER_STANDARD_MONO("bell")
- MCFG_SOUND_ADD("beeper", BEEP, 2'000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2'000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 0.25)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/vrc5074.cpp b/src/devices/machine/vrc5074.cpp
index fe64be7fc89..c695324738d 100644
--- a/src/devices/machine/vrc5074.cpp
+++ b/src/devices/machine/vrc5074.cpp
@@ -145,15 +145,15 @@ void vrc5074_device::target1_map(address_map &map)
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))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("ttys00", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("ttys00", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("ttys00", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", ns16550_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart", ns16550_device, dcd_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", ns16550_device, cts_w))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, vrc5074_device, uart_irq_callback))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("ttys00", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("ttys00", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("ttys00", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("ttys00", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", ns16550_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart", ns16550_device, dcd_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", ns16550_device, cts_w))
MACHINE_CONFIG_END
vrc5074_device::vrc5074_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index 39077438bd1..9dc97e94eaa 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -23,56 +23,56 @@ DEFINE_DEVICE_TYPE(WD7600, wd7600_device, "wd7600", "Western Digital WD7600 chip
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))
- MCFG_I8237_IN_MEMR_CB(READ8(wd7600_device, dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(wd7600_device, dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(wd7600_device, dma1_ior0_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(wd7600_device, dma1_ior1_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(wd7600_device, dma1_ior2_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(wd7600_device, dma1_ior3_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(wd7600_device, dma1_iow0_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(wd7600_device, dma1_iow1_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(wd7600_device, dma1_iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(wd7600_device, dma1_iow3_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(wd7600_device, dma1_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(wd7600_device, dma1_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(wd7600_device, dma1_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(wd7600_device, dma1_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma2", am9517a_device, dreq0_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, wd7600_device, dma1_eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, wd7600_device, dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, wd7600_device, dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, wd7600_device, dma1_ior0_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, wd7600_device, dma1_ior1_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, wd7600_device, dma1_ior2_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, wd7600_device, dma1_ior3_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, wd7600_device, dma1_iow0_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, wd7600_device, dma1_iow1_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, wd7600_device, dma1_iow2_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, wd7600_device, dma1_iow3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, wd7600_device, dma1_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, wd7600_device, dma1_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, wd7600_device, dma1_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, wd7600_device, dma1_dack3_w))
MCFG_DEVICE_ADD("dma2", AM9517A, 0)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(wd7600_device, dma2_hreq_w))
- MCFG_I8237_IN_MEMR_CB(READ8(wd7600_device, dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(wd7600_device, dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(wd7600_device, dma2_ior1_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(wd7600_device, dma2_ior2_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(wd7600_device, dma2_ior3_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(wd7600_device, dma2_iow1_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(wd7600_device, dma2_iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(wd7600_device, dma2_iow3_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(wd7600_device, dma2_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(wd7600_device, dma2_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(wd7600_device, dma2_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(wd7600_device, dma2_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, wd7600_device, dma2_hreq_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, wd7600_device, dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, wd7600_device, dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, wd7600_device, dma2_ior1_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, wd7600_device, dma2_ior2_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, wd7600_device, dma2_ior3_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, wd7600_device, dma2_iow1_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, wd7600_device, dma2_iow2_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, wd7600_device, dma2_iow3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, wd7600_device, dma2_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, wd7600_device, dma2_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, wd7600_device, dma2_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, wd7600_device, dma2_dack3_w))
MCFG_DEVICE_ADD("intc1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(wd7600_device, pic1_int_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, wd7600_device, pic1_int_w))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(wd7600_device, pic1_slave_ack_r))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, wd7600_device, pic1_slave_ack_r))
MCFG_DEVICE_ADD("intc2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("intc1", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("intc1", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("ctc", PIT8254, 0)
MCFG_PIT8253_CLK0(XTAL(14'318'181) / 12.0)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("intc1", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("intc1", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(14'318'181) / 12.0)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(wd7600_device, ctc_out1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, wd7600_device, ctc_out1_w))
MCFG_PIT8253_CLK2(XTAL(14'318'181) / 12.0)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wd7600_device, ctc_out2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, wd7600_device, ctc_out2_w))
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(wd7600_device, rtc_irq_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, wd7600_device, rtc_irq_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
MACHINE_CONFIG_END
diff --git a/src/devices/machine/wozfdc.cpp b/src/devices/machine/wozfdc.cpp
index 7d996a4e77f..79cbb43fadb 100644
--- a/src/devices/machine/wozfdc.cpp
+++ b/src/devices/machine/wozfdc.cpp
@@ -47,7 +47,7 @@ const tiny_rom_entry *wozfdc_device::device_rom_region() const
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))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, wozfdc_device, set_phase))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp
index e434302b554..3644f7749fa 100644
--- a/src/devices/sound/ad1848.cpp
+++ b/src/devices/sound/ad1848.cpp
@@ -23,8 +23,8 @@ ad1848_device::ad1848_device(const machine_config &mconfig, const char *tag, dev
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
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/devices/sound/bsmt2000.cpp b/src/devices/sound/bsmt2000.cpp
index b8c6dad0042..d90a583259d 100644
--- a/src/devices/sound/bsmt2000.cpp
+++ b/src/devices/sound/bsmt2000.cpp
@@ -95,11 +95,11 @@ const tiny_rom_entry *bsmt2000_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(bsmt2000_device::device_add_mconfig)
- MCFG_CPU_ADD("bsmt2000", TMS32015, DERIVED_CLOCK(1,1))
- MCFG_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_DEVICE_ADD("bsmt2000", TMS32015, DERIVED_CLOCK(1,1))
+ MCFG_DEVICE_PROGRAM_MAP(tms_program_map)
// data map is internal to the CPU
- MCFG_CPU_IO_MAP(tms_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(bsmt2000_device, tms_write_pending_r))
+ MCFG_DEVICE_IO_MAP(tms_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, bsmt2000_device, tms_write_pending_r))
MACHINE_CONFIG_END
diff --git a/src/devices/sound/cdda.cpp b/src/devices/sound/cdda.cpp
index e24a8d9bf46..a0902789386 100644
--- a/src/devices/sound/cdda.cpp
+++ b/src/devices/sound/cdda.cpp
@@ -18,8 +18,8 @@
void cdda_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
get_audio_data(&outputs[0][0], &outputs[1][0], samples);
- m_audio_volume[0] = (int16_t)outputs[0][0];
- m_audio_volume[1] = (int16_t)outputs[1][0];
+ m_audio_volume[0] = int16_t(outputs[0][0]);
+ m_audio_volume[1] = int16_t(outputs[1][0]);
}
//-------------------------------------------------
@@ -31,7 +31,7 @@ void cdda_device::device_start()
/* allocate an audio cache */
m_audio_cache = std::make_unique<uint8_t[]>(CD_MAX_SECTOR_DATA * MAX_SECTORS );
- m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100);
+ m_stream = machine().sound().stream_alloc(*this, 0, 2, clock());
m_audio_playing = 0;
m_audio_pause = 0;
diff --git a/src/devices/sound/cdda.h b/src/devices/sound/cdda.h
index 28633f94fd7..73a1e1a237d 100644
--- a/src/devices/sound/cdda.h
+++ b/src/devices/sound/cdda.h
@@ -11,7 +11,7 @@
class cdda_device : public device_t, public device_sound_interface
{
public:
- cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cdda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 44'100);
void set_cdrom(void *file);
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index c65a3aefac2..e1aec5babea 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -57,7 +57,7 @@
//**************************************************************************
#define MCFG_CDP1864_ADD(_tag, _screen_tag, _clock, _inlace, _irq, _dma_out, _efx, _hsync, _rdata, _bdata, _gdata) \
- MCFG_SOUND_ADD(_tag, CDP1864, _clock) \
+ MCFG_DEVICE_ADD(_tag, CDP1864, _clock) \
MCFG_VIDEO_SET_SCREEN(_screen_tag) \
downcast<cdp1864_device *>(device)->set_inlace_callback(DEVCB_##_inlace); \
downcast<cdp1864_device *>(device)->set_irq_callback(DEVCB_##_irq); \
diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h
index d6d450a673e..15d1b5a91a9 100644
--- a/src/devices/sound/dave.h
+++ b/src/devices/sound/dave.h
@@ -24,7 +24,7 @@
#define MCFG_DAVE_ADD(_tag, _clock, _program_map, _io_map) \
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
- MCFG_SOUND_ADD(_tag, DAVE, _clock) \
+ MCFG_DEVICE_ADD(_tag, DAVE, _clock) \
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) \
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25) \
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, _program_map) \
diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h
index 3bdcedcc3bc..bcabbf8978f 100644
--- a/src/devices/sound/discrete.h
+++ b/src/devices/sound/discrete.h
@@ -4377,7 +4377,7 @@ class discrete_sound_device : public discrete_device,
{
public:
// construction/destruction
- discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
virtual ~discrete_sound_device(void) { };
/* --------------------------------- */
diff --git a/src/devices/sound/dmadac.h b/src/devices/sound/dmadac.h
index 4222d020e86..5bcffecc35f 100644
--- a/src/devices/sound/dmadac.h
+++ b/src/devices/sound/dmadac.h
@@ -16,7 +16,7 @@
class dmadac_sound_device : public device_t, public device_sound_interface
{
public:
- dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ dmadac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
void flush();
void transfer(int channel, offs_t channel_spacing, offs_t frame_spacing, offs_t total_frames, int16_t *data);
diff --git a/src/devices/sound/es8712.cpp b/src/devices/sound/es8712.cpp
index 3c15dc986e2..6314d26f4a8 100644
--- a/src/devices/sound/es8712.cpp
+++ b/src/devices/sound/es8712.cpp
@@ -59,7 +59,7 @@ es8712_device::es8712_device(const machine_config &mconfig, const char *tag, dev
MACHINE_CONFIG_START(es8712_device::device_add_mconfig)
MCFG_DEVICE_ADD("adpcm_select", HCT157, 0) // TODO : gcpinbal case, differs per games?
- MCFG_74157_OUT_CB(WRITE8(es8712_device, msm_w))
+ MCFG_74157_OUT_CB(WRITE8(*this, es8712_device, msm_w))
MACHINE_CONFIG_END
diff --git a/src/devices/sound/flt_rc.h b/src/devices/sound/flt_rc.h
index 68a2a201af2..3b9748afaaf 100644
--- a/src/devices/sound/flt_rc.h
+++ b/src/devices/sound/flt_rc.h
@@ -46,12 +46,6 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_FILTER_RC_ADD(_tag, _clock) \
- MCFG_DEVICE_ADD(_tag, FILTER_RC, _clock)
-
-#define MCFG_FILTER_RC_REPLACE(_tag, _clock) \
- MCFG_DEVICE_REPLACE(_tag, FILTER_RC, _clock)
-
#define MCFG_FILTER_RC_AC() \
downcast<filter_rc_device &>(*device).set_rc(filter_rc_device::AC, 10000, 0, 0, CAP_U(1));
@@ -72,23 +66,25 @@ public:
AC = 2
};
- filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ filter_rc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// configuration
- void set_rc(int type, double R1, double R2, double R3, double C)
+ filter_rc_device &set_rc(int type, double R1, double R2, double R3, double C)
{
m_type = type;
m_R1 = R1;
m_R2 = R2;
m_R3 = R3;
m_C = C;
+ return *this;
}
- void filter_rc_set_RC(int type, double R1, double R2, double R3, double C)
+ filter_rc_device &filter_rc_set_RC(int type, double R1, double R2, double R3, double C)
{
m_stream->update();
set_rc(type, R1, R2, R3, C);
recalc();
+ return *this;
}
protected:
diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h
index 59591b4a5e1..25d8e3a9161 100644
--- a/src/devices/sound/mos6560.h
+++ b/src/devices/sound/mos6560.h
@@ -48,7 +48,7 @@
MCFG_SCREEN_SIZE((MOS6560_XSIZE + 7) & ~7, MOS6560_YSIZE) \
MCFG_SCREEN_VISIBLE_AREA(MOS6560_MAME_XPOS, MOS6560_MAME_XPOS + MOS6560_MAME_XSIZE - 1, MOS6560_MAME_YPOS, MOS6560_MAME_YPOS + MOS6560_MAME_YSIZE - 1) \
MCFG_SCREEN_UPDATE_DEVICE(_tag, mos6560_device, screen_update) \
- MCFG_SOUND_ADD(_tag, MOS6560, _clock) \
+ MCFG_DEVICE_ADD(_tag, MOS6560, _clock) \
MCFG_VIDEO_SET_SCREEN(_screen_tag) \
MCFG_DEVICE_ADDRESS_MAP(0, _videoram_map) \
MCFG_DEVICE_ADDRESS_MAP(1, _colorram_map)
@@ -60,7 +60,7 @@
MCFG_SCREEN_SIZE((MOS6561_XSIZE + 7) & ~7, MOS6561_YSIZE) \
MCFG_SCREEN_VISIBLE_AREA(MOS6561_MAME_XPOS, MOS6561_MAME_XPOS + MOS6561_MAME_XSIZE - 1, MOS6561_MAME_YPOS, MOS6561_MAME_YPOS + MOS6561_MAME_YSIZE - 1) \
MCFG_SCREEN_UPDATE_DEVICE(_tag, mos6560_device, screen_update) \
- MCFG_SOUND_ADD(_tag, MOS6561, _clock) \
+ MCFG_DEVICE_ADD(_tag, MOS6561, _clock) \
MCFG_VIDEO_SET_SCREEN(_screen_tag) \
MCFG_DEVICE_ADDRESS_MAP(0, _videoram_map) \
MCFG_DEVICE_ADDRESS_MAP(1, _colorram_map)
@@ -72,7 +72,7 @@
MCFG_SCREEN_SIZE((MOS6560_XSIZE + 7) & ~7, MOS6560_YSIZE) \
MCFG_SCREEN_VISIBLE_AREA(0, 23*8 - 1, 0, 22*8 - 1) \
MCFG_SCREEN_UPDATE_DEVICE(_tag, mos6560_device, screen_update) \
- MCFG_SOUND_ADD(_tag, MOS656X_ATTACK_UFO, _clock) \
+ MCFG_DEVICE_ADD(_tag, MOS656X_ATTACK_UFO, _clock) \
MCFG_VIDEO_SET_SCREEN(_screen_tag) \
MCFG_DEVICE_ADDRESS_MAP(0, _videoram_map) \
MCFG_DEVICE_ADDRESS_MAP(1, _colorram_map)
diff --git a/src/devices/sound/qs1000.cpp b/src/devices/sound/qs1000.cpp
index 487d37cd724..0f980e54ce8 100644
--- a/src/devices/sound/qs1000.cpp
+++ b/src/devices/sound/qs1000.cpp
@@ -196,16 +196,16 @@ const tiny_rom_entry *qs1000_device::device_rom_region() const
// device_add_mconfig - add machine configuration
//-------------------------------------------------
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)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(qs1000_device, p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(qs1000_device, p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(qs1000_device, p2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(qs1000_device, p2_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(qs1000_device, p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(qs1000_device, p3_w))
- MCFG_MCS51_SERIAL_RX_CB(READ8(qs1000_device, data_to_i8052))
+ MCFG_DEVICE_ADD("cpu", I8052, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(qs1000_prg_map)
+ MCFG_DEVICE_IO_MAP(qs1000_io_map)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, qs1000_device, p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, qs1000_device, p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, qs1000_device, p2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, qs1000_device, p2_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, qs1000_device, p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, qs1000_device, p3_w))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, qs1000_device, data_to_i8052))
MACHINE_CONFIG_END
diff --git a/src/devices/sound/qsound.cpp b/src/devices/sound/qsound.cpp
index 2dcb810b95e..a7bc8cdc72e 100644
--- a/src/devices/sound/qsound.cpp
+++ b/src/devices/sound/qsound.cpp
@@ -191,11 +191,11 @@ const tiny_rom_entry *qsound_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(qsound_device::device_add_mconfig)
- MCFG_CPU_ADD("dsp", DSP16A, DERIVED_CLOCK(1, 1))
- MCFG_CPU_IO_MAP(dsp_io_map)
- MCFG_DSP16_OCK_CB(WRITELINE(qsound_device, dsp_ock_w))
- MCFG_DSP16_PIO_R_CB(READ16(qsound_device, dsp_pio_r))
- MCFG_DSP16_PIO_W_CB(WRITE16(qsound_device, dsp_pio_w))
+ MCFG_DEVICE_ADD("dsp", DSP16A, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_IO_MAP(dsp_io_map)
+ MCFG_DSP16_OCK_CB(WRITELINE(*this, qsound_device, dsp_ock_w))
+ MCFG_DSP16_PIO_R_CB(READ16(*this, qsound_device, dsp_pio_r))
+ MCFG_DSP16_PIO_W_CB(WRITE16(*this, qsound_device, dsp_pio_w))
MACHINE_CONFIG_END
diff --git a/src/devices/sound/samples.h b/src/devices/sound/samples.h
index 666fe320f4c..be5684bc37c 100644
--- a/src/devices/sound/samples.h
+++ b/src/devices/sound/samples.h
@@ -51,7 +51,7 @@ public:
typedef device_delegate<void ()> start_cb_delegate;
// construction/destruction
- samples_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ samples_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// configuration helpers
void set_channels(uint8_t channels) { m_channels = channels; }
diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp
index 8c3e6782c09..6c98b5d8fa7 100644
--- a/src/devices/sound/scsp.cpp
+++ b/src/devices/sound/scsp.cpp
@@ -212,7 +212,7 @@ void scsp_device::device_start()
m_main_irq_cb.resolve_safe();
m_exts_cb.resolve_safe(0);
- m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100);
+ m_stream = machine().sound().stream_alloc(*this, 0, 2, clock());
}
//-------------------------------------------------
@@ -598,7 +598,7 @@ void scsp_device::init()
t=ARTimes[i]; //In ms
if(t!=0.0)
{
- step=(1023*1000.0)/( 44100.0*t);
+ step=(1023*1000.0)/( double(clock())*t);
scale=(double) (1<<EG_SHIFT);
m_ARTABLE[i]=(int) (step*scale);
}
@@ -606,7 +606,7 @@ void scsp_device::init()
m_ARTABLE[i]=1024<<EG_SHIFT;
t=DRTimes[i]; //In ms
- step=(1023*1000.0)/( 44100.0*t);
+ step=(1023*1000.0)/( double(clock())*t);
scale=(double) (1<<EG_SHIFT);
m_DRTABLE[i]=(int) (step*scale);
}
@@ -621,8 +621,8 @@ void scsp_device::init()
}
LFO_Init();
- m_buffertmpl=make_unique_clear<int32_t[]>(44100);
- m_buffertmpr=make_unique_clear<int32_t[]>(44100);
+ m_buffertmpl=make_unique_clear<int32_t[]>(clock());
+ m_buffertmpr=make_unique_clear<int32_t[]>(clock());
// no "pend"
m_udata.data[0x20/2] = 0;
@@ -734,7 +734,7 @@ void scsp_device::UpdateReg(address_space &space, int reg)
if ((m_udata.data[0x18/2]&0xff) != 255)
{
- time = (44100 / m_TimPris[0]) / (255-(m_udata.data[0x18/2]&0xff));
+ time = (clock() / m_TimPris[0]) / (255-(m_udata.data[0x18/2]&0xff));
if (time)
{
m_timerA->adjust(attotime::from_hz(time));
@@ -753,7 +753,7 @@ void scsp_device::UpdateReg(address_space &space, int reg)
if ((m_udata.data[0x1A/2]&0xff) != 255)
{
- time = (44100 / m_TimPris[1]) / (255-(m_udata.data[0x1A/2]&0xff));
+ time = (clock() / m_TimPris[1]) / (255-(m_udata.data[0x1A/2]&0xff));
if (time)
{
m_timerB->adjust(attotime::from_hz(time));
@@ -772,7 +772,7 @@ void scsp_device::UpdateReg(address_space &space, int reg)
if ((m_udata.data[0x1C/2]&0xff) != 255)
{
- time = (44100 / m_TimPris[2]) / (255-(m_udata.data[0x1C/2]&0xff));
+ time = (clock() / m_TimPris[2]) / (255-(m_udata.data[0x1C/2]&0xff));
if (time)
{
m_timerC->adjust(attotime::from_hz(time));
@@ -1549,7 +1549,7 @@ signed int scsp_device::ALFO_Step(SCSP_LFO_t *LFO)
void scsp_device::LFO_ComputeStep(SCSP_LFO_t *LFO,uint32_t LFOF,uint32_t LFOWS,uint32_t LFOS,int ALFO)
{
- float step=(float) LFOFreq[LFOF]*256.0f/(float)44100;
+ float step=(float) LFOFreq[LFOF]*256.0f/float(clock());
LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step);
if(ALFO)
{
diff --git a/src/devices/sound/scsp.h b/src/devices/sound/scsp.h
index d59209fda47..54bf92ef59d 100644
--- a/src/devices/sound/scsp.h
+++ b/src/devices/sound/scsp.h
@@ -32,7 +32,7 @@ class scsp_device : public device_t,
public device_sound_interface
{
public:
- scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ scsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 44'100);
void set_roffset(int roffset) { m_roffset = roffset; }
template <class Object> devcb_base &set_irq_callback(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); }
diff --git a/src/devices/sound/sn76477.h b/src/devices/sound/sn76477.h
index 530e9f416ff..04e6386b62b 100644
--- a/src/devices/sound/sn76477.h
+++ b/src/devices/sound/sn76477.h
@@ -93,7 +93,7 @@ class sn76477_device : public device_t,
public device_sound_interface
{
public:
- sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ sn76477_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
void set_noise_params(double clock_res, double filter_res, double filter_cap)
{
diff --git a/src/devices/sound/spkrdev.h b/src/devices/sound/spkrdev.h
index ac9535108ed..b7d0ac95cec 100644
--- a/src/devices/sound/spkrdev.h
+++ b/src/devices/sound/spkrdev.h
@@ -20,7 +20,7 @@ class speaker_sound_device : public device_t,
public device_sound_interface
{
public:
- speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
~speaker_sound_device() {}
// configuration
diff --git a/src/devices/sound/spu.h b/src/devices/sound/spu.h
index 05bce4a5421..874867ff622 100644
--- a/src/devices/sound/spu.h
+++ b/src/devices/sound/spu.h
@@ -14,10 +14,10 @@
#define MCFG_SPU_ADD(_tag, _clock) \
MCFG_DEVICE_MODIFY( "maincpu" ) \
- MCFG_PSX_SPU_READ_HANDLER(DEVREAD16(_tag, spu_device, read)) \
- MCFG_PSX_SPU_WRITE_HANDLER(DEVWRITE16(_tag, spu_device, write)) \
+ MCFG_PSX_SPU_READ_HANDLER(READ16(_tag, spu_device, read)) \
+ MCFG_PSX_SPU_WRITE_HANDLER(WRITE16(_tag, spu_device, write)) \
MCFG_DEVICE_ADD(_tag, SPU, _clock) \
- MCFG_SPU_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin9)) \
+ MCFG_SPU_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin9)) \
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 4, psxdma_device::read_delegate(&spu_device::dma_read, (spu_device *) device ) ) \
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 4, psxdma_device::write_delegate(&spu_device::dma_write, (spu_device *) device ) )
diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h
index a388bf1276d..419365fc9e3 100644
--- a/src/devices/sound/upd7759.h
+++ b/src/devices/sound/upd7759.h
@@ -13,11 +13,11 @@
software.
*/
-#define UPD7759_STANDARD_CLOCK XTAL(640'000)
-
class upd775x_device : public device_t, public device_sound_interface
{
public:
+ enum : u32 { STANDARD_CLOCK = 640'000 };
+
template <class Object> devcb_base &set_drq_callback(Object &&cb) { return m_drqcallback.set_callback(std::forward<Object>(cb)); }
void set_bank_base(offs_t base);
@@ -107,7 +107,7 @@ protected:
class upd7759_device : public upd775x_device
{
public:
- upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ upd7759_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = STANDARD_CLOCK);
DECLARE_WRITE_LINE_MEMBER( start_w );
@@ -130,7 +130,7 @@ protected:
class upd7756_device : public upd775x_device
{
public:
- upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ upd7756_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = STANDARD_CLOCK);
DECLARE_WRITE_LINE_MEMBER( start_w );
diff --git a/src/devices/sound/wave.h b/src/devices/sound/wave.h
index 53f0ac29254..27ad6f18682 100644
--- a/src/devices/sound/wave.h
+++ b/src/devices/sound/wave.h
@@ -39,7 +39,7 @@ DECLARE_DEVICE_TYPE(WAVE, wave_device)
#define MCFG_SOUND_WAVE_ADD(_tag, _cass_tag) \
- MCFG_SOUND_ADD( _tag, WAVE, 0 ) \
+ MCFG_DEVICE_ADD( _tag, WAVE, 0 ) \
downcast<wave_device &>(*device).set_cassette_tag(_cass_tag);
#endif // MAME_SOUND_WAVE_H
diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp
index 45fca983636..b4cc4c7b1e7 100644
--- a/src/devices/video/huc6272.cpp
+++ b/src/devices/video/huc6272.cpp
@@ -385,13 +385,13 @@ WRITE32_MEMBER( huc6272_device::write )
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))
- MCFG_SCSI_REQ_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit5))
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit4))
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit3))
- MCFG_SCSI_IO_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit2))
- MCFG_SCSI_SEL_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit1))
+ MCFG_SCSI_RST_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit5))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit4))
+ MCFG_SCSI_CD_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit3))
+ MCFG_SCSI_IO_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit2))
+ MCFG_SCSI_SEL_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit1))
MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h
index 8763befc8ce..9175322a8ad 100644
--- a/src/devices/video/psx.h
+++ b/src/devices/video/psx.h
@@ -20,21 +20,21 @@
#define MCFG_PSXGPU_ADD( cputag, tag, type, _vramSize, clock ) \
MCFG_DEVICE_MODIFY( cputag ) \
- MCFG_PSX_GPU_READ_HANDLER(DEVREAD32(tag, psxgpu_device, read)) \
- MCFG_PSX_GPU_WRITE_HANDLER(DEVWRITE32(tag, psxgpu_device, write)) \
+ MCFG_PSX_GPU_READ_HANDLER(READ32(tag, psxgpu_device, read)) \
+ MCFG_PSX_GPU_WRITE_HANDLER(WRITE32(tag, psxgpu_device, write)) \
MCFG_DEVICE_ADD( tag, type, clock ) \
downcast<psxgpu_device &>(*device).set_vram_size(_vramSize); \
- MCFG_PSX_GPU_VBLANK_HANDLER(DEVWRITELINE(cputag ":irq", psxirq_device, intin0)) \
+ MCFG_PSX_GPU_VBLANK_HANDLER(WRITELINE(cputag ":irq", psxirq_device, intin0)) \
MCFG_PSX_DMA_CHANNEL_READ( cputag, 2, psxdma_device::write_delegate(&psxgpu_device::dma_read, (psxgpu_device *) device ) ) \
MCFG_PSX_DMA_CHANNEL_WRITE( cputag, 2, psxdma_device::read_delegate(&psxgpu_device::dma_write, (psxgpu_device *) device ) )
#define MCFG_PSXGPU_REPLACE( cputag, tag, type, _vramSize, clock ) \
MCFG_DEVICE_MODIFY( cputag ) \
- MCFG_PSX_GPU_READ_HANDLER(DEVREAD32(tag, psxgpu_device, read)) \
- MCFG_PSX_GPU_WRITE_HANDLER(DEVWRITE32(tag, psxgpu_device, write)) \
+ MCFG_PSX_GPU_READ_HANDLER(READ32(tag, psxgpu_device, read)) \
+ MCFG_PSX_GPU_WRITE_HANDLER(WRITE32(tag, psxgpu_device, write)) \
MCFG_DEVICE_REPLACE( tag, type, clock ) \
downcast<psxgpu_device &>(*device).set_vram_size(_vramSize); \
- MCFG_PSX_GPU_VBLANK_HANDLER(DEVWRITELINE(cputag ":irq", psxirq_device, intin0)) \
+ MCFG_PSX_GPU_VBLANK_HANDLER(WRITELINE(cputag ":irq", psxirq_device, intin0)) \
MCFG_PSX_DMA_CHANNEL_READ( cputag, 2, psxdma_device::write_delegate(&psxgpu_device::dma_read, (psxgpu_device *) device ) ) \
MCFG_PSX_DMA_CHANNEL_WRITE( cputag, 2, psxdma_device::read_delegate(&psxgpu_device::dma_write, (psxgpu_device *) device ) )
diff --git a/src/emu/devcb.h b/src/emu/devcb.h
index 2fd6e53ae19..120a5c47163 100644
--- a/src/emu/devcb.h
+++ b/src/emu/devcb.h
@@ -105,33 +105,19 @@ template <typename DescType> struct devcb_line_desc_creator
// MACROS
//**************************************************************************
-// wrappers for read callbacks into the owner device
-#define DEVCB_READLINE(_class, _func) (emu::detail::devcb_delegate_initialiser<read_line_delegate>(DEVICE_SELF, read_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_READ8(_class, _func) (emu::detail::devcb_delegate_initialiser<read8_delegate>(DEVICE_SELF, read8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_READ16(_class, _func) (emu::detail::devcb_delegate_initialiser<read16_delegate>(DEVICE_SELF, read16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_READ32(_class, _func) (emu::detail::devcb_delegate_initialiser<read32_delegate>(DEVICE_SELF, read32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_READ64(_class, _func) (emu::detail::devcb_delegate_initialiser<read64_delegate>(DEVICE_SELF, read64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-
// wrappers for read callbacks into any tagged device
-#define DEVCB_DEVREADLINE(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read_line_delegate>((tag), read_line_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVREAD8(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read8_delegate>((tag), read8_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVREAD16(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read16_delegate>((tag), read16_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVREAD32(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read32_delegate>((tag), read32_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVREAD64(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read64_delegate>((tag), read64_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-
-// wrappers for write callbacks into the owner device
-#define DEVCB_WRITELINE(_class, _func) (emu::detail::devcb_delegate_initialiser<write_line_delegate>(DEVICE_SELF, write_line_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_WRITE8(_class, _func) (emu::detail::devcb_delegate_initialiser<write8_delegate>(DEVICE_SELF, write8_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_WRITE16(_class, _func) (emu::detail::devcb_delegate_initialiser<write16_delegate>(DEVICE_SELF, write16_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_WRITE32(_class, _func) (emu::detail::devcb_delegate_initialiser<write32_delegate>(DEVICE_SELF, write32_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
-#define DEVCB_WRITE64(_class, _func) (emu::detail::devcb_delegate_initialiser<write64_delegate>(DEVICE_SELF, write64_delegate(&_class::_func, #_class "::" #_func, DEVICE_SELF, (_class *)nullptr)))
+#define DEVCB_READLINE(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read_line_delegate>((tag), read_line_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_READ8(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read8_delegate>((tag), read8_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_READ16(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read16_delegate>((tag), read16_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_READ32(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read32_delegate>((tag), read32_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_READ64(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<read64_delegate>((tag), read64_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
// wrappers for write callbacks into any tagged device
-#define DEVCB_DEVWRITELINE(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write_line_delegate>((tag), write_line_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVWRITE8(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write8_delegate>((tag), write8_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVWRITE16(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write16_delegate>((tag), write16_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVWRITE32(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write32_delegate>((tag), write32_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
-#define DEVCB_DEVWRITE64(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write64_delegate>((tag), write64_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_WRITELINE(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write_line_delegate>((tag), write_line_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_WRITE8(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write8_delegate>((tag), write8_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_WRITE16(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write16_delegate>((tag), write16_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_WRITE32(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write32_delegate>((tag), write32_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
+#define DEVCB_WRITE64(tag, _class, _func) (emu::detail::devcb_delegate_initialiser<write64_delegate>((tag), write64_delegate(&_class::_func, #_class "::" #_func, emu::detail::devcb_delegate_get_tag(tag), (_class *)nullptr)))
// machine config helpers to add shift, mask, or address space configuration
#define MCFG_DEVCB_RSHIFT(_shift) devcb->set_rshift(_shift);
@@ -335,13 +321,14 @@ public:
// callback configuration
using devcb_base::set_callback;
template <typename Delegate>
- std::enable_if_t<set_helper<Delegate, void>::valid, devcb_base &> set_callback(emu::detail::devcb_delegate_initialiser<Delegate> &&desc)
+ std::enable_if_t<set_helper<Delegate, void>::valid, devcb_read_base &> set_callback(emu::detail::devcb_delegate_initialiser<Delegate> &&desc)
{
if (desc.m_base) reset(*desc.m_base, set_helper<Delegate, void>::type);
else reset(set_helper<Delegate, void>::type);
set_helper<Delegate, void>::apply(*this, std::move(desc.m_delegate));
return *this;
}
+ template <typename... Params> auto &chain(Params &&... args) { return chain_alloc().set_callback(std::forward<Params>(args)...); }
devcb_read_base &chain_alloc();
// resolution
@@ -429,14 +416,14 @@ public:
// callback configuration
using devcb_base::set_callback;
template <typename Delegate>
- std::enable_if_t<set_helper<Delegate, void>::valid, devcb_base &> set_callback(emu::detail::devcb_delegate_initialiser<Delegate> &&desc)
+ std::enable_if_t<set_helper<Delegate, void>::valid, devcb_write_base &> set_callback(emu::detail::devcb_delegate_initialiser<Delegate> &&desc)
{
if (desc.m_base) reset(*desc.m_base, set_helper<Delegate, void>::type);
else reset(set_helper<Delegate, void>::type);
set_helper<Delegate, void>::apply(*this, std::move(desc.m_delegate));
return *this;
}
- template <callback_type Type> devcb_base &set_callback(line_desc<Type> desc)
+ template <callback_type Type> devcb_write_base &set_callback(line_desc<Type> desc)
{
if (desc.m_base) reset(*desc.m_base, Type);
else reset(Type);
@@ -444,6 +431,7 @@ public:
m_target_int = desc.m_inputnum;
return *this;
}
+ template <typename... Params> auto &chain(Params &&... args) { return chain_alloc().set_callback(std::forward<Params>(args)...); }
devcb_write_base &chain_alloc();
// resolution
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index 8d73127e1f7..3e4dd89f8ce 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -20,28 +20,6 @@
// CPU DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_CPU_ADD MCFG_DEVICE_ADD
-#define MCFG_CPU_MODIFY MCFG_DEVICE_MODIFY
-#define MCFG_CPU_REPLACE MCFG_DEVICE_REPLACE
-
-#define MCFG_CPU_CLOCK MCFG_DEVICE_CLOCK
-
-#define MCFG_CPU_PROGRAM_MAP MCFG_DEVICE_PROGRAM_MAP
-#define MCFG_CPU_DATA_MAP MCFG_DEVICE_DATA_MAP
-#define MCFG_CPU_IO_MAP MCFG_DEVICE_IO_MAP
-#define MCFG_CPU_OPCODES_MAP MCFG_DEVICE_OPCODES_MAP
-
-#define MCFG_CPU_VBLANK_INT_DRIVER MCFG_DEVICE_VBLANK_INT_DRIVER
-#define MCFG_CPU_PERIODIC_INT_DRIVER MCFG_DEVICE_PERIODIC_INT_DRIVER
-#define MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER
-#define MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE
-
-#define MCFG_CPU_VBLANK_INT_REMOVE MCFG_DEVICE_VBLANK_INT_REMOVE
-#define MCFG_CPU_PERIODIC_INT_REMOVE MCFG_DEVICE_PERIODIC_INT_REMOVE
-#define MCFG_CPU_IRQ_ACKNOWLEDGE_REMOVE MCFG_DEVICE_IRQ_ACKNOWLEDGE_REMOVE
-
-#define MCFG_CPU_DISASSEMBLE_OVERRIDE MCFG_DEVICE_DISASSEMBLE_OVERRIDE
-
// recompilation parameters
#define MCFG_CPU_FORCE_NO_DRC() \
dynamic_cast<cpu_device &>(*device).set_force_no_drc(true);
diff --git a/src/emu/devfind.h b/src/emu/devfind.h
index 9bd5ad48fde..b844eda145f 100644
--- a/src/emu/devfind.h
+++ b/src/emu/devfind.h
@@ -300,6 +300,17 @@ public:
/// until resolution time.
void set_tag(char const *tag);
+ /// \brief Set search tag
+ ///
+ /// Allows search tag to be changed after construction. Note that
+ /// this must be done before resolution time to take effect.
+ /// \param [in] finder Object finder to take the search base and tag
+ /// from.
+ void set_tag(finder_base const &finder)
+ {
+ std::tie(m_base, m_tag) = finder.finder_target();
+ }
+
/// \brief Is the object to be resolved before memory maps?
///
/// Some objects must be resolved before memory maps are loaded
diff --git a/src/emu/device.h b/src/emu/device.h
index cc8b5209945..a7b9d8707e3 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -261,10 +261,6 @@ public:
device_feature::type unemulated_features() const { return m_unemulated_features; }
device_feature::type imperfect_features() const { return m_imperfect_features; }
- std::unique_ptr<device_t> operator()(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) const
- {
- return m_creator(*this, mconfig, tag, owner, clock);
- }
std::unique_ptr<device_t> create(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) const
{
return m_creator(*this, mconfig, tag, owner, clock);
@@ -284,7 +280,6 @@ public:
using device_type_impl_base::device_type_impl_base;
using device_type_impl_base::create;
- using device_type_impl_base::operator();
template <typename... Params>
std::unique_ptr<DeviceClass> create(machine_config &mconfig, char const *tag, device_t *owner, Params &&... args) const
diff --git a/src/emu/digfx.h b/src/emu/digfx.h
index 8c4ebdb5fbe..f63231c7ad8 100644
--- a/src/emu/digfx.h
+++ b/src/emu/digfx.h
@@ -140,7 +140,7 @@ const gfx_layout name = { width, height, RGN_FRAC(1,1), 8, { GFX_RAW }, { 0 }, {
//**************************************************************************
#define MCFG_GFXDECODE_ADD(_tag, _palette_tag, _info) \
- MCFG_DEVICE_ADD(_tag, GFXDECODE, 0) \
+ MCFG_DEVICE_ADD(_tag, GFXDECODE) \
MCFG_GFX_PALETTE(_palette_tag) \
MCFG_GFX_INFO(_info)
diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp
index 37acf1dfddd..5086a658ab8 100644
--- a/src/emu/dislot.cpp
+++ b/src/emu/dislot.cpp
@@ -17,6 +17,7 @@
device_slot_interface::device_slot_interface(const machine_config &mconfig, device_t &device) :
device_interface(device, "slot"),
+ m_default_clock(0), // FIXME: zero to preserve behaviour - should probably be DERIVED_CLOCK(1, 1)
m_default_option(nullptr),
m_fixed(false),
m_card_device(nullptr)
@@ -62,7 +63,7 @@ device_slot_interface::slot_option &device_slot_interface::option_add(const char
if (m_options.count(name))
throw tag_add_exception(name);
- return *m_options.emplace(name, std::make_unique<slot_option>(name, devtype, true)).first->second;
+ return m_options.emplace(name, std::make_unique<slot_option>(name, devtype, true)).first->second->clock(m_default_clock);
}
@@ -79,7 +80,7 @@ device_slot_interface::slot_option &device_slot_interface::option_add_internal(c
if (m_options.count(name))
throw tag_add_exception(name);
- return *m_options.emplace(name, std::make_unique<slot_option>(name, devtype, false)).first->second;
+ return m_options.emplace(name, std::make_unique<slot_option>(name, devtype, false)).first->second->clock(m_default_clock);
}
diff --git a/src/emu/dislot.h b/src/emu/dislot.h
index be10da760cd..154e7452b10 100644
--- a/src/emu/dislot.h
+++ b/src/emu/dislot.h
@@ -110,8 +110,6 @@ public:
std::function<void (device_t *)> m_machine_config;
input_device_default const *m_input_device_defaults;
u32 m_clock;
-
- friend class device_slot_interface;
};
// construction/destruction
@@ -123,9 +121,9 @@ public:
void option_reset() { m_options.clear(); }
slot_option &option_add(const char *option, const device_type &devtype);
slot_option &option_add_internal(const char *option, const device_type &devtype);
- void set_option_default_bios(const char *option, const char *default_bios) { config_option(option)->m_default_bios = default_bios; }
- void set_option_machine_config(const char *option, std::function<void (device_t *)> machine_config) { config_option(option)->m_machine_config = machine_config; }
- void set_option_device_input_defaults(const char *option, const input_device_default *default_input) { config_option(option)->m_input_device_defaults = default_input; }
+ void set_option_default_bios(const char *option, const char *default_bios) { config_option(option)->default_bios(default_bios); }
+ template <typename T> void set_option_machine_config(const char *option, T &&machine_config) { config_option(option)->machine_config(std::forward<T>(machine_config)); }
+ void set_option_device_input_defaults(const char *option, const input_device_default *default_input) { config_option(option)->input_device_defaults(default_input); }
bool fixed() const { return m_fixed; }
bool has_selectable_options() const;
const char *default_option() const { return m_default_option; }
@@ -136,9 +134,13 @@ public:
void set_card_device(device_t *dev) { m_card_device = dev; }
const char *slot_name() const { return device().tag() + 1; }
+protected:
+ void set_default_clock(u32 clock) { m_default_clock = clock; }
+
private:
// internal state
std::unordered_map<std::string,std::unique_ptr<slot_option>> m_options;
+ u32 m_default_clock;
const char *m_default_option;
bool m_fixed;
device_t *m_card_device;
diff --git a/src/emu/disound.h b/src/emu/disound.h
index 05bba47f5b1..baa74321204 100644
--- a/src/emu/disound.h
+++ b/src/emu/disound.h
@@ -33,19 +33,9 @@ constexpr int AUTO_ALLOC_INPUT = 65535;
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_SOUND_ADD(_tag, _type, _clock) \
- MCFG_DEVICE_ADD(_tag, _type, _clock)
-#define MCFG_SOUND_MODIFY(_tag) \
- MCFG_DEVICE_MODIFY(_tag)
-
-#define MCFG_SOUND_CLOCK(_clock) \
- MCFG_DEVICE_CLOCK(_clock)
-
-#define MCFG_SOUND_REPLACE(_tag, _type, _clock) \
- MCFG_DEVICE_REPLACE(_tag, _type, _clock)
-
#define MCFG_SOUND_ROUTE(_output, _target, ...) \
dynamic_cast<device_sound_interface &>(*device).add_route(_output, _target, __VA_ARGS__);
+
#define MCFG_SOUND_ROUTES_RESET() \
dynamic_cast<device_sound_interface &>(*device).reset_routes();
diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h
index 9827c96900a..43e0b85472f 100644
--- a/src/emu/drawgfx.h
+++ b/src/emu/drawgfx.h
@@ -455,10 +455,10 @@ class gfxdecode_device : public device_t, public device_gfx_interface
{
public:
// construction/destruction
- gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ gfxdecode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
protected:
- virtual void device_start() override {};
+ virtual void device_start() override {}
};
GFXDECODE_EXTERN(empty);
diff --git a/src/emu/drivers/testcpu.cpp b/src/emu/drivers/testcpu.cpp
index b622528d02e..802c4f56b75 100644
--- a/src/emu/drivers/testcpu.cpp
+++ b/src/emu/drivers/testcpu.cpp
@@ -193,9 +193,9 @@ void testcpu_state::ppc_mem(address_map &map)
MACHINE_CONFIG_START(testcpu_state::testcpu)
// CPUs
- MCFG_CPU_ADD("maincpu", PPC603E, 66000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603E, 66000000)
MCFG_PPC_BUS_FREQUENCY(66000000) // Multiplier 1, Bus = 66MHz, Core = 66MHz
- MCFG_CPU_PROGRAM_MAP(ppc_mem)
+ MCFG_DEVICE_PROGRAM_MAP(ppc_mem)
MACHINE_CONFIG_END
diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp
index 546ce1c885f..7f142ab5958 100644
--- a/src/emu/mconfig.cpp
+++ b/src/emu/mconfig.cpp
@@ -187,7 +187,7 @@ device_t *machine_config::add_device(std::unique_ptr<device_t> &&device, device_
device_t *machine_config::device_add(const char *tag, device_type type, u32 clock)
{
std::pair<const char *, device_t *> const owner(resolve_owner(tag));
- return add_device(type(*this, owner.first, owner.second, clock), owner.second);
+ return add_device(type.create(*this, owner.first, owner.second, clock), owner.second);
}
@@ -216,7 +216,7 @@ device_t *machine_config::device_replace(const char *tag, device_type type, u32
remove_references(*old_device);
// allocate the new device and substitute it for the old one in the owner's list
- device_t *const new_device = &owner->subdevices().m_list.replace_and_remove(*type(*this, tag, owner, clock).release(), *old_device);
+ device_t *const new_device = &owner->subdevices().m_list.replace_and_remove(*type.create(*this, tag, owner, clock).release(), *old_device);
current_device_stack context(*this);
new_device->add_machine_configuration(*this);
return new_device;
diff --git a/src/emu/softlist_dev.h b/src/emu/softlist_dev.h
index 7f6649e1fb7..7921d751348 100644
--- a/src/emu/softlist_dev.h
+++ b/src/emu/softlist_dev.h
@@ -47,11 +47,11 @@ enum software_compatibility
downcast<software_list_device &>(*device).set_type(_list, _list_type);
#define MCFG_SOFTWARE_LIST_ADD( _tag, _list ) \
- MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \
+ MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST ) \
MCFG_SOFTWARE_LIST_CONFIG(_list, SOFTWARE_LIST_ORIGINAL_SYSTEM)
#define MCFG_SOFTWARE_LIST_COMPATIBLE_ADD( _tag, _list ) \
- MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \
+ MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST ) \
MCFG_SOFTWARE_LIST_CONFIG(_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM)
#define MCFG_SOFTWARE_LIST_MODIFY( _tag, _list ) \
@@ -132,7 +132,7 @@ class software_list_device : public device_t
public:
// construction/destruction
- software_list_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ software_list_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
// inline configuration helpers
void set_type(const char *list, softlist_type list_type) { m_list_name.assign(list); m_list_type = list_type; }
diff --git a/src/emu/speaker.h b/src/emu/speaker.h
index 2280b883250..8d41342e01f 100644
--- a/src/emu/speaker.h
+++ b/src/emu/speaker.h
@@ -28,8 +28,8 @@ DECLARE_DEVICE_TYPE(SPEAKER, speaker_device)
// add/remove speakers
#define MCFG_SPEAKER_ADD(_tag, _x, _y, _z) \
- MCFG_DEVICE_ADD(_tag, SPEAKER, 0) \
- downcast<speaker_device &>(*device).set_position(_x, _y, _z);
+ MCFG_DEVICE_ADD(_tag, SPEAKER, _x, _y, _z)
+
#define MCFG_SPEAKER_STANDARD_MONO(_tag) \
MCFG_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0)
@@ -49,7 +49,12 @@ class speaker_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
- speaker_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ speaker_device(const machine_config &mconfig, const char *tag, device_t *owner, double x, double y, double z)
+ : speaker_device(mconfig, tag, owner, 0)
+ {
+ set_position(x, y, z);
+ }
+ speaker_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
virtual ~speaker_device();
// inline configuration helpers
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index c37cdd66be0..119319d32af 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -368,7 +368,7 @@ enum tilemap_standard_mapper
// primitives
#define MCFG_TILEMAP_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, TILEMAP, 0)
+ MCFG_DEVICE_ADD(_tag, TILEMAP)
#define MCFG_TILEMAP_GFXDECODE(_gfxtag) \
downcast<tilemap_device &>(*device).set_gfxdecode_tag(_gfxtag);
#define MCFG_TILEMAP_BYTES_PER_ENTRY(_bpe) \
@@ -718,7 +718,7 @@ class tilemap_device : public device_t,
{
public:
// construction/destruction
- tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
// configuration
void set_gfxdecode_tag(const char *tag) { m_gfxdecode.set_tag(tag); }
diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp
index 382b862ef8d..a49f25a6ecb 100644
--- a/src/mame/audio/alesis.cpp
+++ b/src/mame/audio/alesis.cpp
@@ -44,7 +44,7 @@ alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, const ch
MACHINE_CONFIG_START(alesis_dm3ag_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker1", "rspeaker1")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2")
- MCFG_SOUND_ADD("dac", PCM54HP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker1", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker1", 1.0) // PCM54HP DAC + R63/R73-75 + Sample and hold
+ MCFG_DEVICE_ADD("dac", PCM54HP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker1", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker1", 1.0) // PCM54HP DAC + R63/R73-75 + Sample and hold
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/arcadia.h b/src/mame/audio/arcadia.h
index 931801d74d8..8a3c9ec465d 100644
--- a/src/mame/audio/arcadia.h
+++ b/src/mame/audio/arcadia.h
@@ -4,13 +4,6 @@
#define MAME_AUDIO_ARCADIA_H
//**************************************************************************
-// INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_ARCADIA_SOUND_ADD(_tag) \
- MCFG_SOUND_ADD(_tag, ARCADIA_SOUND, 0)
-
-//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -20,7 +13,7 @@ class arcadia_sound_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- arcadia_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ arcadia_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
DECLARE_WRITE8_MEMBER(write);
protected:
diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp
index 6c8b0400070..7eb5816c913 100644
--- a/src/mame/audio/asteroid.cpp
+++ b/src/mame/audio/asteroid.cpp
@@ -318,27 +318,27 @@ WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w)
MACHINE_CONFIG_START(asteroid_state::asteroid_sound)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(asteroid)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SND_EN>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_FIRE_EN>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SEL>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_SHIP_FIRE_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_LIFE_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SND_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_FIRE_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_SAUCER_SEL>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_SHIP_FIRE_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_LIFE_EN>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(asteroid_state::astdelux_sound)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(astdelux)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ASTEROID_THRUST_EN>))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp
index a1339992889..88fbb45e2ee 100644
--- a/src/mame/audio/astrof.cpp
+++ b/src/mame/audio/astrof.cpp
@@ -141,7 +141,7 @@ static const char *const astrof_sample_names[] =
MACHINE_CONFIG_START(astrof_state::astrof_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(astrof_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -197,7 +197,7 @@ WRITE8_MEMBER(astrof_state::tomahawk_audio_w)
MACHINE_CONFIG_START(astrof_state::tomahawk_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res N/C
MCFG_SN76477_ATTACK_PARAMS(0, 0) // attack_decay_cap + attack_res: N/C
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index cb6593a6183..3d854ded7c4 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -699,24 +699,24 @@ WRITE8_MEMBER( atari_jsa_i_device::pokey_w )
MACHINE_CONFIG_START(atari_jsa_i_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
+ MCFG_DEVICE_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(atarijsa1_map)
MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
- MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
+ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(*this, atari_jsa_base_device, main_int_write_line))
MCFG_YM2151_ADD("ym2151", JSA_MASTER_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(atari_jsa_base_device, ym2151_port_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w))
MCFG_MIXER_ROUTE(0, *this, 0.60, 0)
MCFG_MIXER_ROUTE(1, *this, 0.60, 1)
- MCFG_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.40, 0)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.40, 1)
- MCFG_SOUND_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) // potentially JSA_MASTER_CLOCK/9 as well
+ MCFG_DEVICE_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) // potentially JSA_MASTER_CLOCK/9 as well
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 1.0, 0)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 1.0, 1)
MACHINE_CONFIG_END
@@ -829,16 +829,16 @@ READ8_MEMBER( atari_jsa_ii_device::rdio_r )
MACHINE_CONFIG_START(atari_jsa_ii_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(atarijsa2_map)
+ MCFG_DEVICE_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(atarijsa2_map)
MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
- MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
+ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(*this, atari_jsa_base_device, main_int_write_line))
MCFG_YM2151_ADD("ym2151", JSA_MASTER_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(atari_jsa_base_device, ym2151_port_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.60, 0)
MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, PIN7_HIGH)
@@ -911,16 +911,16 @@ READ8_MEMBER( atari_jsa_iii_device::rdio_r )
MACHINE_CONFIG_START(atari_jsa_iii_device::device_add_mconfig)
// basic machine hardware
- MCFG_CPU_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(atarijsa3_map)
+ MCFG_DEVICE_ADD("cpu", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(atarijsa3_map)
MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, JSA_MASTER_CLOCK/4/16/16/14)
// sound hardware
- MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(atari_jsa_base_device, main_int_write_line))
+ MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "cpu", WRITELINE(*this, atari_jsa_base_device, main_int_write_line))
MCFG_YM2151_ADD("ym2151", JSA_MASTER_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(atari_jsa_base_device, ym2151_port_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.60, 0)
MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, PIN7_HIGH)
@@ -964,7 +964,7 @@ MACHINE_CONFIG_START(atari_jsa_iiis_device::device_add_mconfig)
atari_jsa_iii_device::device_add_mconfig(config);
- MCFG_SOUND_MODIFY("ym2151")
+ MCFG_DEVICE_MODIFY("ym2151")
MCFG_SOUND_ROUTES_RESET()
MCFG_MIXER_ROUTE(0, *this, 0.60, 0)
MCFG_MIXER_ROUTE(1, *this, 0.60, 1)
diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp
index aaea71a4298..9590658a7c4 100644
--- a/src/mame/audio/avalnche.cpp
+++ b/src/mame/audio/avalnche.cpp
@@ -106,24 +106,24 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(avalnche_state::avalnche_sound)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(avalnche)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_MODIFY("latch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_ATTRACT_EN>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD0_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD1_EN>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<AVALNCHE_ATTRACT_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD0_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<AVALNCHE_AUD2_EN>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(avalnche_state::acatch_sound) // just a stub here...
MCFG_DEVICE_MODIFY("latch")
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // It is attract_enable just like avalnche, but not hooked up yet.
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(avalnche_state, catch_aud0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(avalnche_state, catch_aud1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(avalnche_state, catch_aud2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, avalnche_state, catch_aud0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, avalnche_state, catch_aud1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, avalnche_state, catch_aud2_w))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp
index c89662edba0..5bb074aefa3 100644
--- a/src/mame/audio/bwidow.cpp
+++ b/src/mame/audio/bwidow.cpp
@@ -152,17 +152,17 @@ MACHINE_CONFIG_START(bwidow_state::bwidow_audio)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8) /* C/D3 */
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK / 8) /* C/D3 */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW0"))
MCFG_POKEY_OUTPUT_OPAMP(BW_R51, BW_C31, 5.0)
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8) /* B3 */
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK / 8) /* B3 */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW1"))
MCFG_POKEY_OUTPUT_OPAMP(BW_R47, BW_C32, 5.0)
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 1)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(bwidow)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -172,9 +172,9 @@ MACHINE_CONFIG_START(bwidow_state::bwidow_audio)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bwidow_state::gravitar_audio)
- MCFG_SOUND_MODIFY("pokey1")
+ MCFG_DEVICE_MODIFY("pokey1")
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(BW_R51, GRAV_C34, 5.0) /* BW_C31 ignored */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(gravitar)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp
index 247c0cb8a31..cf7d7f00b37 100644
--- a/src/mame/audio/bzone.cpp
+++ b/src/mame/audio/bzone.cpp
@@ -401,12 +401,12 @@ MACHINE_CONFIG_START(bzone_state::bzone_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("IN3"))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0)
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(bzone)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp
index 131ac9ba0e8..aec6a37d83d 100644
--- a/src/mame/audio/cage.cpp
+++ b/src/mame/audio/cage.cpp
@@ -628,8 +628,8 @@ void atari_cage_seattle_device::cage_map_seattle(address_map &map)
MACHINE_CONFIG_START(atari_cage_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("cage", TMS32031, 33868800)
- MCFG_CPU_PROGRAM_MAP(cage_map)
+ MCFG_DEVICE_ADD("cage", TMS32031, 33868800)
+ MCFG_DEVICE_PROGRAM_MAP(cage_map)
MCFG_TMS3203X_MCBL(true)
MCFG_TIMER_DEVICE_ADD("cage_dma_timer", DEVICE_SELF, atari_cage_device, dma_timer_callback)
@@ -642,22 +642,22 @@ MACHINE_CONFIG_START(atari_cage_device::device_add_mconfig)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
#if (DAC_BUFFER_CHANNELS == 4)
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac3", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac4", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
#else
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
#endif
MACHINE_CONFIG_END
@@ -685,6 +685,6 @@ MACHINE_CONFIG_START(atari_cage_seattle_device::device_add_mconfig)
atari_cage_device::device_add_mconfig(config);
- MCFG_CPU_MODIFY("cage")
- MCFG_CPU_PROGRAM_MAP(cage_map_seattle)
+ MCFG_DEVICE_MODIFY("cage")
+ MCFG_DEVICE_PROGRAM_MAP(cage_map_seattle)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/carnival.cpp b/src/mame/audio/carnival.cpp
index 74b9e246894..90cd3d3b35e 100644
--- a/src/mame/audio/carnival.cpp
+++ b/src/mame/audio/carnival.cpp
@@ -200,17 +200,17 @@ void vicdual_state::mboard_map(address_map &map)
MACHINE_CONFIG_START(vicdual_state::carnival_audio)
/* music board */
- MCFG_CPU_ADD("audiocpu", I8039, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(mboard_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(vicdual_state, carnival_music_port_1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(vicdual_state, carnival_music_port_2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(vicdual_state, carnival_music_port_t1_r))
+ MCFG_DEVICE_ADD("audiocpu", I8039, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(mboard_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, vicdual_state, carnival_music_port_1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, vicdual_state, carnival_music_port_2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, vicdual_state, carnival_music_port_t1_r))
- MCFG_SOUND_ADD("psg", AY8912, XTAL(3'579'545)/3)
+ MCFG_DEVICE_ADD("psg", AY8912, XTAL(3'579'545)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* samples */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(10)
MCFG_SAMPLES_NAMES(carnival_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp
index e29bc52071e..b9dbae51604 100644
--- a/src/mame/audio/cclimber.cpp
+++ b/src/mame/audio/cclimber.cpp
@@ -58,11 +58,11 @@ void cclimber_audio_device::device_start()
//-------------------------------------------------
MACHINE_CONFIG_START(cclimber_audio_device::device_add_mconfig)
- MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK/2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(cclimber_audio_device, sample_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SND_CLOCK/2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, cclimber_audio_device, sample_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":speaker", 0.5)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(cclimber_audio_device, sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":speaker", 0.5)
diff --git a/src/mame/audio/channelf.h b/src/mame/audio/channelf.h
index 167c4e15d08..26e3b85b52d 100644
--- a/src/mame/audio/channelf.h
+++ b/src/mame/audio/channelf.h
@@ -12,7 +12,7 @@
class channelf_sound_device : public device_t, public device_sound_interface
{
public:
- channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
void sound_w(int mode);
protected:
diff --git a/src/mame/audio/cheekyms.cpp b/src/mame/audio/cheekyms.cpp
index 0ffa15a1079..238732f4e19 100644
--- a/src/mame/audio/cheekyms.cpp
+++ b/src/mame/audio/cheekyms.cpp
@@ -40,7 +40,7 @@ WRITE_LINE_MEMBER(cheekyms_audio_device::coin_extra_w) { m_coin_extra->write_li
MACHINE_CONFIG_START(cheekyms_audio_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sound_nl", NETLIST_SOUND, 48000)
+ MCFG_DEVICE_ADD("sound_nl", NETLIST_SOUND, 48000)
MCFG_NETLIST_SETUP(cheekyms)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp
index fb9dbec1349..48a23311981 100644
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@@ -153,15 +153,15 @@ WRITE_LINE_MEMBER(cinemat_state::spacewar_sound4_w)
MACHINE_CONFIG_START(cinemat_state::spacewar_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, spacewar_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, spacewar_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, spacewar_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, spacewar_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, spacewar_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(spacewar_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -207,13 +207,13 @@ WRITE_LINE_MEMBER(cinemat_state::barrier_sound2_w)
MACHINE_CONFIG_START(cinemat_state::barrier_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, barrier_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, barrier_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, barrier_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, barrier_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, barrier_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, barrier_sound2_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(barrier_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -264,13 +264,13 @@ WRITE_LINE_MEMBER(cinemat_state::speedfrk_start_led_w)
MACHINE_CONFIG_START(cinemat_state::speedfrk_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, speedfrk_start_led_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, speedfrk_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, speedfrk_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, speedfrk_start_led_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, speedfrk_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, speedfrk_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(speedfrk_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -346,16 +346,16 @@ WRITE_LINE_MEMBER(cinemat_state::starhawk_sound7_w)
MACHINE_CONFIG_START(cinemat_state::starhawk_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, starhawk_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, starhawk_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, starhawk_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, starhawk_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, starhawk_sound4_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(cinemat_state, starhawk_sound7_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound7_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(starhawk_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -425,16 +425,16 @@ WRITE_LINE_MEMBER(cinemat_state::sundance_sound7_w)
MACHINE_CONFIG_START(cinemat_state::sundance_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, sundance_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, sundance_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, sundance_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, sundance_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, sundance_sound4_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(cinemat_state, sundance_sound7_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound7_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(sundance_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -508,11 +508,11 @@ WRITE_LINE_MEMBER(cinemat_state::tailg_sound_w)
MACHINE_CONFIG_START(cinemat_state::tailg_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, tailg_sound_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, tailg_sound_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(tailg_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -578,15 +578,15 @@ WRITE_LINE_MEMBER(cinemat_state::warrior_sound4_w)
MACHINE_CONFIG_START(cinemat_state::warrior_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, warrior_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, warrior_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, warrior_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, warrior_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, warrior_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(warrior_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -678,15 +678,15 @@ WRITE_LINE_MEMBER(cinemat_state::armora_sound3_w)
MACHINE_CONFIG_START(cinemat_state::armora_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, armora_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, armora_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, armora_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, armora_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, armora_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(7)
MCFG_SAMPLES_NAMES(armora_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -775,15 +775,15 @@ WRITE_LINE_MEMBER(cinemat_state::ripoff_sound7_w)
MACHINE_CONFIG_START(cinemat_state::ripoff_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, ripoff_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, ripoff_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, ripoff_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, ripoff_sound4_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(cinemat_state, ripoff_sound7_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound7_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(ripoff_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -892,15 +892,15 @@ WRITE_LINE_MEMBER(cinemat_state::starcas_sound3_w)
MACHINE_CONFIG_START(cinemat_state::starcas_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, starcas_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, starcas_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, starcas_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, starcas_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, starcas_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(starcas_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
@@ -1026,13 +1026,13 @@ WRITE_LINE_MEMBER(cinemat_state::solarq_sound0_w)
MACHINE_CONFIG_START(cinemat_state::solarq_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, solarq_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, solarq_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, solarq_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, solarq_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, solarq_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, solarq_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(solarq_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
@@ -1164,15 +1164,15 @@ WRITE_LINE_MEMBER(cinemat_state::boxingb_sound3_w)
MACHINE_CONFIG_START(cinemat_state::boxingb_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, boxingb_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, boxingb_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, boxingb_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, boxingb_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, boxingb_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(12)
MCFG_SAMPLES_NAMES(boxingb_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1281,15 +1281,15 @@ WRITE_LINE_MEMBER(cinemat_state::wotw_sound3_w)
MACHINE_CONFIG_START(cinemat_state::wotw_sound)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cinemat_state, wotw_sound0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cinemat_state, wotw_sound1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cinemat_state, wotw_sound2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cinemat_state, wotw_sound3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, wotw_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound4_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(wotw_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1400,10 +1400,10 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(cinemat_state::demon_sound)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(demon_sound_map)
- MCFG_CPU_IO_MAP(demon_sound_ports)
+ MCFG_DEVICE_PROGRAM_MAP(demon_sound_map)
+ MCFG_DEVICE_IO_MAP(demon_sound_ports)
MCFG_DEVICE_ADD("ctc", Z80CTC, 3579545 /* same as "audiocpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
@@ -1411,24 +1411,24 @@ MACHINE_CONFIG_START(cinemat_state::demon_sound)
MCFG_SOUND_RESET_OVERRIDE(cinemat_state, demon)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cinemat_state, demon_sound4_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, demon_sound4_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 3579545)
- MCFG_AY8910_PORT_A_READ_CB(READ8(cinemat_state, sound_porta_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(cinemat_state, sound_portb_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(cinemat_state, sound_portb_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 3579545)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, cinemat_state, sound_porta_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, cinemat_state, sound_portb_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, cinemat_state, sound_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 3579545)
+ MCFG_DEVICE_ADD("ay2", AY8910, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8910, 3579545)
+ MCFG_DEVICE_ADD("ay3", AY8910, 3579545)
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(cinemat_state, sound_output_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, cinemat_state, sound_output_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/cmi01a.cpp b/src/mame/audio/cmi01a.cpp
index 26d4e5a4430..3c027d7ed5d 100644
--- a/src/mame/audio/cmi01a.cpp
+++ b/src/mame/audio/cmi01a.cpp
@@ -28,29 +28,29 @@ cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, dev
MACHINE_CONFIG_START(cmi01a_device::device_add_mconfig)
MCFG_DEVICE_ADD("cmi01a_pia_0", PIA6821, 0) // pia_cmi01a_1_config
- MCFG_PIA_READCB1_HANDLER(READLINE(cmi01a_device, tri_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi01a_device, ws_dir_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(cmi01a_device, rp_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(cmi01a_device, pia_0_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(cmi01a_device, pia_0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("cmi01a_irq", input_merger_device, in_w<0>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("cmi01a_irq", input_merger_device, in_w<1>))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, cmi01a_device, tri_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, cmi01a_device, ws_dir_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, cmi01a_device, rp_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, cmi01a_device, pia_0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, cmi01a_device, pia_0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("cmi01a_irq", input_merger_device, in_w<0>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("cmi01a_irq", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("cmi01a_pia_1", PIA6821, 0) // pia_cmi01a_2_config
- MCFG_PIA_READCA1_HANDLER(READLINE(cmi01a_device, zx_r))
- MCFG_PIA_READCA2_HANDLER(READLINE(cmi01a_device, eosi_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi01a_device, pia_1_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(cmi01a_device, pia_1_b_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("cmi01a_irq", input_merger_device, in_w<2>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("cmi01a_irq", input_merger_device, in_w<3>))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, cmi01a_device, zx_r))
+ MCFG_PIA_READCA2_HANDLER(READLINE(*this, cmi01a_device, eosi_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, cmi01a_device, pia_1_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, cmi01a_device, pia_1_b_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("cmi01a_irq", input_merger_device, in_w<2>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("cmi01a_irq", input_merger_device, in_w<3>))
MCFG_DEVICE_ADD("cmi01a_ptm", PTM6840, 2000000) // ptm_cmi01a_config
MCFG_PTM6840_EXTERNAL_CLOCKS(250000, 500000, 500000)
- MCFG_PTM6840_O1_CB(WRITELINE(cmi01a_device, ptm_o1))
- MCFG_PTM6840_IRQ_CB(DEVWRITELINE("cmi01a_irq", input_merger_device, in_w<4>))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, cmi01a_device, ptm_o1))
+ MCFG_PTM6840_IRQ_CB(WRITELINE("cmi01a_irq", input_merger_device, in_w<4>))
MCFG_INPUT_MERGER_ANY_HIGH("cmi01a_irq")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(cmi01a_device, cmi01a_irq))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, cmi01a_device, cmi01a_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp
index 1137a30c8f9..986537bb7db 100644
--- a/src/mame/audio/copsnrob.cpp
+++ b/src/mame/audio/copsnrob.cpp
@@ -699,18 +699,18 @@ MACHINE_CONFIG_START(copsnrob_state::copsnrob_audio)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(copsnrob)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("latch", F9334, 0) // H3 on audio board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR3_INV>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR2_INV>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR1_INV>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR0_INV>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_SCREECH_INV>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_CRASH_INV>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(copsnrob_state, one_start_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<COPSNROB_AUDIO_ENABLE>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR3_INV>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR2_INV>))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR1_INV>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_MOTOR0_INV>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_SCREECH_INV>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_CRASH_INV>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, copsnrob_state, one_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<COPSNROB_AUDIO_ENABLE>))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp
index 3419edb3d3c..8ed2352e89c 100644
--- a/src/mame/audio/crbaloon.cpp
+++ b/src/mame/audio/crbaloon.cpp
@@ -142,7 +142,7 @@ MACHINE_CONFIG_START(crbaloon_state::crbaloon_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(330), CAP_P(470)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(220)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(1.0), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -158,7 +158,7 @@ MACHINE_CONFIG_START(crbaloon_state::crbaloon_audio)
MCFG_SN76477_ENABLE(0) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(crbaloon)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp
index 5d76e5f772e..79603509c9a 100644
--- a/src/mame/audio/csd.cpp
+++ b/src/mame/audio/csd.cpp
@@ -37,16 +37,16 @@ void midway_cheap_squeak_deluxe_device::csdeluxe_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(midway_cheap_squeak_deluxe_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", M68000, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
+ MCFG_DEVICE_ADD("cpu", M68000, DERIVED_CLOCK(1, 2))
+ MCFG_DEVICE_PROGRAM_MAP(csdeluxe_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_cheap_squeak_deluxe_device, porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_cheap_squeak_deluxe_device, portb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_cheap_squeak_deluxe_device, irq_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_cheap_squeak_deluxe_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, midway_cheap_squeak_deluxe_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, midway_cheap_squeak_deluxe_device, portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, midway_cheap_squeak_deluxe_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, midway_cheap_squeak_deluxe_device, irq_w))
- MCFG_SOUND_ADD("dac", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0)
+ MCFG_DEVICE_ADD("dac", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/csd.h b/src/mame/audio/csd.h
index 100aa272eac..5d637cd6a49 100644
--- a/src/mame/audio/csd.h
+++ b/src/mame/audio/csd.h
@@ -26,7 +26,7 @@ class midway_cheap_squeak_deluxe_device : public device_t, public device_mixer_i
{
public:
// construction/destruction
- midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 16'000'000);
// read/write
DECLARE_READ8_MEMBER(stat_r);
diff --git a/src/mame/audio/dai_snd.h b/src/mame/audio/dai_snd.h
index 20111be1663..68af32869e6 100644
--- a/src/mame/audio/dai_snd.h
+++ b/src/mame/audio/dai_snd.h
@@ -16,7 +16,7 @@ class dai_sound_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
DECLARE_WRITE_LINE_MEMBER(set_input_ch0);
DECLARE_WRITE_LINE_MEMBER(set_input_ch1);
@@ -32,8 +32,8 @@ protected:
private:
sound_stream * m_mixer_channel;
int m_dai_input[3];
- uint8_t m_osc_volume[3];
- uint8_t m_noise_volume;
+ uint8_t m_osc_volume[3];
+ uint8_t m_noise_volume;
static const uint16_t s_osc_volume_table[];
static const uint16_t s_noise_volume_table[];
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 53fe54a4d2b..a89370ea1d0 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -2471,18 +2471,18 @@ int dcs_audio_device::preprocess_write(uint16_t data)
/* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */
MACHINE_CONFIG_START(dcs_audio_device::add_mconfig_dcs )
- MCFG_CPU_ADD("dcs", ADSP2105, XTAL(10'000'000))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
- MCFG_CPU_PROGRAM_MAP(dcs_2k_program_map)
- MCFG_CPU_DATA_MAP(dcs_2k_data_map)
+ MCFG_DEVICE_ADD("dcs", ADSP2105, XTAL(10'000'000))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
+ MCFG_DEVICE_PROGRAM_MAP(dcs_2k_program_map)
+ MCFG_DEVICE_DATA_MAP(dcs_2k_data_map)
MCFG_TIMER_DEVICE_ADD("dcs_reg_timer", DEVICE_SELF, dcs_audio_device, dcs_irq)
MCFG_TIMER_DEVICE_ADD("dcs_int_timer", DEVICE_SELF, dcs_audio_device, internal_timer_callback)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac", DMADAC, 0) // AD-1851 16bit mono
+ MCFG_DEVICE_ADD("dac", DMADAC) // AD-1851 16bit mono
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2518,8 +2518,8 @@ MACHINE_CONFIG_START(dcs_audio_2k_uart_device::device_add_mconfig)
dcs_audio_device::add_mconfig_dcs(config);
- MCFG_CPU_MODIFY("dcs")
- MCFG_CPU_DATA_MAP(dcs_2k_uart_data_map)
+ MCFG_DEVICE_MODIFY("dcs")
+ MCFG_DEVICE_DATA_MAP(dcs_2k_uart_data_map)
MACHINE_CONFIG_END
DEFINE_DEVICE_TYPE(DCS_AUDIO_8K, dcs_audio_8k_device, "dcs_audio_8k", "DCS Audio 8K")
@@ -2538,9 +2538,9 @@ MACHINE_CONFIG_START(dcs_audio_8k_device::device_add_mconfig)
dcs_audio_device::add_mconfig_dcs(config);
- MCFG_CPU_MODIFY("dcs")
- MCFG_CPU_PROGRAM_MAP(dcs_8k_program_map)
- MCFG_CPU_DATA_MAP(dcs_8k_data_map)
+ MCFG_DEVICE_MODIFY("dcs")
+ MCFG_DEVICE_PROGRAM_MAP(dcs_8k_program_map)
+ MCFG_DEVICE_DATA_MAP(dcs_8k_data_map)
MACHINE_CONFIG_END
DEFINE_DEVICE_TYPE(DCS_AUDIO_WPC, dcs_audio_wpc_device, "dcs_audio_wpc", "DCS Audio WPC")
@@ -2558,9 +2558,9 @@ MACHINE_CONFIG_START(dcs_audio_wpc_device::device_add_mconfig)
dcs_audio_device::add_mconfig_dcs(config);
- MCFG_CPU_MODIFY("dcs")
- MCFG_CPU_PROGRAM_MAP(dcs_wpc_program_map)
- MCFG_CPU_DATA_MAP(dcs_wpc_data_map)
+ MCFG_DEVICE_MODIFY("dcs")
+ MCFG_DEVICE_PROGRAM_MAP(dcs_wpc_program_map)
+ MCFG_DEVICE_DATA_MAP(dcs_wpc_data_map)
MACHINE_CONFIG_END
@@ -2574,11 +2574,11 @@ dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type
}
MACHINE_CONFIG_START(dcs2_audio_device::add_mconfig_dcs2 )
- MCFG_CPU_ADD("dcs2", ADSP2115, XTAL(16'000'000))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
- MCFG_CPU_PROGRAM_MAP(dcs2_2115_program_map)
- MCFG_CPU_DATA_MAP(dcs2_2115_data_map)
+ MCFG_DEVICE_ADD("dcs2", ADSP2115, XTAL(16'000'000))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
+ MCFG_DEVICE_PROGRAM_MAP(dcs2_2115_program_map)
+ MCFG_DEVICE_DATA_MAP(dcs2_2115_data_map)
MCFG_TIMER_DEVICE_ADD("dcs_reg_timer", DEVICE_SELF, dcs_audio_device, dcs_irq)
MCFG_TIMER_DEVICE_ADD("dcs_sport0_timer", DEVICE_SELF, dcs_audio_device, sport0_irq)
@@ -2587,10 +2587,10 @@ MACHINE_CONFIG_START(dcs2_audio_device::add_mconfig_dcs2 )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2627,11 +2627,11 @@ MACHINE_CONFIG_START(dcs2_audio_2104_device::device_add_mconfig)
dcs2_audio_device::add_mconfig_dcs2(config);
- MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL(16'000'000))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device,timer_enable_callback)) /* callback for timer fired */
- MCFG_CPU_PROGRAM_MAP(dcs2_2104_program_map)
- MCFG_CPU_DATA_MAP(dcs2_2104_data_map)
+ MCFG_DEVICE_REPLACE("dcs2", ADSP2104, XTAL(16'000'000))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, dcs_audio_device,timer_enable_callback)) /* callback for timer fired */
+ MCFG_DEVICE_PROGRAM_MAP(dcs2_2104_program_map)
+ MCFG_DEVICE_DATA_MAP(dcs2_2104_data_map)
MACHINE_CONFIG_END
DEFINE_DEVICE_TYPE(DCS2_AUDIO_DSIO, dcs2_audio_dsio_device, "dcs2_audio_dsio", "DCS2 Audio DSIO")
@@ -2646,13 +2646,13 @@ dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, co
}
MACHINE_CONFIG_START(dcs2_audio_dsio_device::device_add_mconfig)
- MCFG_CPU_ADD("dsio", ADSP2181, XTAL(32'000'000))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
- MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
- MCFG_CPU_PROGRAM_MAP(dsio_program_map)
- MCFG_CPU_DATA_MAP(dsio_data_map)
- MCFG_CPU_IO_MAP(dsio_io_map)
+ MCFG_DEVICE_ADD("dsio", ADSP2181, XTAL(32'000'000))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
+ MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(*this, dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
+ MCFG_DEVICE_PROGRAM_MAP(dsio_program_map)
+ MCFG_DEVICE_DATA_MAP(dsio_data_map)
+ MCFG_DEVICE_IO_MAP(dsio_io_map)
MCFG_DEVICE_ADD("data_map_bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(dsio_rambank_map)
@@ -2667,10 +2667,10 @@ MACHINE_CONFIG_START(dcs2_audio_dsio_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2687,13 +2687,13 @@ dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig
}
MACHINE_CONFIG_START(dcs2_audio_denver_device::device_add_mconfig)
- MCFG_CPU_ADD("denver", ADSP2181, XTAL(33'333'000))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
- MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
- MCFG_CPU_PROGRAM_MAP(denver_program_map)
- MCFG_CPU_DATA_MAP(denver_data_map)
- MCFG_CPU_IO_MAP(denver_io_map)
+ MCFG_DEVICE_ADD("denver", ADSP2181, XTAL(33'333'000))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, dcs_audio_device, sound_tx_callback)) /* callback for serial transmit */
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, dcs_audio_device, timer_enable_callback)) /* callback for timer fired */
+ MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(*this, dcs_audio_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
+ MCFG_DEVICE_PROGRAM_MAP(denver_program_map)
+ MCFG_DEVICE_DATA_MAP(denver_data_map)
+ MCFG_DEVICE_IO_MAP(denver_io_map)
MCFG_DEVICE_ADD("data_map_bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(denver_rambank_map)
@@ -2708,21 +2708,21 @@ MACHINE_CONFIG_START(dcs2_audio_denver_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac3", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac4", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac5", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac5", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac6", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac6", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index 2a691432e87..8230204a507 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -49,9 +49,9 @@ DEFINE_DEVICE_TYPE(DECOBSMT, decobsmt_device, "decobsmt", "Data East/Sega/Stern
//-------------------------------------------------
MACHINE_CONFIG_START(decobsmt_device::device_add_mconfig)
- MCFG_CPU_ADD(M6809_TAG, MC6809E, XTAL(24'000'000) / 12) // 68B09E U6 (E & Q = 2 MHz according to manual)
- MCFG_CPU_PROGRAM_MAP(decobsmt_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
+ MCFG_DEVICE_ADD(M6809_TAG, MC6809E, XTAL(24'000'000) / 12) // 68B09E U6 (E & Q = 2 MHz according to manual)
+ MCFG_DEVICE_PROGRAM_MAP(decobsmt_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_BSMT2000_ADD(BSMT_TAG, XTAL(24'000'000))
diff --git a/src/mame/audio/depthch.cpp b/src/mame/audio/depthch.cpp
index 84ad14d635d..15f92dfc617 100644
--- a/src/mame/audio/depthch.cpp
+++ b/src/mame/audio/depthch.cpp
@@ -86,7 +86,7 @@ WRITE8_MEMBER( vicdual_state::depthch_audio_w )
MACHINE_CONFIG_START(vicdual_state::depthch_audio)
/* samples */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(depthch_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp
index 4b58364893e..70e06f7b597 100644
--- a/src/mame/audio/dkong.cpp
+++ b/src/mame/audio/dkong.cpp
@@ -1323,11 +1323,11 @@ MACHINE_CONFIG_START(dkong_state::dkong2b_audio)
MCFG_LATCH8_INVERT(0x0F)
MCFG_LATCH8_ADD("ls259.6h")
- MCFG_LATCH8_WRITE_0(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND0_INP>))
- MCFG_LATCH8_WRITE_1(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND1_INP>))
- MCFG_LATCH8_WRITE_2(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND2_INP>))
- MCFG_LATCH8_WRITE_6(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND6_INP>))
- MCFG_LATCH8_WRITE_7(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND7_INP>))
+ MCFG_LATCH8_WRITE_0(WRITELINE("discrete", discrete_device, write_line<DS_SOUND0_INP>))
+ MCFG_LATCH8_WRITE_1(WRITELINE("discrete", discrete_device, write_line<DS_SOUND1_INP>))
+ MCFG_LATCH8_WRITE_2(WRITELINE("discrete", discrete_device, write_line<DS_SOUND2_INP>))
+ MCFG_LATCH8_WRITE_6(WRITELINE("discrete", discrete_device, write_line<DS_SOUND6_INP>))
+ MCFG_LATCH8_WRITE_7(WRITELINE("discrete", discrete_device, write_line<DS_SOUND7_INP>))
/* If P2.Bit7 -> is apparently an external signal decay or other output control
* If P2.Bit6 -> activates the external compressed sample ROM (not radarscp1)
@@ -1338,19 +1338,19 @@ MACHINE_CONFIG_START(dkong_state::dkong2b_audio)
MCFG_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
MCFG_LATCH8_INVERT( 0x20 ) /* signal is inverted */
- MCFG_LATCH8_READ_5(DEVREADLINE("ls259.6h", latch8_device, bit3_r))
- MCFG_LATCH8_WRITE_7(DEVWRITELINE("discrete", discrete_device, write_line<DS_DISCHARGE_INV>))
-
- MCFG_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dkong_sound_map)
- MCFG_CPU_IO_MAP(dkong_sound_io_map)
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(dkong_state, dkong_tune_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dkong_state, dkong_voice_w))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dkong_state, dkong_p1_w)) // only write to dac
- MCFG_MCS48_PORT_P2_IN_CB(DEVREAD8("virtual_p2", latch8_device, read))
- MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("virtual_p2", latch8_device, write))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("ls259.6h", latch8_device, bit5_q_r))
- MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("ls259.6h", latch8_device, bit4_q_r))
+ MCFG_LATCH8_READ_5(READLINE("ls259.6h", latch8_device, bit3_r))
+ MCFG_LATCH8_WRITE_7(WRITELINE("discrete", discrete_device, write_line<DS_DISCHARGE_INV>))
+
+ MCFG_DEVICE_ADD("soundcpu", MB8884, I8035_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dkong_sound_map)
+ MCFG_DEVICE_IO_MAP(dkong_sound_io_map)
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, dkong_state, dkong_tune_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, dkong_state, dkong_voice_w))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dkong_state, dkong_p1_w)) // only write to dac
+ MCFG_MCS48_PORT_P2_IN_CB(READ8("virtual_p2", latch8_device, read))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8("virtual_p2", latch8_device, write))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("ls259.6h", latch8_device, bit5_q_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE("ls259.6h", latch8_device, bit4_q_r))
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_DISCRETE_ADD("discrete", 0, dkong2b)
@@ -1368,27 +1368,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::radarscp1_audio)
radarscp_audio(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(radarscp1_sound_io_map)
- MCFG_MCS48_PORT_P1_IN_CB(DEVREAD8("virtual_p1", latch8_device, read))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dkong_state, M58817_command_w))
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(radarscp1_sound_io_map)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8("virtual_p1", latch8_device, read))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dkong_state, M58817_command_w))
MCFG_MCS48_PORT_P2_IN_CB(NOOP)
/* virtual_p2 is not read -see memory map-, all bits are output bits */
MCFG_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */
MCFG_LATCH8_INVERT( 0x80 ) /* signal is inverted */
- MCFG_LATCH8_READ_7(DEVREADLINE("ls259.6h", latch8_device, bit3_r))
- MCFG_LATCH8_READ_6(DEVREAD8("tms", m58817_device, status_r))
+ MCFG_LATCH8_READ_7(READLINE("ls259.6h", latch8_device, bit3_r))
+ MCFG_LATCH8_READ_6(READ8("tms", m58817_device, status_r))
/* tms memory controller */
MCFG_DEVICE_ADD("m58819", M58819, 0)
- MCFG_SOUND_ADD("tms", M58817, XTAL(640'000))
- MCFG_TMS5110_M0_CB(DEVWRITELINE("m58819", tms6100_device, m0_w))
- MCFG_TMS5110_M1_CB(DEVWRITELINE("m58819", tms6100_device, m1_w))
- MCFG_TMS5110_ADDR_CB(DEVWRITE8("m58819", tms6100_device, add_w))
- MCFG_TMS5110_DATA_CB(DEVREADLINE("m58819", tms6100_device, data_line_r))
- MCFG_TMS5110_ROMCLK_CB(DEVWRITELINE("m58819", tms6100_device, clk_w))
+ MCFG_DEVICE_ADD("tms", M58817, XTAL(640'000))
+ MCFG_TMS5110_M0_CB(WRITELINE("m58819", tms6100_device, m0_w))
+ MCFG_TMS5110_M1_CB(WRITELINE("m58819", tms6100_device, m1_w))
+ MCFG_TMS5110_ADDR_CB(WRITE8("m58819", tms6100_device, add_w))
+ MCFG_TMS5110_DATA_CB(READLINE("m58819", tms6100_device, data_line_r))
+ MCFG_TMS5110_ROMCLK_CB(WRITELINE("m58819", tms6100_device, clk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1399,31 +1399,31 @@ MACHINE_CONFIG_START(dkong_state::dkongjr_audio)
MCFG_LATCH8_MASKOUT(0xE0)
MCFG_LATCH8_ADD( "ls259.6h")
- MCFG_LATCH8_WRITE_0(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND0_INP>))
- MCFG_LATCH8_WRITE_1(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND1_INP>))
- MCFG_LATCH8_WRITE_2(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND2_INP>))
- MCFG_LATCH8_WRITE_7(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND7_INP>))
+ MCFG_LATCH8_WRITE_0(WRITELINE("discrete", discrete_device, write_line<DS_SOUND0_INP>))
+ MCFG_LATCH8_WRITE_1(WRITELINE("discrete", discrete_device, write_line<DS_SOUND1_INP>))
+ MCFG_LATCH8_WRITE_2(WRITELINE("discrete", discrete_device, write_line<DS_SOUND2_INP>))
+ MCFG_LATCH8_WRITE_7(WRITELINE("discrete", discrete_device, write_line<DS_SOUND7_INP>))
MCFG_LATCH8_ADD( "ls259.5h")
- MCFG_LATCH8_WRITE_1(DEVWRITELINE("discrete", discrete_device, write_line<DS_SOUND9_INP>))
+ MCFG_LATCH8_WRITE_1(WRITELINE("discrete", discrete_device, write_line<DS_SOUND9_INP>))
MCFG_LATCH8_ADD( "ls259.4h")
MCFG_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
MCFG_LATCH8_INVERT( 0x70 ) /* all signals are inverted */
- MCFG_LATCH8_READ_6(DEVREADLINE("ls259.4h", latch8_device, bit1_r))
- MCFG_LATCH8_READ_5(DEVREADLINE("ls259.6h", latch8_device, bit3_r))
- MCFG_LATCH8_READ_4(DEVREADLINE("ls259.6h", latch8_device, bit6_r))
- MCFG_LATCH8_WRITE_7(DEVWRITELINE("discrete", discrete_device, write_line<DS_DISCHARGE_INV>))
-
- MCFG_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dkong_sound_map)
- MCFG_CPU_IO_MAP(dkongjr_sound_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dkong_state, dkong_p1_w)) // only write to dac
- MCFG_MCS48_PORT_P2_IN_CB(DEVREAD8("virtual_p2", latch8_device, read))
- MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("virtual_p2", latch8_device, write))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("ls259.6h", latch8_device, bit5_q_r))
- MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("ls259.6h", latch8_device, bit4_q_r))
+ MCFG_LATCH8_READ_6(READLINE("ls259.4h", latch8_device, bit1_r))
+ MCFG_LATCH8_READ_5(READLINE("ls259.6h", latch8_device, bit3_r))
+ MCFG_LATCH8_READ_4(READLINE("ls259.6h", latch8_device, bit6_r))
+ MCFG_LATCH8_WRITE_7(WRITELINE("discrete", discrete_device, write_line<DS_DISCHARGE_INV>))
+
+ MCFG_DEVICE_ADD("soundcpu", MB8884, I8035_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dkong_sound_map)
+ MCFG_DEVICE_IO_MAP(dkongjr_sound_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dkong_state, dkong_p1_w)) // only write to dac
+ MCFG_MCS48_PORT_P2_IN_CB(READ8("virtual_p2", latch8_device, read))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8("virtual_p2", latch8_device, write))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("ls259.6h", latch8_device, bit5_q_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE("ls259.6h", latch8_device, bit4_q_r))
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1433,11 +1433,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::dkong3_audio)
- MCFG_CPU_ADD("n2a03a", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dkong3_sound1_map)
+ MCFG_DEVICE_ADD("n2a03a", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dkong3_sound1_map)
- MCFG_CPU_ADD("n2a03b", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dkong3_sound2_map)
+ MCFG_DEVICE_ADD("n2a03b", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dkong3_sound2_map)
/* sound latches */
MCFG_LATCH8_ADD( "latch1")
diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp
index 7d4066b2cf4..6102e97a1bf 100644
--- a/src/mame/audio/dsbz80.cpp
+++ b/src/mame/audio/dsbz80.cpp
@@ -46,17 +46,17 @@ DEFINE_DEVICE_TYPE(DSBZ80, dsbz80_device, "dsbz80_device", "Sega Z80-based Digit
//-------------------------------------------------
MACHINE_CONFIG_START(dsbz80_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) /* unknown clock, but probably pretty slow considering the z80 does like nothing */
- MCFG_CPU_PROGRAM_MAP(dsbz80_map)
- MCFG_CPU_IO_MAP(dsbz80io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 4000000) /* unknown clock, but probably pretty slow considering the z80 does like nothing */
+ MCFG_DEVICE_PROGRAM_MAP(dsbz80_map)
+ MCFG_DEVICE_IO_MAP(dsbz80io_map)
MCFG_DEVICE_ADD("uart", I8251, 4000000)
MCFG_I8251_RXRDY_HANDLER(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_I8251_TXD_HANDLER(WRITELINE(dsbz80_device, output_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, dsbz80_device, output_txd))
MCFG_CLOCK_ADD("uart_clock", 500000) // 16 times 31.25MHz (standard Sega/MIDI sound data rate)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_txc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_txc))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp
index ec3df3434bd..cbf54a42b5a 100644
--- a/src/mame/audio/efo_zsu.cpp
+++ b/src/mame/audio/efo_zsu.cpp
@@ -191,62 +191,62 @@ TIMER_CALLBACK_MEMBER(cedar_magnet_sound_device::reset_assert_callback)
MACHINE_CONFIG_START(efo_zsu_device::device_add_mconfig)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(zsu_map)
- MCFG_CPU_IO_MAP(zsu_io)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(zsu_map)
+ MCFG_DEVICE_IO_MAP(zsu_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD("ctc0", Z80CTC, 4000000)
- MCFG_Z80CTC_INTR_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<0>))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(efo_zsu_device, ctc0_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(efo_zsu_device, ctc0_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(efo_zsu_device, ctc0_z2_w))
+ MCFG_Z80CTC_INTR_CB(WRITELINE("soundirq", input_merger_device, in_w<0>))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, efo_zsu_device, ctc0_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, efo_zsu_device, ctc0_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, efo_zsu_device, ctc0_z2_w))
MCFG_DEVICE_ADD("ctc1", Z80CTC, 4000000)
- MCFG_Z80CTC_INTR_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(efo_zsu_device, ctc1_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(efo_zsu_device, ctc1_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(efo_zsu_device, ctc1_z2_w))
+ MCFG_Z80CTC_INTR_CB(WRITELINE("soundirq", input_merger_device, in_w<1>))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, efo_zsu_device, ctc1_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, efo_zsu_device, ctc1_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, efo_zsu_device, ctc1_z2_w))
#if 0 // does nothing useful now
MCFG_DEVICE_ADD("ck1mhz", CLOCK, 4000000/4)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc1", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg2))
#endif
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<2>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", input_merger_device, in_w<2>))
MCFG_INPUT_MERGER_ANY_HIGH("soundirq") // 74HC03 NAND gate
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("soundcpu", INPUT_LINE_IRQ0))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd0", AY8910, 4000000/2)
+ MCFG_DEVICE_ADD("aysnd0", AY8910, 4000000/2)
MCFG_AY8910_PORT_A_WRITE_CB(MEMBANK("rombank")) MCFG_DEVCB_MASK(0x03)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("aysnd1", AY8910, 4000000/2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(efo_zsu_device, ay1_porta_w))
+ MCFG_DEVICE_ADD("aysnd1", AY8910, 4000000/2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, efo_zsu_device, ay1_porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADD("fifo", CD40105, 0)
- MCFG_40105_DATA_OUT_READY_CB(WRITELINE(efo_zsu_device, fifo_dor_w))
- MCFG_40105_DATA_OUT_CB(DEVWRITELINE("adpcm", msm5205_device, data_w))
+ MCFG_40105_DATA_OUT_READY_CB(WRITELINE(*this, efo_zsu_device, fifo_dor_w))
+ MCFG_40105_DATA_OUT_CB(WRITELINE("adpcm", msm5205_device, data_w))
- MCFG_SOUND_ADD("adpcm", MSM5205, 4000000/8)
+ MCFG_DEVICE_ADD("adpcm", MSM5205, 4000000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cedar_magnet_sound_device::device_add_mconfig)
efo_zsu_device::device_add_mconfig(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(cedar_magnet_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(cedar_magnet_sound_map)
- MCFG_SOUND_MODIFY("aysnd0")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(cedar_magnet_sound_device, ay0_porta_w))
+ MCFG_DEVICE_MODIFY("aysnd0")
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, cedar_magnet_sound_device, ay0_porta_w))
MACHINE_CONFIG_END
void efo_zsu_device::device_start()
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index 2fe9cd1999e..3a5a4c5a052 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -742,32 +742,32 @@ void exidy_state::venture_audio_map(address_map &map)
MACHINE_CONFIG_START(exidy_state::venture_audio)
- MCFG_CPU_ADD("audiocpu", M6502, 3579545/4)
- MCFG_CPU_PROGRAM_MAP(venture_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 3579545/4)
+ MCFG_DEVICE_PROGRAM_MAP(venture_audio_map)
MCFG_DEVICE_ADD("riot", RIOT6532, SH6532_CLOCK)
- MCFG_RIOT6532_IN_PA_CB(DEVREAD8("custom", exidy_sound_device, r6532_porta_r))
- MCFG_RIOT6532_OUT_PA_CB(DEVWRITE8("custom", exidy_sound_device, r6532_porta_w))
- MCFG_RIOT6532_IN_PB_CB(DEVREAD8("custom", exidy_sound_device, r6532_portb_r))
- MCFG_RIOT6532_OUT_PB_CB(DEVWRITE8("custom", exidy_sound_device, r6532_portb_w))
- MCFG_RIOT6532_IRQ_CB(DEVWRITELINE("custom", exidy_sound_device, r6532_irq))
+ MCFG_RIOT6532_IN_PA_CB(READ8("custom", exidy_sound_device, r6532_porta_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8("custom", exidy_sound_device, r6532_porta_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8("custom", exidy_sound_device, r6532_portb_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8("custom", exidy_sound_device, r6532_portb_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE("custom", exidy_sound_device, r6532_irq))
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("pia1", pia6821_device, portb_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("pia1", pia6821_device, porta_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("pia1", pia6821_device, cb1_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia1", pia6821_device, ca1_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("pia1", pia6821_device, portb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("pia1", pia6821_device, porta_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("pia1", pia6821_device, cb1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("pia1", pia6821_device, ca1_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("pia0", pia6821_device, portb_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("pia0", pia6821_device, porta_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("pia0", pia6821_device, cb1_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia0", pia6821_device, ca1_w))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("custom", exidy_sound_device, update_irq_state))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("pia0", pia6821_device, portb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("pia0", pia6821_device, porta_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("pia0", pia6821_device, cb1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("pia0", pia6821_device, ca1_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("custom", exidy_sound_device, update_irq_state))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", EXIDY_VENTURE, 0)
+ MCFG_DEVICE_ADD("custom", EXIDY_VENTURE, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -823,12 +823,12 @@ void exidy_state::cvsd_iomap(address_map &map)
MACHINE_CONFIG_START(exidy_state::mtrap_cvsd_audio)
- MCFG_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cvsd_map)
- MCFG_CPU_IO_MAP(cvsd_iomap)
+ MCFG_DEVICE_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cvsd_map)
+ MCFG_DEVICE_IO_MAP(cvsd_iomap)
/* audio hardware */
- MCFG_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
+ MCFG_DEVICE_ADD("cvsd", MC3417, CVSD_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -999,26 +999,26 @@ void victory_state::victory_audio_map(address_map &map)
MACHINE_CONFIG_START(victory_state::victory_audio)
- MCFG_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(victory_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(victory_audio_map)
MCFG_DEVICE_ADD("riot", RIOT6532, SH6532_CLOCK)
- MCFG_RIOT6532_IN_PA_CB(DEVREAD8("custom", exidy_sound_device, r6532_porta_r))
- MCFG_RIOT6532_OUT_PA_CB(DEVWRITE8("custom", exidy_sound_device, r6532_porta_w))
- MCFG_RIOT6532_IN_PB_CB(DEVREAD8("custom", exidy_sound_device, r6532_portb_r))
- MCFG_RIOT6532_OUT_PB_CB(DEVWRITE8("custom", exidy_sound_device, r6532_portb_w))
- MCFG_RIOT6532_IRQ_CB(DEVWRITELINE("custom", exidy_sound_device, r6532_irq))
+ MCFG_RIOT6532_IN_PA_CB(READ8("custom", exidy_sound_device, r6532_porta_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8("custom", exidy_sound_device, r6532_porta_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8("custom", exidy_sound_device, r6532_portb_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8("custom", exidy_sound_device, r6532_portb_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE("custom", exidy_sound_device, r6532_irq))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("custom", victory_sound_device, irq_clear_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("custom", victory_sound_device, main_ack_w))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("custom", exidy_sound_device, update_irq_state))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("custom", victory_sound_device, irq_clear_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("custom", victory_sound_device, main_ack_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("custom", exidy_sound_device, update_irq_state))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", EXIDY_VICTORY, 0)
+ MCFG_DEVICE_ADD("custom", EXIDY_VICTORY, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("tms", TMS5220, 640000)
+ MCFG_DEVICE_ADD("tms", TMS5220, 640000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp
index 1a0e9ff7a43..ec0e9fc6801 100644
--- a/src/mame/audio/galaxian.cpp
+++ b/src/mame/audio/galaxian.cpp
@@ -498,20 +498,20 @@ void galaxian_sound_device::sound_stream_update(sound_stream &stream, stream_sam
MACHINE_CONFIG_START(galaxold_state::galaxian_audio)
- MCFG_SOUND_ADD("cust", GALAXIAN, 0)
+ MCFG_DEVICE_ADD("cust", GALAXIAN, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
- MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE)
MCFG_DISCRETE_INTF(galaxian)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxold_state::mooncrst_audio)
- MCFG_SOUND_ADD("cust", GALAXIAN, 0)
+ MCFG_DEVICE_ADD("cust", GALAXIAN, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
- MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE)
MCFG_DISCRETE_INTF(mooncrst)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
@@ -519,20 +519,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::galaxian_audio)
- MCFG_SOUND_ADD("cust", GALAXIAN, 0)
+ MCFG_DEVICE_ADD("cust", GALAXIAN, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
- MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE)
MCFG_DISCRETE_INTF(galaxian)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::mooncrst_audio)
- MCFG_SOUND_ADD("cust", GALAXIAN, 0)
+ MCFG_DEVICE_ADD("cust", GALAXIAN, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
- MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE)
MCFG_DISCRETE_INTF(mooncrst)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp
index c4088b88736..23f71273b6c 100644
--- a/src/mame/audio/geebee.cpp
+++ b/src/mame/audio/geebee.cpp
@@ -13,10 +13,10 @@
#include "audio/geebee.h"
-DEFINE_DEVICE_TYPE(GEEBEE, geebee_sound_device, "geebee_sound", "Gee Bee Custom Sound")
+DEFINE_DEVICE_TYPE(GEEBEE_SOUND, geebee_sound_device, "geebee_sound", "Gee Bee Custom Sound")
geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GEEBEE, tag, owner, clock),
+ : device_t(mconfig, GEEBEE_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_decay(nullptr),
m_channel(nullptr),
@@ -42,7 +42,7 @@ void geebee_sound_device::device_start()
m_decay[0x7fff - i] = (int16_t) (0x7fff/exp(1.0*i/4096));
/* 1V = HSYNC = 18.432MHz / 3 / 2 / 384 = 8000Hz */
- m_channel = machine().sound().stream_alloc(*this, 0, 1, 18432000 / 3 / 2 / 384);
+ m_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 3 / 2 / 384);
m_vcount = 0;
m_volume_timer = timer_alloc(TIMER_VOLUME_DECAY);
diff --git a/src/mame/audio/geebee.h b/src/mame/audio/geebee.h
index e1316df83b4..93d4108e645 100644
--- a/src/mame/audio/geebee.h
+++ b/src/mame/audio/geebee.h
@@ -38,6 +38,6 @@ private:
int m_vcount;
};
-DECLARE_DEVICE_TYPE(GEEBEE, geebee_sound_device)
+DECLARE_DEVICE_TYPE(GEEBEE_SOUND, geebee_sound_device)
#endif // MAME_AUDIO_GEEBEE_H
diff --git a/src/mame/audio/gomoku.cpp b/src/mame/audio/gomoku.cpp
index 0f9c804c216..0566858a70a 100644
--- a/src/mame/audio/gomoku.cpp
+++ b/src/mame/audio/gomoku.cpp
@@ -11,12 +11,11 @@
#include "emu.h"
#include "audio/gomoku.h"
-static constexpr int samplerate = 48000;
-static constexpr int defgain = 48;
+constexpr int DEFGAIN = 48;
// device type definition
-DEFINE_DEVICE_TYPE(GOMOKU, gomoku_sound_device, "gomoku_sound", "Gomoku Narabe Renju Custom Sound")
+DEFINE_DEVICE_TYPE(GOMOKU_SOUND, gomoku_sound_device, "gomoku_sound", "Gomoku Narabe Renju Custom Sound")
//**************************************************************************
@@ -28,21 +27,18 @@ DEFINE_DEVICE_TYPE(GOMOKU, gomoku_sound_device, "gomoku_sound", "Gomoku Narabe R
//-------------------------------------------------
gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GOMOKU, tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_last_channel(nullptr),
- m_sound_rom(nullptr),
- m_num_voices(0),
- m_sound_enable(0),
- m_stream(nullptr),
- m_mixer_table(nullptr),
- m_mixer_lookup(nullptr),
- m_mixer_buffer(nullptr),
- m_mixer_buffer_2(nullptr)
+ : device_t(mconfig, GOMOKU_SOUND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_sound_rom(*this, DEVICE_SELF)
+ , m_sound_enable(0)
+ , m_stream(nullptr)
+ , m_mixer_table(nullptr)
+ , m_mixer_lookup(nullptr)
+ , m_mixer_buffer(nullptr)
+ , m_mixer_buffer_2(nullptr)
{
- memset(m_channel_list, 0, sizeof(gomoku_sound_channel)*MAX_VOICES);
- memset(m_soundregs1, 0, sizeof(uint8_t)*0x20);
- memset(m_soundregs2, 0, sizeof(uint8_t)*0x20);
+ std::fill(std::begin(m_soundregs1), std::end(m_soundregs1), 0);
+ std::fill(std::begin(m_soundregs2), std::end(m_soundregs2), 0);
}
@@ -56,26 +52,20 @@ void gomoku_sound_device::device_start()
int ch;
/* get stream channels */
- m_stream = stream_alloc(0, 1, samplerate);
+ m_stream = stream_alloc(0, 1, clock());
/* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */
- m_mixer_buffer = std::make_unique<short[]>(2 * samplerate);
- m_mixer_buffer_2 = m_mixer_buffer.get() + samplerate;
+ m_mixer_buffer = std::make_unique<short[]>(2 * clock());
+ m_mixer_buffer_2 = m_mixer_buffer.get() + clock();
/* build the mixer table */
- make_mixer_table(8, defgain);
-
- /* extract globals from the interface */
- m_num_voices = MAX_VOICES;
- m_last_channel = m_channel_list + m_num_voices;
-
- m_sound_rom = memregion(":gomoku")->base();
+ make_mixer_table(8, DEFGAIN);
/* start with sound enabled, many games don't have a sound enable register */
m_sound_enable = 1;
/* reset all the voices */
- for (ch = 0, voice = m_channel_list; voice < m_last_channel; ch++, voice++)
+ for (ch = 0, voice = std::begin(m_channel_list); voice < std::end(m_channel_list); ch++, voice++)
{
voice->channel = ch;
voice->frequency = 0;
@@ -108,7 +98,7 @@ void gomoku_sound_device::sound_stream_update(sound_stream &stream, stream_sampl
memset(m_mixer_buffer.get(), 0, samples * sizeof(short));
/* loop over each voice and add its contribution */
- for (ch = 0, voice = m_channel_list; voice < m_last_channel; ch++, voice++)
+ for (ch = 0, voice = std::begin(m_channel_list); voice < std::end(m_channel_list); ch++, voice++)
{
int f = 16 * voice->frequency;
int v = voice->volume;
diff --git a/src/mame/audio/gomoku.h b/src/mame/audio/gomoku.h
index 6b71fab0d49..a057282641f 100644
--- a/src/mame/audio/gomoku.h
+++ b/src/mame/audio/gomoku.h
@@ -13,7 +13,7 @@ class gomoku_sound_device : public device_t,
public device_sound_interface
{
public:
- gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 48'000);
DECLARE_WRITE8_MEMBER( sound1_w );
DECLARE_WRITE8_MEMBER( sound2_w );
@@ -33,28 +33,21 @@ private:
struct gomoku_sound_channel
{
- gomoku_sound_channel():
- channel(0),
- frequency(0),
- counter(0),
- volume(0),
- oneshotplaying(0) {}
-
- int channel;
- int frequency;
- int counter;
- int volume;
- int oneshotplaying;
+ gomoku_sound_channel() { }
+
+ int channel = 0;
+ int frequency = 0;
+ int counter = 0;
+ int volume = 0;
+ int oneshotplaying = 0;
};
/* data about the sound system */
gomoku_sound_channel m_channel_list[MAX_VOICES];
- gomoku_sound_channel *m_last_channel;
/* global sound parameters */
- const uint8_t *m_sound_rom;
- int m_num_voices;
+ required_region_ptr<uint8_t> m_sound_rom;
int m_sound_enable;
sound_stream *m_stream;
@@ -68,6 +61,6 @@ private:
uint8_t m_soundregs2[0x20];
};
-DECLARE_DEVICE_TYPE(GOMOKU, gomoku_sound_device)
+DECLARE_DEVICE_TYPE(GOMOKU_SOUND, gomoku_sound_device)
#endif // MAME_AUDIO_GOMOKU_H
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index 36960cce059..be53f582c66 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -111,16 +111,16 @@ INPUT_CHANGED_MEMBER( gottlieb_sound_r0_device::audio_nmi )
MACHINE_CONFIG_START(gottlieb_sound_r0_device::device_add_mconfig)
// audio CPU
- MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // M6503 - clock is a gate, a resistor and a capacitor. Freq unknown.
- MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r0_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // M6503 - clock is a gate, a resistor and a capacitor. Freq unknown.
+ MCFG_DEVICE_PROGRAM_MAP(gottlieb_sound_r0_map)
// I/O configuration
MCFG_DEVICE_ADD("r6530", MOS6530, SOUND1_CLOCK/4) // unknown - same as cpu
- MCFG_MOS6530_OUT_PA_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MOS6530_IN_PB_CB(READ8(gottlieb_sound_r0_device, r6530b_r))
+ MCFG_MOS6530_OUT_PA_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MOS6530_IN_PB_CB(READ8(*this, gottlieb_sound_r0_device, r6530b_r))
// sound devices
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -310,17 +310,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gottlieb_sound_r1_device::device_add_mconfig)
// audio CPU
- MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // the board can be set to /2 as well
- MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r1_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, SOUND1_CLOCK/4) // the board can be set to /2 as well
+ MCFG_DEVICE_PROGRAM_MAP(gottlieb_sound_r1_map)
// I/O configuration
MCFG_DEVICE_ADD("riot", RIOT6532, SOUND1_CLOCK/4)
MCFG_RIOT6532_IN_PB_CB(IOPORT("SB1"))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gottlieb_sound_r1_device, r6532_portb_w))
- MCFG_RIOT6532_IRQ_CB(WRITELINE(gottlieb_sound_r1_device, snd_interrupt))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gottlieb_sound_r1_device, r6532_portb_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, gottlieb_sound_r1_device, snd_interrupt))
// sound devices
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -371,7 +371,7 @@ MACHINE_CONFIG_START(gottlieb_sound_r1_with_votrax_device::device_add_mconfig)
// add the VOTRAX
MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000)
- MCFG_VOTRAX_SC01_REQUEST_CB(DEVWRITELINE(DEVICE_SELF, gottlieb_sound_r1_device, votrax_request))
+ MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(DEVICE_SELF, gottlieb_sound_r1_device, votrax_request))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.5)
MACHINE_CONFIG_END
@@ -659,26 +659,26 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gottlieb_sound_r2_device::device_add_mconfig)
// audio CPUs
- MCFG_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(gottlieb_sound_r2_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(gottlieb_sound_r2_map)
- MCFG_CPU_ADD("speechcpu", M6502, SOUND2_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(gottlieb_speech_r2_map)
+ MCFG_DEVICE_ADD("speechcpu", M6502, SOUND2_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(gottlieb_speech_r2_map)
// sound hardware
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.075) // unknown DAC
- MCFG_SOUND_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.075) // unknown DAC
+ MCFG_DEVICE_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("ay1", AY8913, SOUND2_CLOCK/2)
+ MCFG_DEVICE_ADD("ay1", AY8913, SOUND2_CLOCK/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.15)
- MCFG_SOUND_ADD("ay2", AY8913, SOUND2_CLOCK/2)
+ MCFG_DEVICE_ADD("ay2", AY8913, SOUND2_CLOCK/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.15)
- MCFG_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
+ MCFG_DEVICE_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/gottlieb.h b/src/mame/audio/gottlieb.h
index b61639eccc4..45bee311c0d 100644
--- a/src/mame/audio/gottlieb.h
+++ b/src/mame/audio/gottlieb.h
@@ -44,7 +44,7 @@ class gottlieb_sound_r0_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
- gottlieb_sound_r0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gottlieb_sound_r0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// read/write
DECLARE_WRITE8_MEMBER( write );
@@ -52,13 +52,14 @@ public:
// internal communications
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
- void gottlieb_sound_r0_map(address_map &map);
protected:
// device-level overrides
virtual void device_add_mconfig(machine_config &config) override;
virtual ioport_constructor device_input_ports() const override;
virtual void device_start() override;
+ void gottlieb_sound_r0_map(address_map &map);
+
private:
// devices
required_device<m6502_device> m_audiocpu;
@@ -76,17 +77,12 @@ class gottlieb_sound_r1_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
- gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// read/write
DECLARE_WRITE8_MEMBER( write );
-
- // internal communications
- DECLARE_WRITE8_MEMBER( votrax_data_w );
- DECLARE_WRITE8_MEMBER( speech_clock_dac_w );
DECLARE_WRITE_LINE_MEMBER( votrax_request );
- void gottlieb_sound_r1_map(address_map &map);
protected:
gottlieb_sound_r1_device(
const machine_config &mconfig,
@@ -100,6 +96,12 @@ protected:
virtual ioport_constructor device_input_ports() const override;
virtual void device_start() override;
+ // internal communications
+ DECLARE_WRITE8_MEMBER( votrax_data_w );
+ DECLARE_WRITE8_MEMBER( speech_clock_dac_w );
+
+ void gottlieb_sound_r1_map(address_map &map);
+
private:
// devices
required_device<m6502_device> m_audiocpu;
@@ -119,7 +121,7 @@ class gottlieb_sound_r1_with_votrax_device : public gottlieb_sound_r1_device
{
public:
// construction/destruction
- gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
protected:
// device-level overrides
@@ -135,7 +137,7 @@ class gottlieb_sound_r2_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
- gottlieb_sound_r2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gottlieb_sound_r2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// configuration helpers
void enable_cobram3_mods() { m_cobram3_mod = true; }
diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp
index c04d1454067..fee321d9c4a 100644
--- a/src/mame/audio/harddriv.cpp
+++ b/src/mame/audio/harddriv.cpp
@@ -435,27 +435,27 @@ void harddriv_sound_board_device::driversnd_dsp_io_map(address_map &map)
MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(driversnd_68k_map)
+ MCFG_DEVICE_ADD("soundcpu", M68000, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(driversnd_68k_map)
MCFG_DEVICE_ADD("latch", LS259, 0) // 80R
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(harddriv_sound_board_device, speech_write_w)) // SPWR - 5220 write strobe
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(harddriv_sound_board_device, speech_reset_w)) // SPRES - 5220 hard reset
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(harddriv_sound_board_device, speech_rate_w)) // SPRATE
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(harddriv_sound_board_device, cram_enable_w)) // CRAMEN
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, harddriv_sound_board_device, speech_write_w)) // SPWR - 5220 write strobe
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, harddriv_sound_board_device, speech_reset_w)) // SPRES - 5220 hard reset
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, harddriv_sound_board_device, speech_rate_w)) // SPRATE
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, harddriv_sound_board_device, cram_enable_w)) // CRAMEN
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sounddsp", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT // RES320
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(harddriv_sound_board_device, led_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, harddriv_sound_board_device, led_w))
- MCFG_CPU_ADD("sounddsp", TMS32010, XTAL(20'000'000))
- MCFG_CPU_PROGRAM_MAP(driversnd_dsp_program_map)
+ MCFG_DEVICE_ADD("sounddsp", TMS32010, XTAL(20'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(driversnd_dsp_program_map)
/* Data Map is internal to the CPU */
- MCFG_CPU_IO_MAP(driversnd_dsp_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(harddriv_sound_board_device, hdsnddsp_get_bio))
+ MCFG_DEVICE_IO_MAP(driversnd_dsp_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, harddriv_sound_board_device, hdsnddsp_get_bio))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // ls374d.75e + ls374d.90e + am6012
+ MCFG_DEVICE_ADD("dac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // ls374d.75e + ls374d.90e + am6012
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp
index 2df7a111b3c..034a24d2fe6 100644
--- a/src/mame/audio/hng64.cpp
+++ b/src/mame/audio/hng64.cpp
@@ -389,20 +389,20 @@ WRITE_LINE_MEMBER(hng64_state::tcu_tm2_cb)
MACHINE_CONFIG_START(hng64_state::hng64_audio)
- MCFG_CPU_ADD("audiocpu", V53A, 32000000/2) // V53A, 16? mhz!
- MCFG_CPU_PROGRAM_MAP(hng_sound_map)
- MCFG_CPU_IO_MAP(hng_sound_io)
- MCFG_V53_DMAU_OUT_HREQ_CB(WRITELINE(hng64_state, dma_hreq_cb))
- MCFG_V53_DMAU_IN_MEMR_CB(READ8(hng64_state, dma_memr_cb))
- MCFG_V53_DMAU_OUT_IOW_3_CB(WRITE8(hng64_state,dma_iow3_cb))
+ MCFG_DEVICE_ADD("audiocpu", V53A, 32000000/2) // V53A, 16? mhz!
+ MCFG_DEVICE_PROGRAM_MAP(hng_sound_map)
+ MCFG_DEVICE_IO_MAP(hng_sound_io)
+ MCFG_V53_DMAU_OUT_HREQ_CB(WRITELINE(*this, hng64_state, dma_hreq_cb))
+ MCFG_V53_DMAU_IN_MEMR_CB(READ8(*this, hng64_state, dma_memr_cb))
+ MCFG_V53_DMAU_OUT_IOW_3_CB(WRITE8(*this, hng64_state,dma_iow3_cb))
- MCFG_V53_TCU_OUT0_HANDLER(WRITELINE(hng64_state, tcu_tm0_cb))
- MCFG_V53_TCU_OUT1_HANDLER(WRITELINE(hng64_state, tcu_tm1_cb))
- MCFG_V53_TCU_OUT2_HANDLER(WRITELINE(hng64_state, tcu_tm2_cb))
+ MCFG_V53_TCU_OUT0_HANDLER(WRITELINE(*this, hng64_state, tcu_tm0_cb))
+ MCFG_V53_TCU_OUT1_HANDLER(WRITELINE(*this, hng64_state, tcu_tm1_cb))
+ MCFG_V53_TCU_OUT2_HANDLER(WRITELINE(*this, hng64_state, tcu_tm2_cb))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("l7a1045", L7A1045, 32000000/2 ) // ??
+ MCFG_DEVICE_ADD("l7a1045", L7A1045, 32000000/2 ) // ??
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/audio/invinco.cpp b/src/mame/audio/invinco.cpp
index 8040ad69d40..22a51709079 100644
--- a/src/mame/audio/invinco.cpp
+++ b/src/mame/audio/invinco.cpp
@@ -97,7 +97,7 @@ WRITE8_MEMBER( vicdual_state::invinco_audio_w )
MACHINE_CONFIG_START(vicdual_state::invinco_audio)
/* samples */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(invinco_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index ddd2c1acddc..3b0dc6844ba 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -407,43 +407,43 @@ void irem_audio_device::irem_sound_portmap(address_map &map)
MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(m62_sound_map)
- MCFG_CPU_IO_MAP(irem_sound_portmap)
+ MCFG_DEVICE_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(m62_sound_map)
+ MCFG_DEVICE_IO_MAP(irem_sound_portmap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, irem_audio_device, soundlatch_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE(0, "snd_nl", 1.0, 0)
MCFG_SOUND_ROUTE(1, "snd_nl", 1.0, 1)
MCFG_SOUND_ROUTE(2, "snd_nl", 1.0, 2)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE(0, "snd_nl", 1.0, 3)
MCFG_SOUND_ROUTE(1, "snd_nl", 1.0, 4)
MCFG_SOUND_ROUTE(2, "snd_nl", 1.0, 5)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE(0, "snd_nl", 1.0, 6)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE(0, "snd_nl", 1.0, 7)
/* NETLIST configuration using internal AY8910 resistor values */
- MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
+ MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, 48000)
MCFG_NETLIST_SETUP(kidniki)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -477,32 +477,32 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m52_soundc_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_IO_MAP(irem_sound_portmap)
- MCFG_CPU_PROGRAM_MAP(m52_small_sound_map)
+ MCFG_DEVICE_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_IO_MAP(irem_sound_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(m52_small_sound_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, irem_audio_device, soundlatch_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE(0, "filtermix", 1.0, 0)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE(0, "filtermix", 1.0, 1)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE(0, "filtermix", 1.0, 2)
- MCFG_SOUND_ADD("filtermix", DISCRETE, 0)
+ MCFG_DEVICE_ADD("filtermix", DISCRETE)
MCFG_DISCRETE_INTF(m52_sound_c)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -511,33 +511,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m52_large_audio_device::device_add_mconfig) /* 10 yard fight */
/* basic machine hardware */
- MCFG_CPU_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(m52_large_sound_map)
- MCFG_CPU_IO_MAP(irem_sound_portmap)
+ MCFG_DEVICE_ADD("iremsound", M6803, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(m52_large_sound_map)
+ MCFG_DEVICE_IO_MAP(irem_sound_portmap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, irem_audio_device, soundlatch_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay_45l", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(irem_audio_device, ay8910_45L_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, irem_audio_device, ay8910_45L_porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_VCK_CALLBACK(INPUTLINE("iremsound", INPUT_LINE_NMI)) // driven through NPN inverter
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("msm2", msm5205_device, vclk_w)) // the first MSM5205 clocks the second
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm2", MSM5205, XTAL(384'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp
index 2925566eeac..ea606f556e6 100644
--- a/src/mame/audio/jedi.cpp
+++ b/src/mame/audio/jedi.cpp
@@ -193,30 +193,30 @@ void jedi_state::audio_map(address_map &map)
MACHINE_CONFIG_START(jedi_state::jedi_audio)
- MCFG_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_DEVICE_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_DEVICE_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_DEVICE_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MCFG_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_DEVICE_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
+ MCFG_DEVICE_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp
index 0e6ea63c723..f816a7ef176 100644
--- a/src/mame/audio/leland.cpp
+++ b/src/mame/audio/leland.cpp
@@ -135,19 +135,19 @@ WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr1_w)
MACHINE_CONFIG_START(leland_80186_sound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u31 + ad7524.u46
- MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u32 + ad7524.u47
- MCFG_SOUND_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u33 + ad7524.u48
- MCFG_SOUND_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u34 + ad7524.u49
- MCFG_SOUND_ADD("dac5", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u35 + ad7524.u50
- MCFG_SOUND_ADD("dac6", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u36 + ad7524.u51
- MCFG_SOUND_ADD("dac9", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // ad7533.u64
- MCFG_SOUND_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u17 + r2-r9 (24k,12k,6.2k,3k,1.5k,750,360,160)
- MCFG_SOUND_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u18 + r12-r19 (24k,12k,6.2k,3k,1.5k,750,360,160)
- MCFG_SOUND_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u19 + r22-r29 (24k,12k,6.2k,3k,1.5k,750,360,160)
- MCFG_SOUND_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u20 + r32-r39 (24k,12k,6.2k,3k,1.5k,750,360,160)
- MCFG_SOUND_ADD("dac5vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac5", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac5", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u21 + r42-r49 (24k,12k,6.2k,3k,1.5k,750,360,160)
- MCFG_SOUND_ADD("dac6vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac6", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac6", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u22 + r52-r59 (24k,12k,6.2k,3k,1.5k,750,360,160)
+ MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u31 + ad7524.u46
+ MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u32 + ad7524.u47
+ MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u33 + ad7524.u48
+ MCFG_DEVICE_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u34 + ad7524.u49
+ MCFG_DEVICE_ADD("dac5", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u35 + ad7524.u50
+ MCFG_DEVICE_ADD("dac6", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u36 + ad7524.u51
+ MCFG_DEVICE_ADD("dac9", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // ad7533.u64
+ MCFG_DEVICE_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u17 + r2-r9 (24k,12k,6.2k,3k,1.5k,750,360,160)
+ MCFG_DEVICE_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u18 + r12-r19 (24k,12k,6.2k,3k,1.5k,750,360,160)
+ MCFG_DEVICE_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u19 + r22-r29 (24k,12k,6.2k,3k,1.5k,750,360,160)
+ MCFG_DEVICE_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u20 + r32-r39 (24k,12k,6.2k,3k,1.5k,750,360,160)
+ MCFG_DEVICE_ADD("dac5vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac5", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac5", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u21 + r42-r49 (24k,12k,6.2k,3k,1.5k,750,360,160)
+ MCFG_DEVICE_ADD("dac6vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac6", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac6", -1.0, DAC_VREF_NEG_INPUT) // 74hc374.u22 + r52-r59 (24k,12k,6.2k,3k,1.5k,750,360,160)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1vol", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac2vol", 1.0, DAC_VREF_POS_INPUT)
@@ -159,39 +159,39 @@ MACHINE_CONFIG_START(leland_80186_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit0", PIT8254, 0)
MCFG_PIT8253_CLK0(4000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
MCFG_PIT8253_CLK1(4000000)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
MCFG_PIT8253_CLK2(4000000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit0_2_w))
MCFG_DEVICE_ADD("pit1", PIT8254, 0)
MCFG_PIT8253_CLK0(4000000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(leland_80186_sound_device, pit1_0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit1_0_w))
MCFG_PIT8253_CLK1(4000000)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(leland_80186_sound_device, pit1_1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit1_1_w))
MCFG_PIT8253_CLK2(4000000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit1_2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit1_2_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(redline_80186_sound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac5", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac6", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac7", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac8", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac5vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac5", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac5", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac6vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac6", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac6", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac7vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac7", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac7", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac8vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac8", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac8", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac5", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac6", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac7", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac8", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac5vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac5", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac5", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac6vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac6", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac6", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac7vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac7", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac7", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac8vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac8", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac8", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1vol", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac2vol", 1.0, DAC_VREF_POS_INPUT)
@@ -204,37 +204,37 @@ MACHINE_CONFIG_START(redline_80186_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit0", PIT8254, 0)
MCFG_PIT8253_CLK0(7000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
MCFG_PIT8253_CLK1(7000000)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
MCFG_PIT8253_CLK2(7000000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit0_2_w))
MCFG_DEVICE_ADD("pit1", PIT8254, 0)
MCFG_PIT8253_CLK0(7000000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(leland_80186_sound_device, pit1_0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit1_0_w))
MCFG_PIT8253_CLK1(7000000)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(leland_80186_sound_device, pit1_1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit1_1_w))
MCFG_PIT8253_CLK2(7000000)
MCFG_DEVICE_ADD("pit2", PIT8254, 0)
MCFG_PIT8253_CLK0(7000000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(leland_80186_sound_device, pit1_2_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit1_2_w))
MCFG_PIT8253_CLK1(7000000)
MCFG_PIT8253_CLK2(7000000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ataxx_80186_sound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac9", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac9", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1vol", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac2vol", 1.0, DAC_VREF_POS_INPUT)
@@ -244,24 +244,24 @@ MACHINE_CONFIG_START(ataxx_80186_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit0", PIT8254, 0)
MCFG_PIT8253_CLK0(4000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
MCFG_PIT8253_CLK1(4000000)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
MCFG_PIT8253_CLK2(4000000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit0_2_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(wsf_80186_sound_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("dac9", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac4", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac9", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac1vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac2vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac3vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac4vol", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(0, "dac4", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac4", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1vol", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac2vol", 1.0, DAC_VREF_POS_INPUT)
@@ -276,11 +276,11 @@ MACHINE_CONFIG_START(wsf_80186_sound_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit0", PIT8254, 0)
MCFG_PIT8253_CLK0(4000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq0_w))
MCFG_PIT8253_CLK1(4000000)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(":audiocpu", i80186_cpu_device, drq1_w))
MCFG_PIT8253_CLK2(4000000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(leland_80186_sound_device, pit0_2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, leland_80186_sound_device, pit0_2_w))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp
index 688242b69ec..1a35dc7c443 100644
--- a/src/mame/audio/llander.cpp
+++ b/src/mame/audio/llander.cpp
@@ -101,7 +101,7 @@ WRITE8_MEMBER(asteroid_state::llander_sounds_w)
MACHINE_CONFIG_START(asteroid_state::llander_sound)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(llander)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h
index 131a2bf3cf1..83509e0e739 100644
--- a/src/mame/audio/m72.h
+++ b/src/mame/audio/m72.h
@@ -15,7 +15,7 @@
class m72_audio_device : public device_t, public device_sound_interface
{
public:
- m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
~m72_audio_device() {}
DECLARE_READ8_MEMBER(sample_r);
diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp
index a8230e3f7da..31aa82269a6 100644
--- a/src/mame/audio/mario.cpp
+++ b/src/mame/audio/mario.cpp
@@ -639,18 +639,18 @@ void mario_state::masao_sound_map(address_map &map)
MACHINE_CONFIG_START(mario_state::mario_audio)
#if USE_8039
- MCFG_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
+ MCFG_DEVICE_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
#else
- MCFG_CPU_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
+ MCFG_DEVICE_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
#endif
- MCFG_CPU_PROGRAM_MAP(mario_sound_map)
- MCFG_CPU_IO_MAP(mario_sound_io_map)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(mario_state, mario_sh_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(mario_state, mario_sh_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(mario_state, mario_sh_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(mario_state, mario_sh_p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(mario_state, mario_sh_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(mario_state, mario_sh_t1_r))
+ MCFG_DEVICE_PROGRAM_MAP(mario_sound_map)
+ MCFG_DEVICE_IO_MAP(mario_sound_io_map)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, mario_state, mario_sh_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, mario_state, mario_sh_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, mario_state, mario_sh_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, mario_state, mario_sh_p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, mario_state, mario_sh_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, mario_state, mario_sh_t1_r))
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -660,11 +660,11 @@ MACHINE_CONFIG_START(mario_state::mario_audio)
MCFG_GENERIC_LATCH_8_ADD("soundlatch4")
#if OLD_SOUND
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(mario)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
#else
- MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
+ MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, 48000)
MCFG_NETLIST_SETUP(mario)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -681,15 +681,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mario_state::masao_audio)
- MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
- MCFG_CPU_PROGRAM_MAP(masao_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 24576000/16) /* ???? */
+ MCFG_DEVICE_PROGRAM_MAP(masao_sound_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 14318000/6)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 14318000/6)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/micro3d.cpp b/src/mame/audio/micro3d.cpp
index 6b775406a75..6e0a4d87db5 100644
--- a/src/mame/audio/micro3d.cpp
+++ b/src/mame/audio/micro3d.cpp
@@ -160,10 +160,10 @@ void micro3d_sound_device::noise_sh_w(u8 data)
*************************************/
-DEFINE_DEVICE_TYPE(MICRO3D, micro3d_sound_device, "micro3d_sound", "Microprose Custom Sound")
+DEFINE_DEVICE_TYPE(MICRO3D_SOUND, micro3d_sound_device, "micro3d_sound", "Microprose Custom Sound")
micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, MICRO3D, tag, owner, clock),
+ : device_t(mconfig, MICRO3D_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_gain(0),
m_noise_shift(0),
@@ -172,7 +172,7 @@ micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const
m_stream(nullptr)
{
- memset(m_dac, 0, sizeof(u8)*4);
+ memset(m_dac, 0, sizeof(u8)*4);
}
//-------------------------------------------------
diff --git a/src/mame/audio/micro3d.h b/src/mame/audio/micro3d.h
index 827a8de4877..e27c57e5bac 100644
--- a/src/mame/audio/micro3d.h
+++ b/src/mame/audio/micro3d.h
@@ -13,7 +13,7 @@
class micro3d_sound_device : public device_t, public device_sound_interface
{
public:
- micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
void dac_w(u8 data) { m_dac_data = data; }
void noise_sh_w(u8 data);
@@ -73,6 +73,6 @@ private:
sound_stream *m_stream;
};
-DECLARE_DEVICE_TYPE(MICRO3D, micro3d_sound_device)
+DECLARE_DEVICE_TYPE(MICRO3D_SOUND, micro3d_sound_device)
#endif // MAME_AUDIO_MICRO3D_H
diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index 3a6b2e461d7..2fdd007a730 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -17,17 +17,6 @@
//**************************************************************************
-// CONSTANTS
-//**************************************************************************
-
-#define SSIO_CLOCK XTAL(16'000'000)
-#define SOUNDSGOOD_CLOCK XTAL(16'000'000)
-#define TURBOCS_CLOCK XTAL(8'000'000)
-#define SQUAWKTALK_CLOCK XTAL(3'579'545)
-
-
-
-//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
@@ -412,18 +401,18 @@ const tiny_rom_entry *midway_ssio_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(midway_ssio_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", Z80, SSIO_CLOCK/2/4)
- MCFG_CPU_PROGRAM_MAP(ssio_map)
- MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, SSIO_CLOCK/2/16/10)
+ MCFG_DEVICE_ADD("cpu", Z80, DERIVED_CLOCK(1, 2*4))
+ MCFG_DEVICE_PROGRAM_MAP(ssio_map)
+ MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, DERIVED_CLOCK(1, 2*16*10))
- MCFG_SOUND_ADD("ay0", AY8910, SSIO_CLOCK/2/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(midway_ssio_device, porta0_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(midway_ssio_device, portb0_w))
+ MCFG_DEVICE_ADD("ay0", AY8910, DERIVED_CLOCK(1, 2*4))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, midway_ssio_device, porta0_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, midway_ssio_device, portb0_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.33, 0)
- MCFG_SOUND_ADD("ay1", AY8910, SSIO_CLOCK/2/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(midway_ssio_device, porta1_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(midway_ssio_device, portb1_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, DERIVED_CLOCK(1, 2*4))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, midway_ssio_device, porta1_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, midway_ssio_device, portb1_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.33, 1)
MACHINE_CONFIG_END
@@ -590,16 +579,16 @@ void midway_sounds_good_device::soundsgood_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(midway_sounds_good_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", M68000, SOUNDSGOOD_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(soundsgood_map)
+ MCFG_DEVICE_ADD("cpu", M68000, DERIVED_CLOCK(1, 2))
+ MCFG_DEVICE_PROGRAM_MAP(soundsgood_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_sounds_good_device, porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_sounds_good_device, portb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_sounds_good_device, irq_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_sounds_good_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, midway_sounds_good_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, midway_sounds_good_device, portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, midway_sounds_good_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, midway_sounds_good_device, irq_w))
- MCFG_SOUND_ADD("dac", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0) /// ad7533jn.u10
+ MCFG_DEVICE_ADD("dac", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0) /// ad7533jn.u10
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -745,16 +734,16 @@ void midway_turbo_cheap_squeak_device::turbocs_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(midway_turbo_cheap_squeak_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", MC6809E, TURBOCS_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(turbocs_map)
+ MCFG_DEVICE_ADD("cpu", MC6809E, DERIVED_CLOCK(1, 4))
+ MCFG_DEVICE_PROGRAM_MAP(turbocs_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_turbo_cheap_squeak_device, porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_turbo_cheap_squeak_device, portb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_turbo_cheap_squeak_device, irq_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_turbo_cheap_squeak_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, midway_turbo_cheap_squeak_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, midway_turbo_cheap_squeak_device, portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, midway_turbo_cheap_squeak_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, midway_turbo_cheap_squeak_device, irq_w))
- MCFG_SOUND_ADD("dac", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0)
+ MCFG_DEVICE_ADD("dac", AD7533, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 1.0)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -949,22 +938,22 @@ void midway_squawk_n_talk_device::squawkntalk_alt_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(midway_squawk_n_talk_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", M6802, SQUAWKTALK_CLOCK)
- MCFG_CPU_PROGRAM_MAP(squawkntalk_map)
+ MCFG_DEVICE_ADD("cpu", M6802, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(squawkntalk_map)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_squawk_n_talk_device, porta1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, midway_squawk_n_talk_device, porta1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, midway_squawk_n_talk_device, irq_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(midway_squawk_n_talk_device, porta2_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(midway_squawk_n_talk_device, portb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, midway_squawk_n_talk_device, porta2_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, midway_squawk_n_talk_device, portb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, midway_squawk_n_talk_device, irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, midway_squawk_n_talk_device, irq_w))
// only used on Discs of Tron, which is stereo
- MCFG_SOUND_ADD("tms5200", TMS5200, 640000)
+ MCFG_DEVICE_ADD("tms5200", TMS5200, 640000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.60)
// the board also supports an AY-8912 and/or an 8-bit DAC, neither of
diff --git a/src/mame/audio/midway.h b/src/mame/audio/midway.h
index b85518960d4..edaeee6d0a7 100644
--- a/src/mame/audio/midway.h
+++ b/src/mame/audio/midway.h
@@ -45,7 +45,7 @@ class midway_ssio_device : public device_t,
{
public:
// construction/destruction
- midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 16'000'000);
// read/write
DECLARE_READ8_MEMBER(read);
@@ -119,7 +119,7 @@ class midway_sounds_good_device : public device_t,
{
public:
// construction/destruction
- midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 16'000'000);
// read/write
DECLARE_READ8_MEMBER(read);
@@ -158,7 +158,7 @@ class midway_turbo_cheap_squeak_device : public device_t,
{
public:
// construction/destruction
- midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 8'000'000);
// read/write
DECLARE_READ8_MEMBER(read);
@@ -197,7 +197,7 @@ class midway_squawk_n_talk_device : public device_t,
{
public:
// construction/destruction
- midway_squawk_n_talk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_squawk_n_talk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 3'579'545);
// read/write
DECLARE_WRITE8_MEMBER(write);
diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp
index 526b614e1d6..1a3d4b602e4 100644
--- a/src/mame/audio/mw8080bw.cpp
+++ b/src/mame/audio/mw8080bw.cpp
@@ -148,7 +148,7 @@ MACHINE_CONFIG_START(mw8080bw_state::seawolf_audio)
MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(seawolf_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
@@ -203,12 +203,12 @@ MACHINE_CONFIG_START(mw8080bw_state::gunfight_audio)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples1", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(gunfight_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples2", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(gunfight_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
@@ -309,7 +309,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::tornbase_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(tornbase)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -555,7 +555,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::maze_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(maze)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -802,7 +802,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::boothill_audio)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(boothill)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1032,7 +1032,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::checkmat_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(checkmat)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
@@ -1243,7 +1243,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::desertgu_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(desertgu)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1508,7 +1508,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::dplay_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(dplay)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1552,12 +1552,12 @@ MACHINE_CONFIG_START(mw8080bw_state::gmissile_audio)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples1", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(gmissile_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.9)
- MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples2", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(gmissile_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9)
@@ -1645,12 +1645,12 @@ MACHINE_CONFIG_START(mw8080bw_state::m4_audio)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples1", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(m4_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1)
- MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples2", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(m4_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
@@ -1900,12 +1900,12 @@ MACHINE_CONFIG_START(mw8080bw_state::clowns_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(clowns_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(clowns)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2271,7 +2271,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::spacwalk_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(spacwalk)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2500,7 +2500,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::shuffle_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(shuffle)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2679,7 +2679,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::dogpatch_audio)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(dogpatch)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -3185,7 +3185,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::spcenctr_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -3201,7 +3201,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spcenctr_audio)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(spcenctr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -3272,7 +3272,7 @@ MACHINE_CONFIG_START(mw8080bw_state::phantom2_audio)
MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(phantom2_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
@@ -3401,7 +3401,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::bowler_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(bowler)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -3518,7 +3518,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -3534,7 +3534,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(invaders_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -4098,7 +4098,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::invaders_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -4114,7 +4114,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders_audio)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(invaders)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -4515,7 +4515,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::blueshrk_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(blueshrk)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4678,12 +4678,12 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(mw8080bw_state::invad2ct_audio)
MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(invad2ct)
MCFG_SOUND_ROUTE(0, "spk1", 0.5)
MCFG_SOUND_ROUTE(1, "spk2", 0.5)
- MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_DEVICE_ADD("sn1", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -4699,7 +4699,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invad2ct_audio)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "spk1", 0.3)
- MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_DEVICE_ADD("sn2", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp
index 8fc7e54fa0a..2d731eec23f 100644
--- a/src/mame/audio/n8080.cpp
+++ b/src/mame/audio/n8080.cpp
@@ -479,23 +479,23 @@ MACHINE_CONFIG_START(n8080_state::spacefev_sound)
MCFG_SOUND_RESET_OVERRIDE(n8080_state,spacefev)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", I8035, 6000000)
- MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(n8080_state, n8080_8035_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(n8080_state, n8080_8035_t1_r))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(n8080_state, n8080_8035_p1_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(n8080_state, n8080_dac_w))
+ MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, n8080_state, n8080_8035_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, n8080_state, n8080_8035_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, n8080_state, n8080_8035_p1_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, n8080_state, n8080_dac_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("vco_timer", n8080_state, spacefev_vco_voltage_timer, attotime::from_hz(1000))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("n8080_dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
+ MCFG_DEVICE_ADD("n8080_dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "n8080_dac", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(36), RES_K(150), CAP_N(1)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_M(1)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(1.0), RES_K(20)) // attack_decay_cap + attack_res
@@ -519,21 +519,21 @@ MACHINE_CONFIG_START(n8080_state::sheriff_sound)
MCFG_SOUND_RESET_OVERRIDE(n8080_state,sheriff)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", I8035, 6000000)
- MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(n8080_state, n8080_8035_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(n8080_state, n8080_8035_t1_r))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(n8080_state, n8080_8035_p1_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(n8080_state, n8080_dac_w))
+ MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, n8080_state, n8080_8035_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, n8080_state, n8080_8035_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, n8080_state, n8080_8035_p1_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, n8080_state, n8080_dac_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("n8080_dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
+ MCFG_DEVICE_ADD("n8080_dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "n8080_dac", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(36), RES_K(100), CAP_N(1)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(620)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(1.0), RES_K(20)) // attack_decay_cap + attack_res
@@ -557,20 +557,20 @@ MACHINE_CONFIG_START(n8080_state::helifire_sound)
MCFG_SOUND_RESET_OVERRIDE(n8080_state,helifire)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", I8035, 6000000)
- MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MCFG_CPU_IO_MAP(helifire_sound_io_map)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(n8080_state, helifire_8035_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(n8080_state, helifire_8035_t1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(n8080_state, helifire_8035_p2_r))
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("helifire_dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(n8080_state, helifire_sound_ctrl_w))
+ MCFG_DEVICE_ADD("audiocpu", I8035, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_DEVICE_IO_MAP(helifire_sound_io_map)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, n8080_state, helifire_8035_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, n8080_state, helifire_8035_t1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, n8080_state, helifire_8035_p2_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("helifire_dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, n8080_state, helifire_sound_ctrl_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("helifire_dac_volume_timer", n8080_state, helifire_dac_volume_timer, attotime::from_hz(1000))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("helifire_dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // unknown DAC
+ MCFG_DEVICE_ADD("helifire_dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "helifire_dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "helifire_dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp
index efd8b93b135..e7bdb78990b 100644
--- a/src/mame/audio/namco52.cpp
+++ b/src/mame/audio/namco52.cpp
@@ -177,15 +177,15 @@ void namco_52xx_device::device_start()
//-------------------------------------------------
MACHINE_CONFIG_START(namco_52xx_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MCFG_MB88XX_READ_K_CB(READ8(namco_52xx_device, K_r))
- MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_52xx_device, O_w))
- MCFG_MB88XX_WRITE_P_CB(WRITE8(namco_52xx_device, P_w))
- MCFG_MB88XX_READ_SI_CB(READLINE(namco_52xx_device, SI_r))
- MCFG_MB88XX_READ_R0_CB(READ8(namco_52xx_device, R0_r))
- MCFG_MB88XX_READ_R1_CB(READ8(namco_52xx_device, R1_r))
- MCFG_MB88XX_WRITE_R2_CB(WRITE8(namco_52xx_device, R2_w))
- MCFG_MB88XX_WRITE_R3_CB(WRITE8(namco_52xx_device, R3_w))
+ MCFG_DEVICE_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_MB88XX_READ_K_CB(READ8(*this, namco_52xx_device, K_r))
+ MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, namco_52xx_device, O_w))
+ MCFG_MB88XX_WRITE_P_CB(WRITE8(*this, namco_52xx_device, P_w))
+ MCFG_MB88XX_READ_SI_CB(READLINE(*this, namco_52xx_device, SI_r))
+ MCFG_MB88XX_READ_R0_CB(READ8(*this, namco_52xx_device, R0_r))
+ MCFG_MB88XX_READ_R1_CB(READ8(*this, namco_52xx_device, R1_r))
+ MCFG_MB88XX_WRITE_R2_CB(WRITE8(*this, namco_52xx_device, R2_w))
+ MCFG_MB88XX_WRITE_R3_CB(WRITE8(*this, namco_52xx_device, R3_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp
index 89d07073d6b..e6deb1fdc59 100644
--- a/src/mame/audio/namco54.cpp
+++ b/src/mame/audio/namco54.cpp
@@ -136,11 +136,11 @@ void namco_54xx_device::device_start()
//-------------------------------------------------
MACHINE_CONFIG_START(namco_54xx_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MCFG_MB88XX_READ_K_CB(READ8(namco_54xx_device, K_r))
- MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_54xx_device, O_w))
- MCFG_MB88XX_READ_R0_CB(READ8(namco_54xx_device, R0_r))
- MCFG_MB88XX_WRITE_R1_CB(WRITE8(namco_54xx_device, R1_w))
+ MCFG_DEVICE_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_MB88XX_READ_K_CB(READ8(*this, namco_54xx_device, K_r))
+ MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, namco_54xx_device, O_w))
+ MCFG_MB88XX_READ_R0_CB(READ8(*this, namco_54xx_device, R0_r))
+ MCFG_MB88XX_WRITE_R1_CB(WRITE8(*this, namco_54xx_device, R1_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/audio/nichisnd.cpp b/src/mame/audio/nichisnd.cpp
index a7b728db8f1..8609756730c 100644
--- a/src/mame/audio/nichisnd.cpp
+++ b/src/mame/audio/nichisnd.cpp
@@ -79,27 +79,27 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(nichisnd_device::device_add_mconfig)
- MCFG_CPU_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */
+ MCFG_DEVICE_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(nichisnd_map)
- MCFG_CPU_IO_MAP(nichisnd_io_map)
- MCFG_TMPZ84C011_PORTD_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(nichisnd_device, soundbank_w))
- MCFG_TMPZ84C011_PORTB_WRITE_CB(DEVWRITE8("dac1", dac_byte_interface, write))
- MCFG_TMPZ84C011_PORTC_WRITE_CB(DEVWRITE8("dac2", dac_byte_interface, write))
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nichisnd_device, soundlatch_clear_w))
- MCFG_TMPZ84C011_ZC0_CB(DEVWRITELINE("audiocpu", tmpz84c011_device, trg3))
+ MCFG_DEVICE_PROGRAM_MAP(nichisnd_map)
+ MCFG_DEVICE_IO_MAP(nichisnd_io_map)
+ MCFG_TMPZ84C011_PORTD_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(*this, nichisnd_device, soundbank_w))
+ MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8("dac1", dac_byte_interface, write))
+ MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8("dac2", dac_byte_interface, write))
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nichisnd_device, soundlatch_clear_w))
+ MCFG_TMPZ84C011_ZC0_CB(WRITELINE("audiocpu", tmpz84c011_device, trg3))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp
index 00fba614a46..6f057b194d3 100644
--- a/src/mame/audio/phoenix.cpp
+++ b/src/mame/audio/phoenix.cpp
@@ -48,10 +48,10 @@
-DEFINE_DEVICE_TYPE(PHOENIX, phoenix_sound_device, "phoenix_sound", "Phoenix Custom Sound")
+DEFINE_DEVICE_TYPE(PHOENIX_SOUND, phoenix_sound_device, "phoenix_sound", "Phoenix Custom Sound")
phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PHOENIX, tag, owner, clock)
+ : device_t(mconfig, PHOENIX_SOUND, tag, owner, clock)
, device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/audio/phoenix.h b/src/mame/audio/phoenix.h
index 38e80c3d31f..1492f39d227 100644
--- a/src/mame/audio/phoenix.h
+++ b/src/mame/audio/phoenix.h
@@ -12,7 +12,7 @@
class phoenix_sound_device : public device_t, public device_sound_interface
{
public:
- phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
DECLARE_WRITE8_MEMBER( control_a_w );
DECLARE_WRITE8_MEMBER( control_b_w );
@@ -55,7 +55,7 @@ private:
int noise(int samplerate);
};
-DECLARE_DEVICE_TYPE(PHOENIX, phoenix_sound_device)
+DECLARE_DEVICE_TYPE(PHOENIX_SOUND, phoenix_sound_device)
DISCRETE_SOUND_EXTERN(phoenix);
diff --git a/src/mame/audio/pleiads.cpp b/src/mame/audio/pleiads.cpp
index e74c4670b8e..d97df0f2da9 100644
--- a/src/mame/audio/pleiads.cpp
+++ b/src/mame/audio/pleiads.cpp
@@ -18,10 +18,10 @@
#define TONE1_CLOCK 8000
-DEFINE_DEVICE_TYPE(PLEIADS, pleiads_sound_device, "pleiads_sound", "Pleiads Custom Sound")
+DEFINE_DEVICE_TYPE(PLEIADS_SOUND, pleiads_sound_device, "pleiads_sound", "Pleiads Custom Sound")
pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pleiads_sound_device(mconfig, PLEIADS, tag, owner, clock)
+ : pleiads_sound_device(mconfig, PLEIADS_SOUND, tag, owner, clock)
{
}
@@ -106,10 +106,10 @@ void pleiads_sound_device::device_start()
common_start();
}
-DEFINE_DEVICE_TYPE(NAUGHTYB, naughtyb_sound_device, "naughtyb_sound", "Naughty Boy Custom Sound")
+DEFINE_DEVICE_TYPE(NAUGHTYB_SOUND, naughtyb_sound_device, "naughtyb_sound", "Naughty Boy Custom Sound")
naughtyb_sound_device::naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pleiads_sound_device(mconfig, NAUGHTYB, tag, owner, clock)
+ : pleiads_sound_device(mconfig, NAUGHTYB_SOUND, tag, owner, clock)
{
}
@@ -174,10 +174,10 @@ void naughtyb_sound_device::device_start()
common_start();
}
-DEFINE_DEVICE_TYPE(POPFLAME, popflame_sound_device, "popflame_sound", "Pop Flamer Custom Sound")
+DEFINE_DEVICE_TYPE(POPFLAME_SOUND, popflame_sound_device, "popflame_sound", "Pop Flamer Custom Sound")
popflame_sound_device::popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pleiads_sound_device(mconfig, POPFLAME, tag, owner, clock)
+ : pleiads_sound_device(mconfig, POPFLAME_SOUND, tag, owner, clock)
{
}
diff --git a/src/mame/audio/pleiads.h b/src/mame/audio/pleiads.h
index f7139b42928..4a6f34dfdb1 100644
--- a/src/mame/audio/pleiads.h
+++ b/src/mame/audio/pleiads.h
@@ -10,7 +10,7 @@
class pleiads_sound_device : public device_t, public device_sound_interface
{
public:
- pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
DECLARE_WRITE8_MEMBER( control_a_w );
DECLARE_WRITE8_MEMBER( control_b_w );
@@ -94,12 +94,11 @@ protected:
int m_opamp_resistor;
};
-DECLARE_DEVICE_TYPE(PLEIADS, pleiads_sound_device)
class naughtyb_sound_device : public pleiads_sound_device
{
public:
- naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
protected:
// device-level overrides
@@ -109,12 +108,12 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
};
-DECLARE_DEVICE_TYPE(NAUGHTYB, naughtyb_sound_device)
class popflame_sound_device : public pleiads_sound_device
{
public:
- popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+
protected:
// device-level overrides
virtual void device_start() override;
@@ -123,6 +122,9 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
};
-DECLARE_DEVICE_TYPE(POPFLAME, popflame_sound_device)
+
+DECLARE_DEVICE_TYPE(PLEIADS_SOUND, pleiads_sound_device)
+DECLARE_DEVICE_TYPE(NAUGHTYB_SOUND, naughtyb_sound_device)
+DECLARE_DEVICE_TYPE(POPFLAME_SOUND, popflame_sound_device)
#endif // MAME_AUDIO_PLEIADS_H
diff --git a/src/mame/audio/polepos.cpp b/src/mame/audio/polepos.cpp
index cd3ee6a62c7..ee706143f4e 100644
--- a/src/mame/audio/polepos.cpp
+++ b/src/mame/audio/polepos.cpp
@@ -5,7 +5,7 @@
Sound handler
****************************************************************************/
#include "emu.h"
-#include "includes/polepos.h"
+#include "polepos.h"
#include "namco52.h"
#include "namco54.h"
@@ -71,25 +71,81 @@ struct filter_state
#define Q_TO_DAMP(q) (1.0/q)
+
/* Setup the filter context based on the passed filter type info.
* type - 1 of the 3 defined filter types
* fc - center frequency
* d - damp = 1/Q
* gain - overall filter gain. Set to 1 if not needed.
*/
-static void filter2_setup(device_t *device, int type, double fc, double d, double gain,
- filter2_context *filter2);
+void polepos_sound_device::filter2_context::setup(device_t *device, int type, double fc, double d, double gain)
+{
+ int const sample_rate = device->machine().sample_rate();
+ double const two_over_T = 2*sample_rate;
+ double const two_over_T_squared = two_over_T * two_over_T;
+
+ /* calculate digital filter coefficents */
+ /* cutoff freq, in radians/sec */
+ /*w = 2.0*M_PI*fc; no pre-warping */
+ double const w = sample_rate*2.0*tan(M_PI*fc/sample_rate); /* pre-warping */
+ double const w_squared = w*w;
+
+ /* temp variable */
+ double const den = two_over_T_squared + d*w*two_over_T + w_squared;
+
+ a1 = 2.0*(-two_over_T_squared + w_squared)/den;
+ a2 = (two_over_T_squared - d*w*two_over_T + w_squared)/den;
+
+ switch (type)
+ {
+ case FILTER_LOWPASS:
+ b0 = b2 = w_squared/den;
+ b1 = 2.0*(b0);
+ break;
+ case FILTER_BANDPASS:
+ b0 = d*w*two_over_T/den;
+ b1 = 0.0;
+ b2 = -(b0);
+ break;
+ case FILTER_HIGHPASS:
+ b0 = b2 = two_over_T_squared/den;
+ b1 = -2.0*(b0);
+ break;
+ default:
+ device->logerror("filter2_setup() - Invalid filter type for 2nd order filter.");
+ break;
+ }
+
+ b0 *= gain;
+ b1 *= gain;
+ b2 *= gain;
+}
/* Reset the input/output voltages to 0. */
-static void filter2_reset(filter2_context *filter2);
+void polepos_sound_device::filter2_context::reset()
+{
+ x0 = 0;
+ x1 = 0;
+ x2 = 0;
+ y0 = 0;
+ y1 = 0;
+ y2 = 0;
+}
/* Step the filter.
* x0 is the new input, which needs to be set before stepping.
* y0 is the new filter output.
*/
-static void filter2_step(filter2_context *filter2);
+void polepos_sound_device::filter2_context::step()
+{
+ y0 = -a1 * y1 - a2 * y2 + b0 * x0 + b1 * x1 + b2 * x2;
+ x2 = x1;
+ x1 = x0;
+ y2 = y1;
+ y1 = y0;
+}
/* Setup a filter2 structure based on an op-amp multipole bandpass circuit.
@@ -110,92 +166,16 @@ static void filter2_step(filter2_context *filter2);
* gnd vRef >---' |/
*
*/
-static void filter_opamp_m_bandpass_setup(device_t *device, double r1, double r2, double r3, double c1, double c2,
- filter2_context *filter2);
-
-
-static void filter2_setup(device_t *device, int type, double fc, double d, double gain,
- filter2_context *filter2)
-{
- int sample_rate = device->machine().sample_rate();
- double w; /* cutoff freq, in radians/sec */
- double w_squared;
- double den; /* temp variable */
- double two_over_T = 2*sample_rate;
- double two_over_T_squared = two_over_T * two_over_T;
-
- /* calculate digital filter coefficents */
- /*w = 2.0*M_PI*fc; no pre-warping */
- w = sample_rate*2.0*tan(M_PI*fc/sample_rate); /* pre-warping */
- w_squared = w*w;
-
- den = two_over_T_squared + d*w*two_over_T + w_squared;
-
- filter2->a1 = 2.0*(-two_over_T_squared + w_squared)/den;
- filter2->a2 = (two_over_T_squared - d*w*two_over_T + w_squared)/den;
-
- switch (type)
- {
- case FILTER_LOWPASS:
- filter2->b0 = filter2->b2 = w_squared/den;
- filter2->b1 = 2.0*(filter2->b0);
- break;
- case FILTER_BANDPASS:
- filter2->b0 = d*w*two_over_T/den;
- filter2->b1 = 0.0;
- filter2->b2 = -(filter2->b0);
- break;
- case FILTER_HIGHPASS:
- filter2->b0 = filter2->b2 = two_over_T_squared/den;
- filter2->b1 = -2.0*(filter2->b0);
- break;
- default:
- device->logerror("filter2_setup() - Invalid filter type for 2nd order filter.");
- break;
- }
-
- filter2->b0 *= gain;
- filter2->b1 *= gain;
- filter2->b2 *= gain;
-}
-
-
-/* Reset the input/output voltages to 0. */
-static void filter2_reset(filter2_context *filter2)
-{
- filter2->x0 = 0;
- filter2->x1 = 0;
- filter2->x2 = 0;
- filter2->y0 = 0;
- filter2->y1 = 0;
- filter2->y2 = 0;
-}
-
-
-/* Step the filter. */
-static void filter2_step(filter2_context *filter2)
+void polepos_sound_device::filter2_context::opamp_m_bandpass_setup(device_t *device, double r1, double r2, double r3, double c1, double c2)
{
- filter2->y0 = -filter2->a1 * filter2->y1 - filter2->a2 * filter2->y2 +
- filter2->b0 * filter2->x0 + filter2->b1 * filter2->x1 + filter2->b2 * filter2->x2;
- filter2->x2 = filter2->x1;
- filter2->x1 = filter2->x0;
- filter2->y2 = filter2->y1;
- filter2->y1 = filter2->y0;
-}
-
-
-/* Setup a filter2 structure based on an op-amp multipole bandpass circuit. */
-static void filter_opamp_m_bandpass_setup(device_t *device, double r1, double r2, double r3, double c1, double c2,
- filter2_context *filter2)
-{
- double r_in, fc, d, gain;
-
if (r1 == 0)
{
device->logerror("filter_opamp_m_bandpass_setup() - r1 can not be 0");
return; /* Filter can not be setup. Undefined results. */
}
+ double r_in, gain;
+
if (r2 == 0)
{
gain = 1;
@@ -207,16 +187,16 @@ static void filter_opamp_m_bandpass_setup(device_t *device, double r1, double r2
r_in = 1.0 / (1.0/r1 + 1.0/r2);
}
- fc = 1.0 / (2 * M_PI * sqrt(r_in * r3 * c1 * c2));
- d = (c1 + c2) / sqrt(r3 / r_in * c1 * c2);
+ double const fc = 1.0 / (2 * M_PI * sqrt(r_in * r3 * c1 * c2));
+ double const d = (c1 + c2) / sqrt(r3 / r_in * c1 * c2);
gain *= -r3 / r_in * c2 / (c1 + c2);
- filter2_setup(device, FILTER_BANDPASS, fc, d, gain, filter2);
+ setup(device, FILTER_BANDPASS, fc, d, gain);
}
// device type definition
-DEFINE_DEVICE_TYPE(POLEPOS, polepos_sound_device, "polepos_sound", "Pole Position Custom Sound")
+DEFINE_DEVICE_TYPE(POLEPOS_SOUND, polepos_sound_device, "polepos_sound", "Pole Position Custom Sound")
//**************************************************************************
@@ -228,7 +208,7 @@ DEFINE_DEVICE_TYPE(POLEPOS, polepos_sound_device, "polepos_sound", "Pole Positio
//-------------------------------------------------
polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, POLEPOS, tag, owner, clock),
+ : device_t(mconfig, POLEPOS_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_current_position(0),
m_sample_msb(0),
@@ -250,13 +230,11 @@ void polepos_sound_device::device_start()
m_sample_enable = 0;
/* setup the filters */
- filter_opamp_m_bandpass_setup(this, RES_K(220), RES_K(33), RES_K(390), CAP_U(.01), CAP_U(.01),
- &m_filter_engine[0]);
- filter_opamp_m_bandpass_setup(this, RES_K(150), RES_K(22), RES_K(330), CAP_U(.0047), CAP_U(.0047),
- &m_filter_engine[1]);
+ m_filter_engine[0].opamp_m_bandpass_setup(this, RES_K(220), RES_K(33), RES_K(390), CAP_U(.01), CAP_U(.01));
+ m_filter_engine[1].opamp_m_bandpass_setup(this, RES_K(150), RES_K(22), RES_K(330), CAP_U(.0047), CAP_U(.0047));
/* Filter 3 is a little different. Because of the input capacitor, it is
* a high pass filter. */
- filter2_setup(this, FILTER_HIGHPASS, 950, Q_TO_DAMP(.707), 1, &m_filter_engine[2]);
+ m_filter_engine[2].setup(this, FILTER_HIGHPASS, 950, Q_TO_DAMP(.707), 1);
}
@@ -268,7 +246,7 @@ void polepos_sound_device::device_reset()
{
int loop;
for (loop = 0; loop < 3; loop++)
- filter2_reset(&m_filter_engine[loop]);
+ m_filter_engine[loop].reset();
}
@@ -310,7 +288,7 @@ void polepos_sound_device::sound_stream_update(sound_stream &stream, stream_samp
i_total = 0;
for (loop = 0; loop < 3; loop++)
{
- filter2_step(&m_filter_engine[loop]);
+ m_filter_engine[loop].step();
/* The op-amp powered @ 5V will clip to 0V & 3.5V.
* Adjusted to vRef of 2V, we will clip as follows: */
if (m_filter_engine[loop].y0 > 1.5) m_filter_engine[loop].y0 = 1.5;
diff --git a/src/mame/audio/polepos.h b/src/mame/audio/polepos.h
new file mode 100644
index 00000000000..6fe6f12e710
--- /dev/null
+++ b/src/mame/audio/polepos.h
@@ -0,0 +1,57 @@
+#ifndef MAME_AUDIO_POLEPOS_H
+#define MAME_AUDIO_POLEPOS_H
+
+#pragma once
+
+#include "sound/discrete.h"
+
+
+class polepos_sound_device : public device_t,
+ public device_sound_interface
+{
+public:
+ polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ~polepos_sound_device() { }
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+public:
+ DECLARE_WRITE_LINE_MEMBER(clson_w);
+ DECLARE_WRITE8_MEMBER(polepos_engine_sound_lsb_w);
+ DECLARE_WRITE8_MEMBER(polepos_engine_sound_msb_w);
+
+private:
+ struct filter2_context
+ {
+ filter2_context() { }
+
+ void setup(device_t *device, int type, double fc, double d, double gain);
+ void opamp_m_bandpass_setup(device_t *device, double r1, double r2, double r3, double c1, double c2);
+ void reset();
+ void step();
+
+ double x0 = 0.0, x1 = 0.0, x2 = 0.0; /* x[k], x[k-1], x[k-2], current and previous 2 input values */
+ double y0 = 0.0, y1 = 0.0, y2 = 0.0; /* y[k], y[k-1], y[k-2], current and previous 2 output values */
+ double a1 = 0.0, a2 = 0.0; /* digital filter coefficients, denominator */
+ double b0 = 0.0, b1 = 0.0, b2 = 0.0; /* digital filter coefficients, numerator */
+ };
+
+ uint32_t m_current_position;
+ int m_sample_msb;
+ int m_sample_lsb;
+ int m_sample_enable;
+ sound_stream *m_stream;
+ filter2_context m_filter_engine[3];
+};
+
+DECLARE_DEVICE_TYPE(POLEPOS_SOUND, polepos_sound_device)
+
+DISCRETE_SOUND_EXTERN( polepos );
+
+#endif // MAME_AUDIO_POLEPOS_H
diff --git a/src/mame/audio/pulsar.cpp b/src/mame/audio/pulsar.cpp
index baf03df2dd7..1aae442a9ae 100644
--- a/src/mame/audio/pulsar.cpp
+++ b/src/mame/audio/pulsar.cpp
@@ -174,7 +174,7 @@ WRITE8_MEMBER( vicdual_state::pulsar_audio_2_w )
MACHINE_CONFIG_START(vicdual_state::pulsar_audio)
/* samples */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(12)
MCFG_SAMPLES_NAMES(pulsar_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp
index a28dc040366..fcd9a2128e1 100644
--- a/src/mame/audio/qix.cpp
+++ b/src/mame/audio/qix.cpp
@@ -172,33 +172,33 @@ void qix_state::audio_map(address_map &map)
*************************************/
MACHINE_CONFIG_START(qix_state::qix_audio)
- MCFG_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_DEVICE_ADD("sndpia0", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(qix_state, sync_sndpia1_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qix_vol_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("sndpia1", pia6821_device, ca1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(qix_state, qix_flip_screen_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_dint))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_dint))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, qix_state, sync_sndpia1_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, qix_vol_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("sndpia1", pia6821_device, ca1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, qix_state, qix_flip_screen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, qix_state, qix_pia_dint))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, qix_state, qix_pia_dint))
MCFG_DEVICE_ADD("sndpia1", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("sndpia0", pia6821_device, porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state,qix_dac_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("sndpia0", pia6821_device, ca1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_sint))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_sint))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("sndpia0", pia6821_device, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state,qix_dac_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("sndpia0", pia6821_device, ca1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, qix_state, qix_pia_sint))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, qix_state, qix_pia_sint))
MCFG_DEVICE_ADD("sndpia2", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
- MCFG_PIA_CA2_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
- MCFG_PIA_CB2_HANDLER(WRITE8(qix_state, sndpia_2_warning_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, qix_state, sndpia_2_warning_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, sndpia_2_warning_w))
+ MCFG_PIA_CA2_HANDLER(WRITE8(*this, qix_state, sndpia_2_warning_w))
+ MCFG_PIA_CB2_HANDLER(WRITE8(*this, qix_state, sndpia_2_warning_w))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(qix)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -208,16 +208,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(qix_state::slither_audio)
MCFG_DEVICE_ADD("sndpia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("P2"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_coinctl_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(qix_state, qix_flip_screen_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(qix_state, qix_pia_dint))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(qix_state, qix_pia_dint))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, slither_coinctl_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, qix_state, qix_flip_screen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, qix_state, qix_pia_dint))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, qix_state, qix_pia_dint))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4)
+ MCFG_DEVICE_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4)
+ MCFG_DEVICE_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp
index 86682328c17..df634c31983 100644
--- a/src/mame/audio/rax.cpp
+++ b/src/mame/audio/rax.cpp
@@ -491,12 +491,12 @@ acclaim_rax_device::acclaim_rax_device(const machine_config &mconfig, const char
//-------------------------------------------------
MACHINE_CONFIG_START(acclaim_rax_device::device_add_mconfig)
- MCFG_CPU_ADD("adsp", ADSP2181, XTAL(16'670'000))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */
- MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
- MCFG_CPU_PROGRAM_MAP(adsp_program_map)
- MCFG_CPU_DATA_MAP(adsp_data_map)
- MCFG_CPU_IO_MAP(adsp_io_map)
+ MCFG_DEVICE_ADD("adsp", ADSP2181, XTAL(16'670'000))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, acclaim_rax_device, adsp_sound_tx_callback)) /* callback for serial transmit */
+ MCFG_ADSP21XX_DMOVLAY_CB(WRITE32(*this, acclaim_rax_device, dmovlay_callback)) // callback for adsp 2181 dmovlay instruction
+ MCFG_DEVICE_PROGRAM_MAP(adsp_program_map)
+ MCFG_DEVICE_DATA_MAP(adsp_data_map)
+ MCFG_DEVICE_IO_MAP(adsp_io_map)
MCFG_TIMER_DEVICE_ADD("adsp_reg_timer0", DEVICE_SELF, acclaim_rax_device, adsp_irq0)
MCFG_TIMER_DEVICE_ADD("adsp_dma_timer", DEVICE_SELF, acclaim_rax_device, dma_timer_callback)
@@ -506,10 +506,10 @@ MACHINE_CONFIG_START(acclaim_rax_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dacl", DMADAC, 0)
+ MCFG_DEVICE_ADD("dacl", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dacr", DMADAC, 0)
+ MCFG_DEVICE_ADD("dacr", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp
index 7aaf5577ffb..67070bcdb1a 100644
--- a/src/mame/audio/redalert.cpp
+++ b/src/mame/audio/redalert.cpp
@@ -180,15 +180,15 @@ void redalert_state::redalert_voice_map(address_map &map)
MACHINE_CONFIG_START(redalert_state::redalert_audio_m37b)
- MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(redalert_audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
+ MCFG_DEVICE_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(redalert_audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(redalert_state, redalert_analog_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, redalert_state, redalert_analog_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
/* channel C is used a noise source and is not connected to a speaker */
@@ -203,14 +203,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(redalert_state::redalert_audio_voice)
- MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(redalert_voice_map)
- MCFG_I8085A_SID(READLINE(redalert_state,sid_callback))
- MCFG_I8085A_SOD(WRITELINE(redalert_state,sod_callback))
+ MCFG_DEVICE_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(redalert_voice_map)
+ MCFG_I8085A_SID(READLINE(*this, redalert_state,sid_callback))
+ MCFG_I8085A_SOD(WRITELINE(*this, redalert_state,sod_callback))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
+ MCFG_DEVICE_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -346,14 +346,14 @@ SOUND_START_MEMBER( redalert_state, demoneye )
MACHINE_CONFIG_START(redalert_state::demoneye_audio)
- MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(demoneye_audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
+ MCFG_DEVICE_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(demoneye_audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(redalert_state, irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
MCFG_DEVICE_ADD("sndpia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(redalert_state, demoneye_ay8910_latch_2_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(redalert_state, demoneye_ay8910_data_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(redalert_state, demoneye_ay8910_latch_1_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, redalert_state, demoneye_ay8910_latch_2_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_data_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, redalert_state, demoneye_ay8910_latch_1_w))
MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye )
@@ -361,10 +361,10 @@ MACHINE_CONFIG_START(redalert_state::demoneye_audio)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_DEVICE_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index 6896485d8fd..802e4f19642 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -58,26 +58,26 @@ void s11c_bg_device::data_w(uint8_t data)
}
MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig)
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
- MCFG_CPU_PROGRAM_MAP(s11c_bg_map)
+ MCFG_DEVICE_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
+ MCFG_DEVICE_PROGRAM_MAP(s11c_bg_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
MCFG_YM2151_ADD("ym2151", XTAL(3'579'545)) // "3.58 MHz" on schematics and parts list
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11c_bg_device, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11c_bg_device, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("hc55516_bg", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516_bg", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.5)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11c_bg_device, pia40_pb_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("ym2151", ym2151_device, reset_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11c_bg_device, pia40_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11c_bg_device, pia40_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("ym2151", ym2151_device, reset_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11c_bg_device, pia40_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/s11c_bg.h b/src/mame/audio/s11c_bg.h
index d51bf213513..bc6133bcd52 100644
--- a/src/mame/audio/s11c_bg.h
+++ b/src/mame/audio/s11c_bg.h
@@ -21,12 +21,11 @@
downcast<s11c_bg_device &>(*device).set_romregion(_region);
-class s11c_bg_device : public device_t,
- public device_mixer_interface
+class s11c_bg_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
- s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
required_device<cpu_device> m_cpu;
required_device<ym2151_device> m_ym2151;
diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp
index ba1f4e49b69..818b23cf6e6 100644
--- a/src/mame/audio/scramble.cpp
+++ b/src/mame/audio/scramble.cpp
@@ -294,9 +294,9 @@ void scramble_state::ad2083_sound_io_map(address_map &map)
MACHINE_CONFIG_START(scramble_state::ad2083_audio)
- MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MCFG_CPU_PROGRAM_MAP(ad2083_sound_map)
- MCFG_CPU_IO_MAP(ad2083_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ad2083_sound_map)
+ MCFG_DEVICE_IO_MAP(ad2083_sound_io_map)
MCFG_DEVICE_ADD("tmsprom", TMSPROM, AD2083_TMS5110_CLOCK / 2) /* rom clock */
MCFG_TMSPROM_REGION("5110ctrl") /* prom memory region - sound region is automatically assigned */
@@ -309,23 +309,23 @@ MACHINE_CONFIG_START(scramble_state::ad2083_audio)
MCFG_TMSPROM_CTL8_BIT(2) /* bit # of ctl8 line */
MCFG_TMSPROM_RESET_BIT(6) /* bit # of rom reset */
MCFG_TMSPROM_STOP_BIT(7) /* bit # of stop */
- MCFG_TMSPROM_PDC_CB(DEVWRITELINE("tms", tms5110_device, pdc_w)) /* tms pdc func */
- MCFG_TMSPROM_CTL_CB(DEVWRITE8("tms", tms5110_device, ctl_w)) /* tms ctl func */
+ MCFG_TMSPROM_PDC_CB(WRITELINE("tms", tms5110_device, pdc_w)) /* tms pdc func */
+ MCFG_TMSPROM_CTL_CB(WRITE8("tms", tms5110_device, ctl_w)) /* tms ctl func */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318000/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(scramble_state, scramble_portB_r))
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, scramble_state, scramble_portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ay2", AY8910, 14318000/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(scramble_state, hotshock_soundlatch_r))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, scramble_state, hotshock_soundlatch_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
- MCFG_TMS5110_M0_CB(DEVWRITELINE("tmsprom", tmsprom_device, m0_w))
- MCFG_TMS5110_DATA_CB(DEVREADLINE("tmsprom", tmsprom_device, data_r))
+ MCFG_DEVICE_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
+ MCFG_TMS5110_M0_CB(WRITELINE("tmsprom", tmsprom_device, m0_w))
+ MCFG_TMS5110_DATA_CB(READLINE("tmsprom", tmsprom_device, data_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp
index cc36d35b327..db25e4ed4c0 100644
--- a/src/mame/audio/segag80r.cpp
+++ b/src/mame/audio/segag80r.cpp
@@ -234,7 +234,7 @@ static const char *const astrob_sample_names[] =
MACHINE_CONFIG_START(segag80r_state::astrob_sound_board)
/* sound hardware */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(11)
MCFG_SAMPLES_NAMES(astrob_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -421,17 +421,17 @@ static const char *const sega005_sample_names[] =
MACHINE_CONFIG_START(segag80r_state::sega005_sound_board)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, sega005_sound_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(segag80r_state, sega005_sound_b_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, segag80r_state, sega005_sound_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, segag80r_state, sega005_sound_b_w))
/* sound hardware */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(7)
MCFG_SAMPLES_NAMES(sega005_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("005", SEGA005, 0)
+ MCFG_DEVICE_ADD("005", SEGA005, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
@@ -584,7 +584,7 @@ MACHINE_CONFIG_START(segag80r_state::spaceod_sound_board)
/* sound hardware */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(11)
MCFG_SAMPLES_NAMES(spaceod_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -680,25 +680,25 @@ static const char *const monsterb_sample_names[] =
MACHINE_CONFIG_START(segag80r_state::monsterb_sound_board)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(segag80r_state, monsterb_sound_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(segag80r_state, monsterb_sound_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(segag80r_state, n7751_status_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(segag80r_state, n7751_command_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, segag80r_state, monsterb_sound_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, segag80r_state, monsterb_sound_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, segag80r_state, n7751_status_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segag80r_state, n7751_command_w))
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", N7751, 6000000)
+ MCFG_DEVICE_ADD("audiocpu", N7751, 6000000)
MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground
- MCFG_MCS48_PORT_P2_IN_CB(READ8(segag80r_state, n7751_command_r))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(segag80r_state, n7751_rom_r))
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(segag80r_state, n7751_p2_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("audio_8243", i8243_device, prog_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, segag80r_state, n7751_command_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, segag80r_state, n7751_rom_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, segag80r_state, n7751_p2_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("audio_8243", i8243_device, prog_w))
- MCFG_I8243_ADD("audio_8243", NOOP, WRITE8(segag80r_state,n7751_rom_control_w))
+ MCFG_I8243_ADD("audio_8243", NOOP, WRITE8(*this, segag80r_state,n7751_rom_control_w))
/* sound hardware */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(monsterb_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -708,7 +708,7 @@ MACHINE_CONFIG_START(segag80r_state::monsterb_sound_board)
MCFG_TMS36XX_DECAY_TIMES(0.5, 0.5, 0.5, 0.5, 0.5, 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // 50K (R91-97)/100K (R98-106) ladder network
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // 50K (R91-97)/100K (R98-106) ladder network
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp
index a91ebd39c82..ea6cf52efc8 100644
--- a/src/mame/audio/segam1audio.cpp
+++ b/src/mame/audio/segam1audio.cpp
@@ -60,32 +60,32 @@ DEFINE_DEVICE_TYPE(SEGAM1AUDIO, segam1audio_device, "segam1audio", "Sega Model 1
//-------------------------------------------------
MACHINE_CONFIG_START(segam1audio_device::device_add_mconfig)
- MCFG_CPU_ADD(M68000_TAG, M68000, 10000000) // verified on real h/w
- MCFG_CPU_PROGRAM_MAP(segam1audio_map)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, 10000000) // verified on real h/w
+ MCFG_DEVICE_PROGRAM_MAP(segam1audio_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD(YM3438_TAG, YM3438, 8000000)
+ MCFG_DEVICE_ADD(YM3438_TAG, YM3438, 8000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_SOUND_ADD(MULTIPCM_1_TAG, MULTIPCM, 8000000)
+ MCFG_DEVICE_ADD(MULTIPCM_1_TAG, MULTIPCM, 8000000)
MCFG_DEVICE_ADDRESS_MAP(0, mpcm1_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD(MULTIPCM_2_TAG, MULTIPCM, 8000000)
+ MCFG_DEVICE_ADD(MULTIPCM_2_TAG, MULTIPCM, 8000000)
MCFG_DEVICE_ADDRESS_MAP(0, mpcm2_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD(UART_TAG, I8251, 8000000) // T82C51, clock unknown
MCFG_I8251_RXRDY_HANDLER(INPUTLINE(M68000_TAG, M68K_IRQ_2))
- MCFG_I8251_TXD_HANDLER(WRITELINE(segam1audio_device, output_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, segam1audio_device, output_txd))
MCFG_CLOCK_ADD("uart_clock", 500000) // 16 times 31.25MHz (standard Sega/MIDI sound data rate)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE(UART_TAG, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(UART_TAG, i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(UART_TAG, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(UART_TAG, i8251_device, write_rxc))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp
index c74b2d2aefb..fd29e227f9d 100644
--- a/src/mame/audio/segasnd.cpp
+++ b/src/mame/audio/segasnd.cpp
@@ -87,12 +87,12 @@ speech_sound_device::speech_sound_device(const machine_config &mconfig, const ch
void speech_sound_device::device_start()
{
- m_speech = machine().root_device().memregion("speech")->base();
+ m_speech = machine().root_device().memregion("speech")->base();
- save_item(NAME(m_latch));
- save_item(NAME(m_t0));
- save_item(NAME(m_p2));
- save_item(NAME(m_drq));
+ save_item(NAME(m_latch));
+ save_item(NAME(m_t0));
+ save_item(NAME(m_p2));
+ save_item(NAME(m_drq));
}
@@ -222,19 +222,19 @@ void segag80snd_common::speech_portmap(address_map &map)
MACHINE_CONFIG_START(segag80snd_common::sega_speech_board)
/* CPU for the speech board */
- MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
- MCFG_CPU_PROGRAM_MAP(speech_map)
- MCFG_CPU_IO_MAP(speech_portmap)
- MCFG_MCS48_PORT_P1_IN_CB(DEVREAD8("segaspeech", speech_sound_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("segaspeech", speech_sound_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("segaspeech", speech_sound_device, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("segaspeech", speech_sound_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("segaspeech", speech_sound_device, t1_r))
+ MCFG_DEVICE_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
+ MCFG_DEVICE_PROGRAM_MAP(speech_map)
+ MCFG_DEVICE_IO_MAP(speech_portmap)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8("segaspeech", speech_sound_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("segaspeech", speech_sound_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8("segaspeech", speech_sound_device, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("segaspeech", speech_sound_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE("segaspeech", speech_sound_device, t1_r))
/* sound hardware */
- MCFG_SOUND_ADD("segaspeech", SEGASPEECH, 0)
- MCFG_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
- MCFG_SP0250_DRQ_CALLBACK(DEVWRITELINE("segaspeech", speech_sound_device, drq_w))
+ MCFG_DEVICE_ADD("segaspeech", SEGASPEECH, 0)
+ MCFG_DEVICE_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
+ MCFG_SP0250_DRQ_CALLBACK(WRITELINE("segaspeech", speech_sound_device, drq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -866,13 +866,13 @@ void usb_sound_device::usb_portmap(address_map &map)
MACHINE_CONFIG_START(usb_sound_device::device_add_mconfig)
/* CPU for the usb board */
- MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
- MCFG_CPU_PROGRAM_MAP(usb_map)
- MCFG_CPU_IO_MAP(usb_portmap)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(usb_sound_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(usb_sound_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(usb_sound_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(usb_sound_device, t1_r))
+ MCFG_DEVICE_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
+ MCFG_DEVICE_PROGRAM_MAP(usb_map)
+ MCFG_DEVICE_IO_MAP(usb_portmap)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, usb_sound_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, usb_sound_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, usb_sound_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, usb_sound_device, t1_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("usb_timer", usb_sound_device, increment_t1_clock_timer_cb, attotime::from_hz(USB_2MHZ_CLOCK / 256))
MACHINE_CONFIG_END
@@ -894,6 +894,6 @@ MACHINE_CONFIG_START(usb_rom_sound_device::device_add_mconfig)
usb_sound_device::device_add_mconfig(config);
/* CPU for the usb board */
- MCFG_CPU_MODIFY("ourcpu")
- MCFG_CPU_PROGRAM_MAP(usb_map_rom)
+ MCFG_DEVICE_MODIFY("ourcpu")
+ MCFG_DEVICE_PROGRAM_MAP(usb_map_rom)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h
index 36f526eab41..3efa682fa51 100644
--- a/src/mame/audio/segasnd.h
+++ b/src/mame/audio/segasnd.h
@@ -189,11 +189,11 @@ DECLARE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device)
#define MCFG_SEGAUSB_ADD(_tag) \
- MCFG_SOUND_ADD(_tag, SEGAUSB, 0) \
+ MCFG_DEVICE_ADD(_tag, SEGAUSB, 0) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- #define MCFG_SEGAUSBROM_ADD(_tag) \
- MCFG_SOUND_ADD(_tag, SEGAUSBROM, 0) \
+#define MCFG_SEGAUSBROM_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SEGAUSBROM, 0) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
#endif // MAME_AUDIO_SEGASND_H
diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp
index 9359b3778cb..04a51c592e8 100644
--- a/src/mame/audio/snes_snd.cpp
+++ b/src/mame/audio/snes_snd.cpp
@@ -114,15 +114,6 @@ static const int gauss[]=
#undef NO_PMOD
#undef NO_ECHO
-#define CPU_RATE 1024000
-#define SAMP_FREQ 32000
-
-
-/* Original SPC DSP took samples 32000 times a second, which is once every (1024000/32000 = 32) cycles. */
-#ifdef UNUSED_DEFINITION
- static const int TS_CYC = CPU_RATE / SAMP_FREQ;
-#endif
-
/* Ptrs to Gaussian table */
static const int *const G1 = &gauss[256];
static const int *const G2 = &gauss[512];
@@ -156,10 +147,10 @@ ALLOW_SAVE_TYPE(snes_sound_device::env_state_t32);
-DEFINE_DEVICE_TYPE(SNES, snes_sound_device, "snes_sound", "SNES Custom DSP (SPC700)")
+DEFINE_DEVICE_TYPE(SNES_SOUND, snes_sound_device, "snes_sound", "SNES Custom DSP (SPC700)")
snes_sound_device::snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SNES, tag, owner, clock)
+ : device_t(mconfig, SNES_SOUND, tag, owner, clock)
, device_sound_interface(mconfig, *this)
{
}
@@ -170,7 +161,7 @@ snes_sound_device::snes_sound_device(const machine_config &mconfig, const char *
void snes_sound_device::device_start()
{
- m_channel = machine().sound().stream_alloc(*this, 0, 2, 32000);
+ m_channel = machine().sound().stream_alloc(*this, 0, 2, clock());
m_ram = make_unique_clear<uint8_t[]>(SNES_SPCRAM_SIZE);
diff --git a/src/mame/audio/snes_snd.h b/src/mame/audio/snes_snd.h
index 4b39b2f3ae0..2808b5f95f4 100644
--- a/src/mame/audio/snes_snd.h
+++ b/src/mame/audio/snes_snd.h
@@ -14,11 +14,10 @@
TYPE DEFINITIONS
***************************************************************************/
-class snes_sound_device : public device_t,
- public device_sound_interface
+class snes_sound_device : public device_t, public device_sound_interface
{
public:
- snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 32'000);
void set_volume(int volume);
@@ -55,7 +54,7 @@ private:
struct voice_state_type /* Voice state type */
{
- uint16_t mem_ptr; /* Sample data memory pointer */
+ uint16_t mem_ptr; /* Sample data memory pointer */
int end; /* End or loop after block */
int envcnt; /* Counts to envelope update */
env_state_t32 envstate; /* Current envelope state */
@@ -67,10 +66,10 @@ private:
int on_cnt; /* Is it time to turn on yet? */
int pitch; /* Sample pitch (4096->32000Hz) */
int range; /* Last header's range */
- uint32_t samp_id; /* Sample ID# */
+ uint32_t samp_id; /* Sample ID# */
int sampptr; /* Where in sampbuf we are */
- int32_t smp1; /* Last sample (for BRR filter) */
- int32_t smp2; /* Second-to-last sample decoded*/
+ int32_t smp1; /* Last sample (for BRR filter) */
+ int32_t smp2; /* Second-to-last sample decoded*/
short sampbuf[4]; /* Buffer for Gaussian interp */
};
@@ -92,8 +91,8 @@ private:
// internal state
std::unique_ptr<uint8_t[]> m_ram;
sound_stream *m_channel;
- uint8_t m_dsp_regs[256]; /* DSP registers */
- uint8_t m_ipl_region[64]; /* SPC top 64 bytes */
+ uint8_t m_dsp_regs[256]; /* DSP registers */
+ uint8_t m_ipl_region[64]; /* SPC top 64 bytes */
int m_keyed_on;
int m_keys; /* 8-bits for 8 voices */
@@ -129,7 +128,7 @@ private:
uint16_t m_TnDIV[3]; /**< Timer N Divider */
};
-DECLARE_DEVICE_TYPE(SNES, snes_sound_device)
+DECLARE_DEVICE_TYPE(SNES_SOUND, snes_sound_device)
#endif // MAME_AUDIO_SNES_SND_H
diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp
index 157c5ba3438..1787413ab71 100644
--- a/src/mame/audio/spacefb.cpp
+++ b/src/mame/audio/spacefb.cpp
@@ -79,11 +79,11 @@ static const char *const spacefb_sample_names[] =
MACHINE_CONFIG_START(spacefb_state::spacefb_audio)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(spacefb_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp
index b4b2755cff3..ffd8f774133 100644
--- a/src/mame/audio/spiders.cpp
+++ b/src/mame/audio/spiders.cpp
@@ -208,7 +208,7 @@ WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w)
MACHINE_CONFIG_START(spiders_state::spiders_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(spiders)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/sprint8.cpp b/src/mame/audio/sprint8.cpp
index 582974094c6..ca6d63fa30b 100644
--- a/src/mame/audio/sprint8.cpp
+++ b/src/mame/audio/sprint8.cpp
@@ -305,7 +305,7 @@ MACHINE_CONFIG_START(sprint8_state::sprint8_audio)
MCFG_SPEAKER_ADD("speaker_5_6", 0.0, 0.0, -0.5) /* back */
MCFG_SPEAKER_ADD("speaker_4_8", 0.2, 0.0, 1.0) /* right */
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(sprint8)
MCFG_SOUND_ROUTE(0, "speaker_1_2", 1.0)
/* volumes on other channels defaulted to off, */
@@ -316,19 +316,19 @@ MACHINE_CONFIG_START(sprint8_state::sprint8_audio)
MCFG_SOUND_ROUTE(3, "speaker_4_8", 0.0)
MCFG_DEVICE_ADD("latch", F9334, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(sprint8_state, int_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_CRASH_EN>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_SCREECH_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(sprint8_state, team_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_ATTRACT_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, sprint8_state, int_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_CRASH_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_SCREECH_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, sprint8_state, team_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_ATTRACT_EN>))
MCFG_DEVICE_ADD("motor", F9334, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR1_EN>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR2_EN>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR3_EN>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR4_EN>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR5_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR6_EN>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR7_EN>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR8_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR3_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR4_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR5_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR6_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR7_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT8_MOTOR8_EN>))
MACHINE_CONFIG_END
diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp
index 6c7489a743f..cdeb8a9ed2e 100644
--- a/src/mame/audio/t5182.cpp
+++ b/src/mame/audio/t5182.cpp
@@ -372,8 +372,8 @@ void t5182_device::t5182_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(t5182_device::device_add_mconfig)
- MCFG_CPU_ADD("t5182_z80", Z80, T5182_CLOCK)
- MCFG_CPU_PROGRAM_MAP(t5182_map)
- MCFG_CPU_IO_MAP(t5182_io)
+ MCFG_DEVICE_ADD("t5182_z80", Z80, T5182_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(t5182_map)
+ MCFG_DEVICE_IO_MAP(t5182_io)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index 49c7b9d487f..3450b1fa153 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -199,30 +199,30 @@ WRITE8_MEMBER(taito_en_device::duart_output)
MACHINE_CONFIG_START(taito_en_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(30'476'100) / 2)
- MCFG_CPU_PROGRAM_MAP(en_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(30'476'100) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(en_sound_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000)) // from Gun Buster schematics
+ MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) // from Gun Buster schematics
MCFG_DEVICE_DISABLE()
MCFG_DEVICE_ADD("duart68681", MC68681, XTAL(16'000'000) / 4)
MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(taito_en_device, duart_irq_handler))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(taito_en_device, duart_output))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, taito_en_device, duart_irq_handler))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, taito_en_device, duart_output))
MCFG_DEVICE_ADD("mb87078", MB87078, 0)
- MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taito_en_device, mb87078_gain_changed))
+ MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taito_en_device, mb87078_gain_changed))
MCFG_DEVICE_ADD("dpram", MB8421, 0) // host accesses this from the other side
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32))
+ MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ensoniq", ES5505, XTAL(30'476'100) / 2)
+ MCFG_DEVICE_ADD("ensoniq", ES5505, XTAL(30'476'100) / 2)
MCFG_ES5505_REGION0("ensoniq.0")
MCFG_ES5505_REGION1("ensoniq.0")
MCFG_ES5505_CHANNELS(4)
diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp
index e310bee2913..cd5e36eaf83 100644
--- a/src/mame/audio/taito_zm.cpp
+++ b/src/mame/audio/taito_zm.cpp
@@ -177,10 +177,10 @@ WRITE16_MEMBER(taito_zoom_device::reg_address_w)
MACHINE_CONFIG_START(taito_zoom_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("mn10200", MN1020012A, XTAL(25'000'000)/2)
- MCFG_MN10200_READ_PORT_CB(1, DEVREAD8(DEVICE_SELF, taito_zoom_device, tms_ctrl_r))
- MCFG_MN10200_WRITE_PORT_CB(1, DEVWRITE8(DEVICE_SELF, taito_zoom_device, tms_ctrl_w))
- MCFG_CPU_PROGRAM_MAP(taitozoom_mn_map)
+ MCFG_DEVICE_ADD("mn10200", MN1020012A, XTAL(25'000'000)/2)
+ MCFG_MN10200_READ_PORT_CB(1, READ8(DEVICE_SELF, taito_zoom_device, tms_ctrl_r))
+ MCFG_MN10200_WRITE_PORT_CB(1, WRITE8(DEVICE_SELF, taito_zoom_device, tms_ctrl_w))
+ MCFG_DEVICE_PROGRAM_MAP(taitozoom_mn_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp
index d8d028c9ab8..d54ab88ce27 100644
--- a/src/mame/audio/targ.cpp
+++ b/src/mame/audio/targ.cpp
@@ -179,13 +179,13 @@ MACHINE_CONFIG_START(exidy_state::spectar_audio)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(sample_names)
MCFG_SAMPLES_START_CB(exidy_state, spectar_audio_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -195,13 +195,13 @@ MACHINE_CONFIG_START(exidy_state::targ_audio)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(sample_names)
MCFG_SAMPLES_START_CB(exidy_state, targ_audio_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp
index ec44bc0c4a4..2d992fdbd28 100644
--- a/src/mame/audio/timeplt.cpp
+++ b/src/mame/audio/timeplt.cpp
@@ -13,16 +13,12 @@
***************************************************************************/
#include "emu.h"
-#include "includes/timeplt.h"
#include "audio/timeplt.h"
#include "machine/gen_latch.h"
#include "speaker.h"
-static constexpr XTAL MASTER_CLOCK(14'318'181);
-
-
DEFINE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device, "timplt_audio", "Time Pilot Audio")
DEFINE_DEVICE_TYPE(LOCOMOTN_AUDIO, locomotn_audio_device, "locomotn_audio", "Loco-Motion Audio")
@@ -195,39 +191,31 @@ void locomotn_audio_device::locomotn_sound_map(address_map &map)
MACHINE_CONFIG_START(timeplt_audio_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("tpsound", Z80, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(timeplt_sound_map)
+ MCFG_DEVICE_ADD(m_soundcpu, Z80, DERIVED_CLOCK(1, 8))
+ MCFG_DEVICE_PROGRAM_MAP(timeplt_sound_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_GENERIC_LATCH_8_ADD("soundlatch")
+ MCFG_GENERIC_LATCH_8_ADD(m_soundlatch)
- MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(timeplt_audio_device, portB_r))
+ MCFG_DEVICE_ADD("ay1", AY8910, DERIVED_CLOCK(1, 8))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(m_soundlatch, generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, timeplt_audio_device, portB_r))
MCFG_SOUND_ROUTE(0, "filter.0.0", 0.60)
MCFG_SOUND_ROUTE(1, "filter.0.1", 0.60)
MCFG_SOUND_ROUTE(2, "filter.0.2", 0.60)
- MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, DERIVED_CLOCK(1, 8))
MCFG_SOUND_ROUTE(0, "filter.1.0", 0.60)
MCFG_SOUND_ROUTE(1, "filter.1.1", 0.60)
MCFG_SOUND_ROUTE(2, "filter.1.2", 0.60)
- MCFG_FILTER_RC_ADD("filter.0.0", 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter.0.1", 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter.0.2", 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-
- MCFG_FILTER_RC_ADD("filter.1.0", 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter.1.1", 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter.1.2", 0)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ for (required_device<filter_rc_device> &filter : m_filter_0)
+ FILTER_RC(config, filter).add_route(ALL_OUTPUTS, "mono", 1.0);
+
+ for (required_device<filter_rc_device> &filter : m_filter_1)
+ FILTER_RC(config, filter).add_route(ALL_OUTPUTS, "mono", 1.0);
MACHINE_CONFIG_END
@@ -235,8 +223,8 @@ MACHINE_CONFIG_START(locomotn_audio_device::device_add_mconfig)
timeplt_audio_device::device_add_mconfig(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("tpsound")
- MCFG_CPU_PROGRAM_MAP(locomotn_sound_map)
+ MCFG_DEVICE_MODIFY("tpsound")
+ MCFG_DEVICE_PROGRAM_MAP(locomotn_sound_map)
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h
index ca63eeb6942..3440cc79aac 100644
--- a/src/mame/audio/timeplt.h
+++ b/src/mame/audio/timeplt.h
@@ -13,7 +13,7 @@
class timeplt_audio_device : public device_t, public device_sound_interface
{
public:
- timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 14'318'181);
DECLARE_WRITE8_MEMBER(sound_data_w);
DECLARE_WRITE_LINE_MEMBER(sh_irqtrigger_w);
@@ -49,7 +49,7 @@ private:
class locomotn_audio_device : public timeplt_audio_device
{
public:
- locomotn_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ locomotn_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 14'318'181);
protected:
// device-level overrides
diff --git a/src/mame/audio/trackfld.cpp b/src/mame/audio/trackfld.cpp
index 44a0dee3b03..dd728107002 100644
--- a/src/mame/audio/trackfld.cpp
+++ b/src/mame/audio/trackfld.cpp
@@ -27,7 +27,7 @@ trackfld_audio_device::trackfld_audio_device(const machine_config &mconfig, cons
void trackfld_audio_device::device_start()
{
- m_audiocpu =machine().device<cpu_device>("audiocpu");
+ m_audiocpu = machine().device<cpu_device>("audiocpu");
m_vlm = machine().device<vlm5030_device>("vlm");
/* sound */
diff --git a/src/mame/audio/tranqgun.cpp b/src/mame/audio/tranqgun.cpp
index 3f43a2b61e4..40c320ca967 100644
--- a/src/mame/audio/tranqgun.cpp
+++ b/src/mame/audio/tranqgun.cpp
@@ -143,7 +143,7 @@ WRITE8_MEMBER( vicdual_state::tranqgun_audio_w )
MACHINE_CONFIG_START(vicdual_state::tranqgun_audio)
/* samples */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(tranqgun_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp
index 73e36ff4693..da93ff07c2c 100644
--- a/src/mame/audio/turbo.cpp
+++ b/src/mame/audio/turbo.cpp
@@ -191,7 +191,7 @@ MACHINE_CONFIG_START(turbo_state::turbo_samples)
MCFG_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */
MCFG_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(10)
MCFG_SAMPLES_NAMES(turbo_sample_names)
@@ -432,7 +432,7 @@ static const char *const subroc3d_sample_names[] =
MACHINE_CONFIG_START(turbo_state::subroc3d_samples)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(12)
MCFG_SAMPLES_NAMES(subroc3d_sample_names)
@@ -576,7 +576,7 @@ static const char *const buckrog_sample_names[]=
MACHINE_CONFIG_START(turbo_state::buckrog_samples)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(buckrog_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index 9a2ce9ff73c..b67bfcf42b5 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -7,7 +7,7 @@
***************************************************************************/
#include "emu.h"
-#include "includes/tx1.h"
+#include "tx1.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
@@ -21,7 +21,7 @@
/* RC oscillator: 1785Hz */
#define TX1_NOISE_CLOCK (1/(1000.0e-12 * 560000.0))
-#define TX1_PIT_CLOCK (TX1_PIXEL_CLOCK / 16)
+#define TX1_PIT_CLOCK (clock() / 16)
#define TX1_FRAC 30
#define TX1_SHUNT (250.0)
@@ -52,10 +52,10 @@ static const double tx1_engine_gains[16] =
};
-DEFINE_DEVICE_TYPE(TX1, tx1_sound_device, "tx1_sound", "TX-1 Custom Sound")
+DEFINE_DEVICE_TYPE(TX1_SOUND, tx1_sound_device, "tx1_sound", "TX-1 Custom Sound")
tx1_sound_device::tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : tx1_sound_device(mconfig, TX1, tag, owner, clock)
+ : tx1_sound_device(mconfig, TX1_SOUND, tag, owner, clock)
{
}
@@ -253,9 +253,9 @@ void tx1_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
/* 8253 outputs for the player/opponent engine sounds. */
- step_0 = m_pit8253.counts[0].val ? (TX1_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step).value() : 0;
- step_1 = m_pit8253.counts[1].val ? (TX1_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step).value() : 0;
- step_2 = m_pit8253.counts[2].val ? (TX1_PIT_CLOCK / m_pit8253.counts[2].val * m_freq_to_step).value() : 0;
+ step_0 = m_pit8253.counts[0].val ? (TX1_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step) : 0;
+ step_1 = m_pit8253.counts[1].val ? (TX1_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step) : 0;
+ step_2 = m_pit8253.counts[2].val ? (TX1_PIT_CLOCK / m_pit8253.counts[2].val * m_freq_to_step) : 0;
//gain_0 = tx1_engine_gains[m_ay_outputa & 0xf];
//gain_1 = tx1_engine_gains[m_ay_outputa >> 4];
@@ -301,7 +301,7 @@ void tx1_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
*
*************************************/
-#define BUGGYBOY_PIT_CLOCK (BUGGYBOY_ZCLK / 8)
+#define BUGGYBOY_PIT_CLOCK (clock() / 8)
#define BUGGYBOY_NOISE_CLOCK (BUGGYBOY_PIT_CLOCK / 4)
#define BUGGYBOY_R1 47000.0
@@ -335,10 +335,10 @@ static const double bb_engine_gains[16] =
-1.0/(1.0/(BUGGYBOY_R1S + BUGGYBOY_R2S + BUGGYBOY_R3S + BUGGYBOY_R4S) + 1.0/100e3)/100e3,
};
-DEFINE_DEVICE_TYPE(BUGGYBOY, buggyboy_sound_device, "buggyboy_sound", "Buggy Boy Custom Sound")
+DEFINE_DEVICE_TYPE(BUGGYBOY_SOUND, buggyboy_sound_device, "buggyboy_sound", "Buggy Boy Custom Sound")
buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : tx1_sound_device(mconfig, BUGGYBOY, tag, owner, clock)
+ : tx1_sound_device(mconfig, BUGGYBOY_SOUND, tag, owner, clock)
{
}
@@ -492,8 +492,8 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
memset(outputs[1], 0, samples * sizeof(*outputs[1]));
/* 8253 outputs for the player/opponent buggy engine sounds. */
- step_0 = m_pit8253.counts[0].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step).value() : 0;
- step_1 = m_pit8253.counts[1].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step).value() : 0;
+ step_0 = m_pit8253.counts[0].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[0].val * m_freq_to_step) : 0;
+ step_1 = m_pit8253.counts[1].val ? (BUGGYBOY_PIT_CLOCK / m_pit8253.counts[1].val * m_freq_to_step) : 0;
if (!strcmp(machine().system().name, "buggyboyjr"))
gain0 = BIT(m_ym2_outputb, 3) ? 1.0 : 2.0;
@@ -514,7 +514,7 @@ void buggyboy_sound_device::sound_stream_update(sound_stream &stream, stream_sam
pit1 = m_eng_voltages[(m_step1 >> 24) & 0xf];
/* Calculate the tyre screech noise source */
- for (i = 0; i < BUGGYBOY_NOISE_CLOCK.value() / machine().sample_rate(); ++i)
+ for (i = 0; i < BUGGYBOY_NOISE_CLOCK / machine().sample_rate(); ++i)
{
/* CD4006 is a 4-4-1-4-4-1 shift register */
int p13 = BIT(m_noise_lfsra, 3);
diff --git a/src/mame/audio/tx1.h b/src/mame/audio/tx1.h
new file mode 100644
index 00000000000..a4d8d3d8735
--- /dev/null
+++ b/src/mame/audio/tx1.h
@@ -0,0 +1,104 @@
+#ifndef MAME_AUDIO_TX1_H
+#define MAME_AUDIO_TX1_H
+
+#pragma once
+
+class tx1_sound_device : public device_t, public device_sound_interface
+{
+public:
+ tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ~tx1_sound_device() {}
+
+ DECLARE_READ8_MEMBER( pit8253_r );
+ DECLARE_WRITE8_MEMBER( pit8253_w );
+ DECLARE_WRITE8_MEMBER( ay8910_a_w );
+ DECLARE_WRITE8_MEMBER( ay8910_b_w );
+
+protected:
+ /*************************************
+ *
+ * 8253 Programmable Interval Timer
+ *
+ *************************************/
+ struct pit8253_state
+ {
+ union
+ {
+#ifdef LSB_FIRST
+ struct { uint8_t LSB; uint8_t MSB; } as8bit;
+#else
+ struct { uint8_t MSB; uint8_t LSB; } as8bit;
+#endif
+ uint16_t val;
+ } counts[3];
+
+ int idx[3];
+ };
+
+ tx1_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+ // internal state
+ sound_stream *m_stream;
+ uint32_t m_freq_to_step;
+ uint32_t m_step0;
+ uint32_t m_step1;
+ uint32_t m_step2;
+
+ pit8253_state m_pit8253;
+
+ uint8_t m_ay_outputa;
+ uint8_t m_ay_outputb;
+
+ stream_sample_t m_pit0;
+ stream_sample_t m_pit1;
+ stream_sample_t m_pit2;
+
+ double m_weights0[4];
+ double m_weights1[3];
+ double m_weights2[3];
+ int m_eng0[4];
+ int m_eng1[4];
+ int m_eng2[4];
+
+ int m_noise_lfsra;
+ int m_noise_lfsrb;
+ int m_noise_lfsrc;
+ int m_noise_lfsrd;
+ int m_noise_counter;
+ uint8_t m_ym1_outputa;
+ uint8_t m_ym2_outputa;
+ uint8_t m_ym2_outputb;
+ uint16_t m_eng_voltages[16];
+};
+
+
+class buggyboy_sound_device : public tx1_sound_device
+{
+public:
+ buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_WRITE8_MEMBER( ym1_a_w );
+ DECLARE_WRITE8_MEMBER( ym2_a_w );
+ DECLARE_WRITE8_MEMBER( ym2_b_w );
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+};
+
+
+DECLARE_DEVICE_TYPE(TX1_SOUND, tx1_sound_device)
+DECLARE_DEVICE_TYPE(BUGGYBOY_SOUND, buggyboy_sound_device)
+
+#endif // MAME_AUDIO_TX1_H
diff --git a/src/mame/audio/vicdual-97271p.cpp b/src/mame/audio/vicdual-97271p.cpp
index baef818445f..3a9a77dbc9e 100644
--- a/src/mame/audio/vicdual-97271p.cpp
+++ b/src/mame/audio/vicdual-97271p.cpp
@@ -90,7 +90,7 @@ MACHINE_CONFIG_START(s97271p_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* samples */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(13)
MCFG_SAMPLES_NAMES(nsub_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp
index 3d4e059ca68..cb2f72a1d18 100644
--- a/src/mame/audio/vicdual.cpp
+++ b/src/mame/audio/vicdual.cpp
@@ -112,12 +112,12 @@ static const char *const frogs_sample_names[] =
MACHINE_CONFIG_START(vicdual_state::frogs_audio)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(frogs_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(frogs)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -447,7 +447,7 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(vicdual_state::headon_audio)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(headon)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -593,7 +593,7 @@ static const char *const brdrline_sample_names[] =
MACHINE_CONFIG_START(vicdual_state::brdrline_audio)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(7)
MCFG_SAMPLES_NAMES(brdrline_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
diff --git a/src/mame/audio/warpwarp.cpp b/src/mame/audio/warpwarp.cpp
index 98a74f24e21..7e722cadfa5 100644
--- a/src/mame/audio/warpwarp.cpp
+++ b/src/mame/audio/warpwarp.cpp
@@ -12,14 +12,11 @@
#include "emu.h"
#include "audio/warpwarp.h"
-#define CLOCK_16H (18432000/3/2/16)
-#define CLOCK_1V (18432000/3/2/384)
-
-DEFINE_DEVICE_TYPE(WARPWARP, warpwarp_sound_device, "warpwarp_sound", "Warp Warp Custom Sound")
+DEFINE_DEVICE_TYPE(WARPWARP_SOUND, warpwarp_sound_device, "warpwarp_sound", "Warp Warp Custom Sound")
warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WARPWARP, tag, owner, clock),
+ : device_t(mconfig, WARPWARP_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_decay(nullptr),
m_channel(nullptr),
@@ -53,7 +50,9 @@ void warpwarp_sound_device::device_start()
for (int i = 0; i < 0x8000; i++)
m_decay[0x7fff - i] = (int16_t) (0x7fff/exp(1.0*i/4096));
- m_channel = machine().sound().stream_alloc(*this, 0, 1, CLOCK_16H);
+ m_clock_16h = clock() / 3 / 2 / 16;
+ m_clock_1v = clock() / 3 / 2 / 384;
+ m_channel = machine().sound().stream_alloc(*this, 0, 1, m_clock_16h);
m_sound_volume_timer = timer_alloc(TIMER_SOUND_VOLUME_DECAY);
m_music_volume_timer = timer_alloc(TIMER_MUSIC_VOLUME_DECAY);
@@ -195,10 +194,10 @@ void warpwarp_sound_device::sound_stream_update(sound_stream &stream, stream_sam
* 63 = 4 steps -> 48 kHz
*/
- m_mcarry -= CLOCK_16H / (4 * (64 - m_music1_latch));
+ m_mcarry -= m_clock_16h / (4 * (64 - m_music1_latch));
while( m_mcarry < 0 )
{
- m_mcarry += CLOCK_16H;
+ m_mcarry += m_clock_16h;
m_mcount++;
m_music_signal = (m_mcount & ~m_music2_latch & 15) ? m_decay[m_music_volume] : 0;
/* override by noise gate? */
@@ -207,10 +206,10 @@ void warpwarp_sound_device::sound_stream_update(sound_stream &stream, stream_sam
}
/* clock 1V = 8kHz */
- m_vcarry -= CLOCK_1V;
+ m_vcarry -= m_clock_1v;
while (m_vcarry < 0)
{
- m_vcarry += CLOCK_16H;
+ m_vcarry += m_clock_16h;
m_vcount++;
/* noise is clocked with raising edge of 2V */
diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h
index 9cf2343e1bd..7590f188113 100644
--- a/src/mame/audio/warpwarp.h
+++ b/src/mame/audio/warpwarp.h
@@ -35,6 +35,8 @@ private:
// internal state
std::unique_ptr<int16_t[]> m_decay;
sound_stream *m_channel;
+ u32 m_clock_16h;
+ u32 m_clock_1v;
int m_sound_latch;
int m_music1_latch;
int m_music2_latch;
@@ -52,6 +54,6 @@ private:
int m_mcount;
};
-DECLARE_DEVICE_TYPE(WARPWARP, warpwarp_sound_device)
+DECLARE_DEVICE_TYPE(WARPWARP_SOUND, warpwarp_sound_device)
#endif // MAME_AUDIO_WARPWARP_H
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp
index 515aad3e31a..0eae5aaa1d2 100644
--- a/src/mame/audio/williams.cpp
+++ b/src/mame/audio/williams.cpp
@@ -176,24 +176,24 @@ void williams_cvsd_sound_device::williams_cvsd_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(williams_cvsd_sound_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", MC6809E, CVSD_MASTER_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(williams_cvsd_map)
+ MCFG_DEVICE_ADD("cpu", MC6809E, CVSD_MASTER_CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(williams_cvsd_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_cvsd_sound_device, talkback_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_cvsd_sound_device, talkback_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("cpu", INPUT_LINE_NMI))
MCFG_YM2151_ADD("ym2151", CVSD_FM_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("pia", pia6821_device, ca1_w)) MCFG_DEVCB_INVERT // IRQ is not true state
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("pia", pia6821_device, ca1_w)) MCFG_DEVCB_INVERT // IRQ is not true state
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10)
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_DEVICE_ADD("cvsd", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.60)
MACHINE_CONFIG_END
@@ -496,23 +496,23 @@ void williams_narc_sound_device::williams_narc_slave_map(address_map &map)
MACHINE_CONFIG_START(williams_narc_sound_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu0", MC6809E, NARC_MASTER_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(williams_narc_master_map)
+ MCFG_DEVICE_ADD("cpu0", MC6809E, NARC_MASTER_CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(williams_narc_master_map)
- MCFG_CPU_ADD("cpu1", MC6809E, NARC_MASTER_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(williams_narc_slave_map)
+ MCFG_DEVICE_ADD("cpu1", MC6809E, NARC_MASTER_CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(williams_narc_slave_map)
MCFG_YM2151_ADD("ym2151", NARC_FM_CLOCK)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("cpu0", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10)
- MCFG_SOUND_ADD("dac1", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
- MCFG_SOUND_ADD("dac2", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
+ MCFG_DEVICE_ADD("dac1", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
+ MCFG_DEVICE_ADD("dac2", AD7224, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_DEVICE_ADD("cvsd", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.60)
MACHINE_CONFIG_END
@@ -751,14 +751,14 @@ void williams_adpcm_sound_device::williams_adpcm_oki_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(williams_adpcm_sound_device::device_add_mconfig)
- MCFG_CPU_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(williams_adpcm_map)
+ MCFG_DEVICE_ADD("cpu", MC6809E, ADPCM_MASTER_CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(williams_adpcm_map)
MCFG_YM2151_ADD("ym2151", ADPCM_FM_CLOCK)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("cpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10)
- MCFG_SOUND_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10)
+ MCFG_DEVICE_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.10)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/audio/williams.h b/src/mame/audio/williams.h
index f7c02996e77..5a46b2b9853 100644
--- a/src/mame/audio/williams.h
+++ b/src/mame/audio/williams.h
@@ -37,7 +37,7 @@ class williams_cvsd_sound_device : public device_t,
{
public:
// construction/destruction
- williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// read/write
DECLARE_WRITE16_MEMBER(write);
@@ -76,7 +76,7 @@ class williams_narc_sound_device : public device_t,
{
public:
// construction/destruction
- williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// read/write
DECLARE_READ16_MEMBER(read);
@@ -135,7 +135,7 @@ class williams_adpcm_sound_device : public device_t,
{
public:
// construction/destruction
- williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
// read/write
DECLARE_WRITE16_MEMBER(write);
diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp
index e0b0521cede..d96ed034a86 100644
--- a/src/mame/audio/wpcsnd.cpp
+++ b/src/mame/audio/wpcsnd.cpp
@@ -12,7 +12,9 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#define LOG_WPCSND (0)
+//#define VERBOSE 1
+#include "logmacro.h"
+
DEFINE_DEVICE_TYPE(WPCSND, wpcsnd_device, "wpcsnd", "Williams WPC Sound")
@@ -68,19 +70,19 @@ uint8_t wpcsnd_device::data_r()
}
MACHINE_CONFIG_START(wpcsnd_device::device_add_mconfig)
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
- MCFG_CPU_PROGRAM_MAP(wpcsnd_map)
+ MCFG_DEVICE_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
+ MCFG_DEVICE_PROGRAM_MAP(wpcsnd_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
MCFG_YM2151_ADD("ym2151", 3580000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(wpcsnd_device, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, wpcsnd_device, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
- MCFG_SOUND_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
+ MCFG_DEVICE_ADD("dac", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.5)
MACHINE_CONFIG_END
@@ -140,7 +142,7 @@ WRITE8_MEMBER( wpcsnd_device::rombank_w )
m_cpubank->set_entry(bank);
- if(LOG_WPCSND) logerror("WPCSND: Bank set to %02x\n",bank);
+ LOG("WPCSND: Bank set to %02x\n",bank);
}
READ8_MEMBER(wpcsnd_device::latch_r)
diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h
index dcace2cfccc..ff13e1dd78a 100644
--- a/src/mame/audio/wpcsnd.h
+++ b/src/mame/audio/wpcsnd.h
@@ -23,12 +23,11 @@
downcast<wpcsnd_device *>(device)->set_reply_callback(DEVCB_##_reply);
-class wpcsnd_device : public device_t,
- public device_mixer_interface
+class wpcsnd_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
- wpcsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ wpcsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
required_device<cpu_device> m_cpu;
required_device<ym2151_device> m_ym2151;
diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp
index d5eeef78820..566fcef973f 100644
--- a/src/mame/audio/zaccaria.cpp
+++ b/src/mame/audio/zaccaria.cpp
@@ -223,23 +223,23 @@ READ8_MEMBER(zac1b111xx_melody_base::melodypsg1_portb_r)
}
MACHINE_CONFIG_START(zac1b111xx_melody_base::device_add_mconfig)
- MCFG_CPU_ADD("melodycpu", M6802, XTAL(3'579'545)) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(zac1b111xx_melody_base_map)
+ MCFG_DEVICE_ADD("melodycpu", M6802, XTAL(3'579'545)) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(zac1b111xx_melody_base_map)
MCFG_DEVICE_ADD("timebase", CLOCK, XTAL(3'579'545)/4096/2) // CPU clock divided using 4040 and half of 74LS74
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("melodypia", pia6821_device, cb1_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("melodypia", pia6821_device, cb1_w))
MCFG_DEVICE_ADD("melodypia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(zac1b111xx_melody_base, melodypia_porta_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(zac1b111xx_melody_base, melodypia_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(zac1b111xx_melody_base, melodypia_portb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, zac1b111xx_melody_base, melodypia_porta_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, zac1b111xx_melody_base, melodypia_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, zac1b111xx_melody_base, melodypia_portb_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("melodycpu", INPUT_LINE_NMI))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("melodycpu", M6802_IRQ_LINE))
- MCFG_SOUND_ADD("melodypsg1", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
- MCFG_AY8910_PORT_B_READ_CB(READ8(zac1b111xx_melody_base, melodypsg1_portb_r))
+ MCFG_DEVICE_ADD("melodypsg1", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, zac1b111xx_melody_base, melodypsg1_portb_r))
- MCFG_SOUND_ADD("melodypsg2", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
+ MCFG_DEVICE_ADD("melodypsg2", AY8910, XTAL(3'579'545)/2) // CPU clock divided using 4040
MACHINE_CONFIG_END
void zac1b111xx_melody_base::device_start()
@@ -304,15 +304,15 @@ WRITE8_MEMBER(zac1b11107_audio_device::melodypsg2_porta_w)
MACHINE_CONFIG_START(zac1b11107_audio_device::device_add_mconfig)
zac1b111xx_melody_base::device_add_mconfig(config);
- MCFG_CPU_MODIFY("melodycpu")
- MCFG_CPU_PROGRAM_MAP(zac1b11107_melody_map)
+ MCFG_DEVICE_MODIFY("melodycpu")
+ MCFG_DEVICE_PROGRAM_MAP(zac1b11107_melody_map)
MCFG_DEVICE_MODIFY("melodypsg1")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(zac1b11107_audio_device, melodypsg1_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, zac1b11107_audio_device, melodypsg1_porta_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.5, 0)
MCFG_DEVICE_MODIFY("melodypsg2")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(zac1b11107_audio_device, melodypsg2_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, zac1b11107_audio_device, melodypsg2_porta_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.5, 0)
MACHINE_CONFIG_END
@@ -407,42 +407,42 @@ WRITE8_MEMBER(zac1b11142_audio_device::pia_1i_portb_w)
MACHINE_CONFIG_START(zac1b11142_audio_device::device_add_mconfig)
zac1b111xx_melody_base::device_add_mconfig(config);
- MCFG_CPU_MODIFY("melodycpu")
- MCFG_CPU_PROGRAM_MAP(zac1b11142_melody_map)
+ MCFG_DEVICE_MODIFY("melodycpu")
+ MCFG_DEVICE_PROGRAM_MAP(zac1b11142_melody_map)
MCFG_DEVICE_MODIFY("melodypsg1")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(zac1b11142_audio_device, ay_4g_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, zac1b11142_audio_device, ay_4g_porta_w))
MCFG_SOUND_ROUTE(0, "sound_nl", 1.0, 0)
MCFG_SOUND_ROUTE(1, "sound_nl", 1.0, 1)
MCFG_SOUND_ROUTE(2, "sound_nl", 1.0, 2)
MCFG_DEVICE_MODIFY("melodypsg2")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(zac1b11142_audio_device, ay_4h_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(zac1b11142_audio_device, ay_4h_portb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, zac1b11142_audio_device, ay_4h_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, zac1b11142_audio_device, ay_4h_portb_w))
MCFG_SOUND_ROUTE(0, "sound_nl", 1.0, 3)
MCFG_SOUND_ROUTE(1, "sound_nl", 1.0, 4)
MCFG_SOUND_ROUTE(2, "sound_nl", 1.0, 5)
- MCFG_CPU_ADD("audiocpu", M6802, XTAL(3'579'545)) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(zac1b11142_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, XTAL(3'579'545)) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(zac1b11142_audio_map)
MCFG_DEVICE_ADD("pia_1i", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(DEVREAD8("speech", tms5220_device, status_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("speech", tms5220_device, data_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(zac1b11142_audio_device, pia_1i_portb_w))
+ MCFG_PIA_READPA_HANDLER(READ8("speech", tms5220_device, status_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("speech", tms5220_device, data_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, zac1b11142_audio_device, pia_1i_portb_w))
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.40, 0) // mc1408.1f
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.40, 0) // mc1408.1f
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// There is no xtal, the clock is obtained from a RC oscillator as shown in the TMS5220 datasheet (R=100kOhm C=22pF)
// 162kHz measured on pin 3 20 minutes after power on, clock would then be 162.3*4=649.2kHz
- MCFG_SOUND_ADD("speech", TMS5200, 649200) // ROMCLK pin measured at 162.3Khz, OSC is exactly *4 of that)
- MCFG_TMS52XX_IRQ_HANDLER(DEVWRITELINE("pia_1i", pia6821_device, cb1_w))
- MCFG_TMS52XX_READYQ_HANDLER(DEVWRITELINE("pia_1i", pia6821_device, ca2_w))
+ MCFG_DEVICE_ADD("speech", TMS5200, 649200) // ROMCLK pin measured at 162.3Khz, OSC is exactly *4 of that)
+ MCFG_TMS52XX_IRQ_HANDLER(WRITELINE("pia_1i", pia6821_device, cb1_w))
+ MCFG_TMS52XX_READYQ_HANDLER(WRITELINE("pia_1i", pia6821_device, ca2_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.80, 0)
- MCFG_SOUND_ADD("sound_nl", NETLIST_SOUND, 48000)
+ MCFG_DEVICE_ADD("sound_nl", NETLIST_SOUND, 48000)
MCFG_NETLIST_SETUP(zac1b11142)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 1.0, 0)
diff --git a/src/mame/audio/zaccaria.h b/src/mame/audio/zaccaria.h
index cf33aa9388b..e467689ba50 100644
--- a/src/mame/audio/zaccaria.h
+++ b/src/mame/audio/zaccaria.h
@@ -65,7 +65,7 @@ protected:
class zac1b11107_audio_device : public zac1b111xx_melody_base
{
public:
- zac1b11107_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ zac1b11107_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
// host interface
DECLARE_WRITE8_MEMBER(sound_w);
@@ -86,7 +86,7 @@ class zac1b11142_audio_device : public zac1b111xx_melody_base
public:
template <class Object> devcb_base &set_acs_cb(device_t &device, Object &&cb) { return m_acs_cb.set_callback(std::forward<Object>(cb)); }
- zac1b11142_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ zac1b11142_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
// host interface
DECLARE_WRITE8_MEMBER(hs_w);
diff --git a/src/mame/audio/zaxxon.cpp b/src/mame/audio/zaxxon.cpp
index 10923afc895..8220bf1885f 100644
--- a/src/mame/audio/zaxxon.cpp
+++ b/src/mame/audio/zaxxon.cpp
@@ -93,7 +93,7 @@ static const char *const zaxxon_sample_names[] =
MACHINE_CONFIG_START(zaxxon_state::zaxxon_samples)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(12)
MCFG_SAMPLES_NAMES(zaxxon_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -193,7 +193,7 @@ static const char *const congo_sample_names[] =
MACHINE_CONFIG_START(zaxxon_state::congo_samples)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(congo_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index 0906b49e065..a26e1e0da55 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -562,13 +562,13 @@ void _1942_state::machine_reset()
MACHINE_CONFIG_START(_1942_state::_1942)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(c1942_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(c1942_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", _1942_state, c1942_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(_1942_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(_1942_state, irq0_line_hold, 4*60)
/* video hardware */
@@ -591,7 +591,7 @@ MACHINE_CONFIG_START(_1942_state::_1942)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MCFG_DEVICE_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(10000.0, 10000.0, 10000.0)
@@ -599,7 +599,7 @@ MACHINE_CONFIG_START(_1942_state::_1942)
MCFG_SOUND_ROUTE(1, "snd_nl", 1.0, 1)
MCFG_SOUND_ROUTE(2, "snd_nl", 1.0, 2)
- MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MCFG_DEVICE_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(10000.0, 10000.0, 10000.0)
@@ -610,7 +610,7 @@ MACHINE_CONFIG_START(_1942_state::_1942)
/* NETLIST configuration using internal AY8910 resistor values */
/* Minimize resampling between ay8910 and netlist */
- MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, AUDIO_CLOCK / 8 / 2)
+ MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, AUDIO_CLOCK / 8 / 2)
MCFG_NETLIST_SETUP(nl_1942)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MCFG_NETLIST_STREAM_INPUT("snd_nl", 0, "R_AY1_1.R")
@@ -630,14 +630,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(_1942_state::_1942p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */
- MCFG_CPU_PROGRAM_MAP(c1942p_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _1942_state, irq0_line_hold) // note, powerups won't move down the screen with the original '1942' logic.
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(c1942p_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _1942_state, irq0_line_hold) // note, powerups won't move down the screen with the original '1942' logic.
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */
- MCFG_CPU_PROGRAM_MAP(c1942p_sound_map)
- MCFG_CPU_IO_MAP(c1942p_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(_1942_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(c1942p_sound_map)
+ MCFG_DEVICE_IO_MAP(c1942p_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(_1942_state, irq0_line_hold, 4*60)
/* video hardware */
@@ -663,9 +663,9 @@ MACHINE_CONFIG_START(_1942_state::_1942p)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK_1942P) /* 1.25 MHz - verified on PCB */
+ MCFG_DEVICE_ADD("ay1", AY8910, AUDIO_CLOCK_1942P) /* 1.25 MHz - verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK_1942P) /* 1.25 MHz - verified on PCB */
+ MCFG_DEVICE_ADD("ay2", AY8910, AUDIO_CLOCK_1942P) /* 1.25 MHz - verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index e2dc7e6f734..4c17341efb6 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -314,13 +314,13 @@ void _1943_state::machine_reset()
MACHINE_CONFIG_START(_1943_state::_1943)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(c1943_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _1943_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(c1943_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _1943_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(_1943_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(_1943_state, irq0_line_hold, 4*60)
MCFG_WATCHDOG_ADD("watchdog")
@@ -343,13 +343,13 @@ MACHINE_CONFIG_START(_1943_state::_1943)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index 94797c1b209..b59af74ffd4 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -384,9 +384,9 @@ void k3_state::machine_start()
MACHINE_CONFIG_START(k3_state::flagrall)
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK ) // ?
- MCFG_CPU_PROGRAM_MAP(flagrall_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", k3_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(flagrall_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", k3_state, irq4_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1945kiii)
@@ -411,8 +411,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(k3_state::k3)
flagrall(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(k3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(k3_map)
MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/16, PIN7_HIGH) /* dividers? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index e3618cd5226..3779b402ef8 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -396,9 +396,9 @@ WRITE_LINE_MEMBER(_20pacgal_state::vblank_irq)
MACHINE_CONFIG_START(_20pacgal_state::_20pacgal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(_20pacgal_map)
- MCFG_CPU_IO_MAP(_20pacgal_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(_20pacgal_map)
+ MCFG_DEVICE_IO_MAP(_20pacgal_io_map)
MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
@@ -410,11 +410,11 @@ MACHINE_CONFIG_START(_20pacgal_state::_20pacgal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, NAMCO_AUDIO_CLOCK)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, NAMCO_AUDIO_CLOCK)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -424,9 +424,9 @@ MACHINE_CONFIG_START(_25pacman_state::_25pacman)
_20pacgal(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(_25pacman_map)
- MCFG_CPU_IO_MAP(_25pacman_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(_25pacman_map)
+ MCFG_DEVICE_IO_MAP(_25pacman_io_map)
MCFG_AMD_29LV200T_ADD("flash")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp
index b3678a6711e..aabcd597124 100644
--- a/src/mame/drivers/24cdjuke.cpp
+++ b/src/mame/drivers/24cdjuke.cpp
@@ -283,10 +283,10 @@ void midcoin24cdjuke_state::machine_reset()
MACHINE_CONFIG_START(midcoin24cdjuke_state::midcoin24cdjuke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(midcoin24cdjuke_map)
- MCFG_CPU_IO_MAP(midcoin24cdjuke_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(midcoin24cdjuke_state, irq0_line_hold, 500)
+ MCFG_DEVICE_ADD("maincpu", Z80,6000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(midcoin24cdjuke_map)
+ MCFG_DEVICE_IO_MAP(midcoin24cdjuke_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(midcoin24cdjuke_state, irq0_line_hold, 500)
MCFG_DEFAULT_LAYOUT(layout_24cdjuke)
@@ -297,8 +297,8 @@ MACHINE_CONFIG_START(midcoin24cdjuke_state::midcoin24cdjuke)
MCFG_DEVICE_ADD("ic25", I8255A, 0)
MCFG_I8255_IN_PORTB_CB(IOPORT("PB"))
- MCFG_I8255_IN_PORTC_CB(READ8(midcoin24cdjuke_state, kb_row_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(midcoin24cdjuke_state, kb_col_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, midcoin24cdjuke_state, kb_row_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, midcoin24cdjuke_state, kb_col_w))
MCFG_DEVICE_ADD("ic31", I8255A, 0)
MCFG_I8255_OUT_PORTB_CB(LOGGER("PPI8255 - unmapped write port B"))
diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp
index 75909adb738..3883a588a2f 100644
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@@ -355,17 +355,17 @@ MACHINE_RESET_MEMBER(_2mindril_state,drill)
MACHINE_CONFIG_START(_2mindril_state::drill)
- MCFG_CPU_ADD("maincpu", M68000, 16000000 )
- MCFG_CPU_PROGRAM_MAP(drill_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _2mindril_state, drill_vblank_irq)
- //MCFG_CPU_PERIODIC_INT_DRIVER(_2mindril_state, drill_device_irq, 60)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000 )
+ MCFG_DEVICE_PROGRAM_MAP(drill_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _2mindril_state, drill_vblank_irq)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(_2mindril_state, drill_device_irq, 60)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 2mindril)
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_0_CB(IOPORT("DSW"))
- MCFG_TC0510NIO_READ_1_CB(READ8(_2mindril_state, arm_pwr_r))
- MCFG_TC0510NIO_READ_2_CB(READ8(_2mindril_state, sensors_r))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(_2mindril_state, coins_w))
+ MCFG_TC0510NIO_READ_1_CB(READ8(*this, _2mindril_state, arm_pwr_r))
+ MCFG_TC0510NIO_READ_2_CB(READ8(*this, _2mindril_state, sensors_r))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, _2mindril_state, coins_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("COINS"))
MCFG_MACHINE_START_OVERRIDE(_2mindril_state,drill)
@@ -377,7 +377,7 @@ MACHINE_CONFIG_START(_2mindril_state::drill)
MCFG_SCREEN_SIZE(40*8+48*2, 32*8)
MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+224-1)
MCFG_SCREEN_UPDATE_DRIVER(_2mindril_state, screen_update_f3)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(_2mindril_state, screen_vblank_f3))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, _2mindril_state, screen_vblank_f3))
MCFG_PALETTE_ADD("palette", 0x2000)
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -386,8 +386,8 @@ MACHINE_CONFIG_START(_2mindril_state::drill)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 16000000/2)
- MCFG_YM2610_IRQ_HANDLER(WRITELINE(_2mindril_state, irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 16000000/2)
+ MCFG_YM2610_IRQ_HANDLER(WRITELINE(*this, _2mindril_state, irqhandler))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index b849bcdff16..133ed2c9872 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -256,9 +256,9 @@ void namco_30test_state::machine_start()
MACHINE_CONFIG_START(namco_30test_state::_30test)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC68HC11,MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(namco_30test_map)
- MCFG_CPU_IO_MAP(namco_30test_io)
+ MCFG_DEVICE_ADD("maincpu", MC68HC11,MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(namco_30test_map)
+ MCFG_DEVICE_IO_MAP(namco_30test_io)
MCFG_MC68HC11_CONFIG( 0, 768, 0x00 )
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp
index d5a4a6c2fb2..78365d41023 100644
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@@ -1585,9 +1585,9 @@ MACHINE_START_MEMBER(_39in1_state,60in1)
MACHINE_CONFIG_START(_39in1_state::_39in1)
- MCFG_CPU_ADD("maincpu", PXA255, 200000000)
- MCFG_CPU_PROGRAM_MAP(_39in1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _39in1_state, pxa255_vblank_start)
+ MCFG_DEVICE_ADD("maincpu", PXA255, 200000000)
+ MCFG_DEVICE_PROGRAM_MAP(_39in1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _39in1_state, pxa255_vblank_start)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1602,9 +1602,9 @@ MACHINE_CONFIG_START(_39in1_state::_39in1)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp
index 15b6b768e85..2f6736209c5 100644
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@@ -158,8 +158,8 @@ void _3do_state::machine_reset()
MACHINE_CONFIG_START(_3do_state::_3do)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL(50'000'000)/4 )
- MCFG_CPU_PROGRAM_MAP( _3do_mem)
+ MCFG_DEVICE_ADD( "maincpu", ARM7_BE, XTAL(50'000'000)/4 )
+ MCFG_DEVICE_PROGRAM_MAP( _3do_mem)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -178,8 +178,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(_3do_state::_3do_pal)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL(50'000'000)/4 )
- MCFG_CPU_PROGRAM_MAP( _3do_mem)
+ MCFG_DEVICE_ADD("maincpu", ARM7_BE, XTAL(50'000'000)/4 )
+ MCFG_DEVICE_PROGRAM_MAP( _3do_mem)
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index fb05e097365..91c2e70584d 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -388,9 +388,9 @@ void _3x3puzzle_state::machine_reset()
MACHINE_CONFIG_START(_3x3puzzle_state::_3x3puzzle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(_3x3puzzle_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _3x3puzzle_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(_3x3puzzle_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _3x3puzzle_state, irq4_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index 243212fcf18..446a1d8c7d3 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -138,7 +138,7 @@ void nixieclock_state::machine_start()
MACHINE_CONFIG_START(nixieclock_state::_4004clk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I4004, 5_MHz_XTAL / 8);
+ MCFG_DEVICE_ADD("maincpu", I4004, 5_MHz_XTAL / 8);
MCFG_I4004_ROM_MAP(_4004clk_rom)
MCFG_I4004_RAM_MEMORY_MAP(_4004clk_mem)
MCFG_I4004_ROM_PORTS_MAP(_4004clk_rp)
@@ -150,7 +150,7 @@ MACHINE_CONFIG_START(nixieclock_state::_4004clk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp
index eb0059b357f..b460f91248b 100644
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@@ -705,16 +705,16 @@ MACHINE_RESET_MEMBER(fortyl_state,40love)
MACHINE_CONFIG_START(fortyl_state::_40love)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
- MCFG_CPU_PROGRAM_MAP(_40love_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fortyl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,8000000/2) /* OK */
+ MCFG_DEVICE_PROGRAM_MAP(_40love_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fortyl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fortyl_state, irq0_line_hold, 2*60) /* source/number of IRQs is unknown */
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* OK */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fortyl_state, irq0_line_hold, 2*60) /* source/number of IRQs is unknown */
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
@@ -744,12 +744,12 @@ MACHINE_CONFIG_START(fortyl_state::_40love)
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fortyl_state, sound_control_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(fortyl_state, sound_control_3_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, fortyl_state, sound_control_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, fortyl_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, 8000000/4)
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -763,7 +763,7 @@ MACHINE_CONFIG_START(fortyl_state::_40love)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -771,16 +771,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fortyl_state::undoukai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(undoukai_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fortyl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(undoukai_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fortyl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fortyl_state, irq0_line_hold, 2*60) /* source/number of IRQs is unknown */
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fortyl_state, irq0_line_hold, 2*60) /* source/number of IRQs is unknown */
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
@@ -810,12 +810,12 @@ MACHINE_CONFIG_START(fortyl_state::undoukai)
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fortyl_state, sound_control_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(fortyl_state, sound_control_3_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, fortyl_state, sound_control_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, fortyl_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, 8000000/4)
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -829,7 +829,7 @@ MACHINE_CONFIG_START(fortyl_state::undoukai)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp
index ed3a11de476..ca899fdc065 100644
--- a/src/mame/drivers/4dpi.cpp
+++ b/src/mame/drivers/4dpi.cpp
@@ -231,10 +231,10 @@ void sgi_ip6_state::sgi_ip6_map(address_map &map)
***************************************************************************/
MACHINE_CONFIG_START(sgi_ip6_state::sgi_ip6)
- MCFG_CPU_ADD( "maincpu", R3041, 20000000 ) // FIXME: Should be R2000
+ MCFG_DEVICE_ADD( "maincpu", R3041, 20000000 ) // FIXME: Should be R2000
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_CPU_PROGRAM_MAP( sgi_ip6_map )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sgi_ip6_state, sgi_ip6_vbl)
+ MCFG_DEVICE_PROGRAM_MAP( sgi_ip6_map )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sgi_ip6_state, sgi_ip6_vbl)
/* video hardware */
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 406ddc091a2..d7098152e89 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -502,20 +502,21 @@ INTERRUPT_GEN_MEMBER(_4enlinea_state::_4enlinea_audio_irq)
MACHINE_CONFIG_START(_4enlinea_state::_4enlinea)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, PRG_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(_4enlinea_state, _4enlinea_irq, 60) //TODO
-// MCFG_CPU_PERIODIC_INT_DRIVER(_4enlinea_state, irq0_line_hold, 4*35)
-
- MCFG_CPU_ADD("audiocpu", Z80, SND_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_IO_MAP(audio_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(_4enlinea_state, _4enlinea_audio_irq, 60) //TODO
-
+ MCFG_DEVICE_ADD("maincpu", Z80, PRG_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(_4enlinea_state, _4enlinea_irq, 60) //TODO
+// MCFG_DEVICE_PERIODIC_INT_DRIVER(_4enlinea_state, irq0_line_hold, 4*35)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, SND_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_IO_MAP(audio_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(_4enlinea_state, _4enlinea_audio_irq, 60) //TODO
+
+ // FIXME: determine ISA bus clock
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA8_SLOT_ADD("isa", "isa1", _4enlinea_isa8_cards, "4enlinea", true)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", _4enlinea_isa8_cards, "4enlinea", true)
/* 6845 clock is a guess, since it's a UM6845R embedded in the UM487F.
@@ -529,7 +530,7 @@ MACHINE_CONFIG_START(_4enlinea_state::_4enlinea)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, SND_AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, SND_AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN-P2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN-P1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 38e97f77ab0..22a100e519c 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -473,10 +473,10 @@ void _4enraya_state::machine_reset()
MACHINE_CONFIG_START(_4enraya_state::_4enraya )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(_4enraya_state, irq0_line_hold, 4*60) // unknown timing
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(_4enraya_state, irq0_line_hold, 4*60) // unknown timing
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -493,7 +493,7 @@ MACHINE_CONFIG_START(_4enraya_state::_4enraya )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4) /* guess */
+ MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
MACHINE_CONFIG_END
@@ -502,14 +502,14 @@ MACHINE_CONFIG_START(_4enraya_state::unkpacg)
_4enraya(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(unkpacg_main_map)
- MCFG_CPU_IO_MAP(unkpacg_main_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(unkpacg_main_map)
+ MCFG_DEVICE_IO_MAP(unkpacg_main_portmap)
MCFG_NVRAM_ADD_0FILL("nvram")
/* sound hardware */
// MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_REPLACE("aysnd", AY8910, MAIN_CLOCK/4) /* guess */
+ MCFG_DEVICE_REPLACE("aysnd", AY8910, MAIN_CLOCK/4) /* guess */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index b1a47fc2673..4467378a25a 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -442,9 +442,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(_4roses_state::_4roses)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
- MCFG_CPU_PROGRAM_MAP(_4roses_map)
- MCFG_CPU_OPCODES_MAP(_4roses_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_DEVICE_PROGRAM_MAP(_4roses_map)
+ MCFG_DEVICE_OPCODES_MAP(_4roses_opcodes_map)
// MCFG_NVRAM_ADD_0FILL("nvram")
@@ -472,15 +472,15 @@ MACHINE_CONFIG_START(_4roses_state::_4roses)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(_4roses_state::rugby)
_4roses(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rugby_map)
- MCFG_CPU_OPCODES_MAP(rugby_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rugby_map)
+ MCFG_DEVICE_OPCODES_MAP(rugby_opcodes_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index 3ee6a443932..c091207f7b1 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -1022,24 +1022,24 @@ GFXDECODE_END
MACHINE_CONFIG_START(_5clown_state::fclown)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
- MCFG_CPU_PROGRAM_MAP(fclown_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_DEVICE_PROGRAM_MAP(fclown_map)
- MCFG_CPU_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
- MCFG_CPU_PROGRAM_MAP(fcaudio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_DEVICE_PROGRAM_MAP(fcaudio_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(_5clown_state, mux_port_r))
- MCFG_PIA_READPB_HANDLER(READ8(_5clown_state, pia0_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(_5clown_state, counters_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, _5clown_state, mux_port_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, _5clown_state, pia0_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, _5clown_state, counters_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("SW4"))
- MCFG_PIA_READPB_HANDLER(READ8(_5clown_state, pia1_b_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(_5clown_state, trigsnd_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(_5clown_state, mux_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, _5clown_state, pia1_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, _5clown_state, trigsnd_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, _5clown_state, mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1062,7 +1062,7 @@ MACHINE_CONFIG_START(_5clown_state::fclown)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp
index 354080565dd..9c90d310bdc 100644
--- a/src/mame/drivers/68ksbc.cpp
+++ b/src/mame/drivers/68ksbc.cpp
@@ -63,20 +63,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(c68ksbc_state::c68ksbc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) // text says 8MHz, schematic says 10MHz
- MCFG_CPU_PROGRAM_MAP(c68ksbc_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) // text says 8MHz, schematic says 10MHz
+ MCFG_DEVICE_PROGRAM_MAP(c68ksbc_mem)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index 92e3241de53..06a03a192a2 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -410,8 +410,8 @@ MACHINE_CONFIG_START(_8080bw_state::invadpt2)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(invadpt2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(invadpt2_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* 60 Hz signal clocks two LS161. Ripple carry will */
@@ -455,8 +455,8 @@ MACHINE_CONFIG_START(_8080bw_state::spacerng)
invadpt2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spacerng_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spacerng_io_map)
MACHINE_CONFIG_END
@@ -498,8 +498,8 @@ MACHINE_CONFIG_START(_8080bw_state::spcewars)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spcewars_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spcewars_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -509,7 +509,7 @@ MACHINE_CONFIG_START(_8080bw_state::spcewars)
invaders_samples_audio(config);
/* extra audio channel */
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* video hardware */
@@ -540,8 +540,8 @@ void _8080bw_state::spcewarla_io_map(address_map &map)
MACHINE_CONFIG_START(_8080bw_state::spcewarla)
spcewars(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spcewarla_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spcewarla_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
@@ -610,8 +610,8 @@ MACHINE_CONFIG_START(_8080bw_state::astropal)
invaders(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(astropal_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(astropal_io_map)
MACHINE_CONFIG_END
@@ -664,9 +664,9 @@ MACHINE_CONFIG_START(_8080bw_state::cosmo)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cosmo_map)
- MCFG_CPU_IO_MAP(cosmo_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cosmo_map)
+ MCFG_DEVICE_IO_MAP(cosmo_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
@@ -823,10 +823,10 @@ void _8080bw_state::spacecom_io_map(address_map &map)
MACHINE_CONFIG_START(_8080bw_state::spacecom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 10) // divider guessed
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000) / 10) // divider guessed
// TODO: move irq handling away from mw8080.c, this game runs on custom hardware
- MCFG_CPU_PROGRAM_MAP(spacecom_map)
- MCFG_CPU_IO_MAP(spacecom_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(spacecom_map)
+ MCFG_DEVICE_IO_MAP(spacecom_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state, mw8080bw)
MCFG_MACHINE_RESET_OVERRIDE(mw8080bw_state, mw8080bw)
@@ -938,13 +938,13 @@ MACHINE_CONFIG_START(_8080bw_state::invrvnge)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(invrvnge_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(invrvnge_io_map)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000)/2) // MC6808P
- MCFG_CPU_PROGRAM_MAP(invrvnge_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000)/2) // MC6808P
+ MCFG_DEVICE_PROGRAM_MAP(invrvnge_sound_map)
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -960,7 +960,7 @@ MACHINE_CONFIG_START(_8080bw_state::invrvnge)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(4'000'000)/2)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(4'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1076,8 +1076,8 @@ void _8080bw_state::starw1_io_map(address_map &map)
MACHINE_CONFIG_START(_8080bw_state::starw1)
invadpt2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(starw1_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(starw1_io_map)
MACHINE_CONFIG_END
/*******************************************************/
@@ -1120,8 +1120,8 @@ MACHINE_CONFIG_START(_8080bw_state::lrescue)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(lrescue_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(lrescue_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -1136,22 +1136,22 @@ MACHINE_CONFIG_START(_8080bw_state::lrescue)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(lrescue_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* extra audio channel */
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(_8080bw_state::escmars)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(18'000'000) / 10) // divider guessed
- MCFG_CPU_PROGRAM_MAP(escmars_map)
- MCFG_CPU_IO_MAP(lrescue_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(18'000'000) / 10) // divider guessed
+ MCFG_DEVICE_PROGRAM_MAP(escmars_map)
+ MCFG_DEVICE_IO_MAP(lrescue_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state, extra_8080bw)
MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw)
@@ -1169,13 +1169,13 @@ MACHINE_CONFIG_START(_8080bw_state::escmars)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(lrescue_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* extra audio channel */
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1249,9 +1249,9 @@ MACHINE_CONFIG_START(_8080bw_state::cosmicmo)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(cosmicmo_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(cosmicmo_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
@@ -1402,9 +1402,9 @@ MACHINE_CONFIG_START(_8080bw_state::rollingc)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rollingc_map)
- MCFG_CPU_IO_MAP(rollingc_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rollingc_map)
+ MCFG_DEVICE_IO_MAP(rollingc_io_map)
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -1545,9 +1545,9 @@ MACHINE_CONFIG_START(_8080bw_state::schaser)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
- MCFG_CPU_PROGRAM_MAP(schaser_map)
- MCFG_CPU_IO_MAP(schaser_io_map)
+ MCFG_DEVICE_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
+ MCFG_DEVICE_PROGRAM_MAP(schaser_map)
+ MCFG_DEVICE_IO_MAP(schaser_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
@@ -1568,7 +1568,7 @@ MACHINE_CONFIG_START(_8080bw_state::schaser)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(330), CAP_P(470)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_M(2.2)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(1.0), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -1584,7 +1584,7 @@ MACHINE_CONFIG_START(_8080bw_state::schaser)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(schaser)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1682,9 +1682,9 @@ MACHINE_CONFIG_START(_8080bw_state::schasercv)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(schaser_map)
- MCFG_CPU_IO_MAP(schasercv_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(schaser_map)
+ MCFG_DEVICE_IO_MAP(schasercv_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state, schasercv)
/* add shifter */
@@ -1699,14 +1699,14 @@ MACHINE_CONFIG_START(_8080bw_state::schasercv)
/* sound hardware */
invaders_samples_audio(config);
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(_8080bw_state::crashrd)
schaser(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(crashrd_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(crashrd_io_map)
MACHINE_CONFIG_END
@@ -1781,9 +1781,9 @@ MACHINE_CONFIG_START(_8080bw_state::sflush)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu",M6800,1500000) // ?
- MCFG_CPU_PROGRAM_MAP(sflush_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu",M6800,1500000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(sflush_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush)
/* add shifter */
@@ -1886,8 +1886,8 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(lupin3_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(lupin3_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
@@ -1903,7 +1903,7 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -1919,20 +1919,20 @@ MACHINE_CONFIG_START(_8080bw_state::lupin3)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(lupin3_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(indianbt)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(_8080bw_state::lupin3a)
lupin3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(schaser_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,sflush)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2053,10 +2053,10 @@ MACHINE_CONFIG_START(_8080bw_state::polaris)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
- MCFG_CPU_PROGRAM_MAP(schaser_map)
- MCFG_CPU_IO_MAP(polaris_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _8080bw_state, polaris_interrupt)
+ MCFG_DEVICE_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
+ MCFG_DEVICE_PROGRAM_MAP(schaser_map)
+ MCFG_DEVICE_IO_MAP(polaris_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, polaris_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 255)
@@ -2075,7 +2075,7 @@ MACHINE_CONFIG_START(_8080bw_state::polaris)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(polaris)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2187,8 +2187,8 @@ MACHINE_CONFIG_START(_8080bw_state::ballbomb)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(ballbomb_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(ballbomb_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -2203,7 +2203,7 @@ MACHINE_CONFIG_START(_8080bw_state::ballbomb)
/* sound hardware */
invaders_samples_audio(config);
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(ballbomb)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2270,9 +2270,9 @@ MACHINE_CONFIG_START(_8080bw_state::yosakdon)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(yosakdon_map)
- MCFG_CPU_IO_MAP(yosakdon_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(yosakdon_map)
+ MCFG_DEVICE_IO_MAP(yosakdon_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* sound hardware */
@@ -2436,8 +2436,8 @@ MACHINE_CONFIG_START(_8080bw_state::indianbt)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(indianbt_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(indianbt_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
@@ -2453,7 +2453,7 @@ MACHINE_CONFIG_START(_8080bw_state::indianbt)
/* sound hardware */
invaders_samples_audio(config);
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(indianbt)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2462,9 +2462,9 @@ MACHINE_CONFIG_START(_8080bw_state::indianbtbr)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(schaser_map)
- MCFG_CPU_IO_MAP(indianbtbr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(schaser_map)
+ MCFG_DEVICE_IO_MAP(indianbtbr_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
@@ -2539,8 +2539,8 @@ MACHINE_CONFIG_START(_8080bw_state::steelwkr)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(steelwkr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(steelwkr_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
/* add shifter */
@@ -2758,10 +2758,10 @@ void _8080bw_state::shuttlei_io_map(address_map &map)
MACHINE_CONFIG_START(_8080bw_state::shuttlei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(18'000'000) / 9)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(18'000'000) / 9)
// TODO: move irq handling away from mw8080.cpp, this game runs on custom hardware
- MCFG_CPU_PROGRAM_MAP(shuttlei_map)
- MCFG_CPU_IO_MAP(shuttlei_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(shuttlei_map)
+ MCFG_DEVICE_IO_MAP(shuttlei_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state, extra_8080bw)
MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state, mw8080bw)
@@ -2885,10 +2885,10 @@ MACHINE_CONFIG_START(_8080bw_state::darthvdr)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(darthvdr_map)
- MCFG_CPU_IO_MAP(darthvdr_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(darthvdr_map)
+ MCFG_DEVICE_IO_MAP(darthvdr_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", _8080bw_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,darthvdr)
MCFG_MACHINE_RESET_OVERRIDE(_8080bw_state,darthvdr)
@@ -2960,8 +2960,8 @@ MACHINE_CONFIG_START(_8080bw_state::vortex)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(vortex_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(vortex_io_map)
MCFG_MACHINE_START_OVERRIDE(_8080bw_state,extra_8080bw)
MCFG_WATCHDOG_ADD("watchdog")
@@ -3270,8 +3270,8 @@ MACHINE_CONFIG_START(_8080bw_state::claybust)
invaders(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(claybust_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(claybust_io_map)
MCFG_TIMER_DRIVER_ADD("claybust_gun", _8080bw_state, claybust_gun_callback)
@@ -3387,8 +3387,8 @@ MACHINE_CONFIG_START(_8080bw_state::attackfc)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(attackfc_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(attackfc_io_map)
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -3527,8 +3527,8 @@ MACHINE_CONFIG_START(_8080bw_state::invmulti)
invaders(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(invmulti_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(invmulti_map)
MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp
index 20ebb856924..f6da79fb92d 100644
--- a/src/mame/drivers/88games.cpp
+++ b/src/mame/drivers/88games.cpp
@@ -307,12 +307,12 @@ void _88games_state::machine_reset()
MACHINE_CONFIG_START(_88games_state::_88games)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_KONAMICPU_LINE_CB(WRITE8(_88games_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, _88games_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -326,7 +326,7 @@ MACHINE_CONFIG_START(_88games_state::_88games)
MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(_88games_state, screen_update_88games)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(_88games_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, _88games_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_ENABLE_SHADOWS()
@@ -354,10 +354,10 @@ MACHINE_CONFIG_START(_88games_state::_88games)
MCFG_SOUND_ROUTE(0, "mono", 0.75)
MCFG_SOUND_ROUTE(1, "mono", 0.75)
- MCFG_SOUND_ADD("upd1", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd1", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd2", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp
index e8f29143b64..8cb30ad84bc 100644
--- a/src/mame/drivers/a2600.cpp
+++ b/src/mame/drivers/a2600.cpp
@@ -505,15 +505,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2600_state::a2600)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_NTSC / 3)
+ MCFG_DEVICE_ADD("maincpu", M6507, MASTER_CLOCK_NTSC / 3)
MCFG_M6502_DISABLE_DIRECT()
- MCFG_CPU_PROGRAM_MAP(a2600_mem)
+ MCFG_DEVICE_PROGRAM_MAP(a2600_mem)
/* video hardware */
MCFG_DEVICE_ADD("tia_video", TIA_NTSC_VIDEO, 0)
- MCFG_TIA_READ_INPUT_PORT_CB(READ16(a2600_state, a2600_read_input_port))
- MCFG_TIA_DATABUS_CONTENTS_CB(READ8(a2600_state, a2600_get_databus_contents))
- MCFG_TIA_VSYNC_CB(WRITE16(a2600_state, a2600_tia_vsync_callback))
+ MCFG_TIA_READ_INPUT_PORT_CB(READ16(*this, a2600_state, a2600_read_input_port))
+ MCFG_TIA_DATABUS_CONTENTS_CB(READ8(*this, a2600_state, a2600_get_databus_contents))
+ MCFG_TIA_VSYNC_CB(WRITE16(*this, a2600_state, a2600_tia_vsync_callback))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK_NTSC, 228, 26, 26 + 160 + 16, 262, 24 , 24 + 192 + 31 )
@@ -528,18 +528,18 @@ MACHINE_CONFIG_START(a2600_state::a2600)
/* devices */
#if USE_NEW_RIOT
MCFG_DEVICE_ADD("riot", MOS6532n, MASTER_CLOCK_NTSC / 3)
- MCFG_MOS6530n_IN_PA_CB(READ8(a2600_state, switch_A_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
- MCFG_MOS6530n_IRQ_CB(WRITELINE(a2600_state, irq_callback))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, a2600_state, switch_A_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, a2600_state, switch_A_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, a2600_state, riot_input_port_8_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, a2600_state, switch_B_w))
+ MCFG_MOS6530n_IRQ_CB(WRITELINE(*this, a2600_state, irq_callback))
#else
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_CLOCK_NTSC / 3)
- MCFG_RIOT6532_IN_PA_CB(READ8(a2600_state, switch_A_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
- MCFG_RIOT6532_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
- MCFG_RIOT6532_IRQ_CB(WRITELINE(a2600_state, irq_callback))
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, a2600_state, switch_A_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, a2600_state, switch_A_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8(*this, a2600_state, riot_input_port_8_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, a2600_state, switch_B_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, a2600_state, irq_callback))
#endif
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy")
@@ -552,15 +552,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2600_state::a2600p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_PAL / 3)
- MCFG_CPU_PROGRAM_MAP(a2600_mem)
+ MCFG_DEVICE_ADD("maincpu", M6507, MASTER_CLOCK_PAL / 3)
+ MCFG_DEVICE_PROGRAM_MAP(a2600_mem)
MCFG_M6502_DISABLE_DIRECT()
/* video hardware */
MCFG_DEVICE_ADD("tia_video", TIA_PAL_VIDEO, 0)
- MCFG_TIA_READ_INPUT_PORT_CB(READ16(a2600_state, a2600_read_input_port))
- MCFG_TIA_DATABUS_CONTENTS_CB(READ8(a2600_state, a2600_get_databus_contents))
- MCFG_TIA_VSYNC_CB(WRITE16(a2600_state, a2600_tia_vsync_callback_pal))
+ MCFG_TIA_READ_INPUT_PORT_CB(READ16(*this, a2600_state, a2600_read_input_port))
+ MCFG_TIA_DATABUS_CONTENTS_CB(READ8(*this, a2600_state, a2600_get_databus_contents))
+ MCFG_TIA_VSYNC_CB(WRITE16(*this, a2600_state, a2600_tia_vsync_callback_pal))
MCFG_SCREEN_ADD("screen", RASTER)
@@ -576,18 +576,18 @@ MACHINE_CONFIG_START(a2600_state::a2600p)
/* devices */
#if USE_NEW_RIOT
MCFG_DEVICE_ADD("riot", MOS6532n, MASTER_CLOCK_PAL / 3)
- MCFG_MOS6530n_IN_PA_CB(READ8(a2600_state, switch_A_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
- MCFG_MOS6530n_IRQ_CB(WRITELINE(a2600_state, irq_callback))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, a2600_state, switch_A_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, a2600_state, switch_A_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, a2600_state, riot_input_port_8_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, a2600_state, switch_B_w))
+ MCFG_MOS6530n_IRQ_CB(WRITELINE(*this, a2600_state, irq_callback))
#else
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_CLOCK_PAL / 3)
- MCFG_RIOT6532_IN_PA_CB(READ8(a2600_state, switch_A_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(a2600_state, switch_A_w))
- MCFG_RIOT6532_IN_PB_CB(READ8(a2600_state, riot_input_port_8_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(a2600_state, switch_B_w))
- MCFG_RIOT6532_IRQ_CB(WRITELINE(a2600_state, irq_callback))
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, a2600_state, switch_A_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, a2600_state, switch_A_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8(*this, a2600_state, riot_input_port_8_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, a2600_state, switch_B_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, a2600_state, irq_callback))
#endif
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy")
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index d7ff5e2bbd9..77eb0cf344b 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -568,9 +568,9 @@ static const z80_daisy_config a5105_daisy_chain[] =
MACHINE_CONFIG_START(a5105_state::a5105)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(15'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(a5105_mem)
- MCFG_CPU_IO_MAP(a5105_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(15'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(a5105_mem)
+ MCFG_DEVICE_IO_MAP(a5105_io)
MCFG_Z80_DAISY_CHAIN(a5105_daisy_chain)
/* video hardware */
@@ -588,7 +588,7 @@ MACHINE_CONFIG_START(a5105_state::a5105)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("beeper", BEEP, 500)
+ MCFG_DEVICE_ADD("beeper", BEEP, 500)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -599,8 +599,8 @@ MACHINE_CONFIG_START(a5105_state::a5105)
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(15'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg2))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(15'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0))
diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp
index c1a93dd266c..03001026b59 100644
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@@ -124,9 +124,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(a51xx_state::a5120)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(a5120_mem)
- MCFG_CPU_IO_MAP(a5120_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(a5120_mem)
+ MCFG_DEVICE_IO_MAP(a5120_io)
/* video hardware */
@@ -147,9 +147,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a51xx_state::a5130)
a5120(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(a5130_mem)
- MCFG_CPU_IO_MAP(a5130_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(a5130_mem)
+ MCFG_DEVICE_IO_MAP(a5130_io)
MCFG_MACHINE_RESET_OVERRIDE(a51xx_state,a5130)
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 5d242f43b42..5cfe9db5eb6 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -225,8 +225,8 @@ void a6809_state::kbd_put(u8 data)
MACHINE_CONFIG_START(a6809_state::a6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(a6809_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(a6809_mem)
MCFG_MACHINE_RESET_OVERRIDE(a6809_state, a6809)
/* video hardware */
@@ -245,7 +245,7 @@ MACHINE_CONFIG_START(a6809_state::a6809)
/* Devices */
MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(a6809_state, cass_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, a6809_state, cass_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_MC6845_ADD("mc6845", HD6845, "screen", XTAL(4'000'000) / 2)
@@ -253,7 +253,7 @@ MACHINE_CONFIG_START(a6809_state::a6809)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_DEVICE_ADD("saa5050", SAA5050, 6000000)
- MCFG_SAA5050_D_CALLBACK(READ8(a6809_state, videoram_r))
+ MCFG_SAA5050_D_CALLBACK(READ8(*this, a6809_state, videoram_r))
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index 28100de1308..3d1e53808d0 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -435,48 +435,48 @@ static const z80_daisy_config k7070_daisy_chain[] =
* (framebuffer and terminal should be slot devices.)
*/
MACHINE_CONFIG_START(a7150_state::a7150)
- MCFG_CPU_ADD("maincpu", I8086, XTAL(9'832'000)/2)
- MCFG_CPU_PROGRAM_MAP(a7150_mem)
- MCFG_CPU_IO_MAP(a7150_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(9'832'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(a7150_mem)
+ MCFG_DEVICE_IO_MAP(a7150_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
// IFSP port on processor card
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
-// MCFG_I8255_IN_PORTA_CB(DEVREAD8("cent_status_in", input_buffer_device, read))
-// MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(a7150_state, ppi_c_w))
+// MCFG_I8255_IN_PORTA_CB(READ8("cent_status_in", input_buffer_device, read))
+// MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, a7150_state, ppi_c_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(14'745'600)/4)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir2_w))
MCFG_PIT8253_CLK1(XTAL(14'745'600)/4)
MCFG_PIT8253_CLK2(XTAL(14'745'600)/4)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(a7150_state, a7150_tmr2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, a7150_state, a7150_tmr2_w))
MCFG_DEVICE_ADD("uart8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir4_w))
// IFSS port on processor card -- keyboard runs at 28800 8N2
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard") // "loopback" allows ACT to pass
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard") // "loopback" allows ACT to pass
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8251", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8251", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart8251", i8251_device, write_dsr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", kbd_rs232_defaults)
MCFG_ISBC_215_ADD("isbc_215g", 0x4a, "maincpu")
- MCFG_ISBC_215_IRQ(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
+ MCFG_ISBC_215_IRQ(WRITELINE("pic8259", pic8259_device, ir5_w))
// KGS K7070 graphics terminal controlling ABG K7072 framebuffer
- MCFG_CPU_ADD("gfxcpu", Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(k7070_cpu_mem)
- MCFG_CPU_IO_MAP(k7070_cpu_io)
+ MCFG_DEVICE_ADD("gfxcpu", Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(k7070_cpu_mem)
+ MCFG_DEVICE_IO_MAP(k7070_cpu_io)
MCFG_Z80_DAISY_CHAIN(k7070_daisy_chain)
MCFG_DEVICE_ADD("video_bankdev", ADDRESS_MAP_BANK, 0)
@@ -488,28 +488,28 @@ MACHINE_CONFIG_START(a7150_state::a7150)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/3)
MCFG_Z80CTC_INTR_CB(INPUTLINE("gfxcpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80SIO_TAG, z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80SIO_TAG, z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80SIO_TAG, z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO, 4800)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("gfxcpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE(a7150_state, kgs_iml_w))
-// MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE(a7150_state, kgs_ifss_loopback_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE(*this, a7150_state, kgs_iml_w))
+// MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE(*this, a7150_state, kgs_ifss_loopback_w))
// V.24 port (graphics tablet)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, ctsa_w))
// IFSS (current loop) port (keyboard)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, rxb_w))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 737,0,640, 431,0,400 )
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index e2d60a0a130..f3436602983 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -1377,8 +1377,8 @@ void a7800_state::machine_reset()
MACHINE_CONFIG_START(a7800_state::a7800_ntsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, A7800_NTSC_Y1/8) /* 1.79 MHz (switches to 1.19 MHz on TIA or RIOT access) */
- MCFG_CPU_PROGRAM_MAP(a7800_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, A7800_NTSC_Y1/8) /* 1.79 MHz (switches to 1.19 MHz on TIA or RIOT access) */
+ MCFG_DEVICE_PROGRAM_MAP(a7800_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a7800_state, interrupt, "screen", 0, 1)
/* video hardware */
@@ -1401,9 +1401,9 @@ MACHINE_CONFIG_START(a7800_state::a7800_ntsc)
/* devices */
MCFG_DEVICE_ADD("riot", MOS6532_NEW, A7800_NTSC_Y1/8)
- MCFG_MOS6530n_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
- MCFG_MOS6530n_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, a7800_state, riot_joystick_r))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, a7800_state, riot_console_button_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, a7800_state, riot_button_pullup_w))
MCFG_A78_CARTRIDGE_ADD("cartslot", a7800_cart, nullptr)
@@ -1417,8 +1417,8 @@ MACHINE_CONFIG_START(a7800_pal_state::a7800_pal)
a7800_ntsc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(CLK_PAL)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(CLK_PAL)
// MCFG_TIMER_ADD_SCANLINE("scantimer", a7800_interrupt, "screen", 0, 1)
MCFG_SCREEN_MODIFY( "screen" )
@@ -1430,9 +1430,9 @@ MACHINE_CONFIG_START(a7800_pal_state::a7800_pal)
/* devices */
MCFG_DEVICE_REMOVE("riot")
MCFG_DEVICE_ADD("riot", MOS6532_NEW, CLK_PAL)
- MCFG_MOS6530n_IN_PA_CB(READ8(a7800_pal_state, riot_joystick_r))
- MCFG_MOS6530n_IN_PB_CB(READ8(a7800_pal_state, riot_console_button_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(a7800_pal_state, riot_button_pullup_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, a7800_pal_state, riot_joystick_r))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, a7800_pal_state, riot_console_button_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, a7800_pal_state, riot_button_pullup_w))
/* software lists */
MCFG_DEVICE_REMOVE("cart_list")
diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp
index b8e69af9d66..402d0911542 100644
--- a/src/mame/drivers/aa310.cpp
+++ b/src/mame/drivers/aa310.cpp
@@ -402,13 +402,13 @@ WRITE_LINE_MEMBER( archimedes_state::a310_kart_rx_w )
MACHINE_CONFIG_START(aa310_state::aa310)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL(24'000'000) / 3) /* ARM2 8 MHz */
- MCFG_CPU_PROGRAM_MAP(aa310_mem)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(24'000'000) / 3) /* ARM2 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(aa310_mem)
MCFG_ARM_COPRO(VL86C020)
MCFG_DEVICE_ADD("kart", AAKART, 8000000/256)
- MCFG_AAKART_OUT_TX_CB(WRITELINE(archimedes_state, a310_kart_tx_w))
- MCFG_AAKART_OUT_RX_CB(WRITELINE(archimedes_state, a310_kart_rx_w))
+ MCFG_AAKART_OUT_TX_CB(WRITELINE(*this, archimedes_state, a310_kart_tx_w))
+ MCFG_AAKART_OUT_RX_CB(WRITELINE(*this, archimedes_state, a310_kart_rx_w))
MCFG_I2CMEM_ADD("i2cmem")
MCFG_I2CMEM_DATA_SIZE(0x100)
@@ -425,8 +425,8 @@ MACHINE_CONFIG_START(aa310_state::aa310)
MCFG_WD1772_ADD("fdc", 8000000 / 1) // TODO: frequency
MCFG_WD_FDC_DISABLE_MOTOR_CONTROL
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(aa310_state, aa310_wd177x_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(aa310_state, aa310_wd177x_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, aa310_state, aa310_wd177x_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, aa310_state, aa310_wd177x_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", aa310_floppies, "35dd", aa310_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", aa310_floppies, nullptr, aa310_state::floppy_formats) // rarely had 2nd FDD installed, space was used for HDD
@@ -435,14 +435,14 @@ MACHINE_CONFIG_START(aa310_state::aa310)
MCFG_SOFTWARE_LIST_ADD("flop_list", "archimedes")
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
@@ -513,8 +513,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aa310_state::aa540)
aa310(config);
- MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL(52'000'000) / 2)
+ MCFG_DEVICE_MODIFY("maincpu") // ARM3
+ MCFG_DEVICE_CLOCK(XTAL(52'000'000) / 2)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -527,8 +527,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aa310_state::aa5000)
aa310(config);
- MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL(50'000'000) / 2)
+ MCFG_DEVICE_MODIFY("maincpu") // ARM3
+ MCFG_DEVICE_CLOCK(XTAL(50'000'000) / 2)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -541,8 +541,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aa310_state::aa4)
aa5000(config);
- MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(XTAL(24'000'000))
+ MCFG_DEVICE_MODIFY("maincpu") // ARM3
+ MCFG_DEVICE_CLOCK(XTAL(24'000'000))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -555,14 +555,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aa310_state::aa5000a)
aa5000(config);
- MCFG_CPU_MODIFY("maincpu") // ARM3
- MCFG_CPU_CLOCK(33000000)
+ MCFG_DEVICE_MODIFY("maincpu") // ARM3
+ MCFG_DEVICE_CLOCK(33000000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(aa310_state::aa3010)
aa310(config);
- MCFG_CPU_MODIFY("maincpu") // ARM250
- MCFG_CPU_CLOCK(XTAL(72'000'000) / 6)
+ MCFG_DEVICE_MODIFY("maincpu") // ARM250
+ MCFG_DEVICE_CLOCK(XTAL(72'000'000) / 6)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1M")
diff --git a/src/mame/drivers/aaa.cpp b/src/mame/drivers/aaa.cpp
index 3b0de2545cc..128abf974bf 100644
--- a/src/mame/drivers/aaa.cpp
+++ b/src/mame/drivers/aaa.cpp
@@ -43,9 +43,9 @@ static INPUT_PORTS_START( aaa )
INPUT_PORTS_END
MACHINE_CONFIG_START(aaa_state::aaa)
- MCFG_CPU_ADD("maincpu", Z80, 2'000'000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2'000'000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MACHINE_CONFIG_END
/**************************************************************************************************************
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index 1a489221a1d..6488f88c0a3 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -878,9 +878,9 @@ void abc1600_state::machine_reset()
MACHINE_CONFIG_START(abc1600_state::abc1600)
// basic machine hardware
- MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL(64'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(abc1600_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(abc1600_state,abc1600_int_ack)
+ MCFG_DEVICE_ADD(MC68008P8_TAG, M68008, XTAL(64'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(abc1600_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(abc1600_state,abc1600_int_ack)
// video hardware
MCFG_ABC1600_MOVER_ADD()
@@ -889,33 +889,33 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_ABC1600_MAC_ADD(MC68008P8_TAG, mac_mem)
MCFG_DEVICE_ADD(Z8410AB1_0_TAG, Z80DMA, XTAL(64'000'000)/16)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
- MCFG_Z80DMA_OUT_BAO_CB(DEVWRITELINE(Z8410AB1_1_TAG, z80dma_device, bai_w))
- MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_r))
- MCFG_Z80DMA_OUT_MREQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_w))
- MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_r))
- MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, abc1600_state, dbrq_w))
+ MCFG_Z80DMA_OUT_BAO_CB(WRITELINE(Z8410AB1_1_TAG, z80dma_device, bai_w))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_r))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_mreq_w))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_r))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma0_iorq_w))
MCFG_DEVICE_ADD(Z8410AB1_1_TAG, Z80DMA, XTAL(64'000'000)/16)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
- MCFG_Z80DMA_OUT_BAO_CB(DEVWRITELINE(Z8410AB1_2_TAG, z80dma_device, bai_w))
- MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_r))
- MCFG_Z80DMA_OUT_MREQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_w))
- MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_r))
- MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, abc1600_state, dbrq_w))
+ MCFG_Z80DMA_OUT_BAO_CB(WRITELINE(Z8410AB1_2_TAG, z80dma_device, bai_w))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_r))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_mreq_w))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_r))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma1_iorq_w))
MCFG_DEVICE_ADD(Z8410AB1_2_TAG, Z80DMA, XTAL(64'000'000)/16)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(abc1600_state, dbrq_w))
- MCFG_Z80DMA_IN_MREQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_r))
- MCFG_Z80DMA_OUT_MREQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_w))
- MCFG_Z80DMA_IN_IORQ_CB(DEVREAD8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_r))
- MCFG_Z80DMA_OUT_IORQ_CB(DEVWRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, abc1600_state, dbrq_w))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_r))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_mreq_w))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_r))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ABC1600_MAC_TAG, abc1600_mac_device, dma2_iorq_w))
MCFG_DEVICE_ADD(Z8470AB1_TAG, Z80DART, XTAL(64'000'000)/16)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(MC68008P8_TAG, M68K_IRQ_5)) // shared with SCC
MCFG_DEVICE_ADD(Z8530B1_TAG, SCC8530, XTAL(64'000'000)/16)
@@ -923,49 +923,49 @@ MACHINE_CONFIG_START(abc1600_state::abc1600)
MCFG_DEVICE_ADD(Z8536B1_TAG, Z8536, XTAL(64'000'000)/16)
MCFG_Z8536_IRQ_CALLBACK(INPUTLINE(MC68008P8_TAG, M68K_IRQ_2))
- MCFG_Z8536_PA_IN_CALLBACK(READ8(abc1600_state, cio_pa_r))
- MCFG_Z8536_PB_IN_CALLBACK(READ8(abc1600_state, cio_pb_r))
- MCFG_Z8536_PB_OUT_CALLBACK(WRITE8(abc1600_state, cio_pb_w))
- MCFG_Z8536_PC_IN_CALLBACK(READ8(abc1600_state, cio_pc_r))
- MCFG_Z8536_PC_OUT_CALLBACK(WRITE8(abc1600_state, cio_pc_w))
+ MCFG_Z8536_PA_IN_CALLBACK(READ8(*this, abc1600_state, cio_pa_r))
+ MCFG_Z8536_PB_IN_CALLBACK(READ8(*this, abc1600_state, cio_pb_r))
+ MCFG_Z8536_PB_OUT_CALLBACK(WRITE8(*this, abc1600_state, cio_pb_w))
+ MCFG_Z8536_PC_IN_CALLBACK(READ8(*this, abc1600_state, cio_pc_r))
+ MCFG_Z8536_PC_OUT_CALLBACK(WRITE8(*this, abc1600_state, cio_pc_w))
MCFG_NMC9306_ADD(NMC9306_TAG)
MCFG_E0516_ADD(E050_C16PC_TAG, XTAL(32'768))
MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL(64'000'000)/64)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pb7_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(abc1600_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pb7_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, abc1600_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":0", abc1600_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":1", abc1600_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(SAB1797_02P_TAG":2", abc1600_floppies, "525qd", floppy_image_device::default_floppy_formats)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z8470AB1_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z8470AB1_TAG, z80dart_device, rxa_w))
MCFG_ABC_KEYBOARD_PORT_ADD(ABC_KEYBOARD_PORT_TAG, "abc99")
- MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(DEVWRITELINE(Z8470AB1_TAG, z80dart_device, rxb_w))
- MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(DEVWRITELINE(Z8470AB1_TAG, z80dart_device, rxtxcb_w))
- MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(DEVWRITELINE(Z8470AB1_TAG, z80dart_device, dcdb_w))
+ MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(WRITELINE(Z8470AB1_TAG, z80dart_device, rxb_w))
+ MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(WRITELINE(Z8470AB1_TAG, z80dart_device, rxtxcb_w))
+ MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(WRITELINE(Z8470AB1_TAG, z80dart_device, dcdb_w))
MCFG_ABCBUS_SLOT_ADD("bus0i", abc1600bus_cards, nullptr)
- MCFG_ABCBUS_SLOT_IRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa7_w))
+ MCFG_ABCBUS_SLOT_IRQ_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa7_w))
MCFG_ABCBUS_SLOT_ADD("bus0x", abc1600bus_cards, nullptr)
- MCFG_ABCBUS_SLOT_IRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa6_w))
- MCFG_ABCBUS_SLOT_NMI_CALLBACK(WRITELINE(abc1600_state, nmi_w))
- MCFG_ABCBUS_SLOT_XINT2_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa2_w))
- MCFG_ABCBUS_SLOT_XINT3_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa3_w))
- MCFG_ABCBUS_SLOT_XINT4_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa4_w))
- MCFG_ABCBUS_SLOT_XINT5_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa5_w))
+ MCFG_ABCBUS_SLOT_IRQ_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa6_w))
+ MCFG_ABCBUS_SLOT_NMI_CALLBACK(WRITELINE(*this, abc1600_state, nmi_w))
+ MCFG_ABCBUS_SLOT_XINT2_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa2_w))
+ MCFG_ABCBUS_SLOT_XINT3_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa3_w))
+ MCFG_ABCBUS_SLOT_XINT4_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa4_w))
+ MCFG_ABCBUS_SLOT_XINT5_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa5_w))
MCFG_ABCBUS_SLOT_ADD("bus1", abc1600bus_cards, nullptr)
- MCFG_ABCBUS_SLOT_IRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa1_w))
+ MCFG_ABCBUS_SLOT_IRQ_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa1_w))
MCFG_ABCBUS_SLOT_ADD("bus2", abc1600bus_cards, "4105")
- MCFG_ABCBUS_SLOT_IRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa0_w))
- //MCFG_ABCBUS_SLOT_PREN_CALLBACK(DEVWRITELINE(Z8410AB1_2_TAG, z80dma_device, iei_w))
- MCFG_ABCBUS_SLOT_TRRQ_CALLBACK(DEVWRITELINE(Z8410AB1_2_TAG, z80dma_device, rdy_w))
+ MCFG_ABCBUS_SLOT_IRQ_CALLBACK(WRITELINE(Z8536B1_TAG, z8536_device, pa0_w))
+ //MCFG_ABCBUS_SLOT_PREN_CALLBACK(WRITELINE(Z8410AB1_2_TAG, z80dma_device, iei_w))
+ MCFG_ABCBUS_SLOT_TRRQ_CALLBACK(WRITELINE(Z8410AB1_2_TAG, z80dma_device, rdy_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 5b87fecffc9..a2b0d11702a 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -487,9 +487,9 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac )
MACHINE_CONFIG_START(abc80_state::abc80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(11'980'800)/2/2) // 2.9952 MHz
- MCFG_CPU_PROGRAM_MAP(abc80_mem)
- MCFG_CPU_IO_MAP(abc80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(11'980'800)/2/2) // 2.9952 MHz
+ MCFG_DEVICE_PROGRAM_MAP(abc80_mem)
+ MCFG_DEVICE_IO_MAP(abc80_io)
MCFG_Z80_DAISY_CHAIN(abc80_daisy_chain)
// video hardware
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(abc80_state::abc80)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76477_TAG, SN76477, 0)
+ MCFG_DEVICE_ADD(SN76477_TAG, SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(330), CAP_P(390)) // noise + filter: R26 47k - R24 330k - C52 390p
MCFG_SN76477_DECAY_RES(RES_K(47)) // decay_res: R23 47k
MCFG_SN76477_ATTACK_PARAMS(CAP_U(10), RES_K(2.2)) // attack_decay_cap + attack_res: C50 10u/35V - R21 2.2k
@@ -515,20 +515,20 @@ MACHINE_CONFIG_START(abc80_state::abc80)
// devices
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(11'980'800)/2/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(abc80_state, pio_pa_r))
- MCFG_Z80PIO_IN_PB_CB(READ8(abc80_state, pio_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(abc80_state, pio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, abc80_state, pio_pa_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, abc80_state, pio_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, abc80_state, pio_pb_w))
MCFG_CASSETTE_ADD(CASSETTE_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CASSETTE_INTERFACE("abc80_cass")
MCFG_DEVICE_ADD(ABC80_KEYBOARD_TAG, ABC80_KEYBOARD, 0)
- MCFG_ABC80_KEYBOARD_KEYDOWN_CALLBACK(WRITELINE(abc80_state, keydown_w))
+ MCFG_ABC80_KEYBOARD_KEYDOWN_CALLBACK(WRITELINE(*this, abc80_state, keydown_w))
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abc80_cards, "abcexp")
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(abc80_state, kbd_w))
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index 1b4485dbacb..8f21826e8bf 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -1151,61 +1151,61 @@ QUICKLOAD_LOAD_MEMBER( abc800_state, bac )
MACHINE_CONFIG_START(abc800c_state::abc800c)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
- MCFG_CPU_OPCODES_MAP(abc800_m1)
- MCFG_CPU_PROGRAM_MAP(abc800c_mem)
- MCFG_CPU_IO_MAP(abc800c_io)
+ MCFG_DEVICE_OPCODES_MAP(abc800_m1)
+ MCFG_DEVICE_PROGRAM_MAP(abc800c_mem)
+ MCFG_DEVICE_IO_MAP(abc800c_io)
// video hardware
abc800c_video(config);
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(abc800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
// peripheral hardware
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, ABC800_X01/2/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(abc800_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(abc800_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(abc800_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, abc800_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, abc800_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, abc800_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO2, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
MCFG_ABC_KEYBOARD_PORT_ADD(ABC_KEYBOARD_PORT_TAG, "abc800")
- MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
- MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
+ MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
// ABC bus
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_cards, "abc830")
@@ -1227,61 +1227,61 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc800m_state::abc800m)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
- MCFG_CPU_OPCODES_MAP(abc800_m1)
- MCFG_CPU_PROGRAM_MAP(abc800m_mem)
- MCFG_CPU_IO_MAP(abc800m_io)
+ MCFG_DEVICE_OPCODES_MAP(abc800_m1)
+ MCFG_DEVICE_PROGRAM_MAP(abc800m_mem)
+ MCFG_DEVICE_IO_MAP(abc800m_io)
// video hardware
abc800m_video(config);
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(abc800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
// peripheral hardware
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, ABC800_X01/2/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(abc800_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(abc800_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(abc800_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, abc800_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, abc800_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, abc800_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO2, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
MCFG_ABC_KEYBOARD_PORT_ADD(ABC_KEYBOARD_PORT_TAG, "abc800")
- MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
- MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
+ MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
// ABC bus
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_cards, "abc830")
@@ -1305,63 +1305,63 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc802_state::abc802)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
- MCFG_CPU_OPCODES_MAP(abc800_m1)
- MCFG_CPU_PROGRAM_MAP(abc802_mem)
- MCFG_CPU_IO_MAP(abc802_io)
+ MCFG_DEVICE_OPCODES_MAP(abc800_m1)
+ MCFG_DEVICE_PROGRAM_MAP(abc802_mem)
+ MCFG_DEVICE_IO_MAP(abc802_io)
// video hardware
abc802_video(config);
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(abc800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
// peripheral hardware
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, ABC800_X01/2/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(abc800_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(abc800_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(abc800_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, abc800_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, abc800_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, abc800_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO2, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(abc802_state, lrs_w))
- MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(abc802_state, mux80_40_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, abc802_state, lrs_w))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(*this, abc802_state, mux80_40_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
MCFG_ABC_KEYBOARD_PORT_ADD(ABC_KEYBOARD_PORT_TAG, "abc55")
- MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
- MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
+ MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
// ABC bus
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_cards, "abc834")
@@ -1382,11 +1382,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(abc806_state::abc806)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
- MCFG_CPU_OPCODES_MAP(abc800_m1)
- MCFG_CPU_PROGRAM_MAP(abc806_mem)
- MCFG_CPU_IO_MAP(abc806_io)
+ MCFG_DEVICE_OPCODES_MAP(abc800_m1)
+ MCFG_DEVICE_PROGRAM_MAP(abc806_mem)
+ MCFG_DEVICE_IO_MAP(abc806_io)
// video hardware
abc806_video(config);
@@ -1396,41 +1396,41 @@ MACHINE_CONFIG_START(abc806_state::abc806)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, ABC800_X01/2/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(abc800_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(abc800_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(abc800_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, abc800_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, abc800_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, abc800_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO2, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(abc800_state, sio_txdb_w))
- MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(*this, abc800_state, sio_txdb_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, ABC800_X01/2/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
- MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(abc806_state, keydtr_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(ABC_KEYBOARD_PORT_TAG, abc_keyboard_port_device, txd_w))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(*this, abc806_state, keydtr_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
MCFG_ABC_KEYBOARD_PORT_ADD(ABC_KEYBOARD_PORT_TAG, "abc77")
- MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
- MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
+ MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, dcdb_w))
// ABC bus
MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_cards, "abc832")
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index 8d2b1862685..d4d23f6f96d 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -131,15 +131,15 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(ac1_state::ac1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ac1_mem)
- MCFG_CPU_IO_MAP(ac1_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ac1_mem)
+ MCFG_DEVICE_IO_MAP(ac1_io)
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(8'000'000) / 4)
- MCFG_Z80PIO_IN_PA_CB(READ8(ac1_state, ac1_port_a_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(ac1_state, ac1_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(ac1_state, ac1_port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(ac1_state, ac1_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, ac1_state, ac1_port_a_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, ac1_state, ac1_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, ac1_state, ac1_port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, ac1_state, ac1_port_b_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -164,8 +164,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ac1_state::ac1_32)
ac1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ac1_32_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ac1_32_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(64*6, 32*8)
diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp
index e6a8a27315e..f7c41c1deee 100644
--- a/src/mame/drivers/accomm.cpp
+++ b/src/mame/drivers/accomm.cpp
@@ -832,9 +832,9 @@ static INPUT_PORTS_START( accomm )
INPUT_PORTS_END
MACHINE_CONFIG_START(accomm_state::accomm)
- MCFG_CPU_ADD("maincpu", G65816, 16_MHz_XTAL / 8)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", accomm_state, vbl_int)
+ MCFG_DEVICE_ADD("maincpu", G65816, 16_MHz_XTAL / 8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", accomm_state, vbl_int)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( 50.08 )
@@ -858,42 +858,42 @@ MACHINE_CONFIG_START(accomm_state::accomm)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 300)
+ MCFG_DEVICE_ADD("beeper", BEEP, 300)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* rtc pcf8573 */
/* via */
MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(16'000'000) / 16)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
/* acia */
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", G65816_LINE_IRQ))
- MCFG_RS232_PORT_ADD("serial", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("serial", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("acia", acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 13)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(accomm_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, accomm_state, write_acia_clock))
/* econet */
MCFG_DEVICE_ADD("mc6854", MC6854, 0)
- MCFG_MC6854_OUT_TXD_CB(DEVWRITELINE(ECONET_TAG, econet_device, data_w))
+ MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, data_w))
MCFG_MC6854_OUT_IRQ_CB(INPUTLINE("maincpu", G65816_LINE_NMI))
MCFG_ECONET_ADD()
- MCFG_ECONET_CLK_CALLBACK(WRITELINE(accomm_state, econet_clk_w))
- MCFG_ECONET_DATA_CALLBACK(DEVWRITELINE("mc6854", mc6854_device, set_rx))
+ MCFG_ECONET_CLK_CALLBACK(WRITELINE(*this, accomm_state, econet_clk_w))
+ MCFG_ECONET_DATA_CALLBACK(WRITELINE("mc6854", mc6854_device, set_rx))
MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, nullptr)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index 01d051e3344..4d10c94c1ff 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -325,8 +325,8 @@ void aceal_state::machine_reset()
MACHINE_CONFIG_START(aceal_state::ace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/aceex.cpp b/src/mame/drivers/aceex.cpp
index f3ab4eca40f..93db5f9385f 100644
--- a/src/mame/drivers/aceex.cpp
+++ b/src/mame/drivers/aceex.cpp
@@ -84,8 +84,8 @@ void aceex2814_state::machine_reset()
MACHINE_CONFIG_START(aceex2814_state::aceex2814)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, Y2_CLOCK)
- MCFG_CPU_PROGRAM_MAP(aceex2814_map)
+ MCFG_DEVICE_ADD("maincpu", I80C31, Y2_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(aceex2814_map)
MACHINE_CONFIG_END
ROM_START( aceex2814 )
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index d816dea7b9f..6a31d0c2c9d 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -628,10 +628,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(acefruit_state::acefruit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
- MCFG_CPU_PROGRAM_MAP(acefruit_map)
- MCFG_CPU_IO_MAP(acefruit_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", acefruit_state, acefruit_vblank)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(acefruit_map)
+ MCFG_DEVICE_IO_MAP(acefruit_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", acefruit_state, acefruit_vblank)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp
index 6d2ce962c62..09d128ee7e5 100644
--- a/src/mame/drivers/aces1.cpp
+++ b/src/mame/drivers/aces1.cpp
@@ -441,27 +441,27 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(aces1_state::aces1)
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */
- MCFG_CPU_PROGRAM_MAP(aces1_map)
- MCFG_CPU_IO_MAP(aces1_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* ?? Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(aces1_map)
+ MCFG_DEVICE_IO_MAP(aces1_portmap)
// 0xafb0 IC24 - lamps, 7segs
MCFG_DEVICE_ADD("ic24", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(aces1_state, ic24_write_a)) // 7segs
- MCFG_I8255_OUT_PORTB_CB(WRITE8(aces1_state, ic24_write_b)) // lamps
- MCFG_I8255_OUT_PORTC_CB(WRITE8(aces1_state, ic24_write_c)) // strobe
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, aces1_state, ic24_write_a)) // 7segs
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, aces1_state, ic24_write_b)) // lamps
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, aces1_state, ic24_write_c)) // strobe
// 0xafd0 IC25 - lamps, meters, reel comms (writes)
MCFG_DEVICE_ADD("ic25", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(aces1_state, ic25_write_a)) // extra lamps
- MCFG_I8255_OUT_PORTB_CB(WRITE8(aces1_state, ic25_write_b)) // meters, extra lamp select
- MCFG_I8255_OUT_PORTC_CB(WRITE8(aces1_state, ic25_write_c)) // reel write, extra lamp strobe
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, aces1_state, ic25_write_a)) // extra lamps
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, aces1_state, ic25_write_b)) // meters, extra lamp select
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, aces1_state, ic25_write_c)) // reel write, extra lamp strobe
// 0xafe0 IC37 - doors, coins, reel optics (reads)
MCFG_DEVICE_ADD("ic37", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(aces1_state, ic37_read_a)) // extra lamps
- MCFG_I8255_IN_PORTB_CB(READ8(aces1_state, ic37_read_b)) // meters, extra lamp select
- MCFG_I8255_IN_PORTC_CB(READ8(aces1_state, ic37_read_c)) // reel write, extra lamp strobe
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, aces1_state, ic37_read_a)) // extra lamps
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, aces1_state, ic37_read_b)) // meters, extra lamp select
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, aces1_state, ic37_read_c)) // reel write, extra lamp strobe
MCFG_DEFAULT_LAYOUT(layout_aces1)
@@ -469,20 +469,20 @@ MACHINE_CONFIG_START(aces1_state::aces1)
MCFG_SPEAKER_STANDARD_MONO("mono")
// 0xadf0 - Dips, Sound
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000) /* ?? MHz */
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000) /* ?? MHz */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* steppers */
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(aces1_state, reel0_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, aces1_state, reel0_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(aces1_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, aces1_state, reel1_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(aces1_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, aces1_state, reel2_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(aces1_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, aces1_state, reel3_optic_cb))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp
index 6b31dd4b446..40ee26737ef 100644
--- a/src/mame/drivers/acesp.cpp
+++ b/src/mame/drivers/acesp.cpp
@@ -85,9 +85,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ace_sp_state::ace_sp)
- MCFG_CPU_ADD("maincpu", HD6303Y, 1000000)
- MCFG_CPU_PROGRAM_MAP(ace_sp_map)
- MCFG_CPU_IO_MAP(ace_sp_portmap)
+ MCFG_DEVICE_ADD("maincpu", HD6303Y, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(ace_sp_map)
+ MCFG_DEVICE_IO_MAP(ace_sp_portmap)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp
index 474f6f8e891..e7b22672992 100644
--- a/src/mame/drivers/acommand.cpp
+++ b/src/mame/drivers/acommand.cpp
@@ -470,8 +470,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(acommand_state::acommand_scanline)
MACHINE_CONFIG_START(acommand_state::acommand)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,12000000)
- MCFG_CPU_PROGRAM_MAP(acommand_map)
+ MCFG_DEVICE_ADD("maincpu",M68000,12000000)
+ MCFG_DEVICE_PROGRAM_MAP(acommand_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", acommand_state, acommand_scanline, "screen", 0, 1)
/* video hardware */
diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp
index 3faaf3a639f..6cfbc014296 100644
--- a/src/mame/drivers/acrnsys1.cpp
+++ b/src/mame/drivers/acrnsys1.cpp
@@ -267,8 +267,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(acrnsys1_state::acrnsys1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1008000) /* 1.008 MHz */
- MCFG_CPU_PROGRAM_MAP(acrnsys1_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1008000) /* 1.008 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(acrnsys1_map)
MCFG_DEFAULT_LAYOUT(layout_acrnsys1)
@@ -279,9 +279,9 @@ MACHINE_CONFIG_START(acrnsys1_state::acrnsys1)
/* devices */
MCFG_DEVICE_ADD("b1", INS8154, 0)
- MCFG_INS8154_IN_A_CB(READ8(acrnsys1_state, ins8154_b1_port_a_r))
- MCFG_INS8154_OUT_A_CB(WRITE8(acrnsys1_state, ins8154_b1_port_a_w))
- MCFG_INS8154_OUT_B_CB(WRITE8(acrnsys1_state, acrnsys1_led_segment_w))
+ MCFG_INS8154_IN_A_CB(READ8(*this, acrnsys1_state, ins8154_b1_port_a_r))
+ MCFG_INS8154_OUT_A_CB(WRITE8(*this, acrnsys1_state, ins8154_b1_port_a_w))
+ MCFG_INS8154_OUT_B_CB(WRITE8(*this, acrnsys1_state, acrnsys1_led_segment_w))
MCFG_DEVICE_ADD("ic8_7445", TTL74145, 0)
MCFG_CASSETTE_ADD( "cassette" )
MCFG_TIMER_DRIVER_ADD_PERIODIC("acrnsys1_c", acrnsys1_state, acrnsys1_c, attotime::from_hz(4800))
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 5ab2d128a6b..c71b335996b 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -289,12 +289,12 @@ MACHINE_RESET_MEMBER(actfancr_state,triothep)
MACHINE_CONFIG_START(actfancr_state::actfancr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, 21477200/3) /* Should be accurate */
- MCFG_CPU_PROGRAM_MAP(actfan_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", actfancr_state, irq0_line_hold) /* VBL */
+ MCFG_DEVICE_ADD("maincpu", H6280, 21477200/3) /* Should be accurate */
+ MCFG_DEVICE_PROGRAM_MAP(actfan_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", actfancr_state, irq0_line_hold) /* VBL */
- MCFG_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
- MCFG_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_DEVICE_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
+ MCFG_DEVICE_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -327,13 +327,13 @@ MACHINE_CONFIG_START(actfancr_state::actfancr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3812, 3000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
@@ -344,12 +344,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(actfancr_state::triothep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",H6280,XTAL(21'477'272)/3) /* XIN=21.4772Mhz, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(triothep_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", actfancr_state, irq0_line_hold) /* VBL */
+ MCFG_DEVICE_ADD("maincpu",H6280,XTAL(21'477'272)/3) /* XIN=21.4772Mhz, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(triothep_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", actfancr_state, irq0_line_hold) /* VBL */
- MCFG_CPU_ADD("audiocpu",M6502, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_DEVICE_ADD("audiocpu",M6502, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(dec0_s_map)
MCFG_MACHINE_START_OVERRIDE(actfancr_state,triothep)
MCFG_MACHINE_RESET_OVERRIDE(actfancr_state,triothep)
@@ -385,13 +385,13 @@ MACHINE_CONFIG_START(actfancr_state::triothep)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
diff --git a/src/mame/drivers/acvirus.cpp b/src/mame/drivers/acvirus.cpp
index dc0d8356364..7f8ce0b99bc 100644
--- a/src/mame/drivers/acvirus.cpp
+++ b/src/mame/drivers/acvirus.cpp
@@ -107,8 +107,8 @@ void acvirus_state::virus_map(address_map &map)
}
MACHINE_CONFIG_START(acvirus_state::virus)
- MCFG_CPU_ADD("maincpu", I8052, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(virus_map)
+ MCFG_DEVICE_ADD("maincpu", I8052, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(virus_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index 17face6d9cb..f0554ebdf4c 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -1053,26 +1053,26 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(adam_state::adam)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(7'159'090)/2)
- MCFG_CPU_PROGRAM_MAP(adam_mem)
- MCFG_CPU_IO_MAP(adam_io)
-
- MCFG_CPU_ADD(M6801_TAG, M6801, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(m6801_mem)
- MCFG_CPU_IO_MAP(m6801_io)
- MCFG_M6801_SC2(WRITELINE(adam_state, os3_w))
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(7'159'090)/2)
+ MCFG_DEVICE_PROGRAM_MAP(adam_mem)
+ MCFG_DEVICE_IO_MAP(adam_io)
+
+ MCFG_DEVICE_ADD(M6801_TAG, M6801, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(m6801_mem)
+ MCFG_DEVICE_IO_MAP(m6801_io)
+ MCFG_M6801_SC2(WRITELINE(*this, adam_state, os3_w))
MCFG_QUANTUM_PERFECT_CPU(M6801_TAG)
// video hardware
MCFG_DEVICE_ADD(TMS9928A_TAG, TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(adam_state, vdc_int_w))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, adam_state, vdc_int_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC(SCREEN_TAG)
MCFG_SCREEN_UPDATE_DEVICE(TMS9928A_TAG, tms9928a_device, screen_update)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL(7'159'090)/2)
+ MCFG_DEVICE_ADD(SN76489A_TAG, SN76489A, XTAL(7'159'090)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// TODO: enable when Z80 has better WAIT pin emulation
//MCFG_SN76496_READY_HANDLER(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_WAIT)) MCFG_DEVCB_INVERT
@@ -1104,9 +1104,9 @@ MACHINE_CONFIG_START(adam_state::adam)
MCFG_ADAM_EXPANSION_SLOT_ADD(ADAM_RIGHT_EXPANSION_SLOT_TAG, XTAL(7'159'090)/2, adam_slot3_devices, "ram")
MCFG_COLECOVISION_CONTROL_PORT_ADD(CONTROL1_TAG, colecovision_control_port_devices, "hand")
- MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(WRITELINE(adam_state, joy1_irq_w))
+ MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(WRITELINE(*this, adam_state, joy1_irq_w))
MCFG_COLECOVISION_CONTROL_PORT_ADD(CONTROL2_TAG, colecovision_control_port_devices, nullptr)
- MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(WRITELINE(adam_state, joy2_irq_w))
+ MCFG_COLECOVISION_CONTROL_PORT_IRQ_CALLBACK(WRITELINE(*this, adam_state, joy2_irq_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index 0bdf0d308e2..26e216dd690 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -550,24 +550,24 @@ void adp_state::fstation_hd63484_map(address_map &map)
MACHINE_CONFIG_START(adp_state::quickjac)
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(quickjac_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(adp_state, duart_iack_handler)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(quickjac_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(adp_state, duart_iack_handler)
MCFG_MACHINE_START_OVERRIDE(adp_state,skattv)
MCFG_MACHINE_RESET_OVERRIDE(adp_state,skattv)
MCFG_DEVICE_ADD( "duart", MC68681, XTAL(8'664'000) / 2 )
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_4))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("microtouch", microtouch_device, rx))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW1"))
- MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("duart", mc68681_device, rx_a_w) )
+ MCFG_MICROTOUCH_ADD( "microtouch", 9600, WRITELINE("duart", mc68681_device, rx_a_w) )
MCFG_NVRAM_ADD_NO_FILL("nvram")
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- //MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(adp_state, rtc_irq))
+ //MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, adp_state, rtc_irq))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -584,7 +584,7 @@ MACHINE_CONFIG_START(adp_state::quickjac)
MCFG_HD63484_ADD("acrtc", 0, adp_hd63484_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 3686400/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("PA"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
@@ -592,14 +592,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(adp_state::skattv)
quickjac(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(skattv_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(skattv_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(adp_state::skattva)
quickjac(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(skattva_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(skattva_mem)
MCFG_NVRAM_REPLACE_CUSTOM_DRIVER("nvram", adp_state, skattva_nvram_init)
MACHINE_CONFIG_END
@@ -617,8 +617,8 @@ void adp_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(adp_state::funland)
quickjac(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(funland_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(funland_mem)
MCFG_DEVICE_REMOVE("palette")
MCFG_PALETTE_ADD_INIT_BLACK("palette", 0x100)
@@ -630,8 +630,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(adp_state::fstation)
funland(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fstation_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fstation_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(640, 480)
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index d5356485abb..58c77b18bcf 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -65,19 +65,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(advision_state::advision)
/* basic machine hardware */
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(11'000'000))
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(advision_state, controller_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(advision_state, bankswitch_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(advision_state, av_control_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(advision_state, vsync_r))
-
- MCFG_CPU_ADD(COP411_TAG, COP411, 52631*4) // COP411L-KCN/N, R11=82k, C8=56pF
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, XTAL(11'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, advision_state, controller_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, advision_state, bankswitch_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, advision_state, av_control_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, advision_state, vsync_r))
+
+ MCFG_DEVICE_ADD(COP411_TAG, COP411, 52631*4) // COP411L-KCN/N, R11=82k, C8=56pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_RAM_POWER_SUPPLY, false)
- MCFG_COP400_READ_L_CB(READ8(advision_state, sound_cmd_r))
- MCFG_COP400_WRITE_G_CB(WRITE8(advision_state, sound_g_w))
- MCFG_COP400_WRITE_D_CB(WRITE8(advision_state, sound_d_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, advision_state, sound_cmd_r))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, advision_state, sound_g_w))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, advision_state, sound_d_w))
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -92,7 +92,7 @@ MACHINE_CONFIG_START(advision_state::advision)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_2BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index 0261028d45b..c94846cce15 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -247,11 +247,11 @@ void aeroboto_state::machine_reset()
MACHINE_CONFIG_START(aeroboto_state::formatz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(10'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(10'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL(10'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, XTAL(10'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -261,7 +261,7 @@ MACHINE_CONFIG_START(aeroboto_state::formatz)
MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(aeroboto_state, screen_update_aeroboto)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(aeroboto_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, aeroboto_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", aeroboto)
@@ -273,12 +273,12 @@ MACHINE_CONFIG_START(aeroboto_state::formatz)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'000'000)/8) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch2", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(10'000'000)/8) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch2", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(10'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 19e8847a25e..451a55fe3d3 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -1449,13 +1449,13 @@ MACHINE_RESET_MEMBER(aerofgt_state,aerofgt)
MACHINE_CONFIG_START(aerofgt_state::pspikes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(pspikes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(pspikes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
@@ -1490,7 +1490,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikes)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1501,9 +1501,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::spikes91)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(spikes91_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(spikes91_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
/* + Z80 for sound */
@@ -1539,9 +1539,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::pspikesb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(pspikesb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(pspikesb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -1580,13 +1580,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::kickball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL(10'000'000)) // 10Mhz XTAL near 10Mhz rated CPU
- MCFG_CPU_PROGRAM_MAP(kickball_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* only IRQ1 is valid */
+ MCFG_DEVICE_ADD("maincpu",M68000,XTAL(10'000'000)) // 10Mhz XTAL near 10Mhz rated CPU
+ MCFG_DEVICE_PROGRAM_MAP(kickball_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* only IRQ1 is valid */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(kickball_sound_map)
- MCFG_CPU_IO_MAP(kickball_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(kickball_sound_map)
+ MCFG_DEVICE_IO_MAP(kickball_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -1620,7 +1620,7 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) // K-666 (YM3812)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(4'000'000)) // K-666 (YM3812)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1631,9 +1631,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::pspikesc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(pspikesc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(pspikesc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -1670,13 +1670,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::karatblz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(karatblz_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(karatblz_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
@@ -1716,7 +1716,7 @@ MACHINE_CONFIG_START(aerofgt_state::karatblz)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000) ) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000) ) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1727,13 +1727,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(karatblzbl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(karatblzbl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(karatblzbl_sound_map)
- MCFG_CPU_IO_MAP(karatblzbl_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(karatblzbl_sound_map)
+ MCFG_DEVICE_IO_MAP(karatblzbl_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -1772,24 +1772,24 @@ MACHINE_CONFIG_START(aerofgt_state::karatblzbl)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(8'000'000)/2)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(8'000'000)/2)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(spinlbrk_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* there are vectors for 3 and 4 too, analog related? */
+ MCFG_DEVICE_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(spinlbrk_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold) /* there are vectors for 3 and 4 too, analog related? */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5mhz verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(spinlbrk_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5mhz verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(spinlbrk_sound_portmap)
/* IRQs are triggered by the YM2610 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,spinlbrk)
@@ -1830,7 +1830,7 @@ MACHINE_CONFIG_START(aerofgt_state::spinlbrk)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1841,13 +1841,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::turbofrc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(turbofrc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(turbofrc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL(5'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,XTAL(5'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
@@ -1887,7 +1887,7 @@ MACHINE_CONFIG_START(aerofgt_state::turbofrc)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1898,13 +1898,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(aerofgtb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(aerofgtb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(aerofgt_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
@@ -1945,7 +1945,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgtb)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1956,13 +1956,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::aerofgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(aerofgt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(aerofgt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5 MHz verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(aerofgt_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,XTAL(20'000'000)/4) /* 5 MHz verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(aerofgt_sound_portmap)
/* IRQs are triggered by the YM2610 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
@@ -1974,8 +1974,8 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
MCFG_VS9209_IN_PORTC_CB(IOPORT("SYSTEM"))
MCFG_VS9209_IN_PORTD_CB(IOPORT("DSW1"))
MCFG_VS9209_IN_PORTE_CB(IOPORT("DSW2"))
- MCFG_VS9209_IN_PORTG_CB(DEVREADLINE("soundlatch", generic_latch_8_device, pending_r)) MCFG_DEVCB_BIT(0)
- MCFG_VS9209_OUT_PORTG_CB(DEVWRITELINE("watchdog", mb3773_device, write_line_ck)) MCFG_DEVCB_BIT(7)
+ MCFG_VS9209_IN_PORTG_CB(READLINE("soundlatch", generic_latch_8_device, pending_r)) MCFG_DEVCB_BIT(0)
+ MCFG_VS9209_OUT_PORTG_CB(WRITELINE("watchdog", mb3773_device, write_line_ck)) MCFG_DEVCB_BIT(7)
MCFG_VS9209_IN_PORTH_CB(IOPORT("JP1"))
MCFG_DEVICE_ADD("watchdog", MB3773, 0)
@@ -2008,7 +2008,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerofgt)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -2019,12 +2019,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::aerfboot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(aerfboot_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(aerfboot_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(aerfboot_sound_map)
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(aerfboot_sound_map)
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -2062,9 +2062,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::aerfboo2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(aerfboo2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(aerfboo2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq2_line_hold)
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -2097,12 +2097,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aerofgt_state::wbbc97)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(wbbc97_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
+ MCFG_DEVICE_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(wbbc97_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aerofgt_state, irq1_line_hold)/* all irq vectors are the same */
- MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(wbbc97_sound_map)
+ MCFG_DEVICE_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(wbbc97_sound_map)
/* IRQs are triggered by the YM3812 */
MCFG_MACHINE_START_OVERRIDE(aerofgt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(aerofgt_state,common)
@@ -2135,7 +2135,7 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(false)
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index d9768d18084..37feb94b390 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -1084,9 +1084,9 @@ static void agat7_cards(device_slot_interface &device)
}
MACHINE_CONFIG_START(agat7_state::agat7)
- MCFG_CPU_ADD("maincpu", M6502, XTAL(14'300'000) / 14)
- MCFG_CPU_PROGRAM_MAP(agat7_map)
- MCFG_CPU_VBLANK_INT_DRIVER(A7_VIDEO_TAG ":a7screen", agat7_state, agat_vblank)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(14'300'000) / 14)
+ MCFG_DEVICE_PROGRAM_MAP(agat7_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER(A7_VIDEO_TAG ":a7screen", agat7_state, agat_vblank)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", agat7_state, timer_irq, A7_VIDEO_TAG ":a7screen", 0, 1)
@@ -1099,7 +1099,7 @@ MACHINE_CONFIG_START(agat7_state::agat7)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(A7_SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(A7_SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* /INH banking */
@@ -1120,10 +1120,10 @@ MACHINE_CONFIG_START(agat7_state::agat7)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(agat7_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(agat7_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(agat7_state, ay3600_data_ready_w))
- MCFG_AY3600_AKO_CB(WRITELINE(agat7_state, ay3600_ako_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, agat7_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, agat7_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, agat7_state, ay3600_data_ready_w))
+ MCFG_AY3600_AKO_CB(WRITELINE(*this, agat7_state, ay3600_ako_w))
/* repeat timer. 10 Hz per Mymrin's book */
MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", agat7_state, ay3600_repeat, attotime::from_hz(10))
@@ -1134,9 +1134,9 @@ MACHINE_CONFIG_START(agat7_state::agat7)
*/
MCFG_DEVICE_ADD(A7_BUS_TAG, A2BUS, 0)
MCFG_A2BUS_CPU(A7_CPU_TAG)
- MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(agat7_state, a2bus_irq_w))
- MCFG_A2BUS_OUT_NMI_CB(WRITELINE(agat7_state, a2bus_nmi_w))
- MCFG_A2BUS_OUT_INH_CB(WRITELINE(agat7_state, a2bus_inh_w))
+ MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(*this, agat7_state, a2bus_irq_w))
+ MCFG_A2BUS_OUT_NMI_CB(WRITELINE(*this, agat7_state, a2bus_nmi_w))
+ MCFG_A2BUS_OUT_INH_CB(WRITELINE(*this, agat7_state, a2bus_inh_w))
MCFG_A2BUS_SLOT_ADD(A7_BUS_TAG, "sl2", agat7_cards, "a7lang")
MCFG_A2BUS_SLOT_ADD(A7_BUS_TAG, "sl3", agat7_cards, "a7fdc")
MCFG_A2BUS_SLOT_ADD(A7_BUS_TAG, "sl4", agat7_cards, "a7ports")
diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp
index 4dd1d3e981f..0119df14328 100644
--- a/src/mame/drivers/age_candy.cpp
+++ b/src/mame/drivers/age_candy.cpp
@@ -56,9 +56,9 @@ void age_candy_state::age_candy_map(address_map &map)
MACHINE_CONFIG_START(age_candy_state::age_candy)
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", HPC46104, 8000000) // unknown clock; HPC emulation needed
-// MCFG_CPU_PROGRAM_MAP(age_candy_map)
-// MCFG_CPU_IO_MAP(age_candy_io)
+// MCFG_DEVICE_ADD("maincpu", HPC46104, 8000000) // unknown clock; HPC emulation needed
+// MCFG_DEVICE_PROGRAM_MAP(age_candy_map)
+// MCFG_DEVICE_IO_MAP(age_candy_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp
index cb6485d3654..8fb5fb4b74f 100644
--- a/src/mame/drivers/aim65.cpp
+++ b/src/mame/drivers/aim65.cpp
@@ -188,22 +188,22 @@ image_init_result aim65_state::load_cart(device_image_interface &image, generic_
MACHINE_CONFIG_START(aim65_state::aim65)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, AIM65_CLOCK) /* 1 MHz */
- MCFG_CPU_PROGRAM_MAP(aim65_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, AIM65_CLOCK) /* 1 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(aim65_mem)
MCFG_DEFAULT_LAYOUT(layout_aim65)
/* alpha-numeric display */
MCFG_DEVICE_ADD("ds1", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(aim65_state, aim65_update_ds<1>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, aim65_state, aim65_update_ds<1>))
MCFG_DEVICE_ADD("ds2", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(aim65_state, aim65_update_ds<2>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, aim65_state, aim65_update_ds<2>))
MCFG_DEVICE_ADD("ds3", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(aim65_state, aim65_update_ds<3>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, aim65_state, aim65_update_ds<3>))
MCFG_DEVICE_ADD("ds4", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(aim65_state, aim65_update_ds<4>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, aim65_state, aim65_update_ds<4>))
MCFG_DEVICE_ADD("ds5", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(aim65_state, aim65_update_ds<5>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, aim65_state, aim65_update_ds<5>))
/* Sound - wave sound only */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -212,14 +212,14 @@ MACHINE_CONFIG_START(aim65_state::aim65)
/* other devices */
MCFG_DEVICE_ADD("riot", MOS6532_NEW, AIM65_CLOCK)
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(aim65_state, aim65_riot_a_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(aim65_state, aim65_riot_b_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, aim65_state, aim65_riot_a_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, aim65_state, aim65_riot_b_r))
MCFG_MOS6530n_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("via6522_0", VIA6522, AIM65_CLOCK)
- MCFG_VIA6522_READPB_HANDLER(READ8(aim65_state, aim65_pb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, aim65_state, aim65_pb_r))
// in CA1 printer ready?
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(aim65_state, aim65_pb_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, aim65_state, aim65_pb_w))
// out CB1 printer start
// out CA2 cass control (H=in)
// out CB2 turn printer on
@@ -229,8 +229,8 @@ MACHINE_CONFIG_START(aim65_state::aim65)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("pia6821", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(aim65_state, aim65_pia_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(aim65_state, aim65_pia_b_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, aim65_state, aim65_pia_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, aim65_state, aim65_pia_b_w))
// Deck 1 can play and record
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp
index 5b45491fa0d..dac2670377e 100644
--- a/src/mame/drivers/aim65_40.cpp
+++ b/src/mame/drivers/aim65_40.cpp
@@ -116,8 +116,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(aim65_40_state::aim65_40)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, 1000000)
- MCFG_CPU_PROGRAM_MAP(aim65_40_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(aim65_40_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_aim65_40)
@@ -130,15 +130,15 @@ MACHINE_CONFIG_START(aim65_40_state::aim65_40)
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, 1000000)
MCFG_DEVICE_ADD(M6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(M6551_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(M6551_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(M6551_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(M6551_TAG, mos6551_device, write_cts))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(M6551_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(M6551_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(M6551_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(M6551_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index faa42849930..fb62be4fc41 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -565,20 +565,20 @@ void airbustr_state::machine_reset()
MACHINE_CONFIG_START(airbustr_state::airbustr)
/* basic machine hardware */
- MCFG_CPU_ADD("master", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(master_map)
- MCFG_CPU_IO_MAP(master_io_map)
+ MCFG_DEVICE_ADD("master", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_IO_MAP(master_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airbustr_state, airbustr_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(slave_map)
- MCFG_CPU_IO_MAP(slave_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, slave_interrupt) /* nmi signal from master cpu */
+ MCFG_DEVICE_ADD("slave", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_IO_MAP(slave_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", airbustr_state, slave_interrupt) /* nmi signal from master cpu */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", airbustr_state, irq0_line_hold) // nmi are caused by sub cpu writing a sound command
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", airbustr_state, irq0_line_hold) // nmi are caused by sub cpu writing a sound command
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // Palette RAM is filled by sub cpu with data supplied by main cpu
// Maybe a high value is safer in order to avoid glitches
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(airbustr_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(airbustr_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, airbustr_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", airbustr)
@@ -612,7 +612,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) // DSW-1 connected to port A
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) // DSW-2 connected to port B
MCFG_SOUND_ROUTE(0, "mono", 0.25)
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index 0c4f1107928..53bb1eb0122 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -388,13 +388,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(airraid_state::airraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(airraid_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(airraid_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", airraid_state, cshooter_scanline, "airraid_vid:screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(airraid_sound_map)
- MCFG_CPU_OPCODES_MAP(airraid_sound_decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(airraid_sound_map)
+ MCFG_DEVICE_OPCODES_MAP(airraid_sound_decrypted_opcodes_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -407,14 +407,14 @@ MACHINE_CONFIG_START(airraid_state::airraid)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_ROM("audiocpu")
@@ -423,8 +423,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(airraid_state::airraid_crypt)
airraid(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index af4d41e79b4..fe0fdb08120 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -173,14 +173,14 @@ WRITE8_MEMBER(ajax_state::volume_callback1)
MACHINE_CONFIG_START(ajax_state::ajax)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 12/4 MHz*/
- MCFG_CPU_PROGRAM_MAP(ajax_main_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 12/4 MHz*/
+ MCFG_DEVICE_PROGRAM_MAP(ajax_main_map)
- MCFG_CPU_ADD("sub", HD6309E, 3000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(ajax_sub_map)
+ MCFG_DEVICE_ADD("sub", HD6309E, 3000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(ajax_sub_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
- MCFG_CPU_PROGRAM_MAP(ajax_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.58 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ajax_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -222,15 +222,15 @@ MACHINE_CONFIG_START(ajax_state::ajax)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(ajax_state, volume_callback0))
+ MCFG_DEVICE_ADD("k007232_1", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, ajax_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(ajax_state, volume_callback1))
+ MCFG_DEVICE_ADD("k007232_2", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, ajax_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp
index 76f91a6cd79..496897c54e0 100644
--- a/src/mame/drivers/akaiax80.cpp
+++ b/src/mame/drivers/akaiax80.cpp
@@ -91,9 +91,9 @@ void ax80_state::ax80_map(address_map &map)
}
MACHINE_CONFIG_START(ax80_state::ax80)
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(ax80_map)
- //MCFG_CPU_IO_MAP(ax80_io)
+ MCFG_DEVICE_ADD("maincpu", UPD7810, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ax80_map)
+ //MCFG_DEVICE_IO_MAP(ax80_io)
MCFG_DEVICE_ADD(PIT0_TAG, PIT8253, 0)
MCFG_DEVICE_ADD(PIT1_TAG, PIT8253, 0)
@@ -107,9 +107,9 @@ MACHINE_CONFIG_START(ax80_state::ax80)
MCFG_DEVICE_ADD("kdc", I8279, 6554800 / 8) // Keyboard/Display Controller
//MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", UPD7810_INTF1)) // irq
- //MCFG_I8279_OUT_SL_CB(WRITE8(ax80_state, scanlines_w)) // scan SL lines
- //MCFG_I8279_OUT_DISP_CB(WRITE8(ax80_state, digit_w)) // display A&B
- //MCFG_I8279_IN_RL_CB(READ8(ax80_state, kbd_r)) // kbd RL lines
+ //MCFG_I8279_OUT_SL_CB(WRITE8(*this, ax80_state, scanlines_w)) // scan SL lines
+ //MCFG_I8279_OUT_DISP_CB(WRITE8(*this, ax80_state, digit_w)) // display A&B
+ //MCFG_I8279_IN_RL_CB(READ8(*this, ax80_state, kbd_r)) // kbd RL lines
//MCFG_I8279_IN_SHIFT_CB(VCC) // not connected
//MCFG_I8279_IN_CTRL_CB(VCC) // not connected
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp
index eb32d5afcaf..615f1daed54 100644
--- a/src/mame/drivers/albazc.cpp
+++ b/src/mame/drivers/albazc.cpp
@@ -281,9 +281,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(albazc_state::hanaroku)
- MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(hanaroku_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", albazc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,6000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hanaroku_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", albazc_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -306,7 +306,7 @@ MACHINE_CONFIG_START(albazc_state::hanaroku)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000) /* ? MHz */
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000) /* ? MHz */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 98fcd134d92..9133200b476 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -362,10 +362,10 @@ void albazg_state::machine_reset()
MACHINE_CONFIG_START(albazg_state::yumefuda)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(port_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", albazg_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(port_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", albazg_state, irq0_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -373,9 +373,9 @@ MACHINE_CONFIG_START(albazg_state::yumefuda)
MCFG_WATCHDOG_VBLANK_INIT("screen", 8) // timing is unknown
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(albazg_state, mux_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, albazg_state, mux_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SYSTEM"))
- MCFG_I8255_IN_PORTC_CB(READ8(albazg_state, mux_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, albazg_state, mux_r))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -398,10 +398,10 @@ MACHINE_CONFIG_START(albazg_state::yumefuda)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/16) /* guessed to use the same xtal as the crtc */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(albazg_state, yumefuda_output_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, albazg_state, yumefuda_output_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp
index e8c52ad6769..956f06af2d0 100644
--- a/src/mame/drivers/aleck64.cpp
+++ b/src/mame/drivers/aleck64.cpp
@@ -909,20 +909,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(aleck64_state::aleck64)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", VR4300BE, 93750000)
+ MCFG_DEVICE_ADD("maincpu", VR4300BE, 93750000)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(8192)
MCFG_MIPS3_SYSTEM_CLOCK(62500000)
- MCFG_CPU_PROGRAM_MAP(n64_map)
+ MCFG_DEVICE_PROGRAM_MAP(n64_map)
MCFG_CPU_FORCE_NO_DRC()
- MCFG_CPU_ADD("rsp", RSP, 62500000)
- MCFG_RSP_DP_REG_R_CB(DEVREAD32("rcp",n64_periphs, dp_reg_r))
- MCFG_RSP_DP_REG_W_CB(DEVWRITE32("rcp",n64_periphs, dp_reg_w))
- MCFG_RSP_SP_REG_R_CB(DEVREAD32("rcp",n64_periphs, sp_reg_r))
- MCFG_RSP_SP_REG_W_CB(DEVWRITE32("rcp",n64_periphs, sp_reg_w))
- MCFG_RSP_SP_SET_STATUS_CB(DEVWRITE32("rcp",n64_periphs, sp_set_status))
- MCFG_CPU_PROGRAM_MAP(rsp_map)
+ MCFG_DEVICE_ADD("rsp", RSP, 62500000)
+ MCFG_RSP_DP_REG_R_CB(READ32("rcp",n64_periphs, dp_reg_r))
+ MCFG_RSP_DP_REG_W_CB(WRITE32("rcp",n64_periphs, dp_reg_w))
+ MCFG_RSP_SP_REG_R_CB(READ32("rcp",n64_periphs, sp_reg_r))
+ MCFG_RSP_SP_REG_W_CB(WRITE32("rcp",n64_periphs, sp_reg_w))
+ MCFG_RSP_SP_SET_STATUS_CB(WRITE32("rcp",n64_periphs, sp_set_status))
+ MCFG_DEVICE_PROGRAM_MAP(rsp_map)
MCFG_CPU_FORCE_NO_DRC()
MCFG_SCREEN_ADD("screen", RASTER)
@@ -931,15 +931,15 @@ MACHINE_CONFIG_START(aleck64_state::aleck64)
MCFG_SCREEN_SIZE(640, 525)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(aleck64_state, screen_update_n64)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(aleck64_state, screen_vblank_n64))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, aleck64_state, screen_vblank_n64))
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_N64_PERIPHS_ADD("rcp");
@@ -1022,8 +1022,8 @@ uint32_t aleck64_state::screen_update_e90(screen_device &screen, bitmap_rgb32 &b
MACHINE_CONFIG_START(aleck64_state::a64_e90)
aleck64(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(e90_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(e90_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(aleck64_state, screen_update_e90)
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 3a38080460d..0ff8307c96d 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -416,12 +416,12 @@ HD44780_PIXEL_UPDATE(alesis_state::sr16_pixel_update)
MACHINE_CONFIG_START(alesis_state::hr16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8031, 12_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(hr16_mem)
- MCFG_CPU_IO_MAP(hr16_io)
+ MCFG_DEVICE_ADD("maincpu",I8031, 12_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(hr16_mem)
+ MCFG_DEVICE_IO_MAP(hr16_io)
MCFG_MCS51_PORT_P1_IN_CB(IOPORT("SELECT"))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(alesis_state, p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(alesis_state, p3_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, alesis_state, p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, alesis_state, p3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -452,9 +452,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alesis_state::sr16)
hr16(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sr16_mem)
- MCFG_CPU_IO_MAP(sr16_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sr16_mem)
+ MCFG_DEVICE_IO_MAP(sr16_io)
MCFG_MCS51_PORT_P1_IN_CB(NOOP)
/* video hardware */
@@ -471,11 +471,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alesis_state::mmt8)
hr16(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mmt8_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(alesis_state, kb_r))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(alesis_state, mmt8_p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(alesis_state, mmt8_p3_w))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mmt8_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, alesis_state, kb_r))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, alesis_state, mmt8_p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, alesis_state, mmt8_p3_w))
MCFG_DEVICE_REMOVE("dm3ag")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp
index 527b33093de..2ec13a0ced8 100644
--- a/src/mame/drivers/alesis_qs.cpp
+++ b/src/mame/drivers/alesis_qs.cpp
@@ -51,8 +51,8 @@ void qs_state::qs7_prog_map(address_map &map)
MACHINE_CONFIG_START(qs_state::qs7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83048, XTAL(10'000'000)) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
- MCFG_CPU_PROGRAM_MAP(qs7_prog_map)
+ MCFG_DEVICE_ADD("maincpu", H83048, XTAL(10'000'000)) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
+ MCFG_DEVICE_PROGRAM_MAP(qs7_prog_map)
//MCFG_ALESIS_KEYSCAN_ASIC_ADD("keyscan")
diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp
index 4e54a82a135..32c4d3eb432 100644
--- a/src/mame/drivers/alg.cpp
+++ b/src/mame/drivers/alg.cpp
@@ -305,8 +305,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(alg_state::alg_r1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
- MCFG_CPU_PROGRAM_MAP(main_map_r1)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
+ MCFG_DEVICE_PROGRAM_MAP(main_map_r1)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map)
@@ -334,48 +334,48 @@ MACHINE_CONFIG_START(alg_state::alg_r1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
- MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w))
+ MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w))
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* cia */
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("FIRE"))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
/* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC)
- MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w))
- MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r))
- MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w))
- MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w))
- MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w))
+ MCFG_AMIGA_FDC_INDEX_CALLBACK(WRITELINE("cia_1", mos8520_device, flag_w))
+ MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w))
+ MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alg_state::alg_r2)
alg_r1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(main_map_r2)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(main_map_r2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alg_state::picmatic)
alg_r1(config);
/* adjust for PAL specs */
- MCFG_CPU_REPLACE("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(main_map_picmatic)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(main_map_picmatic)
MCFG_DEVICE_REMOVE("screen")
pal_video(config);
diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp
index 310f8bb6791..0b7efa6afbe 100644
--- a/src/mame/drivers/alien.cpp
+++ b/src/mame/drivers/alien.cpp
@@ -92,8 +92,8 @@ void alien_state::machine_reset()
MACHINE_CONFIG_START(alien_state::alien)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, MASTER_CLOCK) /* 200MHz */
- MCFG_CPU_PROGRAM_MAP(alien_map)
+ MCFG_DEVICE_ADD("maincpu", SH4LE, MASTER_CLOCK) /* 200MHz */
+ MCFG_DEVICE_PROGRAM_MAP(alien_map)
MCFG_CPU_FORCE_NO_DRC()
/* video hardware */
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index 57c96356273..e364a2e7c52 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -197,12 +197,12 @@ WRITE8_MEMBER( aliens_state::banking_callback )
MACHINE_CONFIG_START(aliens_state::aliens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(aliens_map)
- MCFG_KONAMICPU_LINE_CB(WRITE8(aliens_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(aliens_map)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, aliens_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(aliens_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(aliens_sound_map)
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
@@ -241,12 +241,12 @@ MACHINE_CONFIG_START(aliens_state::aliens)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(aliens_state,aliens_snd_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, aliens_state,aliens_snd_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(aliens_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, aliens_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp
index 5c517117f09..b052de92823 100644
--- a/src/mame/drivers/alinvade.cpp
+++ b/src/mame/drivers/alinvade.cpp
@@ -208,8 +208,8 @@ WRITE_LINE_MEMBER(alinvade_state::vblank_irq)
MACHINE_CONFIG_START(alinvade_state::alinvade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(alinvade_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,2000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(alinvade_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(alinvade_state::alinvade)
MCFG_SCREEN_SIZE(128, 128)
MCFG_SCREEN_VISIBLE_AREA(0, 128-1, 0, 128-1)
MCFG_SCREEN_UPDATE_DRIVER(alinvade_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(alinvade_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, alinvade_state, vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp
index f93958a1b1a..b9907a04d50 100644
--- a/src/mame/drivers/allied.cpp
+++ b/src/mame/drivers/allied.cpp
@@ -622,8 +622,8 @@ void allied_state::machine_reset()
MACHINE_CONFIG_START(allied_state::allied)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6504, 3572549/4)
- MCFG_CPU_PROGRAM_MAP(allied_map)
+ MCFG_DEVICE_ADD("maincpu", M6504, 3572549/4)
+ MCFG_DEVICE_PROGRAM_MAP(allied_map)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_allied)
@@ -633,69 +633,69 @@ MACHINE_CONFIG_START(allied_state::allied)
/* Devices */
MCFG_DEVICE_ADD("ic1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic1_a_r))
- //MCFG_PIA_WRITEPA_HANDLER(WRITE8(allied_state, ic1_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(allied_state, ic1_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic1_b_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic1_ca2_w))
- //MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic1_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, allied_state, ic1_a_r))
+ //MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, allied_state, ic1_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, allied_state, ic1_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, allied_state, ic1_b_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, allied_state, ic1_ca2_w))
+ //MCFG_PIA_CB2_HANDLER(WRITELINE(*this, allied_state, ic1_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic2", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic2_a_r))
- //MCFG_PIA_WRITEPA_HANDLER(WRITE8(allied_state, ic2_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(allied_state, ic2_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic2_b_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic2_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic2_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, allied_state, ic2_a_r))
+ //MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, allied_state, ic2_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, allied_state, ic2_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, allied_state, ic2_b_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, allied_state, ic2_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, allied_state, ic2_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic4", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic4_a_r))
- //MCFG_PIA_WRITEPA_HANDLER(WRITE8(allied_state, ic4_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(allied_state, ic4_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic4_b_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic4_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic4_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, allied_state, ic4_a_r))
+ //MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, allied_state, ic4_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, allied_state, ic4_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, allied_state, ic4_b_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, allied_state, ic4_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, allied_state, ic4_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic7", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic7_a_r))
- //MCFG_PIA_WRITEPA_HANDLER(WRITE8(allied_state, ic7_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(allied_state, ic7_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic7_b_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic7_ca2_w))
- //MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic7_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, allied_state, ic7_a_r))
+ //MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, allied_state, ic7_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, allied_state, ic7_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, allied_state, ic7_b_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, allied_state, ic7_ca2_w))
+ //MCFG_PIA_CB2_HANDLER(WRITELINE(*this, allied_state, ic7_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic8", PIA6821, 0)
- //MCFG_PIA_READPA_HANDLER(READ8(allied_state, ic8_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(allied_state, ic8_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(allied_state, ic8_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(allied_state, ic8_b_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(allied_state, ic8_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(allied_state, ic8_cb2_w))
+ //MCFG_PIA_READPA_HANDLER(READ8(*this, allied_state, ic8_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, allied_state, ic8_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, allied_state, ic8_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, allied_state, ic8_b_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, allied_state, ic8_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, allied_state, ic8_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6504_IRQ_LINE))
MCFG_DEVICE_ADD("ic3", MOS6530, 3572549/4) // unknown where the ram and i/o is located
- MCFG_MOS6530_OUT_PB_CB(WRITE8(allied_state, ic3_b_w))
+ MCFG_MOS6530_OUT_PB_CB(WRITE8(*this, allied_state, ic3_b_w))
MCFG_DEVICE_ADD("ic5", MOS6530, 3572549/4)
- MCFG_MOS6530_IN_PA_CB(READ8(allied_state, ic5_a_r))
- //MCFG_MOS6530_OUT_PA_CB(WRITE8(allied_state, ic5_a_w))
- //MCFG_MOS6530_IN_PB_CB(READ8(allied_state, ic5_b_r))
- MCFG_MOS6530_OUT_PB_CB(WRITE8(allied_state, ic5_b_w))
+ MCFG_MOS6530_IN_PA_CB(READ8(*this, allied_state, ic5_a_r))
+ //MCFG_MOS6530_OUT_PA_CB(WRITE8(*this, allied_state, ic5_a_w))
+ //MCFG_MOS6530_IN_PB_CB(READ8(*this, allied_state, ic5_b_r))
+ MCFG_MOS6530_OUT_PB_CB(WRITE8(*this, allied_state, ic5_b_w))
MCFG_DEVICE_ADD("ic6", MOS6530, 3572549/4)
- MCFG_MOS6530_IN_PA_CB(READ8(allied_state, ic6_a_r))
- //MCFG_MOS6530_OUT_PA_CB(WRITE8(allied_state, ic6_a_w))
- MCFG_MOS6530_IN_PB_CB(READ8(allied_state, ic6_b_r))
- MCFG_MOS6530_OUT_PB_CB(WRITE8(allied_state, ic6_b_w))
+ MCFG_MOS6530_IN_PA_CB(READ8(*this, allied_state, ic6_a_r))
+ //MCFG_MOS6530_OUT_PA_CB(WRITE8(*this, allied_state, ic6_a_w))
+ MCFG_MOS6530_IN_PB_CB(READ8(*this, allied_state, ic6_b_r))
+ MCFG_MOS6530_OUT_PB_CB(WRITE8(*this, allied_state, ic6_b_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", allied_state, timer_a, attotime::from_hz(50))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index 89eee69e27c..1277d24586a 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -1929,24 +1929,24 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_II)
MACHINE_CONFIG_START(alpha68k_state::sstingry)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MCFG_CPU_PROGRAM_MAP(kyros_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq
-
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(sstingry_sound_map)
- MCFG_CPU_IO_MAP(kyros_sound_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000)
-
- MCFG_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
-// MCFG_CPU_PROGRAM_MAP(i8748_map)
-// MCFG_MCS48_PORT_BUS_IN_CB(READ8(alpha68k_state, saiyugoub1_mcu_command_r))
+ MCFG_DEVICE_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
+ MCFG_DEVICE_PROGRAM_MAP(kyros_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(sstingry_sound_map)
+ MCFG_DEVICE_IO_MAP(kyros_sound_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000)
+
+ MCFG_DEVICE_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
+// MCFG_DEVICE_PROGRAM_MAP(i8748_map)
+// MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, alpha68k_state, saiyugoub1_mcu_command_r))
// MCFG_MCS48_PORT_T0_CLK_CUSTOM(alpha68k_state, saiyugoub1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */
-// MCFG_MCS48_PORT_T1_IN_CB(READLINE(alpha68k_state, saiyugoub1_m5205_irq_r))
-// MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alpha68k_state, saiyugoub1_adpcm_rom_addr_w))
-// MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(alpha68k_state, saiyugoub1_adpcm_control_w))
+// MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, alpha68k_state, saiyugoub1_m5205_irq_r))
+// MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, alpha68k_state, saiyugoub1_adpcm_rom_addr_w))
+// MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, alpha68k_state, saiyugoub1_adpcm_control_w))
MCFG_DEVICE_DISABLE()
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
@@ -1973,16 +1973,16 @@ MACHINE_CONFIG_START(alpha68k_state::sstingry)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym2", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym3", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ym3", YM2203, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1990,16 +1990,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::kyros)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* Verified on bootleg PCB */
- MCFG_CPU_PROGRAM_MAP(kyros_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* Verified on bootleg PCB */
+ MCFG_DEVICE_PROGRAM_MAP(kyros_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60) // MCU irq
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) /* Verified on bootleg PCB */
- MCFG_CPU_PROGRAM_MAP(kyros_sound_map)
- MCFG_CPU_IO_MAP(kyros_sound_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) /* Verified on bootleg PCB */
+ MCFG_DEVICE_PROGRAM_MAP(kyros_sound_map)
+ MCFG_DEVICE_IO_MAP(kyros_sound_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq0_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, nmi_line_pulse, 4000)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
@@ -2025,16 +2025,16 @@ MACHINE_CONFIG_START(alpha68k_state::kyros)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("ym3", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
+ MCFG_DEVICE_ADD("ym3", YM2203, XTAL(24'000'000)/12) /* Verified on bootleg PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2042,15 +2042,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::jongbou)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(kyros_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*16) // MCU irq
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(kyros_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*16) // MCU irq
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(jongbou_sound_map)
- MCFG_CPU_IO_MAP(jongbou_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq0_line_hold, 160*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(jongbou_sound_map)
+ MCFG_DEVICE_IO_MAP(jongbou_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq0_line_hold, 160*60)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
@@ -2076,20 +2076,20 @@ MACHINE_CONFIG_START(alpha68k_state::jongbou)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::alpha68k_I)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
- MCFG_CPU_PROGRAM_MAP(alpha68k_I_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
+ MCFG_DEVICE_PROGRAM_MAP(alpha68k_I_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
- MCFG_CPU_PROGRAM_MAP(alpha68k_I_s_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // 4Mhz seems to yield the correct tone
+ MCFG_DEVICE_PROGRAM_MAP(alpha68k_I_s_map)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
@@ -2115,7 +2115,7 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_I)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -2129,14 +2129,14 @@ INTERRUPT_GEN_MEMBER(alpha68k_state::alpha68k_sound_nmi)
MACHINE_CONFIG_START(alpha68k_state::alpha68k_II)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
- MCFG_CPU_PROGRAM_MAP(alpha68k_II_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* Correct */
+ MCFG_DEVICE_PROGRAM_MAP(alpha68k_II_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 3579545*2) /* Unlikely but needed to stop nested NMI's */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_II)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_II)
@@ -2162,38 +2162,38 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 3000000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w))
+ MCFG_DEVICE_ADD("ym1", YM2203, 3000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65)
- MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::btlfieldb)
alpha68k_II(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*4) // MCU irq
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*4) // MCU irq
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::alpha68k_II_gm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(alpha68k_II_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*3) // MCU irq
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(alpha68k_II_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*3) // MCU irq
- MCFG_CPU_ADD("audiocpu", Z80, 4000000*2) // TODO: fix this
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000*2) // TODO: fix this
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 7500)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_II)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_II)
@@ -2219,15 +2219,15 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_II_gm)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 3000000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w))
+ MCFG_DEVICE_ADD("ym1", YM2203, 3000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65)
- MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2235,14 +2235,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::alpha68k_V)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(alpha68k_V_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(alpha68k_V_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500)
+ MCFG_DEVICE_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_V)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_V)
@@ -2268,15 +2268,15 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 3000000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w))
+ MCFG_DEVICE_ADD("ym1", YM2203, 3000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65)
- MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2284,14 +2284,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::alpha68k_V_sb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(alpha68k_V_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(alpha68k_V_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq3_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500)
+ MCFG_DEVICE_ADD("audiocpu", Z80, /*3579545*/3579545*2) /* Unlikely but needed to stop nested NMI's */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(alpha68k_state, alpha68k_sound_nmi, 8500)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,alpha68k_V)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,alpha68k_V)
@@ -2317,15 +2317,15 @@ MACHINE_CONFIG_START(alpha68k_state::alpha68k_V_sb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 3000000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(alpha68k_state, porta_w))
+ MCFG_DEVICE_ADD("ym1", YM2203, 3000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, alpha68k_state, porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65)
- MCFG_SOUND_ADD("ym2", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2333,13 +2333,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(alpha68k_state::tnextspc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
- MCFG_CPU_PROGRAM_MAP(tnextspc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
+ MCFG_DEVICE_PROGRAM_MAP(tnextspc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", alpha68k_state, irq1_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(tnextspc_sound_map)
- MCFG_CPU_IO_MAP(tnextspc_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(tnextspc_sound_map)
+ MCFG_DEVICE_IO_MAP(tnextspc_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(alpha68k_state,common)
MCFG_MACHINE_RESET_OVERRIDE(alpha68k_state,common)
@@ -2365,7 +2365,7 @@ MACHINE_CONFIG_START(alpha68k_state::tnextspc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp
index 987079e52b4..984769d4776 100644
--- a/src/mame/drivers/alphasma.cpp
+++ b/src/mame/drivers/alphasma.cpp
@@ -428,9 +428,9 @@ void alphasmart_state::machine_reset()
MACHINE_CONFIG_START(alphasmart_state::alphasmart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC68HC11, XTAL(8'000'000)/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
- MCFG_CPU_PROGRAM_MAP(alphasmart_mem)
- MCFG_CPU_IO_MAP(alphasmart_io)
+ MCFG_DEVICE_ADD("maincpu", MC68HC11, XTAL(8'000'000)/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
+ MCFG_DEVICE_PROGRAM_MAP(alphasmart_mem)
+ MCFG_DEVICE_IO_MAP(alphasmart_io)
MCFG_MC68HC11_CONFIG(0, 192, 0x00)
MCFG_KS0066_F05_ADD("ks0066_0")
@@ -459,8 +459,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asma2k_state::asma2k)
alphasmart(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(asma2k_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(asma2k_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/alphatpx.cpp b/src/mame/drivers/alphatpx.cpp
index e4ae3c3843e..3c37e024aaa 100644
--- a/src/mame/drivers/alphatpx.cpp
+++ b/src/mame/drivers/alphatpx.cpp
@@ -1205,17 +1205,17 @@ void alphatp_12_state::machine_reset()
}
MACHINE_CONFIG_START(alphatp_12_state::alphatp2)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(alphatp2_mem)
- MCFG_CPU_IO_MAP(alphatp2_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(alphatp2_mem)
+ MCFG_DEVICE_IO_MAP(alphatp2_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(alphatp_12_state, kbd_matrix_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alphatp_12_state, kbd_matrix_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(alphatp_12_state, kbd_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(alphatp_12_state, kbd_port2_w))
+ MCFG_DEVICE_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, alphatp_12_state, kbd_matrix_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, alphatp_12_state, kbd_matrix_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, alphatp_12_state, kbd_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, alphatp_12_state, kbd_port2_w))
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(alphatp2_map)
@@ -1241,16 +1241,16 @@ MACHINE_CONFIG_START(alphatp_12_state::alphatp2)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 1060 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 1060 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("uart", I8251, 0)
// XTAL(4'915'200) serial clock
MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(alphatp_12_state, fdcirq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(alphatp_12_state, fdcdrq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(alphatp_12_state, fdchld_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, alphatp_12_state, fdcirq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, alphatp_12_state, fdcdrq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, alphatp_12_state, fdchld_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", alphatp2_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", alphatp2_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
@@ -1287,17 +1287,17 @@ void alphatp_34_state::machine_reset()
m_88_da = m_85_da = m_88_started = false;
}
MACHINE_CONFIG_START(alphatp_34_state::alphatp3)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(alphatp3_mem)
- MCFG_CPU_IO_MAP(alphatp3_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(alphatp3_mem)
+ MCFG_DEVICE_IO_MAP(alphatp3_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(alphatp_34_state, kbd_matrix_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(alphatp_34_state, kbd_matrix_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(alphatp_34_state, kbd_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(alphatp_34_state, kbd_port2_w))
+ MCFG_DEVICE_ADD("kbdmcu", I8041, XTAL(12'854'400)/2)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, alphatp_34_state, kbd_matrix_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, alphatp_34_state, kbd_matrix_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, alphatp_34_state, kbd_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, alphatp_34_state, kbd_port2_w))
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(alphatp3_map)
@@ -1322,26 +1322,26 @@ MACHINE_CONFIG_START(alphatp_34_state::alphatp3)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 1060 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 1060 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("uart", I8251, 0)
// XTAL(4'915'200) serial clock
MCFG_FD1791_ADD("fdc", XTAL(4'000'000) / 4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(alphatp_34_state, fdcirq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(alphatp_34_state, fdcdrq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(alphatp_34_state, fdchld_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, alphatp_34_state, fdcirq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, alphatp_34_state, fdcdrq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, alphatp_34_state, fdchld_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", alphatp3_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", alphatp3_floppies, "525qd", floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(alphatp_34_state::alphatp30)
alphatp3(config);
- MCFG_CPU_ADD("i8088", I8088, 6000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(alphatp30_8088_map)
- MCFG_CPU_IO_MAP(alphatp30_8088_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("i8088", I8088, 6000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(alphatp30_8088_map)
+ MCFG_DEVICE_IO_MAP(alphatp30_8088_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_DISABLE()
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
@@ -1352,7 +1352,7 @@ MACHINE_CONFIG_START(alphatp_34_state::alphatp30)
MCFG_PIT8253_CLK0(100000) // 15Mhz osc with unknown divisor
MCFG_PIT8253_CLK1(100000)
MCFG_PIT8253_CLK2(100000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MACHINE_CONFIG_END
//**************************************************************************
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 13ed126e1ed..8a7b795cd58 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -700,9 +700,9 @@ static void alphatro_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(alphatro_state::alphatro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(alphatro_map)
- MCFG_CPU_IO_MAP(alphatro_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(alphatro_map)
+ MCFG_DEVICE_IO_MAP(alphatro_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -717,26 +717,26 @@ MACHINE_CONFIG_START(alphatro_state::alphatro)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) /* piezo-device needs to be measured */
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) /* piezo-device needs to be measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(alphatro_state, fdc_irq_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dmac", i8257_device, dreq2_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, alphatro_state, fdc_irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dmac", i8257_device, dreq2_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", alphatro_floppies, "525dd", alphatro_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", alphatro_floppies, "525dd", alphatro_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list", "alphatro_flop")
MCFG_DEVICE_ADD("dmac" , I8257, MAIN_CLOCK)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(alphatro_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(alphatro_state, ram0000_r))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(alphatro_state, ram0000_w))
- MCFG_I8257_IN_IOR_2_CB(DEVREAD8("fdc", upd765a_device, mdma_r))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("fdc", upd765a_device, mdma_w))
- MCFG_I8257_OUT_TC_CB(DEVWRITELINE("fdc", upd765a_device, tc_line_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, alphatro_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, alphatro_state, ram0000_r))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, alphatro_state, ram0000_w))
+ MCFG_I8257_IN_IOR_2_CB(READ8("fdc", upd765a_device, mdma_r))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("fdc", upd765a_device, mdma_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE("fdc", upd765a_device, tc_line_w))
MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(12'288'000) / 8) // clk unknown
MCFG_MC6845_SHOW_BORDER_AREA(false)
@@ -744,11 +744,11 @@ MACHINE_CONFIG_START(alphatro_state::alphatro)
MCFG_MC6845_UPDATE_ROW_CB(alphatro_state, crtc_update_row)
MCFG_DEVICE_ADD("usart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(alphatro_state, txdata_callback))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, alphatro_state, txdata_callback))
MCFG_DEVICE_ADD("usart_clock", CLOCK, 19218) // 19218 to load a real tape, 19222 to load a tape made by this driver
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("usart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("usart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("usart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("usart", i8251_device, write_rxc))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp
index 151b690cfce..2189cce98a8 100644
--- a/src/mame/drivers/altair.cpp
+++ b/src/mame/drivers/altair.cpp
@@ -100,23 +100,23 @@ void altair_state::machine_reset()
MACHINE_CONFIG_START(altair_state::altair)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("acia", acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) // TODO: this is set using jumpers S3/S2/S1/S0
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", altair_state, altair, "bin", 0)
diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp
index 655580498c6..bbcf2135b0e 100644
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@@ -283,10 +283,10 @@ MACHINE_CONFIG_START(alto2_state::alto2)
// Basic machine hardware
// SYSCLK is Display Control part A51 (tagged 29.4MHz) divided by 5(?)
// 5.8MHz according to de.wikipedia.org/wiki/Xerox_Alto
- MCFG_CPU_ADD("maincpu", ALTO2, XTAL(29'491'200)/5)
- MCFG_CPU_PROGRAM_MAP(alto2_ucode_map)
- MCFG_CPU_DATA_MAP(alto2_const_map)
- MCFG_CPU_IO_MAP(alto2_iomem_map)
+ MCFG_DEVICE_ADD("maincpu", ALTO2, XTAL(29'491'200)/5)
+ MCFG_DEVICE_PROGRAM_MAP(alto2_ucode_map)
+ MCFG_DEVICE_DATA_MAP(alto2_const_map)
+ MCFG_DEVICE_IO_MAP(alto2_iomem_map)
// Video hardware
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::white())
@@ -304,7 +304,7 @@ MACHINE_CONFIG_START(alto2_state::alto2)
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_DIABLO_DRIVES_ADD()
diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp
index 2a18b1eec5a..88e06384208 100644
--- a/src/mame/drivers/altos2.cpp
+++ b/src/mame/drivers/altos2.cpp
@@ -103,29 +103,29 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(altos2_state::altos2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) // unknown clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, 4915200) // ctc & dart connections are guesswork
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80dart_device, rxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart1", z80dart_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart2", z80dart_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, txca_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("dart1", z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart1", z80dart_device, rxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("dart1", z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("dart2", z80dart_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart2", z80dart_device, txca_w))
MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(4'000'000))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(4'000'000)) // channel B not used for communications
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("novram", x2210_device, store)) MCFG_DEVCB_INVERT // FIXME: no inverter should be needed
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("novram", x2210_device, store)) MCFG_DEVCB_INVERT // FIXME: no inverter should be needed
MCFG_DEVICE_ADD("novram", X2210, 0)
@@ -134,7 +134,7 @@ MACHINE_CONFIG_START(altos2_state::altos2)
MCFG_SCREEN_UPDATE_DRIVER(altos2_state, screen_update)
//MCFG_DEVICE_ADD("vpac", CRT9007, VPAC_CLOCK)
- //MCFG_CRT9007_INT_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg3))
+ //MCFG_CRT9007_INT_CALLBACK(WRITELINE("ctc", z80ctc_device, trg3))
//MCFG_VIDEO_SET_SCREEN("screen")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index a912487c64f..bd09ca7e382 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -133,19 +133,19 @@ void altos486_state::altos486_z80_io(address_map &map)
}
MACHINE_CONFIG_START(altos486_state::altos486)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(altos486_mem)
- MCFG_CPU_IO_MAP(altos486_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) // yes, really
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(altos486_mem)
+ MCFG_DEVICE_IO_MAP(altos486_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) // yes, really
- MCFG_CPU_ADD("iocpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(altos486_z80_mem)
- MCFG_CPU_IO_MAP(altos486_z80_io)
+ MCFG_DEVICE_ADD("iocpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(altos486_z80_mem)
+ MCFG_DEVICE_IO_MAP(altos486_z80_io)
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int0_w))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(altos486_state, read_rmx_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, altos486_state, read_rmx_ack))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
@@ -154,65 +154,65 @@ MACHINE_CONFIG_START(altos486_state::altos486)
MCFG_SLOT_FIXED(true)
MCFG_DEVICE_ADD("sio0", Z80SIO0, 4000000)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
- //MCFG_Z80DART_OUT_INT_CB(WRITELINE(altos486_state, sio_interrupt))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
+ //MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, altos486_state, sio_interrupt))
MCFG_DEVICE_ADD("sio1", Z80SIO0, 4000000)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232c", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232c", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232c", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("rs232d", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("rs232d", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232d", rs232_port_device, write_rts))
- //MCFG_Z80DART_OUT_INT_CB(WRITELINE(altos486_state, sio_interrupt))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232c", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232c", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232c", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("rs232d", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("rs232d", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE("rs232d", rs232_port_device, write_rts))
+ //MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, altos486_state, sio_interrupt))
MCFG_DEVICE_ADD("sio2", Z80SIO0, 4000000)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232_lp", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232_lp", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232_lp", rs232_port_device, write_rts))
- //MCFG_Z80DART_OUT_INT_CB(WRITELINE(altos486_state, sio_interrupt))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232_lp", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232_lp", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232_lp", rs232_port_device, write_rts))
+ //MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, altos486_state, sio_interrupt))
MCFG_DEVICE_ADD("i8274", I8274, XTAL(16'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs422_wn", rs232_port_device, write_rts))
- //MCFG_Z80DART_OUT_INT_CB(WRITELINE(altos486_state, sio_interrupt))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio0", z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio0", z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio0", z80dart_device, ctsa_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs422_wn", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs422_wn", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs422_wn", rs232_port_device, write_rts))
+ //MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, altos486_state, sio_interrupt))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio0", z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio0", z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio0", z80dart_device, ctsa_w))
//MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", altos486_terminal)
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, NULL)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio0", z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio0", z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio0", z80dart_device, ctsb_w))
-
- MCFG_RS232_PORT_ADD("rs232c", default_rs232_devices, NULL)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80dart_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs232d", default_rs232_devices, NULL)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80dart_device, ctsb_w))
-
- MCFG_RS232_PORT_ADD("rs232_lp", default_rs232_devices, NULL)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio2", z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio2", z80dart_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs422_wn", default_rs232_devices, NULL)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8274", z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("i8274", z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8274", z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio0", z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio0", z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio0", z80dart_device, ctsb_w))
+
+ MCFG_DEVICE_ADD("rs232c", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80dart_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs232d", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80dart_device, ctsb_w))
+
+ MCFG_DEVICE_ADD("rs232_lp", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio2", z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio2", z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio2", z80dart_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs422_wn", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8274", z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("i8274", z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("i8274", z80dart_device, ctsa_w))
MCFG_DEVICE_ADD("pit0", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 1d4cef15081..e121878d5e8 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -410,32 +410,32 @@ DRIVER_INIT_MEMBER( altos5_state, altos5 )
MACHINE_CONFIG_START(altos5_state::altos5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(8'000'000) / 4) // 2MHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc" ,z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc" ,z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc" ,z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc" ,z80ctc_device, trg2))
/* devices */
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(8'000'000) / 2)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(altos5_state, busreq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, altos5_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// BAO, not used
- MCFG_Z80DMA_IN_MREQ_CB(READ8(altos5_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(altos5_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(altos5_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(altos5_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, altos5_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, altos5_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, altos5_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, altos5_state, io_write_byte))
MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(altos5_state, port08_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(altos5_state, port08_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(altos5_state, port09_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(altos5_state, port09_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, altos5_state, port08_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, altos5_state, port08_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, altos5_state, port09_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, altos5_state, port09_w))
MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -449,28 +449,28 @@ MACHINE_CONFIG_START(altos5_state::altos5)
// Channel A - console #2
// WRDY connects to (altos5_state, fdc_intrq_w)
// Channel B - console #1
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) // SIO Ch B
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart" ,z80dart_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio" ,z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio" ,z80sio_device, rxca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) // Z80DART Ch B
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxtxcb_w)) // SIO Ch B
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart" ,z80dart_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio" ,z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio" ,z80sio_device, rxca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("dart", z80dart_device, rxtxcb_w)) // Z80DART Ch B
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_FD1797_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(altos5_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, altos5_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/altos8600.cpp b/src/mame/drivers/altos8600.cpp
index a4deb8b808b..3ecdff23e47 100644
--- a/src/mame/drivers/altos8600.cpp
+++ b/src/mame/drivers/altos8600.cpp
@@ -726,34 +726,34 @@ static void altos8600_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(altos8600_state::altos8600)
- MCFG_CPU_ADD("maincpu", I8086, 5_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(cpu_mem)
- MCFG_CPU_IO_MAP(cpu_io)
- MCFG_CPU_OPCODES_MAP(code_mem)
+ MCFG_DEVICE_ADD("maincpu", I8086, 5_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mem)
+ MCFG_DEVICE_IO_MAP(cpu_io)
+ MCFG_DEVICE_OPCODES_MAP(code_mem)
MCFG_I8086_STACK_MAP(stack_mem)
MCFG_I8086_CODE_MAP(code_mem)
MCFG_I8086_EXTRA_MAP(extra_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(altos8600_state, inta)
- MCFG_I8086_IF_HANDLER(WRITELINE(altos8600_state, cpuif_w))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(altos8600_state, inta)
+ MCFG_I8086_IF_HANDLER(WRITELINE(*this, altos8600_state, cpuif_w))
- MCFG_CPU_ADD("dmac", I8089, 5_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(dmac_mem)
- MCFG_CPU_IO_MAP(dmac_io)
+ MCFG_DEVICE_ADD("dmac", I8089, 5_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(dmac_mem)
+ MCFG_DEVICE_IO_MAP(dmac_io)
MCFG_I8089_DATA_WIDTH(16)
- MCFG_I8089_SINTR1(WRITELINE(altos8600_state, sintr1_w))
- MCFG_I8089_SINTR2(DEVWRITELINE("pic8259_2", pic8259_device, ir4_w))
+ MCFG_I8089_SINTR1(WRITELINE(*this, altos8600_state, sintr1_w))
+ MCFG_I8089_SINTR2(WRITELINE("pic8259_2", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(altos8600_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, altos8600_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("pic8259_3", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir3_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir3_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_RAM_ADD(RAM_TAG)
@@ -761,38 +761,38 @@ MACHINE_CONFIG_START(altos8600_state::altos8600)
//MCFG_RAM_EXTRA_OPTIONS("512K")
MCFG_DEVICE_ADD("uart8274", I8274_NEW, 16_MHz_XTAL/4)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir7_w))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsb_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir7_w))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", i8274_new_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", i8274_new_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", i8274_new_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", i8274_new_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", i8274_new_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", i8274_new_device, ctsb_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(1228800)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart8274", i8274_new_device, txca_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("uart8274", i8274_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart8274", i8274_new_device, txca_w))
MCFG_PIT8253_CLK1(1228800)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxtxcb_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart8274", i8274_new_device, rxtxcb_w))
MCFG_PIT8253_CLK2(1228800)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic8259_1", pic8259_device, ir1_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic8259_1", pic8259_device, ir1_w))
MCFG_FD1797_ADD("fd1797", 2000000)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic8259_2", pic8259_device, ir1_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(altos8600_state, fddrq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic8259_2", pic8259_device, ir1_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, altos8600_state, fddrq_w))
MCFG_FLOPPY_DRIVE_ADD("fd1797:0", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1797:1", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1797:2", altos8600_floppies, "8dd", floppy_image_device::default_floppy_formats)
@@ -800,8 +800,8 @@ MACHINE_CONFIG_START(altos8600_state::altos8600)
MCFG_DEVICE_ADD("ics", ACS8600_ICS, 0)
MCFG_ACS8600_ICS_MAINCPU(":dmac") // TODO: fixme
- MCFG_ACS8600_ICS_IRQ1(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w))
- MCFG_ACS8600_ICS_IRQ2(DEVWRITELINE("pic8259_1", pic8259_device, ir6_w))
+ MCFG_ACS8600_ICS_IRQ1(WRITELINE("pic8259_1", pic8259_device, ir5_w))
+ MCFG_ACS8600_ICS_IRQ2(WRITELINE("pic8259_1", pic8259_device, ir6_w))
MCFG_HARDDISK_ADD("hdd")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/alvg.cpp b/src/mame/drivers/alvg.cpp
index 8ba87f03e6c..ecf6842a7c2 100644
--- a/src/mame/drivers/alvg.cpp
+++ b/src/mame/drivers/alvg.cpp
@@ -46,8 +46,8 @@ DRIVER_INIT_MEMBER(alvg_state,alvg)
MACHINE_CONFIG_START(alvg_state::alvg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, 2000000)
- MCFG_CPU_PROGRAM_MAP(alvg_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(alvg_map)
MACHINE_CONFIG_END
/*----------------------------------------------------------------------------
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index f279bbbccd5..9bb46b56554 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -844,9 +844,9 @@ void amaticmg_state::machine_reset()
MACHINE_CONFIG_START(amaticmg_state::amaticmg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
- MCFG_CPU_PROGRAM_MAP(amaticmg_map)
- MCFG_CPU_IO_MAP(amaticmg_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
+ MCFG_DEVICE_PROGRAM_MAP(amaticmg_map)
+ MCFG_DEVICE_IO_MAP(amaticmg_portmap)
// MCFG_NVRAM_ADD_0FILL("nvram")
@@ -857,9 +857,9 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amaticmg_state, out_a_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amaticmg_state, out_a_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SW1"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amaticmg_state, out_c_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amaticmg_state, out_c_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -883,7 +883,7 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, SND_CLOCK) /* Y3014B DAC */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, SND_CLOCK) /* Y3014B DAC */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -898,8 +898,8 @@ WRITE_LINE_MEMBER(amaticmg_state::amaticmg2_irq)
MACHINE_CONFIG_START(amaticmg_state::amaticmg2)
amaticmg(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(amaticmg2_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(amaticmg2_portmap)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) // MG4: 0x89 -> A:out; B:out; C(h):in; C(l):in.
@@ -907,7 +907,7 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg2)
MCFG_SCREEN_UPDATE_DRIVER(amaticmg_state, screen_update_amaticmg2)
MCFG_DEVICE_MODIFY("crtc")
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(amaticmg_state, amaticmg2_irq))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amaticmg_state, amaticmg2_irq))
MCFG_GFXDECODE_MODIFY("gfxdecode", amaticmg2)
MCFG_PALETTE_MODIFY("palette")
@@ -919,8 +919,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amaticmg_state::amaticmg4)
amaticmg(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(amaticmg4_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(amaticmg4_portmap)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0) // MG4: 0x89 -> A:out; B:out; C(h):in; C(l):in.
@@ -928,7 +928,7 @@ MACHINE_CONFIG_START(amaticmg_state::amaticmg4)
MCFG_SCREEN_UPDATE_DRIVER(amaticmg_state, screen_update_amaticmg2)
MCFG_DEVICE_MODIFY("crtc")
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(amaticmg_state, amaticmg2_irq))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amaticmg_state, amaticmg2_irq))
MCFG_GFXDECODE_MODIFY("gfxdecode", amaticmg2)
MCFG_PALETTE_MODIFY("palette")
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 8e1f19fa319..2775ec4197a 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -688,19 +688,19 @@ WRITE8_MEMBER(ambush_state::output_latches_w)
//**************************************************************************
MACHINE_CONFIG_START(ambush_state::ambush)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ambush_state, irq0_line_hold)
// addressable latches at 8B and 8C
MCFG_DEVICE_ADD("outlatch1", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ambush_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ambush_state, color_bank_1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ambush_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w))
MCFG_DEVICE_ADD("outlatch2", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ambush_state, color_bank_2_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ambush_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ambush_state, color_bank_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_2_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -719,26 +719,26 @@ MACHINE_CONFIG_START(ambush_state::ambush)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8912, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_ADD("ay1", AY8912, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_ADD("ay2", AY8912, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ambush_state::mariobl)
ambush(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
// To be verified: do these bootlegs only have one LS259?
MCFG_DEVICE_REMOVE("outlatch1")
MCFG_DEVICE_REMOVE("outlatch2")
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ambush_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ambush_state, color_bank_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ambush_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ambush_state, color_bank_1_w))
MCFG_MACHINE_START_OVERRIDE(ambush_state, mariobl)
@@ -750,11 +750,11 @@ MACHINE_CONFIG_START(ambush_state::mariobl)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(ambush_state, mario)
- MCFG_SOUND_REPLACE("ay1", AY8910, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_REPLACE("ay1", AY8910, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("buttons"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_REPLACE("ay2", AY8910, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_REPLACE("ay2", AY8910, XTAL(18'432'000)/6/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("joystick"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index fd11323d847..c6c03c47a30 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -79,14 +79,14 @@ void amerihok_state::machine_reset()
MACHINE_CONFIG_START(amerihok_state::amerihok)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8681, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(amerihok_map)
- MCFG_CPU_DATA_MAP(amerihok_data_map)
+ MCFG_DEVICE_ADD("maincpu", Z8681, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(amerihok_map)
+ MCFG_DEVICE_DATA_MAP(amerihok_data_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, 1000000) // 64-pin QFP (probably actually MSM6650)
+ MCFG_DEVICE_ADD("oki", OKIM6376, 1000000) // 64-pin QFP (probably actually MSM6650)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp
index 080338c1e28..b2731a7d6d8 100644
--- a/src/mame/drivers/amico2k.cpp
+++ b/src/mame/drivers/amico2k.cpp
@@ -215,17 +215,17 @@ void amico2k_state::machine_start()
MACHINE_CONFIG_START(amico2k_state::amico2k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1MHz */
- MCFG_CPU_PROGRAM_MAP(amico2k_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000) /* 1MHz */
+ MCFG_DEVICE_PROGRAM_MAP(amico2k_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_amico2k )
MCFG_DEVICE_ADD("i8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(amico2k_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amico2k_state, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(amico2k_state, ppi_pb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(amico2k_state, ppi_pb_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, amico2k_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amico2k_state, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, amico2k_state, ppi_pb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, amico2k_state, ppi_pb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 7bbc48c355a..27b371d798b 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -1382,35 +1382,35 @@ MACHINE_CONFIG_START(amiga_state::amiga_base)
// cia
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_PAL)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("cia_0_port_a"))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE("centronics", centronics_device, write_strobe))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE("kbd", amiga_keyboard_bus_device, kdat_in_w)) MCFG_DEVCB_INVERT
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE("kbd", amiga_keyboard_bus_device, kdat_in_w)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_PAL)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(amiga_state, cia_1_port_a_read))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_1_port_a_write))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8("fdc", amiga_fdc_device, ciaaprb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, amiga_state, cia_1_port_a_read))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_1_port_a_write))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8("fdc", amiga_fdc_device, ciaaprb_w))
// audio
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_PAL)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_PAL)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(2, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
- MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w))
+ MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w))
// floppy drives
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_PAL)
- MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r))
- MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w))
- MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w))
- MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w))
+ MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w))
+ MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", amiga_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, nullptr, amiga_fdc_device::floppy_formats)
@@ -1421,26 +1421,26 @@ MACHINE_CONFIG_START(amiga_state::amiga_base)
MCFG_FLOPPY_DRIVE_SOUND(true)
// rs232
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(amiga_state, rs232_rx_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(amiga_state, rs232_dcd_w))
- MCFG_RS232_DSR_HANDLER(WRITELINE(amiga_state, rs232_dsr_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(amiga_state, rs232_ri_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(amiga_state, rs232_cts_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, amiga_state, rs232_rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, amiga_state, rs232_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(*this, amiga_state, rs232_dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(*this, amiga_state, rs232_ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, amiga_state, rs232_cts_w))
// centronics
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(amiga_state, centronics_ack_w))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amiga_state, centronics_busy_w))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(amiga_state, centronics_perror_w))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(amiga_state, centronics_select_w))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, amiga_state, centronics_ack_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, amiga_state, centronics_busy_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, amiga_state, centronics_perror_w))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, amiga_state, centronics_select_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
// keyboard
MCFG_AMIGA_KEYBOARD_INTERFACE_ADD("kbd", "a500_us")
- MCFG_AMIGA_KEYBOARD_KCLK_HANDLER(DEVWRITELINE("cia_0", mos8520_device, cnt_w))
- MCFG_AMIGA_KEYBOARD_KDAT_HANDLER(DEVWRITELINE("cia_0", mos8520_device, sp_w))
- MCFG_AMIGA_KEYBOARD_KRST_HANDLER(WRITELINE(amiga_state, kbreset_w))
+ MCFG_AMIGA_KEYBOARD_KCLK_HANDLER(WRITELINE("cia_0", mos8520_device, cnt_w))
+ MCFG_AMIGA_KEYBOARD_KDAT_HANDLER(WRITELINE("cia_0", mos8520_device, sp_w))
+ MCFG_AMIGA_KEYBOARD_KRST_HANDLER(WRITELINE(*this, amiga_state, kbreset_w))
// software
MCFG_SOFTWARE_LIST_ADD("wb_list", "amiga_workbench")
@@ -1453,8 +1453,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a1000_state::a1000)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(a1000_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(a1000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(a1000_overlay_map)
@@ -1492,8 +1492,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a2000_state::a2000)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(a2000_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(a2000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map)
@@ -1510,8 +1510,8 @@ MACHINE_CONFIG_START(a2000_state::a2000)
// zorro slots
MCFG_ZORRO2_ADD("maincpu")
- MCFG_ZORRO2_INT2_HANDLER(WRITELINE(a2000_state, zorro2_int2_w))
- MCFG_ZORRO2_INT6_HANDLER(WRITELINE(a2000_state, zorro2_int6_w))
+ MCFG_ZORRO2_INT2_HANDLER(WRITELINE(*this, a2000_state, zorro2_int2_w))
+ MCFG_ZORRO2_INT6_HANDLER(WRITELINE(*this, a2000_state, zorro2_int6_w))
MCFG_ZORRO2_SLOT_ADD("zorro1", zorro2_cards, nullptr)
MCFG_ZORRO2_SLOT_ADD("zorro2", zorro2_cards, nullptr)
MCFG_ZORRO2_SLOT_ADD("zorro3", zorro2_cards, nullptr)
@@ -1538,8 +1538,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a500_state::a500)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(a500_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(a500_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
//MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map)
@@ -1551,8 +1551,8 @@ MACHINE_CONFIG_START(a500_state::a500)
// cpu slot
MCFG_EXPANSION_SLOT_ADD("maincpu", a500_expansion_cards, nullptr)
- MCFG_EXPANSION_SLOT_INT2_HANDLER(WRITELINE(a500_state, side_int2_w))
- MCFG_EXPANSION_SLOT_INT6_HANDLER(WRITELINE(a500_state, side_int6_w))
+ MCFG_EXPANSION_SLOT_INT2_HANDLER(WRITELINE(*this, a500_state, side_int2_w))
+ MCFG_EXPANSION_SLOT_INT6_HANDLER(WRITELINE(*this, a500_state, side_int6_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(a500_state::a500n)
@@ -1574,18 +1574,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cdtv_state::cdtv)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(cdtv_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(cdtv_mem)
// remote control input converter
- MCFG_CPU_ADD("u75", M6502, XTAL(3'000'000))
- MCFG_CPU_PROGRAM_MAP(cdtv_rc_mem)
+ MCFG_DEVICE_ADD("u75", M6502, XTAL(3'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(cdtv_rc_mem)
MCFG_DEVICE_DISABLE()
// lcd controller
#if 0
- MCFG_CPU_ADD("u62", LC6554, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(lcd_mem)
+ MCFG_DEVICE_ADD("u62", LC6554, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(lcd_mem)
#endif
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
@@ -1606,24 +1606,24 @@ MACHINE_CONFIG_START(cdtv_state::cdtv)
// cd-rom controller
MCFG_DMAC_ADD("u36", amiga_state::CLK_7M_PAL)
- MCFG_DMAC_SCSI_READ_HANDLER(READ8(cdtv_state, dmac_scsi_data_read))
- MCFG_DMAC_SCSI_WRITE_HANDLER(WRITE8(cdtv_state, dmac_scsi_data_write))
- MCFG_DMAC_IO_READ_HANDLER(READ8(cdtv_state, dmac_io_read))
- MCFG_DMAC_IO_WRITE_HANDLER(WRITE8(cdtv_state, dmac_io_write))
- MCFG_DMAC_INT_HANDLER(WRITELINE(cdtv_state, dmac_int_w))
+ MCFG_DMAC_SCSI_READ_HANDLER(READ8(*this, cdtv_state, dmac_scsi_data_read))
+ MCFG_DMAC_SCSI_WRITE_HANDLER(WRITE8(*this, cdtv_state, dmac_scsi_data_write))
+ MCFG_DMAC_IO_READ_HANDLER(READ8(*this, cdtv_state, dmac_io_read))
+ MCFG_DMAC_IO_WRITE_HANDLER(WRITE8(*this, cdtv_state, dmac_io_write))
+ MCFG_DMAC_INT_HANDLER(WRITELINE(*this, cdtv_state, dmac_int_w))
MCFG_DEVICE_ADD("u32", TPI6525, 0)
- MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(cdtv_state, tpi_int_w))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cdtv_state, tpi_port_b_write))
+ MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(*this, cdtv_state, tpi_int_w))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cdtv_state, tpi_port_b_write))
// cd-rom
MCFG_CR511B_ADD("cdrom")
- MCFG_CR511B_SCOR_HANDLER(DEVWRITELINE("u32", tpi6525_device, i1_w)) MCFG_DEVCB_INVERT
- MCFG_CR511B_STCH_HANDLER(DEVWRITELINE("u32", tpi6525_device, i2_w)) MCFG_DEVCB_INVERT
- MCFG_CR511B_STEN_HANDLER(DEVWRITELINE("u32", tpi6525_device, i3_w))
- MCFG_CR511B_XAEN_HANDLER(DEVWRITELINE("u32", tpi6525_device, pb2_w))
- MCFG_CR511B_DRQ_HANDLER(DEVWRITELINE("u36", amiga_dmac_device, xdreq_w))
- MCFG_CR511B_DTEN_HANDLER(DEVWRITELINE("u36", amiga_dmac_device, xdreq_w))
+ MCFG_CR511B_SCOR_HANDLER(WRITELINE("u32", tpi6525_device, i1_w)) MCFG_DEVCB_INVERT
+ MCFG_CR511B_STCH_HANDLER(WRITELINE("u32", tpi6525_device, i2_w)) MCFG_DEVCB_INVERT
+ MCFG_CR511B_STEN_HANDLER(WRITELINE("u32", tpi6525_device, i3_w))
+ MCFG_CR511B_XAEN_HANDLER(WRITELINE("u32", tpi6525_device, pb2_w))
+ MCFG_CR511B_DRQ_HANDLER(WRITELINE("u36", amiga_dmac_device, xdreq_w))
+ MCFG_CR511B_DTEN_HANDLER(WRITELINE("u36", amiga_dmac_device, xdreq_w))
// software
MCFG_SOFTWARE_LIST_ADD("cd_list", "cdtv")
@@ -1650,8 +1650,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a3000_state::a3000)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68030, XTAL(32'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(a3000_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, XTAL(32'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(a3000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_1mb_map32)
@@ -1685,8 +1685,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a500p_state::a500p)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(a500p_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(a500p_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_1mb_map)
@@ -1724,8 +1724,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a600_state::a600)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
- MCFG_CPU_PROGRAM_MAP(a600_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(a600_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_2mb_map16)
@@ -1735,14 +1735,14 @@ MACHINE_CONFIG_START(a600_state::a600)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x200000)
MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a600_state::GAYLE_ID)
- MCFG_GAYLE_INT2_HANDLER(WRITELINE(a600_state, gayle_int2_w))
- MCFG_GAYLE_CS0_READ_HANDLER(DEVREAD16("ata", ata_interface_device, read_cs0))
- MCFG_GAYLE_CS0_WRITE_HANDLER(DEVWRITE16("ata", ata_interface_device, write_cs0))
- MCFG_GAYLE_CS1_READ_HANDLER(DEVREAD16("ata", ata_interface_device, read_cs1))
- MCFG_GAYLE_CS1_WRITE_HANDLER(DEVWRITE16("ata", ata_interface_device, write_cs1))
+ MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a600_state, gayle_int2_w))
+ MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, read_cs0))
+ MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs0))
+ MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, read_cs1))
+ MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs1))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("gayle", gayle_device, ide_interrupt_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("gayle", gayle_device, ide_interrupt_w))
// todo: pcmcia
@@ -1771,8 +1771,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a1200_state::a1200)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
- MCFG_CPU_PROGRAM_MAP(a1200_mem)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(a1200_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_2mb_map32)
@@ -1790,14 +1790,14 @@ MACHINE_CONFIG_START(a1200_state::a1200)
MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
MCFG_GAYLE_ADD("gayle", amiga_state::CLK_28M_PAL / 2, a1200_state::GAYLE_ID)
- MCFG_GAYLE_INT2_HANDLER(WRITELINE(a1200_state, gayle_int2_w))
- MCFG_GAYLE_CS0_READ_HANDLER(DEVREAD16("ata", ata_interface_device, read_cs0))
- MCFG_GAYLE_CS0_WRITE_HANDLER(DEVWRITE16("ata", ata_interface_device, write_cs0))
- MCFG_GAYLE_CS1_READ_HANDLER(DEVREAD16("ata", ata_interface_device, read_cs1))
- MCFG_GAYLE_CS1_WRITE_HANDLER(DEVWRITE16("ata", ata_interface_device, write_cs1))
+ MCFG_GAYLE_INT2_HANDLER(WRITELINE(*this, a1200_state, gayle_int2_w))
+ MCFG_GAYLE_CS0_READ_HANDLER(READ16("ata", ata_interface_device, read_cs0))
+ MCFG_GAYLE_CS0_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs0))
+ MCFG_GAYLE_CS1_READ_HANDLER(READ16("ata", ata_interface_device, read_cs1))
+ MCFG_GAYLE_CS1_WRITE_HANDLER(WRITE16("ata", ata_interface_device, write_cs1))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("gayle", gayle_device, ide_interrupt_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("gayle", gayle_device, ide_interrupt_w))
// keyboard
#if 0
@@ -1836,8 +1836,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a4000_state::a4000)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(a4000_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(a4000_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_2mb_map32)
@@ -1859,7 +1859,7 @@ MACHINE_CONFIG_START(a4000_state::a4000)
// ide
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(a4000_state, ide_interrupt_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, a4000_state, ide_interrupt_w))
// todo: zorro3
@@ -1889,8 +1889,8 @@ MACHINE_CONFIG_START(a4000_state::a400030)
a4000(config);
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68EC030, XTAL(50'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(a400030_mem)
+ MCFG_DEVICE_ADD("maincpu", M68EC030, XTAL(50'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(a400030_mem)
// todo: ide
MACHINE_CONFIG_END
@@ -1915,8 +1915,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cd32_state::cd32)
amiga_base(config);
// main cpu
- MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
- MCFG_CPU_PROGRAM_MAP(cd32_mem)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cd32_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_2mb_map32)
@@ -1930,12 +1930,12 @@ MACHINE_CONFIG_START(cd32_state::cd32)
MCFG_I2CMEM_DATA_SIZE(1024)
MCFG_AKIKO_ADD("akiko")
- MCFG_AKIKO_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_AKIKO_MEM_WRITE_CB(WRITE16(amiga_state, chip_ram_w))
- MCFG_AKIKO_INT_CB(WRITELINE(cd32_state, akiko_int_w))
- MCFG_AKIKO_SCL_HANDLER(DEVWRITELINE("i2cmem", i2cmem_device, write_scl))
- MCFG_AKIKO_SDA_READ_HANDLER(DEVREADLINE("i2cmem", i2cmem_device, read_sda))
- MCFG_AKIKO_SDA_WRITE_HANDLER(DEVWRITELINE("i2cmem", i2cmem_device, write_sda))
+ MCFG_AKIKO_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AKIKO_MEM_WRITE_CB(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AKIKO_INT_CB(WRITELINE(*this, cd32_state, akiko_int_w))
+ MCFG_AKIKO_SCL_HANDLER(WRITELINE("i2cmem", i2cmem_device, write_scl))
+ MCFG_AKIKO_SDA_READ_HANDLER(READLINE("i2cmem", i2cmem_device, read_sda))
+ MCFG_AKIKO_SDA_WRITE_HANDLER(WRITELINE("i2cmem", i2cmem_device, write_sda))
MCFG_DEVICE_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga_aga)
@@ -1945,12 +1945,12 @@ MACHINE_CONFIG_START(cd32_state::cd32)
MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga)
- MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_DEVICE_MODIFY("cia_0")
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cd32_state, akiko_cia_0_port_a_write))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, cd32_state, akiko_cia_0_port_a_write))
MCFG_MOS6526_SP_CALLBACK(NOOP)
MCFG_CDROM_ADD("cdrom")
@@ -1982,8 +1982,8 @@ MACHINE_CONFIG_START(a4000_state::a4000t)
a4000(config);
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(a4000t_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(50'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(a4000t_mem)
// todo: ide, zorro3, scsi, super dmac
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ampex.cpp b/src/mame/drivers/ampex.cpp
index 72ba0eec193..ec713d251f4 100644
--- a/src/mame/drivers/ampex.cpp
+++ b/src/mame/drivers/ampex.cpp
@@ -206,8 +206,8 @@ void ampex_state::machine_start()
}
MACHINE_CONFIG_START(ampex_state::ampex)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(23'814'000) / 9) // clocked by 8224?
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(23'814'000) / 9) // clocked by 8224?
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(23'814'000) / 2, 105 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 270, 0, 250)
@@ -215,17 +215,17 @@ MACHINE_CONFIG_START(ampex_state::ampex)
MCFG_DEVICE_ADD("vtac", CRT5037, XTAL(23'814'000) / 2 / CHAR_WIDTH)
MCFG_TMS9927_CHAR_WIDTH(CHAR_WIDTH)
- MCFG_TMS9927_VSYN_CALLBACK(WRITELINE(ampex_state, vsyn_w))
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE(*this, ampex_state, vsyn_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD("uart", AY31015, 0) // COM8017, actually
- MCFG_AY31015_WRITE_SO_CB(WRITELINE(ampex_state, so_w))
- MCFG_AY31015_WRITE_DAV_CB(WRITELINE(ampex_state, dav_w))
+ MCFG_AY31015_WRITE_SO_CB(WRITELINE(*this, ampex_state, so_w))
+ MCFG_AY31015_WRITE_DAV_CB(WRITELINE(*this, ampex_state, dav_w))
MCFG_AY31015_AUTO_RDAV(true)
MCFG_DEVICE_ADD("dbrg", COM5016_5, XTAL(4'915'200))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("uart", ay31015_device, write_rcp))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("uart", ay31015_device, write_tcp))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("uart", ay31015_device, write_rcp))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("uart", ay31015_device, write_tcp))
MACHINE_CONFIG_END
ROM_START( dialog80 )
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index f31602615fa..992ecefad17 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -1149,10 +1149,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(ampoker2_state::ampoker2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(ampoker2_map)
- MCFG_CPU_IO_MAP(ampoker2_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(ampoker2_state, nmi_line_pulse, 1536)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ampoker2_map)
+ MCFG_DEVICE_IO_MAP(ampoker2_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ampoker2_state, nmi_line_pulse, 1536)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(200)) /* 200 ms, measured */
@@ -1176,7 +1176,7 @@ MACHINE_CONFIG_START(ampoker2_state::ampoker2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4) /* 1.5 MHz, measured */
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/4) /* 1.5 MHz, measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 91d0477a4b3..4af3485c8b8 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -151,31 +151,31 @@ DRIVER_INIT_MEMBER( ampro_state, ampro )
MACHINE_CONFIG_START(ampro_state::ampro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ampro_mem)
- MCFG_CPU_IO_MAP(ampro_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ampro_mem)
+ MCFG_DEVICE_IO_MAP(ampro_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_MACHINE_RESET_OVERRIDE(ampro_state, ampro)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(16'000'000) / 8) // 2MHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
/* Devices */
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w)) // SIO Ch B
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("dart", z80dart_device, txca_w)) // Z80DART Ch A, SIO Ch A
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("dart", z80dart_device, rxtxcb_w)) // SIO Ch B
MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("dart", z80dart_device, rxa_w))
MCFG_WD1772_ADD("fdc", XTAL(16'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ampro_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/ampscarp.cpp b/src/mame/drivers/ampscarp.cpp
index 174151dc9b3..6af6ff6e4fe 100644
--- a/src/mame/drivers/ampscarp.cpp
+++ b/src/mame/drivers/ampscarp.cpp
@@ -37,8 +37,8 @@ static INPUT_PORTS_START( ampscarp )
INPUT_PORTS_END
MACHINE_CONFIG_START(ampscarp_state::ampscarp)
- MCFG_CPU_ADD("maincpu", MC68HC11, 8'000'000) // type and clock unknown
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", MC68HC11, 8'000'000) // type and clock unknown
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
ROM_START( ampscarp )
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp
index 019cf659497..8a398a08118 100644
--- a/src/mame/drivers/amspdwy.cpp
+++ b/src/mame/drivers/amspdwy.cpp
@@ -250,13 +250,13 @@ void amspdwy_state::machine_reset()
MACHINE_CONFIG_START(amspdwy_state::amspdwy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3000000)
- MCFG_CPU_PROGRAM_MAP(amspdwy_map)
- MCFG_CPU_IO_MAP(amspdwy_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", amspdwy_state, irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
+ MCFG_DEVICE_ADD("maincpu", Z80, 3000000)
+ MCFG_DEVICE_PROGRAM_MAP(amspdwy_map)
+ MCFG_DEVICE_IO_MAP(amspdwy_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", amspdwy_state, irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
- MCFG_CPU_ADD("audiocpu", Z80, 3000000)
- MCFG_CPU_PROGRAM_MAP(amspdwy_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)
+ MCFG_DEVICE_PROGRAM_MAP(amspdwy_sound_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index d2aedc4bebc..9ed1230a6c8 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -487,34 +487,35 @@ void amstrad_pc_state::cfg_com(device_t *device)
MACHINE_CONFIG_START(amstrad_pc_state::pc200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 8000000)
- MCFG_CPU_PROGRAM_MAP(ppc640_map)
- MCFG_CPU_IO_MAP(pc200_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(ppc640_map)
+ MCFG_DEVICE_IO_MAP(pc200_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "aga", pc_isa8_cards, "aga_pc200", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "fdc", pc_isa8_cards, "fdc_xt", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "com", pc_isa8_cards, "com", true)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("aga", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "aga_pc200", true)
+ MCFG_DEVICE_ADD("fdc", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", true)
+ MCFG_DEVICE_ADD("com", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("com", cfg_com)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* printer */
MCFG_DEVICE_ADD("lpt_0", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(DEVWRITELINE("mb:pic8259", pic8259_device, ir7_w))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE("mb:pic8259", pic8259_device, ir7_w))
MCFG_DEVICE_ADD("lpt_1", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(DEVWRITELINE("mb:pic8259", pic8259_device, ir7_w))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE("mb:pic8259", pic8259_device, ir7_w))
MCFG_DEVICE_ADD("lpt_2", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(DEVWRITELINE("mb:pic8259", pic8259_device, ir5_w))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE("mb:pic8259", pic8259_device, ir5_w))
MCFG_PC_JOY_ADD("pc_joy")
- MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE("mb:pic8259", pic8259_device, ir1_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -524,16 +525,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_pc_state::pc2086)
pc200(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pc2086_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pc2086_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_pc_state::ppc640)
pc200(config);
- MCFG_CPU_REPLACE("maincpu", V30, 8000000)
- MCFG_CPU_PROGRAM_MAP(ppc640_map)
- MCFG_CPU_IO_MAP(ppc512_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu", V30, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(ppc640_map)
+ MCFG_DEVICE_IO_MAP(ppc512_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_REMOVE("isa1")
MCFG_DEVICE_REMOVE("isa2")
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index 1d378d3fc46..c7dfd59874f 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -909,10 +909,10 @@ void amstrad_centronics_devices(device_slot_interface &device)
MACHINE_CONFIG_START(amstrad_state::amstrad_base)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(amstrad_mem)
- MCFG_CPU_IO_MAP(amstrad_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(amstrad_mem)
+ MCFG_DEVICE_IO_MAP(amstrad_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -920,16 +920,16 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, amstrad )
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(amstrad_state, amstrad_ppi_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amstrad_state, amstrad_ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(amstrad_state, amstrad_ppi_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amstrad_state, amstrad_ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amstrad_state, amstrad_ppi_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, amstrad_state, amstrad_ppi_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amstrad_state, amstrad_ppi_portc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( XTAL(16'000'000), 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
@@ -939,10 +939,10 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_MC6845_ADD("mc6845", HD6845, nullptr, XTAL(16'000'000) / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_de_changed))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(amstrad_state, amstrad_hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(amstrad_state, amstrad_vsync_changed))
- MCFG_MC6845_OUT_CUR_CB(DEVWRITELINE("exp", cpc_expansion_slot_device, cursor_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, amstrad_state, amstrad_de_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_vsync_changed))
+ MCFG_MC6845_OUT_CUR_CB(WRITELINE("exp", cpc_expansion_slot_device, cursor_w))
MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad)
@@ -950,13 +950,13 @@ MACHINE_CONFIG_START(amstrad_state::amstrad_base)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL(16'000'000) / 16)
- MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
+ MCFG_DEVICE_ADD("ay", AY8912, XTAL(16'000'000) / 16)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* printer */
MCFG_CENTRONICS_ADD("centronics", amstrad_centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amstrad_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, amstrad_state, write_centronics_busy))
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", amstrad_state, amstrad, "sna", 0)
@@ -976,8 +976,8 @@ MACHINE_CONFIG_START(amstrad_state::cpc464)
MCFG_DEVICE_SLOT_INTERFACE(cpc464_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(amstrad_state, cpc_romdis)) // ROMDIS
- MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(amstrad_state,rom_select))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(*this, amstrad_state, cpc_romdis)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(*this, amstrad_state,rom_select))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -996,8 +996,8 @@ MACHINE_CONFIG_START(amstrad_state::cpc664)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(amstrad_state, cpc_romdis)) // ROMDIS
- MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(amstrad_state,rom_select))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(*this, amstrad_state, cpc_romdis)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(*this, amstrad_state,rom_select))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1016,8 +1016,8 @@ MACHINE_CONFIG_START(amstrad_state::cpc6128)
MCFG_DEVICE_SLOT_INTERFACE(cpc_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(amstrad_state, cpc_romdis)) // ROMDIS
- MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(amstrad_state,rom_select))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(*this, amstrad_state, cpc_romdis)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(*this, amstrad_state,rom_select))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1038,10 +1038,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::cpcplus)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
- MCFG_CPU_PROGRAM_MAP(amstrad_mem)
- MCFG_CPU_IO_MAP(amstrad_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
+ MCFG_DEVICE_PROGRAM_MAP(amstrad_mem)
+ MCFG_DEVICE_IO_MAP(amstrad_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1049,16 +1049,16 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, plus )
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(amstrad_state, amstrad_ppi_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amstrad_state, amstrad_ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(amstrad_state, amstrad_ppi_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amstrad_state, amstrad_ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amstrad_state, amstrad_ppi_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, amstrad_state, amstrad_ppi_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amstrad_state, amstrad_ppi_portc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
@@ -1068,9 +1068,9 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(amstrad_state, amstrad_plus_hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(amstrad_state, amstrad_plus_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, amstrad_state, amstrad_plus_de_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_vsync_changed))
MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad)
@@ -1078,13 +1078,13 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
- MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
+ MCFG_DEVICE_ADD("ay", AY8912, XTAL(40'000'000) / 40)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(amstrad_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, amstrad_state, write_centronics_busy))
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", amstrad_state, amstrad, "sna", 0)
@@ -1105,8 +1105,8 @@ MACHINE_CONFIG_START(amstrad_state::cpcplus)
MCFG_DEVICE_SLOT_INTERFACE(cpcplus_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(amstrad_state, cpc_romdis)) // ROMDIS
- MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(amstrad_state,rom_select))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(*this, amstrad_state, cpc_romdis)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(*this, amstrad_state,rom_select))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1117,10 +1117,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(amstrad_state::gx4000)
/* Machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
- MCFG_CPU_PROGRAM_MAP(amstrad_mem)
- MCFG_CPU_IO_MAP(amstrad_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(40'000'000) / 10)
+ MCFG_DEVICE_PROGRAM_MAP(amstrad_mem)
+ MCFG_DEVICE_IO_MAP(amstrad_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(amstrad_state,amstrad_cpu_acknowledge_int)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1128,16 +1128,16 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state, gx4000 )
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(amstrad_state, amstrad_ppi_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amstrad_state, amstrad_ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(amstrad_state, amstrad_ppi_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amstrad_state, amstrad_ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, amstrad_state, amstrad_ppi_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amstrad_state, amstrad_ppi_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, amstrad_state, amstrad_ppi_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amstrad_state, amstrad_ppi_portc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( ( XTAL(40'000'000) * 2 ) / 5, 1024, 32, 32 + 640 + 64, 312, 56 + 15, 200 + 15 )
MCFG_SCREEN_UPDATE_DRIVER(amstrad_state, screen_update_amstrad)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(amstrad_state, screen_vblank_amstrad))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, amstrad_state, screen_vblank_amstrad))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
@@ -1147,16 +1147,16 @@ MACHINE_CONFIG_START(amstrad_state::gx4000)
MCFG_MC6845_ADD("mc6845", AMS40489, nullptr, XTAL(40'000'000) / 40)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(amstrad_state, amstrad_plus_de_changed))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(amstrad_state, amstrad_plus_hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(amstrad_state, amstrad_plus_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, amstrad_state, amstrad_plus_de_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, amstrad_state, amstrad_plus_vsync_changed))
MCFG_VIDEO_START_OVERRIDE(amstrad_state,amstrad)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8912, XTAL(40'000'000) / 40)
- MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
+ MCFG_DEVICE_ADD("ay", AY8912, XTAL(40'000'000) / 40)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
cpcplus_cartslot(config);
@@ -1172,8 +1172,8 @@ MACHINE_CONFIG_START(amstrad_state::aleste)
MCFG_MACHINE_START_OVERRIDE(amstrad_state,aleste)
MCFG_MACHINE_RESET_OVERRIDE(amstrad_state,aleste)
- MCFG_SOUND_REPLACE("ay", AY8912, XTAL(16'000'000) / 16)
- MCFG_AY8910_PORT_A_READ_CB(READ8(amstrad_state, amstrad_psg_porta_read)) /* portA read */
+ MCFG_DEVICE_REPLACE("ay", AY8912, XTAL(16'000'000) / 16)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, amstrad_state, amstrad_psg_porta_read)) /* portA read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_PALETTE_MODIFY("palette")
@@ -1189,8 +1189,8 @@ MACHINE_CONFIG_START(amstrad_state::aleste)
MCFG_DEVICE_SLOT_INTERFACE(aleste_exp_cards, nullptr, false)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(INPUTLINE("maincpu", 0))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(amstrad_state, cpc_romdis)) // ROMDIS
- MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(amstrad_state,rom_select))
+ MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE(*this, amstrad_state, cpc_romdis)) // ROMDIS
+ MCFG_CPC_EXPANSION_SLOT_ROM_SELECT(WRITE8(*this, amstrad_state,rom_select))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", aleste_floppies, "35dd", amstrad_state::aleste_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", aleste_floppies, "35dd", amstrad_state::aleste_floppy_formats)
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index 26c0bd2a8f2..b2ddd42d138 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -533,24 +533,24 @@ PALETTE_INIT_MEMBER(amusco_state,amusco)
MACHINE_CONFIG_START(amusco_state::amusco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK) // 5 MHz ?
- MCFG_CPU_PROGRAM_MAP(amusco_mem_map)
- MCFG_CPU_IO_MAP(amusco_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, CPU_CLOCK) // 5 MHz ?
+ MCFG_DEVICE_PROGRAM_MAP(amusco_mem_map)
+ MCFG_DEVICE_IO_MAP(amusco_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(PIT_CLOCK0)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(PIT_CLOCK1)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pic8259", pic8259_device, ir2_w))
MCFG_DEVICE_ADD("ppi_outputs", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amusco_state, output_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(amusco_state, output_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amusco_state, output_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amusco_state, output_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, amusco_state, output_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amusco_state, output_c_w))
MCFG_DEVICE_ADD("ppi_inputs", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -558,16 +558,16 @@ MACHINE_CONFIG_START(amusco_state::amusco)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("lpt_interface", I8155, 0)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(amusco_state, lpt_data_w))
- MCFG_I8155_IN_PORTB_CB(READ8(amusco_state, lpt_status_r))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, amusco_state, lpt_data_w))
+ MCFG_I8155_IN_PORTB_CB(READ8(*this, amusco_state, lpt_status_r))
// Port C uses ALT 3 mode, which MAME does not currently emulate
MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("rtc_interface", I8155, 0)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(amusco_state, rtc_control_w))
- MCFG_I8155_IN_PORTC_CB(DEVREAD8("rtc", msm5832_device, data_r))
- MCFG_I8155_OUT_PORTC_CB(DEVWRITE8("rtc", msm5832_device, data_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, amusco_state, rtc_control_w))
+ MCFG_I8155_IN_PORTC_CB(READ8("rtc", msm5832_device, data_r))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8("rtc", msm5832_device, data_w))
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(30), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
@@ -588,12 +588,12 @@ MACHINE_CONFIG_START(amusco_state::amusco)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_ADDR_CHANGED_CB(amusco_state, crtc_addr)
- MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w)) // IRQ1 sets 0x918 bit 3
+ MCFG_MC6845_OUT_DE_CB(WRITELINE("pic8259", pic8259_device, ir1_w)) // IRQ1 sets 0x918 bit 3
MCFG_MC6845_UPDATE_ROW_CB(amusco_state, update_row)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn", SN76489A, SND_CLOCK)
+ MCFG_DEVICE_ADD("sn", SN76489A, SND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index 83b93c60246..e64a9de40b1 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -378,10 +378,10 @@ DRIVER_INIT_MEMBER( amust_state, amust )
MACHINE_CONFIG_START(amust_state::amust)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", amust_state, irq_vs)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", amust_state, irq_vs)
MCFG_MACHINE_RESET_OVERRIDE(amust_state, amust)
/* video hardware */
@@ -396,7 +396,7 @@ MACHINE_CONFIG_START(amust_state::amust)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 800)
+ MCFG_DEVICE_ADD("beeper", BEEP, 800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -412,39 +412,39 @@ MACHINE_CONFIG_START(amust_state::amust)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
MCFG_DEVICE_ADD("uart2", I8251, 0)
- //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ //MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ //MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(amust_state, port04_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amust_state, port04_w))
- MCFG_I8255_IN_PORTB_CB(READ8(amust_state, port05_r))
- MCFG_I8255_IN_PORTC_CB(READ8(amust_state, port06_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amust_state, port06_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, amust_state, port04_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amust_state, port04_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, amust_state, port05_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, amust_state, port06_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amust_state, port06_w))
MCFG_DEVICE_ADD("ppi2", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(amust_state, port08_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(amust_state, port08_w))
- MCFG_I8255_IN_PORTB_CB(READ8(amust_state, port09_r))
- MCFG_I8255_IN_PORTC_CB(READ8(amust_state, port0a_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(amust_state, port0a_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, amust_state, port08_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, amust_state, port08_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, amust_state, port09_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, amust_state, port0a_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, amust_state, port0a_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/anes.cpp b/src/mame/drivers/anes.cpp
index 9087fbda23f..6e2adfcaf90 100644
--- a/src/mame/drivers/anes.cpp
+++ b/src/mame/drivers/anes.cpp
@@ -156,10 +156,10 @@ void anes_state::machine_start()
MACHINE_CONFIG_START(anes_state::anes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 2) // Z0840008PSC
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", anes_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 2) // Z0840008PSC
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", anes_state, irq0_line_hold)
// all wrong
MCFG_SCREEN_ADD("screen", RASTER)
@@ -174,7 +174,7 @@ MACHINE_CONFIG_START(anes_state::anes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index 9438ccfd0a0..83550c5e1bc 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -518,20 +518,20 @@ void angelkds_state::machine_reset()
MACHINE_CONFIG_START(angelkds_state::angelkds)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_IO_MAP(sub_portmap)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_IO_MAP(sub_portmap)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("I40"))
MCFG_I8255_IN_PORTB_CB(IOPORT("I41"))
- MCFG_I8255_IN_PORTC_CB(READ8(angelkds_state, angeklds_ff_r)) // or left inputs don't work
- MCFG_I8255_OUT_PORTC_CB(WRITE8(angelkds_state, angelkds_cpu_bank_write))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, angelkds_state, angeklds_ff_r)) // or left inputs don't work
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, angelkds_state, angelkds_cpu_bank_write))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("I80"))
@@ -556,14 +556,14 @@ MACHINE_CONFIG_START(angelkds_state::angelkds)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(4'000'000))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)
MCFG_SOUND_ROUTE(3, "mono", 0.45)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(4'000'000))
MCFG_SOUND_ROUTE(0, "mono", 0.65)
MCFG_SOUND_ROUTE(1, "mono", 0.65)
MCFG_SOUND_ROUTE(2, "mono", 0.65)
@@ -573,11 +573,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(angelkds_state::spcpostn)
angelkds(config);
/* encryption */
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0005, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_317_0005, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", angelkds_state, irq0_line_hold)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp
index 07903d28fbf..8d8f4a572c8 100644
--- a/src/mame/drivers/anzterm.cpp
+++ b/src/mame/drivers/anzterm.cpp
@@ -412,8 +412,8 @@ void anzterm_state::anzterm(address_map &map)
MACHINE_CONFIG_START(anzterm_state::anzterm)
- MCFG_CPU_ADD("maincpu", M6809, 15974400/4)
- MCFG_CPU_PROGRAM_MAP(anzterm)
+ MCFG_DEVICE_ADD("maincpu", M6809, 15974400/4)
+ MCFG_DEVICE_PROGRAM_MAP(anzterm)
MCFG_DEVICE_ADD("pic.ic39", I8214, 0)
MCFG_DEVICE_ADD("adlc.ic16", MC6854, 0)
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index 95213e51826..419e836d199 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -924,44 +924,44 @@ static void apc_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(apc_state::apc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8086,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(apc_map)
- MCFG_CPU_IO_MAP(apc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu",I8086,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(apc_map)
+ MCFG_DEVICE_IO_MAP(apc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(MAIN_CLOCK) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir3_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259_master", pic8259_device, ir3_w))
MCFG_PIT8253_CLK1(MAIN_CLOCK) /* Memory Refresh */
MCFG_PIT8253_CLK2(MAIN_CLOCK) /* RS-232c */
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(apc_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, apc_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w)) // TODO: check ir7_w
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w)) // TODO: check ir7_w
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("i8237", AM9517A, MAIN_CLOCK)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(apc_state, apc_dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(apc_state, apc_tc_w))
- MCFG_I8237_IN_MEMR_CB(READ8(apc_state, apc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(apc_state, apc_dma_write_byte))
- MCFG_I8237_IN_IOR_1_CB(READ8(apc_state, fdc_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(apc_state, fdc_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(apc_state, apc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(apc_state, apc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(apc_state, apc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(apc_state, apc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, apc_state, apc_dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, apc_state, apc_tc_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, apc_state, apc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, apc_state, apc_dma_write_byte))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, apc_state, fdc_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, apc_state, fdc_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, apc_state, apc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, apc_state, apc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, apc_state, apc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, apc_state, apc_dack3_w))
MCFG_NVRAM_ADD_1FILL("cmos")
MCFG_UPD1990A_ADD("upd1990a", XTAL(32'768), NOOP, NOOP)
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir4_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq1_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("pic8259_slave", pic8259_device, ir4_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("i8237", am9517a_device, dreq1_w))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", apc_floppies, "8", apc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", apc_floppies, "8", apc_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","apc")
@@ -988,7 +988,7 @@ MACHINE_CONFIG_START(apc_state::apc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD( "upd1771c", UPD1771C, MAIN_CLOCK ) //uPD1771C-006
+ MCFG_DEVICE_ADD( "upd1771c", UPD1771C, MAIN_CLOCK ) //uPD1771C-006
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp
index f42a6eb6b19..d541fb5b393 100644
--- a/src/mame/drivers/apexc.cpp
+++ b/src/mame/drivers/apexc.cpp
@@ -855,12 +855,12 @@ MACHINE_CONFIG_START(apexc_state::apexc)
/* basic machine hardware */
/* APEXC CPU @ 2.0 kHz (memory word clock frequency) */
- MCFG_CPU_ADD("maincpu", APEXC, 2000)
- MCFG_CPU_PROGRAM_MAP(apexc_mem_map)
- MCFG_APEXC_TAPE_READ_CB(READ8(apexc_state, tape_read))
- MCFG_APEXC_TAPE_PUNCH_CB(WRITE8(apexc_state, tape_write))
+ MCFG_DEVICE_ADD("maincpu", APEXC, 2000)
+ MCFG_DEVICE_PROGRAM_MAP(apexc_mem_map)
+ MCFG_APEXC_TAPE_READ_CB(READ8(*this, apexc_state, tape_read))
+ MCFG_APEXC_TAPE_PUNCH_CB(WRITE8(*this, apexc_state, tape_write))
/* dummy interrupt: handles the control panel */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", apexc_state, apexc_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", apexc_state, apexc_interrupt)
/* video hardware does not exist, but we display a control panel and the typewriter output */
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 2f9ff38a3fb..3409811f529 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -519,30 +519,30 @@ static void apf_cart(device_slot_interface &device)
MACHINE_CONFIG_START(apf_state::apfm1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545) / 4 ) // divided by 4 in external clock circuit
- MCFG_CPU_PROGRAM_MAP(apfm1000_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(3'579'545) / 4 ) // divided by 4 in external clock circuit
+ MCFG_DEVICE_PROGRAM_MAP(apfm1000_map)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
- MCFG_MC6847_FSYNC_CALLBACK(DEVWRITELINE("pia0", pia6821_device, cb1_w))
- MCFG_MC6847_INPUT_CALLBACK(READ8(apf_state, videoram_r))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE("pia0", pia6821_device, cb1_w))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, apf_state, videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1)
// INTEXT = GND
// other lines not connected
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(apf_state, pia0_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(apf_state, pia0_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(apf_state, pia0_ca2_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, apf_state, pia0_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, apf_state, pia0_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, apf_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
@@ -554,8 +554,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apf_state::apfimag)
apfm1000(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( apfimag_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( apfimag_map)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -566,9 +566,9 @@ MACHINE_CONFIG_START(apf_state::apfimag)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(apf_state, pia1_porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(apf_state, pia1_portb_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(apf_state, pia1_portb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, apf_state, pia1_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, apf_state, pia1_portb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, apf_state, pia1_portb_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(apf_cassette_formats)
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index fc6c6e7f398..91c727e26ea 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -217,30 +217,30 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(apogee_state::apogee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
- MCFG_CPU_PROGRAM_MAP(apogee_mem)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(apogee_mem)
MCFG_MACHINE_RESET_OVERRIDE(apogee_state, radio86 )
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000)/9)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(apogee_state,pit8253_out0_changed))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, apogee_state,pit8253_out0_changed))
MCFG_PIT8253_CLK1(XTAL(16'000'000)/9)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(apogee_state,pit8253_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, apogee_state,pit8253_out1_changed))
MCFG_PIT8253_CLK2(XTAL(16'000'000)/9)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(apogee_state,pit8253_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, apogee_state,pit8253_out2_changed))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
//MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(apogee_state, display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257",i8257_device, dreq2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -256,15 +256,15 @@ MACHINE_CONFIG_START(apogee_state::apogee)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("i8275", i8275_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, radio86_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, radio86_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, radio86_state, memory_write_byte))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("i8275", i8275_device, dack_w))
MCFG_I8257_REVERSE_RW_MODE(1)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 36acbe3e8f3..8ee9cf4c829 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -1055,9 +1055,9 @@ READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german )
MACHINE_CONFIG_START(apollo_state::dn3500)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
- MCFG_CPU_PROGRAM_MAP(dn3500_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
+ MCFG_DEVICE_PROGRAM_MAP(dn3500_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(apollo_state::dn3500)
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* internal ram */
@@ -1075,21 +1075,21 @@ MACHINE_CONFIG_START(apollo_state::dn3500)
#ifdef APOLLO_XXL
MCFG_DEVICE_ADD(APOLLO_STDIO_TAG, APOLLO_STDIO, 0)
- MCFG_APOLLO_STDIO_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_b_w))
+ MCFG_APOLLO_STDIO_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_b_w))
#endif
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dsp3500)
- MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
- MCFG_CPU_PROGRAM_MAP(dsp3500_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
+ MCFG_DEVICE_PROGRAM_MAP(dsp3500_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* internal ram */
@@ -1106,8 +1106,8 @@ MACHINE_CONFIG_START(apollo_state::dn3500_19i)
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn3500_15i)
@@ -1115,15 +1115,15 @@ MACHINE_CONFIG_START(apollo_state::dn3500_15i)
/* video hardware is 15" monochrome or color */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn3000)
dn3500(config);
- MCFG_CPU_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
- MCFG_CPU_PROGRAM_MAP(dn3000_map)
+ MCFG_DEVICE_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_PROGRAM_MAP(dn3000_map)
MCFG_DEVICE_REMOVE( APOLLO_SIO2_TAG )
MCFG_RAM_MODIFY("messram")
MCFG_RAM_DEFAULT_SIZE("8M")
@@ -1131,16 +1131,16 @@ MACHINE_CONFIG_START(apollo_state::dn3000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dsp3000)
- MCFG_CPU_ADD(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
- MCFG_CPU_PROGRAM_MAP(dsp3000_map)
+ MCFG_DEVICE_ADD(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_PROGRAM_MAP(dsp3000_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* internal ram */
@@ -1160,8 +1160,8 @@ MACHINE_CONFIG_START(apollo_state::dn3000_19i)
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn3000_15i)
@@ -1169,27 +1169,27 @@ MACHINE_CONFIG_START(apollo_state::dn3000_15i)
/* video hardware 15" monochrome */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn5500)
dn3500(config);
- MCFG_CPU_REPLACE(MAINCPU, M68040, 25000000) /* 25 MHz */
- MCFG_CPU_PROGRAM_MAP(dn5500_map)
+ MCFG_DEVICE_REPLACE(MAINCPU, M68040, 25000000) /* 25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dn5500_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dsp5500)
- MCFG_CPU_ADD(MAINCPU, M68040, 25000000) /* 25 MHz */
- MCFG_CPU_PROGRAM_MAP(dsp5500_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
+ MCFG_DEVICE_ADD(MAINCPU, M68040, 25000000) /* 25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dsp5500_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
apollo_terminal(config);
/* keyboard beeper */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000)
+ MCFG_DEVICE_ADD("beep", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* terminal hardware */
@@ -1201,8 +1201,8 @@ MACHINE_CONFIG_START(apollo_state::dn5500_19i)
/* video hardware 19" monochrome */
MCFG_APOLLO_MONO19I_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::dn5500_15i)
@@ -1210,8 +1210,8 @@ MACHINE_CONFIG_START(apollo_state::dn5500_15i)
/* video hardware 15" monochrome */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_DEVICE_ADD(APOLLO_KBD_TAG, APOLLO_KBD, 0)
- MCFG_APOLLO_KBD_TX_CALLBACK(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
- MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(apollo_state, apollo_kbd_is_german))
+ MCFG_APOLLO_KBD_TX_CALLBACK(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_a_w))
+ MCFG_APOLLO_KBD_GERMAN_CALLBACK(READLINE(*this, apollo_state, apollo_kbd_is_german))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp
index 181880a7be0..1d68553fc45 100644
--- a/src/mame/drivers/apple1.cpp
+++ b/src/mame/drivers/apple1.cpp
@@ -595,8 +595,8 @@ static void apple1_cards(device_slot_interface &device)
}
MACHINE_CONFIG_START(apple1_state::apple1)
- MCFG_CPU_ADD(A1_CPU_TAG, M6502, 960000) // effective CPU speed
- MCFG_CPU_PROGRAM_MAP(apple1_map)
+ MCFG_DEVICE_ADD(A1_CPU_TAG, M6502, 960000) // effective CPU speed
+ MCFG_DEVICE_PROGRAM_MAP(apple1_map)
// video timings are identical to the Apple II, unsurprisingly
MCFG_SCREEN_ADD("screen", RASTER)
@@ -607,9 +607,9 @@ MACHINE_CONFIG_START(apple1_state::apple1)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD( A1_PIA_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(apple1_state, pia_keyboard_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(apple1_state, pia_display_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(apple1_state, pia_display_gate_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, apple1_state, pia_keyboard_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, apple1_state, pia_display_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, apple1_state, pia_display_gate_w))
MCFG_DEVICE_ADD(A1_BUS_TAG, A1BUS, 0)
MCFG_A1BUS_CPU("maincpu")
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index bf78aca9a3b..bc40711a8c3 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -1376,8 +1376,8 @@ static void apple2_cards(device_slot_interface &device)
MACHINE_CONFIG_START(napple2_state::apple2_common)
/* basic machine hardware */
- MCFG_CPU_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2_map)
+ MCFG_DEVICE_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", napple2_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1393,7 +1393,7 @@ MACHINE_CONFIG_START(napple2_state::apple2_common)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(A2_SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(A2_SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* /INH banking */
@@ -1405,14 +1405,14 @@ MACHINE_CONFIG_START(napple2_state::apple2_common)
/* soft switches */
MCFG_DEVICE_ADD("softlatch", F9334, 0) // F14 (labeled 74LS259 on some boards and in the Apple ][ Reference Manual)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(napple2_state, txt_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(napple2_state, mix_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(napple2_state, scr_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(napple2_state, res_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(napple2_state, an0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(napple2_state, an1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(napple2_state, an2_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(napple2_state, an3_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, napple2_state, txt_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, napple2_state, mix_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, napple2_state, scr_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, napple2_state, res_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, napple2_state, an0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, napple2_state, an1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, napple2_state, an2_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, napple2_state, an3_w))
/* keyboard controller */
MCFG_DEVICE_ADD(A2_KBDC_TAG, AY3600, 0)
@@ -1425,10 +1425,10 @@ MACHINE_CONFIG_START(napple2_state::apple2_common)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(napple2_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(napple2_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(napple2_state, ay3600_data_ready_w))
- MCFG_AY3600_AKO_CB(WRITELINE(napple2_state, ay3600_ako_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, napple2_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, napple2_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, napple2_state, ay3600_data_ready_w))
+ MCFG_AY3600_AKO_CB(WRITELINE(*this, napple2_state, ay3600_ako_w))
/* repeat timer. 15 Hz from page 90 of "The Apple II Circuit Description */
MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", napple2_state, ay3600_repeat, attotime::from_hz(15))
@@ -1436,9 +1436,9 @@ MACHINE_CONFIG_START(napple2_state::apple2_common)
/* slot devices */
MCFG_DEVICE_ADD(A2_BUS_TAG, A2BUS, 0)
MCFG_A2BUS_CPU(A2_CPU_TAG)
- MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(napple2_state, a2bus_irq_w))
- MCFG_A2BUS_OUT_NMI_CB(WRITELINE(napple2_state, a2bus_nmi_w))
- MCFG_A2BUS_OUT_INH_CB(WRITELINE(napple2_state, a2bus_inh_w))
+ MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(*this, napple2_state, a2bus_irq_w))
+ MCFG_A2BUS_OUT_NMI_CB(WRITELINE(*this, napple2_state, a2bus_nmi_w))
+ MCFG_A2BUS_OUT_INH_CB(WRITELINE(*this, napple2_state, a2bus_inh_w))
MCFG_A2BUS_SLOT_ADD(A2_BUS_TAG, "sl0", apple2_slot0_cards, "lang")
MCFG_A2BUS_SLOT_ADD(A2_BUS_TAG, "sl1", apple2_cards, nullptr)
MCFG_A2BUS_SLOT_ADD(A2_BUS_TAG, "sl2", apple2_cards, nullptr)
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index f79f4fcfea5..4dc491266e7 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -3887,8 +3887,8 @@ static void apple2eaux_cards(device_slot_interface &device)
MACHINE_CONFIG_START(apple2e_state::apple2e)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2e_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple2e_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -3904,12 +3904,12 @@ MACHINE_CONFIG_START(apple2e_state::apple2e)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(A2_SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(A2_SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* DS1315 for no-slot clock */
MCFG_DS1315_ADD("nsc")
- MCFG_DS1315_BACKING_HANDLER(READ8(apple2e_state, nsc_backing_r))
+ MCFG_DS1315_BACKING_HANDLER(READ8(*this, apple2e_state, nsc_backing_r))
/* RAM */
MCFG_RAM_ADD(RAM_TAG)
@@ -4011,10 +4011,10 @@ MACHINE_CONFIG_START(apple2e_state::apple2e)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(apple2e_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(apple2e_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(apple2e_state, ay3600_data_ready_w))
- MCFG_AY3600_AKO_CB(WRITELINE(apple2e_state, ay3600_ako_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, apple2e_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, apple2e_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, apple2e_state, ay3600_data_ready_w))
+ MCFG_AY3600_AKO_CB(WRITELINE(*this, apple2e_state, ay3600_ako_w))
/* repeat timer. 15 Hz from page 7-15 of "Understanding the Apple IIe" */
MCFG_TIMER_DRIVER_ADD_PERIODIC("repttmr", apple2e_state, ay3600_repeat, attotime::from_hz(15))
@@ -4022,9 +4022,9 @@ MACHINE_CONFIG_START(apple2e_state::apple2e)
/* slot devices */
MCFG_DEVICE_ADD("a2bus", A2BUS, 0)
MCFG_A2BUS_CPU("maincpu")
- MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(apple2e_state, a2bus_irq_w))
- MCFG_A2BUS_OUT_NMI_CB(WRITELINE(apple2e_state, a2bus_nmi_w))
- MCFG_A2BUS_OUT_INH_CB(WRITELINE(apple2e_state, a2bus_inh_w))
+ MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(*this, apple2e_state, a2bus_irq_w))
+ MCFG_A2BUS_OUT_NMI_CB(WRITELINE(*this, apple2e_state, a2bus_nmi_w))
+ MCFG_A2BUS_OUT_INH_CB(WRITELINE(*this, apple2e_state, a2bus_inh_w))
MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, nullptr)
MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, nullptr)
MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, nullptr)
@@ -4035,8 +4035,8 @@ MACHINE_CONFIG_START(apple2e_state::apple2e)
MCFG_DEVICE_ADD(A2_AUXSLOT_TAG, A2EAUXSLOT, 0)
MCFG_A2EAUXSLOT_CPU("maincpu")
- MCFG_A2EAUXSLOT_OUT_IRQ_CB(WRITELINE(apple2e_state, a2bus_irq_w))
- MCFG_A2EAUXSLOT_OUT_NMI_CB(WRITELINE(apple2e_state, a2bus_nmi_w))
+ MCFG_A2EAUXSLOT_OUT_IRQ_CB(WRITELINE(*this, apple2e_state, a2bus_irq_w))
+ MCFG_A2EAUXSLOT_OUT_NMI_CB(WRITELINE(*this, apple2e_state, a2bus_nmi_w))
MCFG_A2EAUXSLOT_SLOT_ADD(A2_AUXSLOT_TAG, "aux", apple2eaux_cards, "ext80") // default to an extended 80-column card
MCFG_SOFTWARE_LIST_ADD("flop525_list","apple2")
@@ -4054,14 +4054,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2ee)
apple2e(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2e_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::spectred)
apple2e(config);
- MCFG_CPU_ADD("keyb_mcu", I8035, XTAL(4'000'000)) /* guessed frequency */
- MCFG_CPU_PROGRAM_MAP(spectred_keyb_map)
+ MCFG_DEVICE_ADD("keyb_mcu", I8035, XTAL(4'000'000)) /* guessed frequency */
+ MCFG_DEVICE_PROGRAM_MAP(spectred_keyb_map)
//TODO: implement the actual interfacing to this 8035 MCU and
// and then remove the keyb CPU inherited from apple2e
@@ -4069,23 +4069,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::tk3000)
apple2e(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2e_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
-// MCFG_CPU_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock
-// MCFG_CPU_PROGRAM_MAP(tk3000_kbd_map)
+// MCFG_DEVICE_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock
+// MCFG_DEVICE_PROGRAM_MAP(tk3000_kbd_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2ep)
apple2e(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2e_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2c)
apple2ee(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2c_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2c_map)
// IIc and friends have no cassette port
MCFG_DEVICE_REMOVE(A2_CASSETTE_TAG)
@@ -4100,23 +4100,23 @@ MACHINE_CONFIG_START(apple2e_state::apple2c)
MCFG_DEVICE_ADD(IIC_ACIA1_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(14'318'181) / 8) // ~1.789 MHz
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd))
MCFG_DEVICE_ADD(IIC_ACIA2_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200)) // matches SSC so modem software is compatible
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_txd))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("modem", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(IIC_ACIA1_TAG, mos6551_device, write_cts))
+ MCFG_DEVICE_ADD(PRINTER_PORT_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(IIC_ACIA1_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(IIC_ACIA1_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(IIC_ACIA1_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(IIC_ACIA1_TAG, mos6551_device, write_cts))
- MCFG_RS232_PORT_ADD(MODEM_PORT_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(IIC_ACIA2_TAG, mos6551_device, write_cts))
+ MCFG_DEVICE_ADD(MODEM_PORT_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(IIC_ACIA2_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(IIC_ACIA2_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(IIC_ACIA2_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(IIC_ACIA2_TAG, mos6551_device, write_cts))
// TODO: populate the IIc's other virtual slots with ONBOARD_ADD
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl4", A2BUS_MOCKINGBOARD, NOOP ) // Mockingboard 4C
@@ -4164,8 +4164,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2c_mem)
apple2c(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2c_memexp_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2c_memexp_map)
MCFG_A2BUS_SLOT_REMOVE("sl6")
MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_IWM_FDC, NOOP)
@@ -4194,8 +4194,8 @@ static const floppy_interface floppy_interface =
MACHINE_CONFIG_START(apple2e_state::laser128)
apple2c(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(laser128_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(laser128_map)
MCFG_APPLEFDC_ADD(LASER128_UDC_TAG, fdc_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
@@ -4218,8 +4218,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::laser128ex2)
apple2c(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(laser128_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(laser128_map)
MCFG_APPLEFDC_ADD(LASER128_UDC_TAG, fdc_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 5d47280fabe..c286236de6c 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -315,19 +315,19 @@ static void apple2_cards(device_slot_interface &device)
MACHINE_CONFIG_START(apple2gs_state::apple2gs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", G65816, APPLE2GS_14M/5)
- MCFG_CPU_PROGRAM_MAP(apple2gs_map)
+ MCFG_DEVICE_ADD("maincpu", G65816, APPLE2GS_14M/5)
+ MCFG_DEVICE_PROGRAM_MAP(apple2gs_map)
MCFG_DEVICE_ADDRESS_MAP(g65816_device::AS_VECTORS, vectors_map)
#if RUN_ADB_MICRO
- MCFG_CPU_ADD(ADBMICRO_TAG, M50741, XTAL(3'579'545))
- MCFG_M5074X_PORT0_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p0_in))
- MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p0_out))
- MCFG_M5074X_PORT1_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p1_in))
- MCFG_M5074X_PORT1_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p1_out))
- MCFG_M5074X_PORT2_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p2_in))
- MCFG_M5074X_PORT2_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p2_out))
- MCFG_M5074X_PORT3_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p3_in))
- MCFG_M5074X_PORT3_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p3_out))
+ MCFG_DEVICE_ADD(ADBMICRO_TAG, M50741, XTAL(3'579'545))
+ MCFG_M5074X_PORT0_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p0_in))
+ MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p0_out))
+ MCFG_M5074X_PORT1_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p1_in))
+ MCFG_M5074X_PORT1_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p1_out))
+ MCFG_M5074X_PORT2_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p2_in))
+ MCFG_M5074X_PORT2_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p2_out))
+ MCFG_M5074X_PORT3_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p3_in))
+ MCFG_M5074X_PORT3_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p3_out))
#endif
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", apple2gs_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -358,20 +358,20 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(apple2_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(apple2_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(apple2_state, ay3600_iie_data_ready_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, apple2_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, apple2_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, apple2_state, ay3600_iie_data_ready_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("a2speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("a2speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_ES5503_ADD("es5503", APPLE2GS_7M)
MCFG_ES5503_OUTPUT_CHANNELS(2)
- MCFG_ES5503_IRQ_FUNC(WRITELINE(apple2gs_state, apple2gs_doc_irq))
- MCFG_ES5503_ADC_FUNC(READ8(apple2gs_state, apple2gs_adc_read))
+ MCFG_ES5503_IRQ_FUNC(WRITELINE(*this, apple2gs_state, apple2gs_doc_irq))
+ MCFG_ES5503_ADC_FUNC(READ8(*this, apple2gs_state, apple2gs_adc_read))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -379,9 +379,9 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
/* slot devices */
MCFG_DEVICE_ADD("a2bus", A2BUS, 0)
MCFG_A2BUS_CPU("maincpu")
- MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(apple2gs_state, a2bus_irq_w))
- MCFG_A2BUS_OUT_NMI_CB(WRITELINE(apple2gs_state, a2bus_nmi_w))
- MCFG_A2BUS_OUT_INH_CB(WRITELINE(apple2gs_state, a2bus_inh_w))
+ MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(*this, apple2gs_state, a2bus_irq_w))
+ MCFG_A2BUS_OUT_NMI_CB(WRITELINE(*this, apple2gs_state, a2bus_nmi_w))
+ MCFG_A2BUS_OUT_INH_CB(WRITELINE(*this, apple2gs_state, a2bus_inh_w))
MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, nullptr)
MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, nullptr)
MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, nullptr)
@@ -394,18 +394,18 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gs)
/* SCC */
MCFG_SCC85C30_ADD(SCC_TAG, APPLE2GS_14M/2, 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC_TAG, z80scc_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC_TAG, z80scc_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC_TAG, z80scc_device, ctsb_w))
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(apple2gs_floppy525_floppy_interface,15,16)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADDITIONAL_ADD(apple2gs_floppy35_floppy_interface)
@@ -427,15 +427,15 @@ MACHINE_CONFIG_START(apple2gs_state::apple2gsr1)
MCFG_MACHINE_START_OVERRIDE(apple2gs_state, apple2gsr1 )
#if RUN_ADB_MICRO
- MCFG_CPU_REPLACE(ADBMICRO_TAG, M50740, XTAL(3'579'545))
- MCFG_M5074X_PORT0_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p0_in))
- MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p0_out))
- MCFG_M5074X_PORT1_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p1_in))
- MCFG_M5074X_PORT1_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p1_out))
- MCFG_M5074X_PORT2_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p2_in))
- MCFG_M5074X_PORT2_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p2_out))
- MCFG_M5074X_PORT3_READ_CALLBACK(READ8(apple2gs_state, adbmicro_p3_in))
- MCFG_M5074X_PORT3_WRITE_CALLBACK(WRITE8(apple2gs_state, adbmicro_p3_out))
+ MCFG_DEVICE_REPLACE(ADBMICRO_TAG, M50740, XTAL(3'579'545))
+ MCFG_M5074X_PORT0_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p0_in))
+ MCFG_M5074X_PORT0_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p0_out))
+ MCFG_M5074X_PORT1_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p1_in))
+ MCFG_M5074X_PORT1_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p1_out))
+ MCFG_M5074X_PORT2_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p2_in))
+ MCFG_M5074X_PORT2_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p2_out))
+ MCFG_M5074X_PORT3_READ_CALLBACK(READ8(*this, apple2gs_state, adbmicro_p3_in))
+ MCFG_M5074X_PORT3_WRITE_CALLBACK(WRITE8(*this, apple2gs_state, adbmicro_p3_out))
#endif
MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp
index 77c2cd75887..0ad1bb978a2 100644
--- a/src/mame/drivers/apple3.cpp
+++ b/src/mame/drivers/apple3.cpp
@@ -55,9 +55,9 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(apple3_state::apple3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz */
- MCFG_M6502_SYNC_CALLBACK(WRITELINE(apple3_state, apple3_sync_w))
- MCFG_CPU_PROGRAM_MAP(apple3_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 2000000) /* 2 MHz */
+ MCFG_M6502_SYNC_CALLBACK(WRITELINE(*this, apple3_state, apple3_sync_w))
+ MCFG_DEVICE_PROGRAM_MAP(apple3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_RESET_OVERRIDE(apple3_state, apple3 )
@@ -89,16 +89,16 @@ MACHINE_CONFIG_START(apple3_state::apple3)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(apple3_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(apple3_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(apple3_state, ay3600_data_ready_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, apple3_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, apple3_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, apple3_state, ay3600_data_ready_w))
/* slot bus */
MCFG_DEVICE_ADD("a2bus", A2BUS, 0)
MCFG_A2BUS_CPU("maincpu")
- MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(apple3_state, a2bus_irq_w))
- MCFG_A2BUS_OUT_NMI_CB(WRITELINE(apple3_state, a2bus_nmi_w))
- //MCFG_A2BUS_OUT_INH_CB(WRITELINE(apple3_state, a2bus_inh_w))
+ MCFG_A2BUS_OUT_IRQ_CB(WRITELINE(*this, apple3_state, a2bus_irq_w))
+ MCFG_A2BUS_OUT_NMI_CB(WRITELINE(*this, apple3_state, a2bus_nmi_w))
+ //MCFG_A2BUS_OUT_INH_CB(WRITELINE(*this, apple3_state, a2bus_inh_w))
MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple3_cards, nullptr)
MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple3_cards, nullptr)
MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple3_cards, nullptr)
@@ -117,15 +117,15 @@ MACHINE_CONFIG_START(apple3_state::apple3)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200)) // HACK: The schematic shows an external clock generator but using a XTAL is faster to emulate.
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(apple3_state, apple3_acia_irq_func))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, apple3_state, apple3_acia_irq_func))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("acia", mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr))
// TODO: remove cts kludge from machine/apple3.c and come up with a good way of coping with pull up resistors.
/* paddle */
@@ -136,19 +136,19 @@ MACHINE_CONFIG_START(apple3_state::apple3)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(apple3_state, apple3_via_0_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(apple3_state, apple3_via_0_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(apple3_state, apple3_via_0_irq_func))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, apple3_state, apple3_via_0_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, apple3_state, apple3_via_0_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, apple3_state, apple3_via_0_irq_func))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 1000000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(apple3_state, apple3_via_1_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(apple3_state, apple3_via_1_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(apple3_state, apple3_via_1_irq_func))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, apple3_state, apple3_via_1_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, apple3_state, apple3_via_1_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, apple3_state, apple3_via_1_irq_func))
/* sound */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("bell", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
- MCFG_SOUND_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // 6522.b5(pb0-pb5) + 320k,160k,80k,40k,20k,10k
+ MCFG_DEVICE_ADD("bell", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // 6522.b5(pb0-pb5) + 320k,160k,80k,40k,20k,10k
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "bell", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index d4f95115a9e..fd82b97630f 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -844,20 +844,20 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer)
MACHINE_CONFIG_START(applix_state::applix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz
- MCFG_CPU_PROGRAM_MAP(applix_mem)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H
- MCFG_CPU_PROGRAM_MAP(subcpu_mem)
- MCFG_CPU_IO_MAP(subcpu_io)
- MCFG_CPU_ADD("kbdcpu", I8051, 11060250)
- MCFG_CPU_PROGRAM_MAP(keytronic_pc3270_program)
- MCFG_CPU_IO_MAP(keytronic_pc3270_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(applix_state, p1_read))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(applix_state, p1_write))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(applix_state, p2_read))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(applix_state, p2_write))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(applix_state, p3_read))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(applix_state, p3_write))
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'000'000) / 4) // MC68000-P10 @ 7.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(applix_mem)
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(16'000'000) / 2) // Z80H
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_mem)
+ MCFG_DEVICE_IO_MAP(subcpu_io)
+ MCFG_DEVICE_ADD("kbdcpu", I8051, 11060250)
+ MCFG_DEVICE_PROGRAM_MAP(keytronic_pc3270_program)
+ MCFG_DEVICE_IO_MAP(keytronic_pc3270_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, applix_state, p1_read))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, applix_state, p1_write))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, applix_state, p2_read))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, applix_state, p2_write))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, applix_state, p3_read))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, applix_state, p3_write))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -871,8 +871,8 @@ MACHINE_CONFIG_START(applix_state::applix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
- MCFG_SOUND_ADD("rdac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
+ MCFG_DEVICE_ADD("ldac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
+ MCFG_DEVICE_ADD("rdac", DAC0800, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // 74ls374.u20 + dac0800.u21 + 4052.u23
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -885,20 +885,20 @@ MACHINE_CONFIG_START(applix_state::applix)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(applix_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(applix_state, vsync_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, applix_state, vsync_w))
MCFG_DEVICE_ADD("via6522", VIA6522, XTAL(30'000'000) / 4 / 10) // VIA uses 68000 E clock
- MCFG_VIA6522_READPB_HANDLER(READ8(applix_state, applix_pb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, applix_state, applix_pb_r))
// in CB1 kbd clk
// in CA2 vsync
// in CB2 kdb data
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(applix_state, applix_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(applix_state, applix_pb_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, applix_state, applix_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, applix_state, applix_pb_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("via6522", via6522_device, write_pa0))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("via6522", via6522_device, write_pa0))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp
index 6def479dfbb..3436dd4302f 100644
--- a/src/mame/drivers/appoooh.cpp
+++ b/src/mame/drivers/appoooh.cpp
@@ -422,26 +422,26 @@ INTERRUPT_GEN_MEMBER(appoooh_state::vblank_irq)
MACHINE_CONFIG_START(appoooh_state::appoooh_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", appoooh_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", appoooh_state, vblank_irq)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 18432000/6)
+ MCFG_DEVICE_ADD("sn1", SN76489, 18432000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("sn2", SN76489, 18432000/6)
+ MCFG_DEVICE_ADD("sn2", SN76489, 18432000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("sn3", SN76489, 18432000/6)
+ MCFG_DEVICE_ADD("sn3", SN76489, 18432000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(appoooh_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, appoooh_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -470,7 +470,7 @@ MACHINE_CONFIG_START(appoooh_state::robowres)
appoooh_common(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -490,11 +490,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(appoooh_state::robowrese)
robowres(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5179,18432000/6) /* ??? the main xtal is 18.432 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", appoooh_state, vblank_irq)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5179,18432000/6) /* ??? the main xtal is 18.432 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", appoooh_state, vblank_irq)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index 3ad783046ce..eeacbb4b68e 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -357,19 +357,19 @@ void apricot_state::apricot_io(address_map &map)
MACHINE_CONFIG_START(apricot_state::apricot)
// main cpu
- MCFG_CPU_ADD("ic91", I8086, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(apricot_mem)
- MCFG_CPU_IO_MAP(apricot_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
- MCFG_I8086_LOCK_HANDLER(WRITELINE(apricot_state, i8086_lock_w))
+ MCFG_DEVICE_ADD("ic91", I8086, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(apricot_mem)
+ MCFG_DEVICE_IO_MAP(apricot_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("ic31", pic8259_device, inta_cb)
+ MCFG_I8086_LOCK_HANDLER(WRITELINE(*this, apricot_state, i8086_lock_w))
// i/o cpu
- MCFG_CPU_ADD("ic71", I8089, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(apricot_mem)
- MCFG_CPU_IO_MAP(apricot_io)
+ MCFG_DEVICE_ADD("ic71", I8089, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(apricot_mem)
+ MCFG_DEVICE_IO_MAP(apricot_io)
MCFG_I8089_DATA_WIDTH(16)
- MCFG_I8089_SINTR1(DEVWRITELINE("ic31", pic8259_device, ir0_w))
- MCFG_I8089_SINTR2(DEVWRITELINE("ic31", pic8259_device, ir1_w))
+ MCFG_I8089_SINTR1(WRITELINE("ic31", pic8259_device, ir0_w))
+ MCFG_I8089_SINTR2(WRITELINE("ic31", pic8259_device, ir1_w))
// ram
MCFG_RAM_ADD(RAM_TAG)
@@ -388,71 +388,71 @@ MACHINE_CONFIG_START(apricot_state::apricot)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(apricot_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(apricot_state, apricot_hd6845_de))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, apricot_state, apricot_hd6845_de))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_ADD("ic7", SN76489, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
MCFG_DEVICE_ADD("ic17", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(apricot_state, i8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(apricot_state, i8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(apricot_state, i8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("cent_data_in", input_buffer_device, read))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, apricot_state, i8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, apricot_state, i8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, apricot_state, i8255_portc_w))
MCFG_DEVICE_ADD("ic31", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ic91", 0))
MCFG_DEVICE_ADD("ic16", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(4'000'000) / 16)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ic31", pic8259_device, ir6_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("ic31", pic8259_device, ir6_w))
MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0a_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("ic14", ttl153_device, i0a_w))
MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ic14", ttl153_device, i0b_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2a_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ic14", ttl153_device, i2b_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("ic14", ttl153_device, i0b_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2a_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ic14", ttl153_device, i2b_w))
MCFG_TTL153_ADD("ic14")
- MCFG_TTL153_ZA_CB(DEVWRITELINE("ic15", z80sio_device, rxca_w))
- MCFG_TTL153_ZB_CB(DEVWRITELINE("ic15", z80sio_device, txca_w))
+ MCFG_TTL153_ZA_CB(WRITELINE("ic15", z80sio_device, rxca_w))
+ MCFG_TTL153_ZB_CB(WRITELINE("ic15", z80sio_device, txca_w))
MCFG_CLOCK_ADD("ic15_rxtxcb", XTAL(4'000'000) / 16)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxtxcb_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ic15", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("ic15", Z80SIO, XTAL(15'000'000) / 6)
MCFG_Z80SIO_CPU("ic91")
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_WRDYA_CB(DEVWRITELINE("ic71", i8089_device, drq2_w))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", apricot_keyboard_bus_device, out_w))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("ic14", ttl153_device, s0_w))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("ic14", ttl153_device, s1_w))
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("ic31", pic8259_device, ir5_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE("ic71", i8089_device, drq2_w))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("kbd", apricot_keyboard_bus_device, out_w))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("ic14", ttl153_device, s0_w))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("ic14", ttl153_device, s1_w))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("ic31", pic8259_device, ir5_w))
// rs232 port
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
// note: missing a receive clock callback to support external clock mode (i1 to 153)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ic15", z80sio_device, dcda_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ic15", z80sio_device, synca_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ic15", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ic15", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ic15", z80sio_device, dcda_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ic15", z80sio_device, synca_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ic15", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1)
// keyboard
MCFG_APRICOT_KEYBOARD_INTERFACE_ADD("kbd", "hle")
- MCFG_APRICOT_KEYBOARD_IN_HANDLER(DEVWRITELINE("ic15", z80sio_device, rxb_w))
+ MCFG_APRICOT_KEYBOARD_IN_HANDLER(WRITELINE("ic15", z80sio_device, rxb_w))
// centronics printer
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("ic15", z80sio_device, ctsb_w))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("ic15", z80sio_device, dcdb_w))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(apricot_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(apricot_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("ic15", z80sio_device, ctsb_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("ic15", z80sio_device, dcdb_w))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, apricot_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, apricot_state, write_centronics_perror))
//MCFG_CENTRONICS_SELECT_HANDLER() // schematic page 294 says this is connected to pc4, but that is an output to the printer
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
@@ -460,8 +460,8 @@ MACHINE_CONFIG_START(apricot_state::apricot)
// floppy
MCFG_WD2797_ADD("ic68", XTAL(4'000'000) / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(apricot_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("ic71", i8089_device, drq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, apricot_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("ic71", i8089_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("ic68:1", apricot_floppies, "d32w", apricot_state::floppy_formats)
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index cc29c5e5784..eea1b31e3dd 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -337,9 +337,9 @@ void apricotf_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(f1_state::act_f1)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(14'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(act_f1_mem)
- MCFG_CPU_IO_MAP(act_f1_io)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(14'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(act_f1_mem)
+ MCFG_DEVICE_IO_MAP(act_f1_io)
MCFG_INPUT_MERGER_ANY_HIGH("irqs")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
@@ -360,15 +360,15 @@ MACHINE_CONFIG_START(f1_state::act_f1)
MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0)
MCFG_DEVICE_ADD(Z80SIO2_TAG, Z80SIO, 2500000)
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("irqs", input_merger_device, in_w<0>))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("irqs", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 2500000)
- MCFG_Z80CTC_INTR_CB(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(f1_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(f1_state, ctc_z2_w))
+ MCFG_Z80CTC_INTR_CB(WRITELINE("irqs", input_merger_device, in_w<1>))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, f1_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, f1_state, ctc_z2_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(Z80SIO2_TAG, z80sio_device, ctsa_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(Z80SIO2_TAG, z80sio_device, ctsa_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index c1868990dcb..e6bcf0ae926 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -586,14 +586,14 @@ static void fp_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(fp_state::fp)
/* basic machine hardware */
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(fp_mem)
- MCFG_CPU_IO_MAP(fp_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
-
- MCFG_CPU_ADD(HD63B01V1_TAG, HD6301, 2000000)
- MCFG_CPU_PROGRAM_MAP(sound_mem)
- MCFG_CPU_IO_MAP(sound_io)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(15'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(fp_mem)
+ MCFG_DEVICE_IO_MAP(fp_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
+
+ MCFG_DEVICE_ADD(HD63B01V1_TAG, HD6301, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_mem)
+ MCFG_DEVICE_IO_MAP(sound_io)
MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -624,41 +624,41 @@ MACHINE_CONFIG_START(fp_state::fp)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, 2000000)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* Devices */
MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0)
MCFG_DEVICE_ADD(I8237_TAG, AM9517A, 250000)
- MCFG_I8237_OUT_EOP_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir7_w))
- MCFG_I8237_IN_IOR_1_CB(DEVREAD8(WD2797_TAG, wd_fdc_device_base, data_r))
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8(WD2797_TAG, wd_fdc_device_base, data_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(I8259A_TAG, pic8259_device, ir7_w))
+ MCFG_I8237_IN_IOR_1_CB(READ8(WD2797_TAG, wd_fdc_device_base, data_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(WD2797_TAG, wd_fdc_device_base, data_w))
MCFG_DEVICE_ADD(I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253A5_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(2000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259A_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(2000000)
MCFG_PIT8253_CLK2(2000000)
MCFG_DEVICE_ADD(Z80SIO0_TAG, Z80SIO, 2500000)
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir4_w))
MCFG_WD2797_ADD(WD2797_TAG, 2000000)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir1_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir1_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(I8237_TAG, am9517a_device, dreq1_w))
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", fp_floppies, "d32w", fp_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", fp_floppies, nullptr, fp_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fp_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(fp_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fp_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fp_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fp_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, fp_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fp_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fp_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index 152676e3faf..e01eb4b2ca1 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -290,13 +290,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(aquarium_state::aquarium)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // clock not verified on pcb
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aquarium_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) // clock not verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aquarium_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) // clock not verified on pcb
- MCFG_CPU_PROGRAM_MAP(snd_map)
- MCFG_CPU_IO_MAP(snd_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/6) // clock not verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(snd_map)
+ MCFG_DEVICE_IO_MAP(snd_portmap)
// Is this the actual IC type? Some other Excellent games from this period use a MAX693.
MCFG_DEVICE_ADD("watchdog", MB3773, 0)
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index c5dc432c4e6..c6fa6ac234e 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -351,10 +351,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(aquarius_state::aquarius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545)) // ???
- MCFG_CPU_PROGRAM_MAP(aquarius_mem)
- MCFG_CPU_IO_MAP(aquarius_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aquarius_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545)) // ???
+ MCFG_DEVICE_PROGRAM_MAP(aquarius_mem)
+ MCFG_DEVICE_IO_MAP(aquarius_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aquarius_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -373,10 +373,10 @@ MACHINE_CONFIG_START(aquarius_state::aquarius)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(3'579'545)/2) // ??? AY-3-8914
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(3'579'545)/2) // ??? AY-3-8914
MCFG_AY8910_PORT_A_READ_CB(IOPORT("RIGHT"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("LEFT"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp
index bf0c6b9d605..390239549e0 100644
--- a/src/mame/drivers/arabian.cpp
+++ b/src/mame/drivers/arabian.cpp
@@ -358,23 +358,23 @@ void arabian_state::machine_reset()
MACHINE_CONFIG_START(arabian_state::arabian)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", arabian_state, irq0_line_hold)
-
- MCFG_CPU_ADD("mcu", MB8841, MAIN_OSC/3/2)
- MCFG_MB88XX_READ_K_CB(READ8(arabian_state, mcu_portk_r))
- MCFG_MB88XX_WRITE_O_CB(WRITE8(arabian_state, mcu_port_o_w))
- MCFG_MB88XX_WRITE_P_CB(WRITE8(arabian_state, mcu_port_p_w))
- MCFG_MB88XX_READ_R0_CB(READ8(arabian_state, mcu_port_r0_r))
- MCFG_MB88XX_WRITE_R0_CB(WRITE8(arabian_state, mcu_port_r0_w))
- MCFG_MB88XX_READ_R1_CB(READ8(arabian_state, mcu_port_r1_r))
- MCFG_MB88XX_WRITE_R1_CB(WRITE8(arabian_state, mcu_port_r1_w))
- MCFG_MB88XX_READ_R2_CB(READ8(arabian_state, mcu_port_r2_r))
- MCFG_MB88XX_WRITE_R2_CB(WRITE8(arabian_state, mcu_port_r2_w))
- MCFG_MB88XX_READ_R3_CB(READ8(arabian_state, mcu_port_r3_r))
- MCFG_MB88XX_WRITE_R3_CB(WRITE8(arabian_state, mcu_port_r3_w))
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_OSC/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arabian_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("mcu", MB8841, MAIN_OSC/3/2)
+ MCFG_MB88XX_READ_K_CB(READ8(*this, arabian_state, mcu_portk_r))
+ MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, arabian_state, mcu_port_o_w))
+ MCFG_MB88XX_WRITE_P_CB(WRITE8(*this, arabian_state, mcu_port_p_w))
+ MCFG_MB88XX_READ_R0_CB(READ8(*this, arabian_state, mcu_port_r0_r))
+ MCFG_MB88XX_WRITE_R0_CB(WRITE8(*this, arabian_state, mcu_port_r0_w))
+ MCFG_MB88XX_READ_R1_CB(READ8(*this, arabian_state, mcu_port_r1_r))
+ MCFG_MB88XX_WRITE_R1_CB(WRITE8(*this, arabian_state, mcu_port_r1_w))
+ MCFG_MB88XX_READ_R2_CB(READ8(*this, arabian_state, mcu_port_r2_r))
+ MCFG_MB88XX_WRITE_R2_CB(WRITE8(*this, arabian_state, mcu_port_r2_w))
+ MCFG_MB88XX_READ_R3_CB(READ8(*this, arabian_state, mcu_port_r3_r))
+ MCFG_MB88XX_WRITE_R3_CB(WRITE8(*this, arabian_state, mcu_port_r3_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -394,9 +394,9 @@ MACHINE_CONFIG_START(arabian_state::arabian)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MAIN_OSC/4/2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(arabian_state, ay8910_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(arabian_state, ay8910_portb_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_OSC/4/2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, arabian_state, ay8910_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, arabian_state, ay8910_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp
index 800c689f9f6..43266ae2644 100644
--- a/src/mame/drivers/arachnid.cpp
+++ b/src/mame/drivers/arachnid.cpp
@@ -422,25 +422,25 @@ void arachnid_state::machine_start()
MACHINE_CONFIG_START(arachnid_state::arachnid)
// basic machine hardware
- MCFG_CPU_ADD(M6809_TAG, M6809, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(arachnid_map)
+ MCFG_DEVICE_ADD(M6809_TAG, M6809, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(arachnid_map)
// devices
MCFG_DEVICE_ADD(PIA6821_U4_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(arachnid_state, pia_u4_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(arachnid_state, pia_u4_pb_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(arachnid_state, pia_u4_pca_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(arachnid_state, pia_u4_pcb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(arachnid_state, pia_u4_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(arachnid_state, pia_u4_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(arachnid_state, pia_u4_pca_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(arachnid_state, pia_u4_pcb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, arachnid_state, pia_u4_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, arachnid_state, pia_u4_pb_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, arachnid_state, pia_u4_pca_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, arachnid_state, pia_u4_pcb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, arachnid_state, pia_u4_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, arachnid_state, pia_u4_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, arachnid_state, pia_u4_pca_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, arachnid_state, pia_u4_pcb_w))
MCFG_DEVICE_ADD(PIA6821_U17_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(arachnid_state, pia_u17_pa_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(arachnid_state, pia_u17_pca_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(arachnid_state, pia_u17_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(arachnid_state, pia_u17_pcb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, arachnid_state, pia_u17_pa_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, arachnid_state, pia_u17_pca_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, arachnid_state, pia_u17_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, arachnid_state, pia_u17_pcb_w))
// video hardware
MCFG_DEVICE_ADD( TMS9118_TAG, TMS9118, XTAL(10'738'635) / 2 )
@@ -451,12 +451,12 @@ MACHINE_CONFIG_START(arachnid_state::arachnid)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, XTAL(8'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(arachnid_state, ptm_o1_callback))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, arachnid_state, ptm_o1_callback))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index f5ab894473e..3fbe7fb1cb0 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -322,8 +322,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(sparkz_state::sparkz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -343,7 +343,7 @@ MACHINE_CONFIG_START(sparkz_state::sparkz)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(sparkz_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sparkz_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sparkz_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp
index 1a545ea4db6..f086a4d83be 100644
--- a/src/mame/drivers/arcadia.cpp
+++ b/src/mame/drivers/arcadia.cpp
@@ -473,10 +473,10 @@ static void arcadia_cart(device_slot_interface &device)
MACHINE_CONFIG_START(arcadia_state::arcadia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 3580000/4) /* 0.895 MHz */
- MCFG_CPU_PROGRAM_MAP(arcadia_mem)
- MCFG_S2650_SENSE_INPUT(READLINE(arcadia_state, vsync_r))
- MCFG_CPU_PERIODIC_INT_DRIVER(arcadia_state, video_line, 262*60)
+ MCFG_DEVICE_ADD("maincpu", S2650, 3580000/4) /* 0.895 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(arcadia_mem)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, arcadia_state, vsync_r))
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(arcadia_state, video_line, 262*60)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -488,14 +488,14 @@ MACHINE_CONFIG_START(arcadia_state::arcadia)
MCFG_SCREEN_UPDATE_DRIVER(arcadia_state, screen_update_arcadia)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", arcadia )
+ MCFG_GFXDECODE_ADD("gfxdecode", "palette", arcadia)
MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(arcadia_palette))
MCFG_PALETTE_INDIRECT_ENTRIES(8)
MCFG_PALETTE_INIT_OWNER(arcadia_state, arcadia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_ARCADIA_SOUND_ADD("custom")
+ MCFG_DEVICE_ADD("custom", ARCADIA_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* cartridge */
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index 527ec5f1268..8b79ca27346 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -349,9 +349,9 @@ uint32_t argo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
MACHINE_CONFIG_START(argo_state::argo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3500000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3500000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp
index b20f1d308e3..1fa62441adc 100644
--- a/src/mame/drivers/argox.cpp
+++ b/src/mame/drivers/argox.cpp
@@ -70,10 +70,10 @@ void os214_state::os214_io_map(address_map &map)
MACHINE_CONFIG_START(os214_state::os214)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL(16'000'000)) /* X1 xtal value is correct,
+ MCFG_DEVICE_ADD("maincpu", H83002, XTAL(16'000'000)) /* X1 xtal value is correct,
but there can be some clock divider perhaps ? */
- MCFG_CPU_PROGRAM_MAP(os214_prg_map)
- MCFG_CPU_IO_MAP(os214_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(os214_prg_map)
+ MCFG_DEVICE_IO_MAP(os214_io_map)
MACHINE_CONFIG_END
DRIVER_INIT_MEMBER( os214_state, os214 )
diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp
index e2f0afdcab7..761903f0f71 100644
--- a/src/mame/drivers/argus.cpp
+++ b/src/mame/drivers/argus.cpp
@@ -540,13 +540,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(argus_state::argus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(argus_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(argus_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", argus_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 5000000)
- MCFG_CPU_PROGRAM_MAP(sound_map_a)
- MCFG_CPU_IO_MAP(sound_portmap_2)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_a)
+ MCFG_DEVICE_IO_MAP(sound_portmap_2)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -571,14 +571,14 @@ MACHINE_CONFIG_START(argus_state::argus)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_DEVICE_ADD("ym1", YM2203, 6000000 / 4)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_DEVICE_ADD("ym2", YM2203, 6000000 / 4)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -588,13 +588,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(argus_state::valtric)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MCFG_CPU_PROGRAM_MAP(valtric_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(valtric_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", argus_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 5000000)
- MCFG_CPU_PROGRAM_MAP(sound_map_a)
- MCFG_CPU_IO_MAP(sound_portmap_2)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_a)
+ MCFG_DEVICE_IO_MAP(sound_portmap_2)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -619,14 +619,14 @@ MACHINE_CONFIG_START(argus_state::valtric)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_DEVICE_ADD("ym1", YM2203, 6000000 / 4)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_DEVICE_ADD("ym2", YM2203, 6000000 / 4)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -636,13 +636,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(argus_state::butasan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
- MCFG_CPU_PROGRAM_MAP(butasan_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(butasan_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", argus_state, butasan_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 5000000)
- MCFG_CPU_PROGRAM_MAP(sound_map_b)
- MCFG_CPU_IO_MAP(sound_portmap_2)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_b)
+ MCFG_DEVICE_IO_MAP(sound_portmap_2)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -667,14 +667,14 @@ MACHINE_CONFIG_START(argus_state::butasan)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 6000000 / 4)
+ MCFG_DEVICE_ADD("ym1", YM2203, 6000000 / 4)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)
MCFG_SOUND_ROUTE(3, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM2203, 6000000 / 4)
+ MCFG_DEVICE_ADD("ym2", YM2203, 6000000 / 4)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 86261c19fe6..e3966751ced 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -1768,9 +1768,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(aristmk4_state::aristmk4_pf)
MACHINE_CONFIG_START(aristmk4_state::aristmk4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK/8) // M68B09E @ 1.5 MHz
- MCFG_CPU_PROGRAM_MAP(aristmk4_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aristmk4_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CLOCK/8) // M68B09E @ 1.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(aristmk4_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aristmk4_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_TIMER_DRIVER_ADD_PERIODIC("power_fail", aristmk4_state, aristmk4_pf, attotime::from_hz(1))
@@ -1789,26 +1789,26 @@ MACHINE_CONFIG_START(aristmk4_state::aristmk4)
MCFG_PALETTE_INIT_OWNER(aristmk4_state, aristmk4)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(aristmk4_state, pa1_r))
- MCFG_I8255_IN_PORTB_CB(READ8(aristmk4_state, pb1_r))
- MCFG_I8255_IN_PORTC_CB(READ8(aristmk4_state, pc1_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, aristmk4_state, pa1_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, aristmk4_state, pb1_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, aristmk4_state, pc1_r))
MCFG_DEVICE_ADD("via6522_0", VIA6522, MAIN_CLOCK/8) // R65C22P2
- MCFG_VIA6522_READPA_HANDLER(READ8(aristmk4_state, via_a_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(aristmk4_state, via_b_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(aristmk4_state, via_a_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(aristmk4_state, via_b_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(aristmk4_state, via_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(aristmk4_state, via_cb2_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, aristmk4_state, via_a_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, aristmk4_state, via_b_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, aristmk4_state, via_a_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, aristmk4_state, via_b_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, aristmk4_state, via_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, aristmk4_state, via_cb2_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
// CA1 is connected to +5V, CB1 is not connected.
MCFG_DEVICE_ADD("pia6821_0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(aristmk4_state, mkiv_pia_ina))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(aristmk4_state, mkiv_pia_outa))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(aristmk4_state, mkiv_pia_outb))
- MCFG_PIA_CA2_HANDLER(WRITELINE(aristmk4_state, mkiv_pia_ca2))
- MCFG_PIA_CB2_HANDLER(WRITELINE(aristmk4_state, mkiv_pia_cb2))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, aristmk4_state, mkiv_pia_ina))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, aristmk4_state, mkiv_pia_outa))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, aristmk4_state, mkiv_pia_outb))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, aristmk4_state, mkiv_pia_ca2))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, aristmk4_state, mkiv_pia_cb2))
MCFG_MC6845_ADD("crtc", C6545_1, "screen", MAIN_CLOCK/8) // TODO: type is unknown
/* in fact is a mc6845 driving 4 pixels by memory address.
@@ -1821,17 +1821,17 @@ MACHINE_CONFIG_START(aristmk4_state::aristmk4)
MCFG_SPEAKER_STANDARD_MONO("mono")
// the Mark IV has X 2 AY8910 sound chips which are tied to the VIA
- MCFG_SOUND_ADD("ay1", AY8910 , MAIN_CLOCK/8)
+ MCFG_DEVICE_ADD("ay1", AY8910 , MAIN_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(aristmk4_state, zn434_w)) // Port write to set Vout of the DA convertors ( 2 x ZN434 )
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, aristmk4_state, zn434_w)) // Port write to set Vout of the DA convertors ( 2 x ZN434 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay2", AY8910 , MAIN_CLOCK/8)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(aristmk4_state, pblp_out)) // Port A write - goes to lamps on the buttons x8
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(aristmk4_state, pbltlp_out)) // Port B write - goes to lamps on the buttons x4 and light tower x4
+ MCFG_DEVICE_ADD("ay2", AY8910 , MAIN_CLOCK/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, aristmk4_state, pblp_out)) // Port A write - goes to lamps on the buttons x8
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, aristmk4_state, pbltlp_out)) // Port B write - goes to lamps on the buttons x4 and light tower x4
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5) /* one for each meter - can pulse simultaneously */
MCFG_SAMPLES_NAMES(meter_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
@@ -1841,9 +1841,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aristmk4_state::aristmk4_poker)
aristmk4(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(aristmk4_poker_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aristmk4_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(aristmk4_poker_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aristmk4_state, irq0_line_hold)
MACHINE_CONFIG_END
/* same as Aristocrat Mark-IV HW color offset 7 */
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index aa6a9e8952f..55012a00697 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -2037,8 +2037,8 @@ void aristmk5_state::machine_reset()
MACHINE_CONFIG_START(aristmk5_state::aristmk5)
- MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
- MCFG_CPU_PROGRAM_MAP(aristmk5_drame_map)
+ MCFG_DEVICE_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
+ MCFG_DEVICE_PROGRAM_MAP(aristmk5_drame_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2)) /* 1.6 - 2 seconds */
@@ -2062,44 +2062,44 @@ MACHINE_CONFIG_START(aristmk5_state::aristmk5)
// TL16C452FN U71
MCFG_DEVICE_ADD("uart_0a", NS16450, MASTER_CLOCK / 9)
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<0>))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("uart_0b", NS16450, MASTER_CLOCK / 9)
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<1>))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<1>))
// TL16C452FN U72
MCFG_DEVICE_ADD("uart_1a", NS16450, MASTER_CLOCK / 9)
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<2>))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<2>))
MCFG_DEVICE_ADD("uart_1b", NS16450, MASTER_CLOCK / 9)
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("uart_irq", input_merger_device, in_w<3>))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("uart_irq", input_merger_device, in_w<3>))
// COMM port 4 - 5
MCFG_DEVICE_ADD("uart_2a", NS16450, MASTER_CLOCK / 9)
-// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback))
+// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback))
MCFG_DEVICE_ADD("uart_2b", NS16450, MASTER_CLOCK / 9)
-// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback))
+// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback))
// COMM port 6 - 7
MCFG_DEVICE_ADD("uart_3a", NS16450, MASTER_CLOCK / 9)
-// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback))
+// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback))
MCFG_DEVICE_ADD("uart_3b", NS16450, MASTER_CLOCK / 9)
-// MCFG_INS8250_OUT_INT_CB(WRITELINE(aristmk5_state, uart_irq_callback))
+// MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, aristmk5_state, uart_irq_callback))
MCFG_INPUT_MERGER_ANY_HIGH("uart_irq")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(aristmk5_state, uart_irq_callback))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, aristmk5_state, uart_irq_callback))
MCFG_DS1302_ADD("rtc", XTAL(32'768))
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
@@ -2115,23 +2115,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(aristmk5_state::aristmk5_touch)
aristmk5(config);
MCFG_DEVICE_MODIFY("uart_0a")
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
- MCFG_MICROTOUCH_ADD("microtouch", 2400, DEVWRITELINE("uart_0a", ins8250_uart_device, rx_w))
+ MCFG_MICROTOUCH_ADD("microtouch", 2400, WRITELINE("uart_0a", ins8250_uart_device, rx_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(aristmk5_state::aristmk5_usa)
aristmk5(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(aristmk5_usa_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(aristmk5_usa_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(aristmk5_state::aristmk5_usa_touch)
aristmk5_usa(config);
MCFG_DEVICE_MODIFY("uart_0a")
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
- MCFG_MICROTOUCH_ADD("microtouch", 2400, DEVWRITELINE("uart_0a", ins8250_uart_device, rx_w))
+ MCFG_MICROTOUCH_ADD("microtouch", 2400, WRITELINE("uart_0a", ins8250_uart_device, rx_w))
MACHINE_CONFIG_END
#define ARISTOCRAT_MK5_BIOS \
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index f5f1facaf3e..c0c5c2a93f3 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -333,7 +333,7 @@ static constexpr XTAL ARISTMK6_CPU_CLOCK = 200_MHz_XTAL;
MACHINE_CONFIG_START(aristmk6_state::aristmk6)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, ARISTMK6_CPU_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", SH4LE, ARISTMK6_CPU_CLOCK)
MCFG_SH4_MD0(1)
MCFG_SH4_MD1(0)
MCFG_SH4_MD2(1)
@@ -344,8 +344,8 @@ MACHINE_CONFIG_START(aristmk6_state::aristmk6)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(ARISTMK6_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(aristmk6_map)
- MCFG_CPU_IO_MAP(aristmk6_port)
+ MCFG_DEVICE_PROGRAM_MAP(aristmk6_map)
+ MCFG_DEVICE_IO_MAP(aristmk6_port)
MCFG_MMU_HACK_TYPE(2)
MCFG_CPU_FORCE_NO_DRC()
// MCFG_DEVICE_DISABLE()
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index cb58c0e9ef8..df49864a7d2 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -1343,9 +1343,9 @@ Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz
MACHINE_CONFIG_START(arkanoid_state::arkanoid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(arkanoid_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(arkanoid_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393 at ic21, counts 128 vblanks before firing watchdog; z80 /RESET ls08 ic19 pin 9 input comes from ls04 ic20 pin 8, ls04 ic20 pin 9 input comes from ic21 ls393 pin 8, and ls393 is set to chain both 4 bit counters together
@@ -1371,7 +1371,7 @@ MACHINE_CONFIG_START(arkanoid_state::arkanoid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(12'000'000)/4) /* YM2149 clock is 3mhz, pin 26 is low so final clock is 3mhz/2, handled inside the ay core */
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(12'000'000)/4) /* YM2149 clock is 3mhz, pin 26 is low so final clock is 3mhz/2, handled inside the ay core */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | YM2149_PIN26_LOW) // all outputs are tied together with no resistors, and pin 26 is low
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1393,7 +1393,7 @@ MACHINE_CONFIG_START(arkanoid_state::p3mcuay)
MCFG_DEVICE_REPLACE("mcu", ARKANOID_68705P3, XTAL(12'000'000)/4)
MCFG_ARKANOID_MCU_PORTB_R_CB(IOPORT("MUX"))
- MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4) // AY-3-8910A
+ MCFG_DEVICE_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4) // AY-3-8910A
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1404,15 +1404,15 @@ MACHINE_CONFIG_START(arkanoid_state::bootleg)
arkanoid(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::aysnd)
bootleg(config);
- MCFG_SOUND_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4)
+ MCFG_DEVICE_REPLACE("aysnd", AY8910, XTAL(12'000'000)/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNUSED"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
@@ -1423,9 +1423,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::hexa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Imported from arkanoid - correct? */
- MCFG_CPU_PROGRAM_MAP(hexa_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Imported from arkanoid - correct? */
+ MCFG_DEVICE_PROGRAM_MAP(hexa_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1444,7 +1444,7 @@ MACHINE_CONFIG_START(arkanoid_state::hexa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1452,22 +1452,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::hexaa)
hexa(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hexaa_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hexaa_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(12'000'000)/2) // ?
- MCFG_CPU_PROGRAM_MAP(hexaa_sub_map)
- MCFG_CPU_IO_MAP(hexaa_sub_iomap)
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(12'000'000)/2) // ?
+ MCFG_DEVICE_PROGRAM_MAP(hexaa_sub_map)
+ MCFG_DEVICE_IO_MAP(hexaa_sub_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(arkanoid_state::brixian)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(brixian_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(brixian_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arkanoid_state, irq0_line_hold)
/* there is a 68705 but it's only role appears to be to copy data to RAM at startup */
/* the RAM is also battery backed, making the 68705 almost redundant as long as the battery doesn't die(!) */
@@ -1487,7 +1487,7 @@ MACHINE_CONFIG_START(arkanoid_state::brixian)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(12'000'000)/4/2) /* Imported from arkanoid - correct? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index 4fc0769878b..317fef6d5d1 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -1251,20 +1251,20 @@ MACHINE_RESET_MEMBER(armedf_state,armedf)
MACHINE_CONFIG_START(armedf_state::terraf_sound)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // 10-pin SIP with 74HC374P latch
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // 10-pin SIP with 74HC374P latch
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // 10-pin SIP with 74HC374P latch
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // 10-pin SIP with 74HC374P latch
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1273,9 +1273,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::terraf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz?
- MCFG_CPU_PROGRAM_MAP(terraf_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz?
+ MCFG_DEVICE_PROGRAM_MAP(terraf_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1292,7 +1292,7 @@ MACHINE_CONFIG_START(armedf_state::terraf)
MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
@@ -1308,18 +1308,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::terrafjb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(terraf_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(terraf_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
- MCFG_CPU_ADD("extra", Z80, XTAL(16'000'000)/4) // 4mhz?
- MCFG_CPU_PROGRAM_MAP(terrafjb_extraz80_map)
- MCFG_CPU_IO_MAP(terrafjb_extraz80_portmap)
+ MCFG_DEVICE_ADD("extra", Z80, XTAL(16'000'000)/4) // 4mhz?
+ MCFG_DEVICE_PROGRAM_MAP(terrafjb_extraz80_map)
+ MCFG_DEVICE_IO_MAP(terrafjb_extraz80_portmap)
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1334,7 +1334,7 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1347,11 +1347,11 @@ MACHINE_CONFIG_START(armedf_state::terrafjb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1365,9 +1365,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::kozure)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(kozure_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(kozure_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1384,7 +1384,7 @@ MACHINE_CONFIG_START(armedf_state::kozure)
MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1399,14 +1399,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::armedf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(armedf_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(armedf_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1421,7 +1421,7 @@ MACHINE_CONFIG_START(armedf_state::armedf)
MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1434,11 +1434,11 @@ MACHINE_CONFIG_START(armedf_state::armedf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", 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)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1447,14 +1447,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::cclimbr2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(cclimbr2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(cclimbr2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
- MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1471,7 +1471,7 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1484,11 +1484,11 @@ MACHINE_CONFIG_START(armedf_state::cclimbr2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1497,14 +1497,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::legion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(legion_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(legion_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
- MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MCFG_CPU_IO_MAP(sound_3526_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_DEVICE_IO_MAP(sound_3526_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1521,7 +1521,7 @@ MACHINE_CONFIG_START(armedf_state::legion)
MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1534,11 +1534,11 @@ MACHINE_CONFIG_START(armedf_state::legion)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(24'000'000)/6) // 4mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 10-pin SIP with 74HC374P latch
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 10-pin SIP with 74HC374P latch
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 10-pin SIP with 74HC374P latch
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // 10-pin SIP with 74HC374P latch
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1547,14 +1547,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(armedf_state::legionjb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(legionjb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(legionjb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
- MCFG_CPU_PROGRAM_MAP(cclimbr2_soundmap)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/6) // 4mhz
+ MCFG_DEVICE_PROGRAM_MAP(cclimbr2_soundmap)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(armedf_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
MCFG_MACHINE_RESET_OVERRIDE(armedf_state,armedf)
@@ -1569,7 +1569,7 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
MCFG_VIDEO_START_OVERRIDE(armedf_state,terraf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1582,11 +1582,11 @@ MACHINE_CONFIG_START(armedf_state::legionjb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(24'000'000)/6) // or YM3526?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1594,13 +1594,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // verified
- MCFG_CPU_PROGRAM_MAP(bigfghtr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // verified
+ MCFG_DEVICE_PROGRAM_MAP(bigfghtr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", armedf_state, irq1_line_assert)
- MCFG_CPU_ADD("mcu", I8751, XTAL(16'000'000)/2) // verified
- MCFG_CPU_PROGRAM_MAP(bigfghtr_mcu_map)
- MCFG_CPU_IO_MAP(bigfghtr_mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(16'000'000)/2) // verified
+ MCFG_DEVICE_PROGRAM_MAP(bigfghtr_mcu_map)
+ MCFG_DEVICE_IO_MAP(bigfghtr_mcu_io_map)
MCFG_MCS51_PORT_P1_IN_CB(CONSTANT(0xdf)) // bit 5: bus contention related?
MCFG_MACHINE_START_OVERRIDE(armedf_state,armedf)
@@ -1613,7 +1613,7 @@ MACHINE_CONFIG_START(bigfghtr_state::bigfghtr)
MCFG_VIDEO_START_OVERRIDE(armedf_state,armedf)
MCFG_SCREEN_UPDATE_DRIVER(armedf_state, screen_update_armedf)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", armedf)
MCFG_PALETTE_ADD("palette", 2048)
diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp
index 8fd8ab4534d..437aec43b31 100644
--- a/src/mame/drivers/arsystems.cpp
+++ b/src/mame/drivers/arsystems.cpp
@@ -301,8 +301,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(arcadia_amiga_state::arcadia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
- MCFG_CPU_PROGRAM_MAP(arcadia_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
+ MCFG_DEVICE_PROGRAM_MAP(arcadia_map)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map)
@@ -324,39 +324,39 @@ MACHINE_CONFIG_START(arcadia_amiga_state::arcadia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(2, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
- MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w))
+ MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w))
/* cia */
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA"))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
MCFG_MOS6526_PB_INPUT_CALLBACK(IOPORT("CIA0PORTB"))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(arcadia_amiga_state,arcadia_cia_0_portb_w))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, arcadia_amiga_state,arcadia_cia_0_portb_w))
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
/* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC)
- MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w))
- MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r))
- MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w))
- MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w))
- MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w))
+ MCFG_AMIGA_FDC_INDEX_CALLBACK(WRITELINE("cia_1", mos8520_device, flag_w))
+ MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w))
+ MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(arcadia_amiga_state::argh)
arcadia(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(argh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(argh_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index 774642fce99..5ba124ca2b5 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -809,16 +809,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(artmagic_state::artmagic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
- MCFG_CPU_PROGRAM_MAP(tms_map)
+ MCFG_DEVICE_ADD("tms", TMS34010, MASTER_CLOCK_40MHz)
+ MCFG_DEVICE_PROGRAM_MAP(tms_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(MASTER_CLOCK_40MHz/6) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(artmagic_state, scanline) /* scanline update (rgb32) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(artmagic_state, m68k_gen_int))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, artmagic_state, m68k_gen_int))
MCFG_TMS340X0_TO_SHIFTREG_CB(artmagic_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(artmagic_state, from_shiftreg) /* read from shiftreg function */
@@ -845,7 +845,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(artmagic_state::cheesech)
artmagic(config);
- MCFG_SOUND_MODIFY("oki")
+ MCFG_DEVICE_MODIFY("oki")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -854,13 +854,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(artmagic_state::stonebal)
artmagic(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(stonebal_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(stonebal_map)
- MCFG_CPU_MODIFY("tms")
- MCFG_CPU_PROGRAM_MAP(stonebal_tms_map)
+ MCFG_DEVICE_MODIFY("tms")
+ MCFG_DEVICE_PROGRAM_MAP(stonebal_tms_map)
- MCFG_SOUND_MODIFY("oki")
+ MCFG_DEVICE_MODIFY("oki")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -868,24 +868,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(artmagic_state::shtstar)
artmagic(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(shtstar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(shtstar_map)
MCFG_DEVICE_ADD("mainduart", MC68681, 3686400)
/* sub cpu*/
- MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/2)
- MCFG_CPU_PROGRAM_MAP(shtstar_subcpu_map)
+ MCFG_DEVICE_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(shtstar_subcpu_map)
MCFG_DEVICE_ADD("subduart", MC68681, 3686400)
- MCFG_SOUND_ADD("aysnd", YM2149, 3686400/2)
+ MCFG_DEVICE_ADD("aysnd", YM2149, 3686400/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
/*gun board cpu*/
- MCFG_CPU_ADD("guncpu", I80C31, 6000000)
- MCFG_CPU_IO_MAP(shtstar_guncpu_io_map)
- MCFG_CPU_PROGRAM_MAP(shtstar_guncpu_map)
+ MCFG_DEVICE_ADD("guncpu", I80C31, 6000000)
+ MCFG_DEVICE_IO_MAP(shtstar_guncpu_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(shtstar_guncpu_map)
MCFG_MCS51_PORT_P1_IN_CB(NOOP) // ?
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp
index 837998df461..e99964760af 100644
--- a/src/mame/drivers/ashnojoe.cpp
+++ b/src/mame/drivers/ashnojoe.cpp
@@ -307,13 +307,13 @@ void ashnojoe_state::machine_reset()
MACHINE_CONFIG_START(ashnojoe_state::ashnojoe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(ashnojoe_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ashnojoe_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(ashnojoe_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ashnojoe_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
/* video hardware */
@@ -334,14 +334,14 @@ MACHINE_CONFIG_START(ashnojoe_state::ashnojoe)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 4000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ashnojoe_state, ym2203_write_a))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ashnojoe_state, ym2203_write_b))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ashnojoe_state, ym2203_write_a))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ashnojoe_state, ym2203_write_b))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ashnojoe_state, ashnojoe_vclk_cb))
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ashnojoe_state, ashnojoe_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp
index 32dfc693bb1..2222796b752 100644
--- a/src/mame/drivers/asst128.cpp
+++ b/src/mame/drivers/asst128.cpp
@@ -100,10 +100,10 @@ static DEVICE_INPUT_DEFAULTS_START( asst128 )
DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(asst128_state::asst128)
- MCFG_CPU_ADD("maincpu", I8086, 4772720)
- MCFG_CPU_PROGRAM_MAP(asst128_map)
- MCFG_CPU_IO_MAP(asst128_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 4772720)
+ MCFG_DEVICE_PROGRAM_MAP(asst128_map)
+ MCFG_DEVICE_IO_MAP(asst128_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mb", ASST128_MOTHERBOARD, 0)
downcast<asst128_mb_device &>(*device).set_cputag("maincpu");
@@ -112,13 +112,14 @@ MACHINE_CONFIG_START(asst128_state::asst128)
MCFG_DEVICE_MODIFY("mb:cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
- MCFG_ISA8_SLOT_ADD("mb:isa", "board0", pc_isa8_cards, "cga_mc1502", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "board1", pc_isa8_cards, "lpt", true)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board0", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga_mc1502", true)
+ MCFG_DEVICE_ADD("board1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", true)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
MCFG_PC_FDC_XT_ADD("fdc")
- MCFG_PC_FDC_INTRQ_CALLBACK(DEVWRITELINE("mb:pic8259", pic8259_device, ir6_w))
+ MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE("mb:pic8259", pic8259_device, ir6_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", asst128_floppies, "525ssqd", asst128_state::asst128_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", asst128_floppies, "525ssqd", asst128_state::asst128_formats)
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index 37ef4020662..dcb210a1df1 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -262,12 +262,12 @@ void asterix_state::machine_reset()
MACHINE_CONFIG_START(asterix_state::asterix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) // 12MHz
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", asterix_state, asterix_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) // 12MHz
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", asterix_state, asterix_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // 8MHz Z80E ??
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // 8MHz Z80E ??
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index 1f8119f90f3..d11876fb033 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -649,9 +649,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(asteroid_state::asteroid_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(asteroid_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, asteroid_interrupt, CLOCK_3KHZ/12)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(asteroid_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(asteroid_state, asteroid_interrupt, CLOCK_3KHZ/12)
MCFG_WATCHDOG_ADD("watchdog")
@@ -662,10 +662,10 @@ MACHINE_CONFIG_START(asteroid_state::asteroid_base)
MCFG_OUTPUT_LATCH_BIT1_HANDLER(OUTPUT("led0")) MCFG_DEVCB_INVERT // 1 PLYR START LAMP
MCFG_OUTPUT_LATCH_BIT2_HANDLER(MEMBANK("ram1")) // RAMSEL
MCFG_DEVCB_CHAIN_OUTPUT(MEMBANK("ram2"))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(asteroid_state, cocktail_inv_w))
- MCFG_OUTPUT_LATCH_BIT3_HANDLER(WRITELINE(asteroid_state, coin_counter_left_w)) // COIN CNTRL
- MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(asteroid_state, coin_counter_center_w)) // COIN CNTRC
- MCFG_OUTPUT_LATCH_BIT5_HANDLER(WRITELINE(asteroid_state, coin_counter_right_w)) // COIN CNTRR
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, asteroid_state, cocktail_inv_w))
+ MCFG_OUTPUT_LATCH_BIT3_HANDLER(WRITELINE(*this, asteroid_state, coin_counter_left_w)) // COIN CNTRL
+ MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(*this, asteroid_state, coin_counter_center_w)) // COIN CNTRC
+ MCFG_OUTPUT_LATCH_BIT5_HANDLER(WRITELINE(*this, asteroid_state, coin_counter_right_w)) // COIN CNTRR
/* video hardware */
MCFG_VECTOR_ADD("vector")
@@ -690,8 +690,8 @@ MACHINE_CONFIG_START(asteroid_state::asterock)
asteroid(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, asterock_interrupt, CLOCK_3KHZ/12)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(asteroid_state, asterock_interrupt, CLOCK_3KHZ/12)
MACHINE_CONFIG_END
@@ -699,15 +699,15 @@ MACHINE_CONFIG_START(asteroid_state::astdelux)
asteroid_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(astdelux_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(astdelux_map)
MCFG_ATARIVGEAROM_ADD("earom")
/* sound hardware */
astdelux_sound(config);
- MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, MASTER_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW2"))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -718,10 +718,10 @@ MACHINE_CONFIG_START(asteroid_state::astdelux)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // START2
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(MEMBANK("ram1")) // RAMSEL
MCFG_DEVCB_CHAIN_OUTPUT(MEMBANK("ram2"))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(asteroid_state, cocktail_inv_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(asteroid_state, coin_counter_left_w)) // LEFT COIN
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(asteroid_state, coin_counter_center_w)) // CENTER COIN
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(asteroid_state, coin_counter_right_w)) // RIGHT COIN
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, asteroid_state, cocktail_inv_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, asteroid_state, coin_counter_left_w)) // LEFT COIN
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, asteroid_state, coin_counter_center_w)) // CENTER COIN
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, asteroid_state, coin_counter_right_w)) // RIGHT COIN
MACHINE_CONFIG_END
@@ -729,9 +729,9 @@ MACHINE_CONFIG_START(asteroid_state::llander)
asteroid_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(llander_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, MASTER_CLOCK/4096/12)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(llander_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(asteroid_state, llander_interrupt, MASTER_CLOCK/4096/12)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(CLOCK_3KHZ/12/6)
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp
index e02932b471b..69e3076d2ce 100644
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@@ -666,9 +666,9 @@ static const char *const astinvad_sample_names[] =
MACHINE_CONFIG_START(astinvad_state::kamikaze)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kamikaze_map)
- MCFG_CPU_IO_MAP(kamikaze_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kamikaze_map)
+ MCFG_DEVICE_IO_MAP(kamikaze_portmap)
MCFG_MACHINE_START_OVERRIDE(astinvad_state, kamikaze)
MCFG_MACHINE_RESET_OVERRIDE(astinvad_state, kamikaze)
@@ -679,8 +679,8 @@ MACHINE_CONFIG_START(astinvad_state::kamikaze)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(astinvad_state, kamikaze_sound1_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(astinvad_state, kamikaze_sound2_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, astinvad_state, kamikaze_sound1_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, astinvad_state, kamikaze_sound2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -692,7 +692,7 @@ MACHINE_CONFIG_START(astinvad_state::kamikaze)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(astinvad_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -704,9 +704,9 @@ MACHINE_CONFIG_START(astinvad_state::spcking2)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("ppi8255_1")
- MCFG_I8255_OUT_PORTA_CB(WRITE8(astinvad_state, spcking2_sound1_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(astinvad_state, spcking2_sound2_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(astinvad_state, spcking2_sound3_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, astinvad_state, spcking2_sound1_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, astinvad_state, spcking2_sound2_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, astinvad_state, spcking2_sound3_w))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -718,10 +718,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(astinvad_state::spaceint)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
- MCFG_CPU_PROGRAM_MAP(spaceint_map)
- MCFG_CPU_IO_MAP(spaceint_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", astinvad_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
+ MCFG_DEVICE_PROGRAM_MAP(spaceint_map)
+ MCFG_DEVICE_IO_MAP(spaceint_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", astinvad_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(astinvad_state, spaceint)
MCFG_MACHINE_RESET_OVERRIDE(astinvad_state, spaceint)
@@ -740,7 +740,7 @@ MACHINE_CONFIG_START(astinvad_state::spaceint)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(astinvad_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/astrafr.cpp b/src/mame/drivers/astrafr.cpp
index a63875dc0bd..1d787019c69 100644
--- a/src/mame/drivers/astrafr.cpp
+++ b/src/mame/drivers/astrafr.cpp
@@ -308,11 +308,11 @@ MACHINE_START_MEMBER(astrafr_state,astra_2e)
MACHINE_CONFIG_START(astrafr_state::astrafr_dual)
- MCFG_CPU_ADD("maincpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(astrafr_master_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(astrafr_master_map)
- MCFG_CPU_ADD("slavecpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(astrafr_slave_map)
+ MCFG_DEVICE_ADD("slavecpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(astrafr_slave_map)
MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
MACHINE_CONFIG_END
@@ -328,11 +328,11 @@ MACHINE_CONFIG_START(astrafr_state::astrafr_dual_37)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt)
- MCFG_CPU_ADD("maincpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(astrafr_master_alt_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(astrafr_master_alt_map)
- MCFG_CPU_ADD("slavecpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(astrafr_slave_map)
+ MCFG_DEVICE_ADD("slavecpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(astrafr_slave_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrafr_state::astrafr_dual_alt_37)
@@ -343,8 +343,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrafr_state::astra_single)
- MCFG_CPU_ADD("maincpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(astra_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(astra_map)
MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
MACHINE_CONFIG_END
@@ -368,8 +368,8 @@ MACHINE_START_MEMBER(astrafr_state,astra_57)
MACHINE_CONFIG_START(astrafr_state::astra_single_alt)
- MCFG_CPU_ADD("maincpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(astra_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(astra_map)
MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index 76c49f57337..6fa9943edea 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -510,9 +510,9 @@ TODO: understand if later hardware uses different parameters (XTAL is almost sur
MACHINE_CONFIG_START(astrocorp_state::showhand)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(showhand_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", astrocorp_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(showhand_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", astrocorp_state, irq4_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -544,8 +544,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrocorp_state::showhanc)
showhand(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(showhanc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(showhanc_map)
MACHINE_CONFIG_END
@@ -563,8 +563,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::skilldrp_scanline)
MACHINE_CONFIG_START(astrocorp_state::skilldrp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) // JX-1689F1028N GRX586.V5
- MCFG_CPU_PROGRAM_MAP(skilldrp_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) // JX-1689F1028N GRX586.V5
+ MCFG_DEVICE_PROGRAM_MAP(skilldrp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", astrocorp_state, skilldrp_scanline, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -599,8 +599,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrocorp_state::speeddrp)
skilldrp(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(speeddrp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(speeddrp_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index bfeef40c394..54c46098d08 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -1265,7 +1265,7 @@ static const z80_daisy_config tenpin_daisy_chain[] =
MACHINE_CONFIG_START(astrocde_state::astrocade_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
+ MCFG_DEVICE_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
/* each game has its own map */
/* video hardware */
@@ -1340,14 +1340,14 @@ MACHINE_CONFIG_START(astrocde_state::seawolf2)
astrocade_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(seawolf2_map)
- MCFG_CPU_IO_MAP(port_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(seawolf2_map)
+ MCFG_DEVICE_IO_MAP(port_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(10) /* 5*2 channels */
MCFG_SAMPLES_NAMES(seawolf_sample_names)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
@@ -1368,9 +1368,9 @@ MACHINE_CONFIG_START(astrocde_state::ebases)
astrocade_mono_sound(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ebases_map)
- MCFG_CPU_IO_MAP(port_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ebases_map)
+ MCFG_DEVICE_IO_MAP(port_map)
MACHINE_CONFIG_END
@@ -1379,9 +1379,9 @@ MACHINE_CONFIG_START(astrocde_state::spacezap)
astrocade_mono_sound(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spacezap_map)
- MCFG_CPU_IO_MAP(port_map_mono_pattern)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spacezap_map)
+ MCFG_DEVICE_IO_MAP(port_map_mono_pattern)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(astrocde_state::wow)
@@ -1389,9 +1389,9 @@ MACHINE_CONFIG_START(astrocde_state::wow)
astrocade_stereo_sound(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wow_map)
- MCFG_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wow_map)
+ MCFG_DEVICE_IO_MAP(port_map_stereo_pattern)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1401,7 +1401,7 @@ MACHINE_CONFIG_START(astrocde_state::wow)
/* sound hardware */
MCFG_SPEAKER_ADD("center", 0.0, 0.0, 1.0)
- MCFG_SOUND_ADD("votrax", VOTRAX_SC01, 720000)
+ MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "center", 0.85)
MACHINE_CONFIG_END
@@ -1410,9 +1410,9 @@ MACHINE_CONFIG_START(astrocde_state::gorf)
astrocade_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wow_map)
- MCFG_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wow_map)
+ MCFG_DEVICE_IO_MAP(port_map_stereo_pattern)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1428,7 +1428,7 @@ MACHINE_CONFIG_START(astrocde_state::gorf)
MCFG_ASTROCADE_ADD("astrocade2", ASTROCADE_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lower", 1.0)
- MCFG_SOUND_ADD("votrax", VOTRAX_SC01, 720000)
+ MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "upper", 0.85)
MACHINE_CONFIG_END
@@ -1438,9 +1438,9 @@ MACHINE_CONFIG_START(astrocde_state::robby)
astrocade_stereo_sound(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(robby_map)
- MCFG_CPU_IO_MAP(port_map_stereo_pattern)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(robby_map)
+ MCFG_DEVICE_IO_MAP(port_map_stereo_pattern)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -1451,9 +1451,9 @@ MACHINE_CONFIG_START(astrocde_state::profpac)
astrocade_stereo_sound(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(profpac_map)
- MCFG_CPU_IO_MAP(port_map_16col_pattern)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(profpac_map)
+ MCFG_DEVICE_IO_MAP(port_map_16col_pattern)
MCFG_DEVICE_MODIFY("bank4000")
MCFG_DEVICE_PROGRAM_MAP(profpac_bank4000_map)
@@ -1465,9 +1465,9 @@ MACHINE_CONFIG_START(astrocde_state::demndrgn)
astrocade_16color_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(demndrgn_map)
- MCFG_CPU_IO_MAP(port_map_16col_pattern_nosound)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(demndrgn_map)
+ MCFG_DEVICE_IO_MAP(port_map_16col_pattern_nosound)
MACHINE_CONFIG_END
@@ -1475,14 +1475,14 @@ MACHINE_CONFIG_START(astrocde_state::tenpindx)
astrocade_16color_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(profpac_map)
- MCFG_CPU_IO_MAP(port_map_16col_pattern_tenpindx)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(profpac_map)
+ MCFG_DEVICE_IO_MAP(port_map_16col_pattern_tenpindx)
- MCFG_CPU_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */
+ MCFG_DEVICE_ADD("sub", Z80, ASTROCADE_CLOCK/4) /* real clock unknown */
MCFG_Z80_DAISY_CHAIN(tenpin_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(tenpin_sub_map)
- MCFG_CPU_IO_MAP(tenpin_sub_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(tenpin_sub_map)
+ MCFG_DEVICE_IO_MAP(tenpin_sub_io_map)
MCFG_DEVICE_ADD("ctc", Z80CTC, ASTROCADE_CLOCK/4 /* same as "sub" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("sub", INPUT_LINE_IRQ0))
@@ -1493,7 +1493,7 @@ MACHINE_CONFIG_START(astrocde_state::tenpindx)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("sub", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("aysnd", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */
+ MCFG_DEVICE_ADD("aysnd", AY8912, ASTROCADE_CLOCK/4) /* real clock unknown */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DIPSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp
index 195dae13a46..8a81d354df9 100644
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@@ -916,7 +916,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(astrof_state::base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
MCFG_TIMER_DRIVER_ADD_SCANLINE("vblank", astrof_state, irq_callback, "screen", VBSTART, 0)
/* video hardware */
@@ -930,8 +930,8 @@ MACHINE_CONFIG_START(astrof_state::astrof)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(astrof_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(astrof_map)
MCFG_MACHINE_START_OVERRIDE(astrof_state,astrof)
@@ -958,8 +958,8 @@ MACHINE_CONFIG_START(astrof_state::spfghmk2)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spfghmk2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spfghmk2_map)
MCFG_MACHINE_START_OVERRIDE(astrof_state,spfghmk2)
@@ -976,8 +976,8 @@ MACHINE_CONFIG_START(astrof_state::tomahawk)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tomahawk_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tomahawk_map)
MCFG_MACHINE_START_OVERRIDE(astrof_state,tomahawk)
diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp
index e12c1ea1886..a806fb5f778 100644
--- a/src/mame/drivers/astrohome.cpp
+++ b/src/mame/drivers/astrohome.cpp
@@ -199,9 +199,9 @@ static void astrocade_exp(device_slot_interface &device)
MACHINE_CONFIG_START(astrocde_mess_state::astrocde)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4) /* 1.789 MHz */
- MCFG_CPU_PROGRAM_MAP(astrocade_mem)
- MCFG_CPU_IO_MAP(astrocade_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, ASTROCADE_CLOCK/4) /* 1.789 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(astrocade_mem)
+ MCFG_DEVICE_IO_MAP(astrocade_io)
MCFG_MACHINE_START_OVERRIDE(astrocde_mess_state, astrocde)
@@ -216,7 +216,7 @@ MACHINE_CONFIG_START(astrocde_mess_state::astrocde)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
+ MCFG_DEVICE_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* expansion port */
diff --git a/src/mame/drivers/astropc.cpp b/src/mame/drivers/astropc.cpp
index 4fb6a45f312..7f6e3c0560a 100644
--- a/src/mame/drivers/astropc.cpp
+++ b/src/mame/drivers/astropc.cpp
@@ -52,9 +52,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(astropc_state::astropc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I486, 40000000 ) // ??
- MCFG_CPU_PROGRAM_MAP(astropc_map)
- MCFG_CPU_IO_MAP(astropc_io)
+ MCFG_DEVICE_ADD("maincpu", I486, 40000000 ) // ??
+ MCFG_DEVICE_PROGRAM_MAP(astropc_map)
+ MCFG_DEVICE_IO_MAP(astropc_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 8bacf2b22d0..86c69995841 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -840,19 +840,19 @@ WRITE8_MEMBER(asuka_state::counters_w)
MACHINE_CONFIG_START(asuka_state::bonzeadv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* checked on PCB */
- MCFG_CPU_PROGRAM_MAP(bonzeadv_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, bonze_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* checked on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(bonzeadv_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", asuka_state, bonze_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* sound CPU, also required for test mode */
- MCFG_CPU_PROGRAM_MAP(bonzeadv_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* sound CPU, also required for test mode */
+ MCFG_DEVICE_PROGRAM_MAP(bonzeadv_z80_map)
MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)) /* 12MHz OSC near C-Chip */
MCFG_CCHIP_IN_PORTA_CB(IOPORT("800007"))
MCFG_CCHIP_IN_PORTB_CB(IOPORT("800009"))
MCFG_CCHIP_IN_PORTC_CB(IOPORT("80000B"))
MCFG_CCHIP_IN_PORTAD_CB(IOPORT("80000D"))
- MCFG_CCHIP_OUT_PORTB_CB(WRITE8(asuka_state, counters_w))
+ MCFG_CCHIP_OUT_PORTB_CB(WRITE8(*this, asuka_state, counters_w))
MCFG_TIMER_DRIVER_ADD("cchip_irq_clear", asuka_state, cchip_irq_clear_cb)
@@ -867,7 +867,7 @@ MACHINE_CONFIG_START(asuka_state::bonzeadv)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(asuka_state, screen_update_bonzeadv)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(asuka_state, screen_vblank_asuka))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
@@ -890,7 +890,7 @@ MACHINE_CONFIG_START(asuka_state::bonzeadv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -904,12 +904,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::asuka)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(asuka_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(asuka_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -919,7 +919,7 @@ MACHINE_CONFIG_START(asuka_state::asuka)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(asuka_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, asuka_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -929,7 +929,7 @@ MACHINE_CONFIG_START(asuka_state::asuka)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(asuka_state, screen_update_asuka)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(asuka_state, screen_vblank_asuka))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
@@ -959,13 +959,13 @@ MACHINE_CONFIG_START(asuka_state::asuka)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
- MCFG_MSM5205_VCLK_CB(WRITELINE(asuka_state, asuka_msm5205_vck)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, asuka_state, asuka_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
MCFG_PC060HA_MASTER_CPU("maincpu")
@@ -975,16 +975,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::cadash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 68000p12 running at 16Mhz, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cadash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, cadash_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 68000p12 running at 16Mhz, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cadash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", asuka_state, cadash_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cadash_z80_map)
- MCFG_CPU_ADD("subcpu", Z180, XTAL(8'000'000)) /* 8MHz HD64180RP8 Z180 */
- MCFG_CPU_PROGRAM_MAP(cadash_sub_map)
- MCFG_CPU_IO_MAP(cadash_sub_io)
+ MCFG_DEVICE_ADD("subcpu", Z180, XTAL(8'000'000)) /* 8MHz HD64180RP8 Z180 */
+ MCFG_DEVICE_PROGRAM_MAP(cadash_sub_map)
+ MCFG_DEVICE_IO_MAP(cadash_sub_io)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -994,7 +994,7 @@ MACHINE_CONFIG_START(asuka_state::cadash)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(asuka_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, asuka_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -1004,7 +1004,7 @@ MACHINE_CONFIG_START(asuka_state::cadash)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(asuka_state, screen_update_bonzeadv)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(asuka_state, screen_vblank_asuka))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
@@ -1043,12 +1043,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::mofflott)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(asuka_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(asuka_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -1058,7 +1058,7 @@ MACHINE_CONFIG_START(asuka_state::mofflott)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(asuka_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, asuka_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -1068,7 +1068,7 @@ MACHINE_CONFIG_START(asuka_state::mofflott)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(asuka_state, screen_update_asuka)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(asuka_state, screen_vblank_asuka))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
@@ -1098,13 +1098,13 @@ MACHINE_CONFIG_START(asuka_state::mofflott)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(asuka_state, asuka_msm5205_vck)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, asuka_state, asuka_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
MCFG_PC060HA_MASTER_CPU("maincpu")
@@ -1114,12 +1114,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(asuka_state::eto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(eto_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(eto_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", asuka_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(cadash_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(cadash_z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -1129,7 +1129,7 @@ MACHINE_CONFIG_START(asuka_state::eto)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(asuka_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, asuka_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -1139,7 +1139,7 @@ MACHINE_CONFIG_START(asuka_state::eto)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(asuka_state, screen_update_asuka)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(asuka_state, screen_vblank_asuka))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, asuka_state, screen_vblank_asuka))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", asuka)
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index ff7042251be..5d6e129f665 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -423,20 +423,21 @@ static void pci_devices(device_slot_interface &device)
MACHINE_CONFIG_START(at_state::ibm5170)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL(12'000'000)/2 /*6000000*/)
- MCFG_CPU_PROGRAM_MAP(at16_map)
- MCFG_CPU_IO_MAP(at16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
- MCFG_80286_SHUTDOWN(DEVWRITELINE("mb", at_mb_device, shutdown))
+ MCFG_DEVICE_ADD("maincpu", I80286, XTAL(12'000'000)/2 /*6000000*/)
+ MCFG_DEVICE_PROGRAM_MAP(at16_map)
+ MCFG_DEVICE_IO_MAP(at16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_80286_SHUTDOWN(WRITELINE("mb", at_mb_device, shutdown))
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
downcast<at_mb_device *>(device)->at_softlists(config);
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "ega", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, "fdc", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa3", pc_isa16_cards, "comat", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa4", pc_isa16_cards, "ide", false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ega", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdc", false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ide", false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_IBM_PC_AT_84)
/* internal ram */
@@ -447,14 +448,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ibm5170a)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(16'000'000)/2)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(16'000'000)/2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ews286)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(16'000'000)/2) // Exact crystal needs to be verified, 8 MHz according to specification
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(16'000'000)/2) // Exact crystal needs to be verified, 8 MHz according to specification
MCFG_DEVICE_MODIFY("isa2")
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc", cfg_single_1200K) // From pictures but also with a 3.5" as second floppy
@@ -467,14 +468,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ec1842)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(12000000)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(12000000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ibm5162)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000)
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "cga", false)
MACHINE_CONFIG_END
@@ -482,10 +483,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ibmps1)
ibm5170(config);
MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(at16l_map)
- MCFG_CPU_IO_MAP(ps1_16_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(at16l_map)
+ MCFG_DEVICE_IO_MAP(ps1_16_io)
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", true)
MCFG_DEVICE_MODIFY("kbd")
@@ -494,64 +495,64 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::atvga)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(12000000)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(12000000)
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "svga_et4k", false)
MCFG_DEVICE_MODIFY("kbd")
MCFG_DEVICE_SLOT_INTERFACE(pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false) // FIXME: determine ISA bus clock
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::neat)
atvga(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(neat_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(neat_io)
MCFG_DEVICE_REMOVE("mb:rtc") // TODO: move this into the cs8221
MCFG_DS12885_ADD("mb:rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("mb:pic8259_slave", pic8259_device, ir0_w)) // this is in :mb
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("mb:pic8259_slave", pic8259_device, ir0_w)) // this is in :mb
MCFG_MC146818_CENTURY_INDEX(0x32)
MCFG_CS8221_ADD("cs8221", "maincpu", "mb:isa", "bios")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::xb42639)
atvga(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(12500000)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(12500000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::k286i)
ibm5162(config);
MCFG_DEVICE_MODIFY("kbd")
MCFG_DEVICE_SLOT_INTERFACE(pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa6", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa7", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa8", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa6", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa7", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa8", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::at386)
- MCFG_CPU_ADD("maincpu", I386, 12000000)
- MCFG_CPU_PROGRAM_MAP(at32_map)
- MCFG_CPU_IO_MAP(at32_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I386, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(at32_map)
+ MCFG_DEVICE_IO_MAP(at32_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
downcast<at_mb_device *>(device)->at_softlists(config);
MCFG_NVRAM_ADD_0FILL("nvram")
- // on board devices
- MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board3", pc_isa16_cards, "ide", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board4", pc_isa16_cards, "lpt", true)
+ // on-board devices
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdcsmc", true) // FIXME: deteremine ISA bus clock
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ide", true)
+ MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "lpt", true)
// ISA cards
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
/* internal ram */
@@ -562,44 +563,44 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::at386l)
at386(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(at32l_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(at32l_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::at486)
at386(config);
- MCFG_CPU_REPLACE("maincpu", I486, 25000000)
- MCFG_CPU_PROGRAM_MAP(at32_map)
- MCFG_CPU_IO_MAP(at32_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu", I486, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(at32_map)
+ MCFG_DEVICE_IO_MAP(at32_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::at486l)
at486(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(at32l_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(at32l_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::at386sx)
atvga(config);
- MCFG_CPU_REPLACE("maincpu", I386SX, 16000000) /* 386SX */
- MCFG_CPU_PROGRAM_MAP(at16_map)
- MCFG_CPU_IO_MAP(at16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu", I386SX, 16000000) /* 386SX */
+ MCFG_DEVICE_PROGRAM_MAP(at16_map)
+ MCFG_DEVICE_IO_MAP(at16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ct386sx)
at386sx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(neat_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(neat_io)
MCFG_CS8221_ADD("cs8221", "maincpu", "mb:isa", "maincpu")
MACHINE_CONFIG_END
// Commodore PC 30-III
MACHINE_CONFIG_START(at_state::pc30iii)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be ATI EGA Wonder 800+
MACHINE_CONFIG_END
@@ -607,70 +608,70 @@ MACHINE_CONFIG_END
// Commodore PC 40-III
MACHINE_CONFIG_START(at_state::pc40iii)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000) // should be XTAL(24'000'000)/2, but doesn't post with that setting
MCFG_DEVICE_MODIFY("isa1")
MCFG_DEVICE_SLOT_INTERFACE(pc_isa16_cards, "vga", false) // should be onboard Paradise VGA, see ROM declarations
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megapc_state::megapc)
- MCFG_CPU_ADD("maincpu", I386SX, XTAL(50'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(megapc_map)
- MCFG_CPU_IO_MAP(megapc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
+ MCFG_DEVICE_ADD("maincpu", I386SX, XTAL(50'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(megapc_map)
+ MCFG_DEVICE_IO_MAP(megapc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
MCFG_WD7600_ADD("wd7600",XTAL(50'000'000) / 2, ":maincpu", ":isa", ":bios", ":keybc")
- MCFG_WD7600_HOLD(WRITELINE(megapc_state, wd7600_hold));
+ MCFG_WD7600_HOLD(WRITELINE(*this, megapc_state, wd7600_hold));
MCFG_WD7600_NMI(INPUTLINE("maincpu", INPUT_LINE_NMI));
MCFG_WD7600_INTR(INPUTLINE("maincpu", INPUT_LINE_IRQ0));
MCFG_WD7600_CPURESET(INPUTLINE("maincpu", INPUT_LINE_RESET));
MCFG_WD7600_A20M(INPUTLINE("maincpu", INPUT_LINE_A20));
// isa dma
- MCFG_WD7600_IOR(READ16(megapc_state, wd7600_ior))
- MCFG_WD7600_IOW(WRITE16(megapc_state, wd7600_iow))
- MCFG_WD7600_TC(WRITE8(megapc_state, wd7600_tc))
+ MCFG_WD7600_IOR(READ16(*this, megapc_state, wd7600_ior))
+ MCFG_WD7600_IOW(WRITE16(*this, megapc_state, wd7600_iow))
+ MCFG_WD7600_TC(WRITE8(*this, megapc_state, wd7600_tc))
// speaker
- MCFG_WD7600_SPKR(WRITELINE(megapc_state, wd7600_spkr))
+ MCFG_WD7600_SPKR(WRITELINE(*this, megapc_state, wd7600_spkr))
// on board devices
MCFG_DEVICE_ADD("isabus", ISA16, 0)
MCFG_ISA16_CPU("maincpu")
- MCFG_ISA_BUS_IOCHCK(DEVWRITELINE("wd7600", wd7600_device, iochck_w))
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("wd7600", wd7600_device, irq09_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("wd7600", wd7600_device, irq03_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("wd7600", wd7600_device, irq04_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("wd7600", wd7600_device, irq05_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("wd7600", wd7600_device, irq06_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("wd7600", wd7600_device, irq07_w))
- MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE("wd7600", wd7600_device, irq10_w))
- MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE("wd7600", wd7600_device, irq11_w))
- MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE("wd7600", wd7600_device, irq12_w))
- MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE("wd7600", wd7600_device, irq14_w))
- MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE("wd7600", wd7600_device, irq15_w))
- MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE("wd7600", wd7600_device, dreq0_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("wd7600", wd7600_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("wd7600", wd7600_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("wd7600", wd7600_device, dreq3_w))
- MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE("wd7600", wd7600_device, dreq5_w))
- MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE("wd7600", wd7600_device, dreq6_w))
- MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE("wd7600", wd7600_device, dreq7_w))
- MCFG_ISA16_SLOT_ADD("isabus","board1", pc_isa16_cards, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("isabus","board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("isabus","board3", pc_isa16_cards, "ide", true)
- MCFG_ISA16_SLOT_ADD("isabus","board4", pc_isa16_cards, "lpt", true)
- MCFG_ISA16_SLOT_ADD("isabus","board5", pc_isa16_cards, "vga", true)
+ MCFG_ISA_BUS_IOCHCK(WRITELINE("wd7600", wd7600_device, iochck_w))
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("wd7600", wd7600_device, irq09_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("wd7600", wd7600_device, irq03_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("wd7600", wd7600_device, irq04_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("wd7600", wd7600_device, irq05_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("wd7600", wd7600_device, irq06_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("wd7600", wd7600_device, irq07_w))
+ MCFG_ISA_OUT_IRQ10_CB(WRITELINE("wd7600", wd7600_device, irq10_w))
+ MCFG_ISA_OUT_IRQ11_CB(WRITELINE("wd7600", wd7600_device, irq11_w))
+ MCFG_ISA_OUT_IRQ12_CB(WRITELINE("wd7600", wd7600_device, irq12_w))
+ MCFG_ISA_OUT_IRQ14_CB(WRITELINE("wd7600", wd7600_device, irq14_w))
+ MCFG_ISA_OUT_IRQ15_CB(WRITELINE("wd7600", wd7600_device, irq15_w))
+ MCFG_ISA_OUT_DRQ0_CB(WRITELINE("wd7600", wd7600_device, dreq0_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("wd7600", wd7600_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("wd7600", wd7600_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("wd7600", wd7600_device, dreq3_w))
+ MCFG_ISA_OUT_DRQ5_CB(WRITELINE("wd7600", wd7600_device, dreq5_w))
+ MCFG_ISA_OUT_DRQ6_CB(WRITELINE("wd7600", wd7600_device, dreq6_w))
+ MCFG_ISA_OUT_DRQ7_CB(WRITELINE("wd7600", wd7600_device, dreq7_w))
+ MCFG_DEVICE_ADD("board1",ISA16_SLOT, 0, "isabus", pc_isa16_cards, "fdcsmc", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board2",ISA16_SLOT, 0, "isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3",ISA16_SLOT, 0, "isabus", pc_isa16_cards, "ide", true)
+ MCFG_DEVICE_ADD("board4",ISA16_SLOT, 0, "isabus", pc_isa16_cards, "lpt", true)
+ MCFG_DEVICE_ADD("board5",ISA16_SLOT, 0, "isabus", pc_isa16_cards, "vga", true)
// ISA cards
- MCFG_ISA16_SLOT_ADD("isabus","isa1", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false)
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
- MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(DEVWRITELINE("wd7600", wd7600_device, kbrst_w))
- MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(DEVWRITELINE("wd7600", wd7600_device, gatea20_w))
- MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("wd7600", wd7600_device, irq01_w))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(WRITELINE("wd7600", wd7600_device, kbrst_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(WRITELINE("wd7600", wd7600_device, gatea20_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("wd7600", wd7600_device, irq01_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(WRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(WRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
/* internal ram */
@@ -680,7 +681,7 @@ MACHINE_CONFIG_START(megapc_state::megapc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// video hardware
@@ -692,17 +693,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megapc_state::megapcpl)
megapc(config);
- MCFG_CPU_REPLACE("maincpu", I486, 66000000 / 2)
- MCFG_CPU_PROGRAM_MAP(megapcpl_map)
- MCFG_CPU_IO_MAP(megapcpl_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
+ MCFG_DEVICE_REPLACE("maincpu", I486, 66000000 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(megapcpl_map)
+ MCFG_DEVICE_IO_MAP(megapcpl_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::megapcpla)
- MCFG_CPU_ADD("maincpu", I486, 66000000 / 2) // 486SLC
- MCFG_CPU_PROGRAM_MAP(at32l_map)
- MCFG_CPU_IO_MAP(at32_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486, 66000000 / 2) // 486SLC
+ MCFG_DEVICE_PROGRAM_MAP(at32l_map)
+ MCFG_DEVICE_IO_MAP(at32_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MCFG_MACHINE_START_OVERRIDE(at_state, vrom_fix)
MCFG_DEVICE_ADD("mb", AT_MB, 0)
@@ -711,16 +712,16 @@ MACHINE_CONFIG_START(at_state::megapcpla)
MCFG_NVRAM_ADD_0FILL("nvram")
// on board devices
- MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board3", pc_isa16_cards, "ide", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board4", pc_isa16_cards, "lpt", true)
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdcsmc", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ide", true)
+ MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "lpt", true)
// ISA cards
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "svga_dm", false) // closest to the CL-GD5420
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "svga_dm", false) // closest to the CL-GD5420
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
/* internal ram */
@@ -733,10 +734,10 @@ MACHINE_CONFIG_START(at_state::megapcpla)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::ficpio2)
- MCFG_CPU_ADD("maincpu", I486, 25000000)
- MCFG_CPU_PROGRAM_MAP(ficpio_map)
- MCFG_CPU_IO_MAP(ficpio_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(ficpio_map)
+ MCFG_DEVICE_IO_MAP(ficpio_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -744,7 +745,7 @@ MACHINE_CONFIG_START(at_state::ficpio2)
MCFG_DEVICE_REMOVE("mb:rtc")
MCFG_DS12885_ADD("mb:rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("mb:pic8259_slave", pic8259_device, ir0_w)) // this is in :mb
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("mb:pic8259_slave", pic8259_device, ir0_w)) // this is in :mb
MCFG_MC146818_CENTURY_INDEX(0x32)
MCFG_RAM_ADD(RAM_TAG)
@@ -752,21 +753,21 @@ MACHINE_CONFIG_START(at_state::ficpio2)
MCFG_RAM_EXTRA_OPTIONS("1M,2M,8M,16M,32M,64M,128M")
// on board devices
- MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board3", pc_isa16_cards, "lpt", true)
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdcsmc", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "lpt", true)
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("mb:pic8259_slave", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("mb:pic8259_slave", pic8259_device, ir6_w))
MCFG_IDE_CONTROLLER_32_ADD("ide2", ata_devices, "cdrom", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("mb:pic8259_slave", pic8259_device, ir7_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("mb:pic8259_slave", pic8259_device, ir7_w))
MCFG_PCI_BUS_ADD("pcibus", 0)
MCFG_PCI_BUS_DEVICE("pcibus:0", pci_devices, "vt82c505", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa4", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
MCFG_VT82C496_ADD("chipset")
@@ -777,23 +778,24 @@ MACHINE_CONFIG_END
// Compaq Portable III
MACHINE_CONFIG_START(at_state::comportiii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, 48_MHz_XTAL/4 /*12000000*/)
- MCFG_CPU_PROGRAM_MAP(at16_map)
- MCFG_CPU_IO_MAP(at16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
- MCFG_80286_SHUTDOWN(DEVWRITELINE("mb", at_mb_device, shutdown))
+ MCFG_DEVICE_ADD("maincpu", I80286, 48_MHz_XTAL/4 /*12000000*/)
+ MCFG_DEVICE_PROGRAM_MAP(at16_map)
+ MCFG_DEVICE_IO_MAP(at16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_80286_SHUTDOWN(WRITELINE("mb", at_mb_device, shutdown))
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
downcast<at_mb_device *>(device)->at_softlists(config);
- MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "fdc", true)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdc", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc", cfg_single_1200K)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board3", pc_isa16_cards, "hdc", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board4", pc_isa16_cards, "cga_cportiii", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "hdc", true)
+ MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "cga_cportiii", true)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_IBM_PC_AT_84)
@@ -805,8 +807,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_state::comportii)
ibm5170(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(48_MHz_XTAL/6)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(48_MHz_XTAL/6)
MCFG_DEVICE_MODIFY("isa2")
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc", cfg_single_360K)
MCFG_DEVICE_MODIFY("isa4")
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp
index a30a07a9ec1..dbc306d217f 100644
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@@ -2107,7 +2107,7 @@ WRITE8_MEMBER(a400_state::a800xl_pia_pb_w)
MACHINE_CONFIG_START(a400_state::atari_common_nodac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
+ MCFG_DEVICE_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
MCFG_MACHINE_RESET_OVERRIDE( a400_state, a400 )
@@ -2124,16 +2124,16 @@ MACHINE_CONFIG_START(a400_state::atari_common_nodac)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("djoy_0_1"))
MCFG_PIA_READPB_HANDLER(IOPORT("djoy_2_3"))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("a8sio", a8sio_device, motor_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("fdc", atari_fdc_device, pia_cb2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("a8sio", a8sio_device, motor_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("fdc", atari_fdc_device, pia_cb2_w))
MCFG_DEVICE_ADD("a8sio", A8SIO, 0)
- MCFG_A8SIO_DATA_IN_CB(DEVWRITELINE("pokey", pokey_device, sid_w))
+ MCFG_A8SIO_DATA_IN_CB(WRITELINE("pokey", pokey_device, sid_w))
MCFG_A8SIO_SLOT_ADD("a8sio", "sio", nullptr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
+ MCFG_DEVICE_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
MCFG_POKEY_POT0_R_CB(IOPORT("analog_0"))
MCFG_POKEY_POT1_R_CB(IOPORT("analog_1"))
MCFG_POKEY_POT2_R_CB(IOPORT("analog_2"))
@@ -2142,8 +2142,8 @@ MACHINE_CONFIG_START(a400_state::atari_common_nodac)
MCFG_POKEY_POT5_R_CB(IOPORT("analog_5"))
MCFG_POKEY_POT6_R_CB(IOPORT("analog_6"))
MCFG_POKEY_POT7_R_CB(IOPORT("analog_7"))
- MCFG_POKEY_SERIN_R_CB(DEVREAD8("fdc", atari_fdc_device, serin_r))
- MCFG_POKEY_SEROUT_W_CB(DEVWRITE8("fdc", atari_fdc_device, serout_w))
+ MCFG_POKEY_SERIN_R_CB(READ8("fdc", atari_fdc_device, serin_r))
+ MCFG_POKEY_SEROUT_W_CB(WRITE8("fdc", atari_fdc_device, serout_w))
MCFG_POKEY_KEYBOARD_CB(a400_state, a800_keyboard)
MCFG_POKEY_INTERRUPT_CB(a400_state, interrupt_cb)
@@ -2152,7 +2152,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::atari_common)
atari_common_nodac(config);
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.03)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.03)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -2162,7 +2162,7 @@ MACHINE_CONFIG_START(a400_state::atari_common)
MCFG_DEVICE_ADD("gtia", ATARI_GTIA, 0)
MCFG_GTIA_READ_CB(IOPORT("console"))
- MCFG_GTIA_WRITE_CB(WRITE8(a400_state, gtia_cb))
+ MCFG_GTIA_WRITE_CB(WRITE8(*this, a400_state, gtia_cb))
MCFG_DEVICE_ADD("antic", ATARI_ANTIC, 0)
MCFG_ANTIC_GTIA("gtia")
@@ -2183,8 +2183,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a400)
atari_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a400_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a400_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE( a400_state, a400 )
@@ -2202,8 +2202,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a400pal)
atari_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a400_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a400_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE( a400_state, a400 )
@@ -2221,8 +2221,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a800)
atari_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a400_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a400_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE( a400_state, a800 )
@@ -2242,8 +2242,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a800pal)
atari_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a400_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a400_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a400_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE( a400_state, a800 )
@@ -2263,12 +2263,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a600xl)
atari_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a600xl_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a600xl_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a800xl_interrupt, "screen", 0, 1)
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, a600xl_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a600xl_pia_pb_w))
MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl )
@@ -2288,12 +2288,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a800xl)
atari_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a800xl_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a800xl_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a800xl_interrupt, "screen", 0, 1)
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, a800xl_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a800xl_pia_pb_w))
MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl )
@@ -2313,8 +2313,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a800xlpal)
a800xl(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_CLOCK( 1773000 )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_CLOCK( 1773000 )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ()
@@ -2323,8 +2323,8 @@ MACHINE_CONFIG_START(a400_state::a800xlpal)
MCFG_DEVICE_MODIFY("gtia")
MCFG_GTIA_REGION(GTIA_PAL)
- MCFG_SOUND_MODIFY("pokey")
- MCFG_SOUND_CLOCK(1773000)
+ MCFG_DEVICE_MODIFY("pokey")
+ MCFG_DEVICE_CLOCK(1773000)
MACHINE_CONFIG_END
@@ -2332,11 +2332,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a1200xl)
a800xl(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a1200xl_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a1200xl_mem)
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(a400_state, a800xl_pia_pb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, a400_state, a800xl_pia_pb_w))
MACHINE_CONFIG_END
@@ -2344,8 +2344,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a130xe)
a800xl(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a130xe_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a130xe_mem)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("128K")
@@ -2356,8 +2356,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::xegs)
a800xl(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(xegs_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(xegs_mem)
MCFG_DEVICE_REMOVE("cartleft")
MCFG_DEVICE_REMOVE("cart_list")
@@ -2370,12 +2370,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(a400_state::a5200)
atari_common_nodac(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(a5200_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(a5200_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", a400_state, a5200_interrupt, "screen", 0, 1)
// FIXME: should there be anything connected where other system have the fdc?
- MCFG_SOUND_MODIFY("pokey")
+ MCFG_DEVICE_MODIFY("pokey")
MCFG_POKEY_SERIN_R_CB(NOOP)
MCFG_POKEY_SEROUT_W_CB(NOOP)
MCFG_POKEY_KEYBOARD_CB(a400_state, a5200_keypads)
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 310ee762156..2fa24684b31 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -450,8 +450,8 @@ void atari_s1_state::machine_reset()
MACHINE_CONFIG_START(atari_s1_state::atari_s1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, MASTER_CLK)
- MCFG_CPU_PROGRAM_MAP(atari_s1_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, MASTER_CLK)
+ MCFG_DEVICE_PROGRAM_MAP(atari_s1_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -459,7 +459,7 @@ MACHINE_CONFIG_START(atari_s1_state::atari_s1)
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -472,14 +472,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atari_s1_state::atarians)
atari_s1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(atarians_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(atarians_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(atari_s1_state::midearth)
atari_s1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(midearth_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(midearth_map)
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index ca4c6c9d898..86d5346eb9c 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -482,8 +482,8 @@ void atari_s2_state::machine_reset()
MACHINE_CONFIG_START(atari_s2_state::atari_s2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(4'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(atari_s2_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(4'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(atari_s2_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_WATCHDOG_ADD("watchdog")
@@ -491,8 +491,8 @@ MACHINE_CONFIG_START(atari_s2_state::atari_s2)
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_4BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // r23-r26 (68k,33k,18k,8.2k)
- MCFG_SOUND_ADD("dac1", DAC_3BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // r18-r20 (100k,47k,100k)
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // r23-r26 (68k,33k,18k,8.2k)
+ MCFG_DEVICE_ADD("dac1", DAC_3BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // r18-r20 (100k,47k,100k)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
@@ -506,8 +506,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atari_s2_state::atari_s3)
atari_s2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(atari_s3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(atari_s3_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp
index 46f19408752..04304a2df77 100644
--- a/src/mame/drivers/atarifb.cpp
+++ b/src/mame/drivers/atarifb.cpp
@@ -557,9 +557,9 @@ void atarifb_state::machine_reset()
MACHINE_CONFIG_START(atarifb_state::atarifb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 750000)
- MCFG_CPU_PROGRAM_MAP(atarifb_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(atarifb_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("maincpu", M6502, 750000)
+ MCFG_DEVICE_PROGRAM_MAP(atarifb_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(atarifb_state, irq0_line_hold, 4*60)
MCFG_WATCHDOG_ADD("watchdog")
@@ -579,7 +579,7 @@ MACHINE_CONFIG_START(atarifb_state::atarifb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(atarifb)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.18)
MACHINE_CONFIG_END
@@ -589,8 +589,8 @@ MACHINE_CONFIG_START(atarifb_state::atarifb4)
atarifb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(atarifb4_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(atarifb4_map)
MACHINE_CONFIG_END
@@ -598,15 +598,15 @@ MACHINE_CONFIG_START(atarifb_state::abaseb)
atarifb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(abaseb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(abaseb_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(atarifb_state, screen_update_abaseb)
/* sound hardware */
- MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_DEVICE_REPLACE("discrete", DISCRETE, 0)
MCFG_DISCRETE_INTF(abaseb)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.24)
MACHINE_CONFIG_END
@@ -616,8 +616,8 @@ MACHINE_CONFIG_START(atarifb_state::soccer)
atarifb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(soccer_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(soccer_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index 431fc763324..223a44d6919 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -398,8 +398,8 @@ static const atari_rle_objects_config modesc_pitfight =
MACHINE_CONFIG_START(atarig1_state::atarig1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_MACHINE_START_OVERRIDE(atarig1_state,atarig1)
MCFG_MACHINE_RESET_OVERRIDE(atarig1_state,atarig1)
@@ -429,7 +429,7 @@ MACHINE_CONFIG_START(atarig1_state::atarig1)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(atarig1_state, screen_update_atarig1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarig1_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarig1_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(atarig1_state,atarig1)
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 1f222105e24..b9175417042 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -516,8 +516,8 @@ static const atari_rle_objects_config modesc_0x400 =
MACHINE_CONFIG_START(atarig42_state::atarig42)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz / 16)
MCFG_ADC0808_IN0_CB(IOPORT("A2D0"))
@@ -543,7 +543,7 @@ MACHINE_CONFIG_START(atarig42_state::atarig42)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(atarig42_state, screen_update_atarig42)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarig42_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarig42_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(atarig42_state,atarig42)
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index 61aa7913af2..5d7e2029458 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -794,9 +794,9 @@ static const atari_rle_objects_config modesc =
MACHINE_CONFIG_START(atarigt_state::atarigt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(atarigt_state, scanline_int_gen, 250)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(atarigt_state, scanline_int_gen, 250)
MCFG_MACHINE_RESET_OVERRIDE(atarigt_state,atarigt)
@@ -822,7 +822,7 @@ MACHINE_CONFIG_START(atarigt_state::atarigt)
/* the board uses a pair of GALs to determine H and V parameters */
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(atarigt_state, screen_update_atarigt)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarigt_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarigt_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(atarigt_state,atarigt)
@@ -835,7 +835,7 @@ MACHINE_CONFIG_START(atarigt_state::tmek)
/* sound hardware */
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x4fad)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(*this, atarigt_state,cage_irq_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(atarigt_state::primrage)
@@ -843,7 +843,7 @@ MACHINE_CONFIG_START(atarigt_state::primrage)
/* sound hardware */
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x42f2)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(*this, atarigt_state,cage_irq_callback))
MCFG_DEVICE_REMOVE("adc")
MACHINE_CONFIG_END
@@ -852,7 +852,7 @@ MACHINE_CONFIG_START(atarigt_state::primrage20)
/* sound hardware */
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x48a4)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(atarigt_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(*this, atarigt_state,cage_irq_callback))
MCFG_DEVICE_REMOVE("adc")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp
index 92712919627..3c5ab257b68 100644
--- a/src/mame/drivers/atarigx2.cpp
+++ b/src/mame/drivers/atarigx2.cpp
@@ -1487,8 +1487,8 @@ static const atari_rle_objects_config modesc_0x400 =
MACHINE_CONFIG_START(atarigx2_state::atarigx2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16)
MCFG_ADC0808_IN0_CB(IOPORT("A2D0"))
@@ -1518,7 +1518,7 @@ MACHINE_CONFIG_START(atarigx2_state::atarigx2)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(atarigx2_state, screen_update_atarigx2)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarigx2_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarigx2_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 2371d953ea0..5c31455ad92 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -2032,13 +2032,13 @@ static void atari_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(st_state::st)
// basic machine hardware
- MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4)
- MCFG_CPU_PROGRAM_MAP(st_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, Y2/4)
+ MCFG_DEVICE_PROGRAM_MAP(st_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
- MCFG_CPU_ADD(HD6301V1_TAG, HD6301, Y2/8)
- MCFG_CPU_PROGRAM_MAP(ikbd_map)
- MCFG_CPU_IO_MAP(ikbd_io_map)
+ MCFG_DEVICE_ADD(HD6301V1_TAG, HD6301, Y2/8)
+ MCFG_DEVICE_PROGRAM_MAP(ikbd_map)
+ MCFG_DEVICE_IO_MAP(ikbd_io_map)
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -2049,23 +2049,23 @@ MACHINE_CONFIG_START(st_state::st)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(YM2149_TAG, YM2149, Y2/16)
+ MCFG_DEVICE_ADD(YM2149_TAG, YM2149, Y2/16)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(st_state, psg_pa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, st_state, psg_pa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_WD1772_ADD(WD1772_TAG, Y2/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2074,30 +2074,30 @@ MACHINE_CONFIG_START(st_state::st)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
MCFG_MC68901_OUT_IRQ_CB(INPUTLINE(M68000_TAG, M68K_IRQ_6))
- MCFG_MC68901_OUT_TDO_CB(WRITELINE(st_state, mfp_tdo_w))
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_TDO_CB(WRITELINE(*this, st_state, mfp_tdo_w))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
MCFG_DEVICE_ADD(MC6850_0_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(st_state, ikbd_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_ikbd_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, st_state, ikbd_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_ikbd_irq_w))
MCFG_DEVICE_ADD(MC6850_1_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_midi_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_midi_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, Y2/64) // 500kHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(st_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, st_state, write_acia_clock))
// cartridge
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "st_cart")
@@ -2122,13 +2122,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megast_state::megast)
// basic machine hardware
- MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4)
- MCFG_CPU_PROGRAM_MAP(megast_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, Y2/4)
+ MCFG_DEVICE_PROGRAM_MAP(megast_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
- MCFG_CPU_ADD(HD6301V1_TAG, HD6301, Y2/8)
- MCFG_CPU_PROGRAM_MAP(ikbd_map)
- MCFG_CPU_IO_MAP(ikbd_io_map)
+ MCFG_DEVICE_ADD(HD6301V1_TAG, HD6301, Y2/8)
+ MCFG_DEVICE_PROGRAM_MAP(ikbd_map)
+ MCFG_DEVICE_IO_MAP(ikbd_io_map)
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -2139,24 +2139,24 @@ MACHINE_CONFIG_START(megast_state::megast)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(YM2149_TAG, YM2149, Y2/16)
+ MCFG_DEVICE_ADD(YM2149_TAG, YM2149, Y2/16)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(st_state, psg_pa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, st_state, psg_pa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_WD1772_ADD(WD1772_TAG, Y2/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2165,30 +2165,30 @@ MACHINE_CONFIG_START(megast_state::megast)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
MCFG_MC68901_OUT_IRQ_CB(INPUTLINE(M68000_TAG, M68K_IRQ_6))
- MCFG_MC68901_OUT_TDO_CB(WRITELINE(st_state, mfp_tdo_w))
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_TDO_CB(WRITELINE(*this, st_state, mfp_tdo_w))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
MCFG_DEVICE_ADD(MC6850_0_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(st_state, ikbd_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_ikbd_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, st_state, ikbd_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_ikbd_irq_w))
MCFG_DEVICE_ADD(MC6850_1_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_midi_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_midi_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, Y2/64) // 500kHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(st_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, st_state, write_acia_clock))
// cartridge
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "st_cart")
@@ -2213,13 +2213,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ste_state::ste)
// basic machine hardware
- MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4)
- MCFG_CPU_PROGRAM_MAP(ste_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, Y2/4)
+ MCFG_DEVICE_PROGRAM_MAP(ste_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
- MCFG_CPU_ADD(HD6301V1_TAG, HD6301, Y2/8)
- MCFG_CPU_PROGRAM_MAP(ikbd_map)
- MCFG_CPU_IO_MAP(ikbd_io_map)
+ MCFG_DEVICE_ADD(HD6301V1_TAG, HD6301, Y2/8)
+ MCFG_DEVICE_PROGRAM_MAP(ikbd_map)
+ MCFG_DEVICE_IO_MAP(ikbd_io_map)
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -2231,15 +2231,15 @@ MACHINE_CONFIG_START(ste_state::ste)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD(YM2149_TAG, YM2149, Y2/16)
+ MCFG_DEVICE_ADD(YM2149_TAG, YM2149, Y2/16)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(st_state, psg_pa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, st_state, psg_pa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
/*
- MCFG_SOUND_ADD("custom", CUSTOM, 0) // DAC
+ MCFG_DEVICE_ADD("custom", CUSTOM, 0) // DAC
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
*/
@@ -2248,13 +2248,13 @@ MACHINE_CONFIG_START(ste_state::ste)
// devices
MCFG_WD1772_ADD(WD1772_TAG, Y2/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, nullptr, st_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2263,30 +2263,30 @@ MACHINE_CONFIG_START(ste_state::ste)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
MCFG_MC68901_OUT_IRQ_CB(INPUTLINE(M68000_TAG, M68K_IRQ_6))
- MCFG_MC68901_OUT_TDO_CB(WRITELINE(st_state, mfp_tdo_w))
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_TDO_CB(WRITELINE(*this, st_state, mfp_tdo_w))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
MCFG_DEVICE_ADD(MC6850_0_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(st_state, ikbd_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_ikbd_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, st_state, ikbd_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_ikbd_irq_w))
MCFG_DEVICE_ADD(MC6850_1_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_midi_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_midi_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, Y2/64) // 500kHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(st_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, st_state, write_acia_clock))
// cartridge
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "st_cart")
@@ -2311,8 +2311,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megaste_state::megaste)
ste(config);
- MCFG_CPU_MODIFY(M68000_TAG)
- MCFG_CPU_PROGRAM_MAP(megaste_map)
+ MCFG_DEVICE_MODIFY(M68000_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(megaste_map)
MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
MCFG_DEVICE_ADD(Z8530_TAG, SCC8530, Y2/4)
@@ -2329,11 +2329,11 @@ MACHINE_CONFIG_END
#if 0
static MACHINE_CONFIG_START(stbook_state::stbook)
// basic machine hardware
- MCFG_CPU_ADD(M68000_TAG, M68000, U517/2)
- MCFG_CPU_PROGRAM_MAP(stbook_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, U517/2)
+ MCFG_DEVICE_PROGRAM_MAP(stbook_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(st_state,atarist_int_ack)
- //MCFG_CPU_ADD(COP888_TAG, COP888, Y700)
+ //MCFG_DEVICE_ADD(COP888_TAG, COP888, Y700)
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, LCD)
@@ -2346,11 +2346,11 @@ static MACHINE_CONFIG_START(stbook_state::stbook)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(YM3439_TAG, YM3439, U517/8)
+ MCFG_DEVICE_ADD(YM3439_TAG, YM3439, U517/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(1), 0, 0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(stbook_state, psg_pa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, stbook_state, psg_pa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD(MC68901_TAG, MC68901, U517/8)
@@ -2358,42 +2358,42 @@ static MACHINE_CONFIG_START(stbook_state::stbook)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
MCFG_MC68901_OUT_IRQ_CB(INPUTLINE(M68000_TAG, M68K_IRQ_6))
- MCFG_MC68901_OUT_TDO_CB(WRITELINE(st_state, mfp_tdo_w))
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_TDO_CB(WRITELINE(*this, st_state, mfp_tdo_w))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_WD1772_ADD(WD1772_TAG, U517/2)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, st_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":1", atari_floppies, 0, 0, st_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_SERIAL_OUT_RX_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx))
- MCFG_RS232_OUT_DCD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i1_w))
- MCFG_RS232_OUT_CTS_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i2_w))
- MCFG_RS232_OUT_RI_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, i6_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_SERIAL_OUT_RX_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
+ MCFG_RS232_OUT_DCD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i1_w))
+ MCFG_RS232_OUT_CTS_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i2_w))
+ MCFG_RS232_OUT_RI_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, i6_w))
// device hardware
MCFG_DEVICE_ADD(MC6850_0_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(st_state, ikbd_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_ikbd_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, st_state, ikbd_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_ikbd_irq_w))
MCFG_DEVICE_ADD(MC6850_1_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(st_state, acia_midi_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, st_state, acia_midi_irq_w))
MCFG_SERIAL_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
MCFG_SERIAL_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, U517/2/16) // 500kHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(st_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, st_state, write_acia_clock))
// cartridge
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "st_cart")
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index c3dcff381ad..cd75472b3a6 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -710,17 +710,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(atarisy1_state::atarisy1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(atarisy1_state,atarisy1)
MCFG_MACHINE_RESET_OVERRIDE(atarisy1_state,atarisy1)
MCFG_DEVICE_ADD("adc", ADC0809, ATARI_CLOCK_14MHz/16)
- MCFG_ADC0808_EOC_CB(DEVWRITELINE("ajsint", input_merger_device, in_w<1>))
+ MCFG_ADC0808_EOC_CB(WRITELINE("ajsint", input_merger_device, in_w<1>))
// IN7 = J102 pin 2
// IN6 = J102 pin 3
// IN5 = J102 pin 4
@@ -731,17 +731,17 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1)
// IN0 = J102 pin 5
MCFG_INPUT_MERGER_ALL_HIGH("ajsint")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(atarisy1_state, joystick_int))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, atarisy1_state, joystick_int))
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 15H (TTL) or 14F (LSI)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("ymsnd", ym2151_device, reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("ymsnd", ym2151_device, reset_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // J106 pin 4
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // J106 pin 3
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(atarisy1_state, coin_counter_right_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(atarisy1_state, coin_counter_left_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, atarisy1_state, coin_counter_right_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, atarisy1_state, coin_counter_left_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -768,7 +768,7 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(atarisy1_state, screen_update_atarisy1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarisy1_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarisy1_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(atarisy1_state,atarisy1)
@@ -777,24 +777,24 @@ MACHINE_CONFIG_START(atarisy1_state::atarisy1)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ymsnd", ATARI_CLOCK_14MHz/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_SOUND_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11)
+ MCFG_DEVICE_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, ATARI_CLOCK_14MHz/8)
- MCFG_VIA6522_READPA_HANDLER(READ8(atarisy1_state, via_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(atarisy1_state, via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(atarisy1_state, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(atarisy1_state, via_pb_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, atarisy1_state, via_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, atarisy1_state, via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, atarisy1_state, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, atarisy1_state, via_pb_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(atarisy1_state::marble)
@@ -812,10 +812,10 @@ MACHINE_CONFIG_START(atarisy1_state::peterpak)
// Digital joystick read through ADC
MCFG_DEVICE_MODIFY("adc")
- MCFG_ADC0808_IN0_CB(READ8(atarisy1_state, digital_joystick_r<0>))
- MCFG_ADC0808_IN1_CB(READ8(atarisy1_state, digital_joystick_r<1>))
- MCFG_ADC0808_IN2_CB(READ8(atarisy1_state, digital_joystick_r<2>))
- MCFG_ADC0808_IN3_CB(READ8(atarisy1_state, digital_joystick_r<3>))
+ MCFG_ADC0808_IN0_CB(READ8(*this, atarisy1_state, digital_joystick_r<0>))
+ MCFG_ADC0808_IN1_CB(READ8(*this, atarisy1_state, digital_joystick_r<1>))
+ MCFG_ADC0808_IN2_CB(READ8(*this, atarisy1_state, digital_joystick_r<2>))
+ MCFG_ADC0808_IN3_CB(READ8(*this, atarisy1_state, digital_joystick_r<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(atarisy1_state::indytemp)
@@ -824,10 +824,10 @@ MACHINE_CONFIG_START(atarisy1_state::indytemp)
// Digital joystick read through ADC
MCFG_DEVICE_MODIFY("adc")
- MCFG_ADC0808_IN0_CB(READ8(atarisy1_state, digital_joystick_r<0>))
- MCFG_ADC0808_IN1_CB(READ8(atarisy1_state, digital_joystick_r<1>))
- MCFG_ADC0808_IN2_CB(READ8(atarisy1_state, digital_joystick_r<2>))
- MCFG_ADC0808_IN3_CB(READ8(atarisy1_state, digital_joystick_r<3>))
+ MCFG_ADC0808_IN0_CB(READ8(*this, atarisy1_state, digital_joystick_r<0>))
+ MCFG_ADC0808_IN1_CB(READ8(*this, atarisy1_state, digital_joystick_r<1>))
+ MCFG_ADC0808_IN2_CB(READ8(*this, atarisy1_state, digital_joystick_r<2>))
+ MCFG_ADC0808_IN3_CB(READ8(*this, atarisy1_state, digital_joystick_r<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(atarisy1_state::roadrunn)
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index d59e37fdb0b..b989521bc6d 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -1183,12 +1183,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(atarisy2_state::atarisy2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", T11, MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD("maincpu", T11, MASTER_CLOCK/2)
MCFG_T11_INITIAL_MODE(0x36ff) /* initial mode word has DAL15,14,11,8 pulled low */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", M6502, SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, MASTER_CLOCK/2/16/16/16/10)
MCFG_MACHINE_START_OVERRIDE(atarisy2_state,atarisy2)
@@ -1224,7 +1224,7 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 416, 0, 384)
MCFG_SCREEN_UPDATE_DRIVER(atarisy2_state, screen_update_atarisy2)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(atarisy2_state, vblank_int))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, atarisy2_state, vblank_int))
MCFG_DEVICE_ADD("vrambank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(vrambank_map)
@@ -1242,15 +1242,15 @@ MACHINE_CONFIG_START(atarisy2_state::atarisy2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_SOUND_ADD("pokey1", POKEY, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, SOUND_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.35)
- MCFG_SOUND_ADD("pokey2", POKEY, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, SOUND_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.35)
- MCFG_SOUND_ADD("tms", TMS5220C, MASTER_CLOCK/4/4/2)
+ MCFG_DEVICE_ADD("tms", TMS5220C, MASTER_CLOCK/4/4/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp
index 0c05243b57a..46fe7e023ef 100644
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@@ -770,14 +770,14 @@ INPUT_PORTS_END
*************************************/
MACHINE_CONFIG_START(atarisy4_state::atarisy4)
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", atarisy4_state, vblank_int)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atarisy4_state, vblank_int)
- MCFG_CPU_ADD("dsp0", TMS32010, 16000000)
- MCFG_CPU_PROGRAM_MAP(dsp0_map)
- MCFG_CPU_IO_MAP(dsp0_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(atarisy4_state, dsp0_bio_r))
+ MCFG_DEVICE_ADD("dsp0", TMS32010, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp0_map)
+ MCFG_DEVICE_IO_MAP(dsp0_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, atarisy4_state, dsp0_bio_r))
MCFG_SCREEN_ADD("screen", RASTER)
@@ -791,10 +791,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atarisy4_state::airrace)
atarisy4(config);
- MCFG_CPU_ADD("dsp1", TMS32010, 16000000)
- MCFG_CPU_PROGRAM_MAP(dsp1_map)
- MCFG_CPU_IO_MAP(dsp1_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(atarisy4_state, dsp1_bio_r))
+ MCFG_DEVICE_ADD("dsp1", TMS32010, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp1_map)
+ MCFG_DEVICE_IO_MAP(dsp1_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, atarisy4_state, dsp1_bio_r))
MCFG_MACHINE_RESET_OVERRIDE(atarisy4_state,airrace)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index e9f18b087df..2376a9ddb9d 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -332,8 +332,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(atetris_state::atetris)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_SLAPSTIC_ADD("slapstic", 101)
@@ -358,11 +358,11 @@ MACHINE_CONFIG_START(atetris_state::atetris)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("IN0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -371,8 +371,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atetris_state::atetrisb2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(atetrisb2_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(atetrisb2_map)
MCFG_SLAPSTIC_ADD("slapstic", 101)
@@ -397,13 +397,13 @@ MACHINE_CONFIG_START(atetris_state::atetrisb2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, BOOTLEG_CLOCK/8)
+ MCFG_DEVICE_ADD("sn1", SN76496, BOOTLEG_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76496, BOOTLEG_CLOCK/8)
+ MCFG_DEVICE_ADD("sn2", SN76496, BOOTLEG_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76496, BOOTLEG_CLOCK/8)
+ MCFG_DEVICE_ADD("sn3", SN76496, BOOTLEG_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -411,18 +411,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atetris_state::atetrisb3)
atetrisb2(config);
- MCFG_CPU_REPLACE("maincpu", M6502, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(atetrisb3_map)
+ MCFG_DEVICE_REPLACE("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(atetrisb3_map)
//8749 at 10 MHz instead of slapstic
- MCFG_SOUND_REPLACE("sn1", SN76489, 4000000)
+ MCFG_DEVICE_REPLACE("sn1", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_REPLACE("sn2", SN76489, 4000000)
+ MCFG_DEVICE_REPLACE("sn2", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_REPLACE("sn3", SN76489, 4000000)
+ MCFG_DEVICE_REPLACE("sn3", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 9cce5ae0681..eb2a512aac2 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -806,7 +806,7 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(atlantis_state::mwskins)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", VR4310LE, 166666666) // clock is TRUSTED
+ MCFG_DEVICE_ADD("maincpu", VR4310LE, 166666666) // clock is TRUSTED
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(66666666)
@@ -819,15 +819,15 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
MCFG_PCI9050_SET_MAP(1, atlantis_state::map1)
MCFG_PCI9050_SET_MAP(2, atlantis_state::map2)
MCFG_PCI9050_SET_MAP(3, atlantis_state::map3)
- MCFG_PCI9050_USER_OUTPUT_CALLBACK(DEVWRITE32(":", atlantis_state, user_io_output))
- MCFG_PCI9050_USER_INPUT_CALLBACK(DEVREAD32(":", atlantis_state, user_io_input))
+ MCFG_PCI9050_USER_OUTPUT_CALLBACK(WRITE32(*this, atlantis_state, user_io_output))
+ MCFG_PCI9050_USER_INPUT_CALLBACK(READ32(*this, atlantis_state, user_io_input))
MCFG_M48T37_ADD("rtc")
- MCFG_M48T37_RESET_HANDLER(WRITELINE(atlantis_state, watchdog_reset))
- MCFG_M48T37_IRQ_HANDLER(WRITELINE(atlantis_state, watchdog_irq))
+ MCFG_M48T37_RESET_HANDLER(WRITELINE(*this, atlantis_state, watchdog_reset))
+ MCFG_M48T37_IRQ_HANDLER(WRITELINE(*this, atlantis_state, watchdog_irq))
MCFG_IDE_PCI_ADD(PCI_ID_IDE, 0x10950646, 0x07, 0x0)
- MCFG_IDE_PCI_IRQ_HANDLER(DEVWRITELINE(":", atlantis_state, ide_irq))
+ MCFG_IDE_PCI_IRQ_HANDLER(WRITELINE(*this, atlantis_state, ide_irq))
// The pci-ide by default expects the system controller to be pci:00.0 so need to fix here
MCFG_DEVICE_MODIFY(PCI_ID_IDE":ide")
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(PCI_ID_NILE, AS_DATA)
@@ -837,8 +837,8 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
/* video hardware */
MCFG_DEVICE_ADD("zeus2", ZEUS2, ZEUS2_VIDEO_CLOCK)
MCFG_ZEUS2_FLOAT_MODE(1)
- MCFG_ZEUS2_IRQ_CB(WRITELINE(atlantis_state, zeus_irq))
- MCFG_ZEUS2_VBLANK_CB(WRITELINE(atlantis_state, vblank_irq))
+ MCFG_ZEUS2_IRQ_CB(WRITELINE(*this, atlantis_state, zeus_irq))
+ MCFG_ZEUS2_VBLANK_CB(WRITELINE(*this, atlantis_state, vblank_irq))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SCREEN_ADD("screen", RASTER)
@@ -854,41 +854,41 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(80)
MCFG_MIDWAY_IOASIC_UPPER(342) // 325
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(atlantis_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, atlantis_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
if DEBUG_CONSOLE {
- MCFG_MIDWAY_IOASIC_OUT_TX_CB(DEVWRITE8("uart0", generic_terminal_device, write))
+ MCFG_MIDWAY_IOASIC_OUT_TX_CB(WRITE8("uart0", generic_terminal_device, write))
MCFG_DEVICE_ADD("uart0", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(DEVPUT("ioasic", midway_ioasic_device, serial_rx_w))
}
// TL16C552 UART
MCFG_DEVICE_ADD("uart1", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com1", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com1", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com1", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, duart_irq_callback))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("com1", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("com1", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("com1", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, atlantis_state, duart_irq_callback))
MCFG_DEVICE_ADD("uart2", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("com2", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("com2", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("com2", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", atlantis_state, duart_irq_callback))
-
- MCFG_RS232_PORT_ADD("com1", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("com2", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("com2", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("com2", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, atlantis_state, duart_irq_callback))
+
+ MCFG_DEVICE_ADD("com1", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart1", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart1", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", ins8250_uart_device, cts_w))
//MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("com1", mwskins_comm)
- MCFG_RS232_PORT_ADD("com2", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, cts_w))
+ MCFG_DEVICE_ADD("com2", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart2", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("uart2", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp
index b421ad70aa4..60eb4c4e276 100644
--- a/src/mame/drivers/atm.cpp
+++ b/src/mame/drivers/atm.cpp
@@ -188,10 +188,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(atm_state::atm)
spectrum_128(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(atm_mem)
- MCFG_CPU_IO_MAP(atm_io)
- MCFG_CPU_OPCODES_MAP(atm_switch)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(atm_mem)
+ MCFG_DEVICE_IO_MAP(atm_io)
+ MCFG_DEVICE_OPCODES_MAP(atm_switch)
MCFG_MACHINE_RESET_OVERRIDE(atm_state, atm )
MCFG_BETA_DISK_ADD(BETA_DISK_TAG)
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index acf570a9b41..26c150ff144 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -710,45 +710,45 @@ FLOPPY_FORMATS_END0
MACHINE_CONFIG_START(atom_state::atom)
/* basic machine hardware */
- MCFG_CPU_ADD(SY6502_TAG, M6502, X2/4)
- MCFG_CPU_PROGRAM_MAP(atom_mem)
+ MCFG_DEVICE_ADD(SY6502_TAG, M6502, X2/4)
+ MCFG_DEVICE_PROGRAM_MAP(atom_mem)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_INPUT_CALLBACK(READ8(atom_state, vdg_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, atom_state, vdg_videoram_r))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_TIMER_DRIVER_ADD_PERIODIC("hz2400", atom_state, cassette_output_tick, attotime::from_hz(4806))
MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(INS8255_TAG, I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(atom_state, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(atom_state, ppi_pb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(atom_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(atom_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, atom_state, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, atom_state, ppi_pb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, atom_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, atom_state, ppi_pc_w))
MCFG_DEVICE_ADD(I8271_TAG, I8271 , 0)
- MCFG_I8271_IRQ_CALLBACK(WRITELINE(atom_state, atom_8271_interrupt_callback))
- MCFG_I8271_HDL_CALLBACK(WRITELINE(atom_state, motor_w))
+ MCFG_I8271_IRQ_CALLBACK(WRITELINE(*this, atom_state, atom_8271_interrupt_callback))
+ MCFG_I8271_HDL_CALLBACK(WRITELINE(*this, atom_state, motor_w))
MCFG_FLOPPY_DRIVE_ADD(I8271_TAG ":0", atom_floppies, "525sssd", atom_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(I8271_TAG ":1", atom_floppies, "525sssd", atom_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_ca1))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_pa7))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_ca1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_pa7))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -787,8 +787,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atomeb_state::atomeb)
atom(config);
- MCFG_CPU_MODIFY(SY6502_TAG)
- MCFG_CPU_PROGRAM_MAP(atomeb_mem)
+ MCFG_DEVICE_MODIFY(SY6502_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(atomeb_mem)
/* cartridges */
MCFG_DEVICE_REMOVE("cartslot")
@@ -820,37 +820,37 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atom_state::atombb)
/* basic machine hardware */
- MCFG_CPU_ADD(SY6502_TAG, M6502, X2/4)
- MCFG_CPU_PROGRAM_MAP(atombb_mem)
+ MCFG_DEVICE_ADD(SY6502_TAG, M6502, X2/4)
+ MCFG_DEVICE_PROGRAM_MAP(atombb_mem)
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_INPUT_CALLBACK(READ8(atom_state, vdg_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, atom_state, vdg_videoram_r))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_TIMER_DRIVER_ADD_PERIODIC("hz2400", atom_state, cassette_output_tick, attotime::from_hz(4806))
MCFG_DEVICE_ADD(R6522_TAG, VIA6522, X2/4)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(SY6502_TAG, M6502_IRQ_LINE))
MCFG_DEVICE_ADD(INS8255_TAG, I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(atom_state, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(atom_state, ppi_pb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(atom_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(atom_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, atom_state, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, atom_state, ppi_pb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, atom_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, atom_state, ppi_pc_w))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_ca1))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(R6522_TAG, via6522_device, write_pa7))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_ca1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(R6522_TAG, via6522_device, write_pa7))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -873,8 +873,8 @@ MACHINE_CONFIG_END
//static MACHINE_CONFIG_START( prophet2 )
// atom(config);
// /* basic machine hardware */
-// MCFG_CPU_MODIFY(SY6502_TAG)
-// MCFG_CPU_PROGRAM_MAP(prophet_mem)
+// MCFG_DEVICE_MODIFY(SY6502_TAG)
+// MCFG_DEVICE_PROGRAM_MAP(prophet_mem)
//
// /* fdc */
// MCFG_DEVICE_REMOVE(I8271_TAG)
@@ -897,8 +897,8 @@ MACHINE_CONFIG_END
//static MACHINE_CONFIG_START( prophet3 )
// atom(config);
// /* basic machine hardware */
-// MCFG_CPU_MODIFY(SY6502_TAG)
-// MCFG_CPU_PROGRAM_MAP(prophet_mem)
+// MCFG_DEVICE_MODIFY(SY6502_TAG)
+// MCFG_DEVICE_PROGRAM_MAP(prophet_mem)
//
// /* internal ram */
// MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp
index 3d76c709dff..f3961f5350f 100644
--- a/src/mame/drivers/atpci.cpp
+++ b/src/mame/drivers/atpci.cpp
@@ -56,7 +56,7 @@ void at586_state::sb_config(device_t *device)
{
devcb_base *devcb = nullptr;
(void)devcb;
- MCFG_I82371SB_BOOT_STATE_HOOK(DEVWRITE8(":", at586_state, boot_state_w))
+ MCFG_I82371SB_BOOT_STATE_HOOK(WRITE8(":", at586_state, boot_state_w))
MCFG_I82371SB_SMI_CB(INPUTLINE(":maincpu", INPUT_LINE_SMI))
}
@@ -68,7 +68,7 @@ void at586_state::superio_config(device_t *device)
MCFG_FDC37C93X_SYSOPT(1)
MCFG_FDC37C93X_GP20_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_FDC37C93X_GP25_GATEA20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
- MCFG_FDC37C93X_IRQ1_CB(DEVWRITELINE(":pcibus:7:i82371sb:pic8259_master", pic8259_device, ir1_w))
+ MCFG_FDC37C93X_IRQ1_CB(WRITELINE(":pcibus:7:i82371sb:pic8259_master", pic8259_device, ir1_w))
}
@@ -106,10 +106,10 @@ MACHINE_CONFIG_START(at586_state::at_softlists)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at586_state::at586)
- MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
- MCFG_CPU_PROGRAM_MAP(at586_map)
- MCFG_CPU_IO_MAP(at586_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pcibus:1:i82371ab:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(at586_map)
+ MCFG_DEVICE_IO_MAP(at586_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pcibus:1:i82371ab:pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -121,21 +121,22 @@ MACHINE_CONFIG_START(at586_state::at586)
MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "i82371ab", true)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa5", pc_isa16_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "pcibus:1:i82371ab:isabus", pc_isa16_cards, nullptr, false)
at_softlists(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(at586_state::at586x3)
- MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
- MCFG_CPU_PROGRAM_MAP(at586_map)
- MCFG_CPU_IO_MAP(at586_io)
- MCFG_I386_SMIACT(DEVWRITELINE(":pcibus:0:i82439tx", i82439tx_device, smi_act_w))
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pcibus:1:i82371sb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(at586_map)
+ MCFG_DEVICE_IO_MAP(at586_io)
+ MCFG_I386_SMIACT(WRITELINE("pcibus:0:i82439tx", i82439tx_device, smi_act_w))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pcibus:1:i82371sb:pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -148,11 +149,12 @@ MACHINE_CONFIG_START(at586_state::at586x3)
MCFG_PCI_BUS_DEVICE("pcibus:1", pci_devices, "i82371sb", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("i82371sb", sb_config)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa5", pc_isa16_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "pcibus:1:i82371sb:isabus", pc_isa16_cards, nullptr, false)
at_softlists(config);
MACHINE_CONFIG_END
@@ -162,11 +164,11 @@ static INPUT_PORTS_START(at586m55)
INPUT_PORTS_END
MACHINE_CONFIG_START(at586_state::at586m55)
- MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
- MCFG_CPU_PROGRAM_MAP(at586_map)
- MCFG_CPU_IO_MAP(at586_io)
- MCFG_I386_SMIACT(DEVWRITELINE(":pcibus:0:i82439tx", i82439tx_device, smi_act_w))
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pcibus:7:i82371sb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(at586_map)
+ MCFG_DEVICE_IO_MAP(at586_io)
+ MCFG_I386_SMIACT(WRITELINE("pcibus:0:i82439tx", i82439tx_device, smi_act_w))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pcibus:7:i82371sb:pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -179,13 +181,13 @@ MACHINE_CONFIG_START(at586_state::at586m55)
MCFG_PCI_BUS_DEVICE("pcibus:7", pci_devices, "i82371sb", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("i82371sb", sb_config)
- MCFG_ISA16_SLOT_ADD(":pcibus:7:i82371sb:isabus", "board4", isa_internal_devices, "fdc37c93x", true)
+ MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "pcibus:7:i82371sb:isabus", isa_internal_devices, "fdc37c93x", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc37c93x", superio_config)
- MCFG_ISA16_SLOT_ADD(":pcibus:7:i82371sb:isabus", "isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD(":pcibus:7:i82371sb:isabus", "isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:7:i82371sb:isabus", "isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:7:i82371sb:isabus", "isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(":pcibus:7:i82371sb:isabus", "isa5", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "pcibus:7:i82371sb:isabus", pc_isa16_cards, nullptr, false)
at_softlists(config);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp
index d83f79753ab..5ee0d448f6a 100644
--- a/src/mame/drivers/atronic.cpp
+++ b/src/mame/drivers/atronic.cpp
@@ -65,10 +65,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(atronic_state::atronic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, 6000000)
- MCFG_CPU_PROGRAM_MAP(atronic_map)
- MCFG_CPU_IO_MAP(atronic_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", atronic_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z180, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(atronic_map)
+ MCFG_DEVICE_IO_MAP(atronic_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", atronic_state, irq0_line_hold)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/att4425.cpp b/src/mame/drivers/att4425.cpp
index 437cc251787..77f4451a5d1 100644
--- a/src/mame/drivers/att4425.cpp
+++ b/src/mame/drivers/att4425.cpp
@@ -240,9 +240,9 @@ static const z80_daisy_config att4425_daisy_chain[] =
MACHINE_CONFIG_START(att4425_state::att4425)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(32'000'000)/8) // XXX
- MCFG_CPU_PROGRAM_MAP(att4425_mem)
- MCFG_CPU_IO_MAP(att4425_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(32'000'000)/8) // XXX
+ MCFG_DEVICE_PROGRAM_MAP(att4425_mem)
+ MCFG_DEVICE_IO_MAP(att4425_io)
MCFG_Z80_DAISY_CHAIN(att4425_daisy_chain)
/* video hardware */
@@ -260,45 +260,45 @@ MACHINE_CONFIG_START(att4425_state::att4425)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(32'000'000)) // XXX
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
#ifdef notdef
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80SIO_TAG, z80sio_device, txca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80SIO_TAG, z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80SIO_TAG, z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80SIO_TAG, z80sio_device, rxtxcb_w))
#endif
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO, 4800) // XXX
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
// host
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, ctsa_w))
// aux printer?
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, "printer")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, "printer")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio_device, rxb_w))
// XXX
MCFG_DEVICE_ADD("line_clock", CLOCK, 9600*64)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(att4425_state, write_line_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, att4425_state, write_line_clock))
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
// XXX
MCFG_DEVICE_ADD("keyboard_clock", CLOCK, 4800*64)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(att4425_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, att4425_state, write_keyboard_clock))
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("32K")
diff --git a/src/mame/drivers/att630.cpp b/src/mame/drivers/att630.cpp
index 37dc55b4522..aa3de46a28e 100644
--- a/src/mame/drivers/att630.cpp
+++ b/src/mame/drivers/att630.cpp
@@ -47,8 +47,8 @@ static INPUT_PORTS_START( att630 )
INPUT_PORTS_END
MACHINE_CONFIG_START(att630_state::att630)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(40'000'000) / 4) // clock not confirmed
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(40'000'000) / 4) // clock not confirmed
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(87'183'360), 1376, 0, 1024, 1056, 0, 1024)
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index d669fa2a599..4c9b59ce5f3 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -1108,9 +1108,9 @@ void attache816_state::machine_reset()
}
MACHINE_CONFIG_START(attache_state::attache)
- MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(attache_map)
- MCFG_CPU_IO_MAP(attache_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(attache_map)
+ MCFG_DEVICE_IO_MAP(attache_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1122,60 +1122,60 @@ MACHINE_CONFIG_START(attache_state::attache)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_MSM5832_ADD("rtc",XTAL(32'768))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
- MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, attache_state, pio_portA_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, attache_state, pio_portA_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, attache_state, pio_portB_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, attache_state, pio_portB_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(attache_state, dma_mem_w))
- MCFG_AM9517A_IN_IOR_0_CB(READ8(attache_state, fdc_dma_r))
- MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(attache_state, fdc_dma_w))
- // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(attache_state, fdc_dack_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, attache_state, hreq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, attache_state, eop_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, attache_state, dma_mem_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, attache_state, dma_mem_w))
+ MCFG_AM9517A_IN_IOR_0_CB(READ8(*this, attache_state, fdc_dma_r))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(*this, attache_state, fdc_dma_w))
+ // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(*this, attache_state, fdc_dack_w))
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("fdc:0", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("crtc", TMS9927, 12324000 / 8)
MCFG_TMS9927_CHAR_WIDTH(8)
- MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1187,16 +1187,16 @@ MACHINE_CONFIG_START(attache_state::attache)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(attache816_state::attache816)
- MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(attache_map)
- MCFG_CPU_IO_MAP(attache816_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(attache_map)
+ MCFG_DEVICE_IO_MAP(attache816_io)
MCFG_Z80_DAISY_CHAIN(attache_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_ADD("extcpu",I8086,XTAL(24'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(attache_x86_map)
- MCFG_CPU_IO_MAP(attache_x86_io)
+ MCFG_DEVICE_ADD("extcpu",I8086,XTAL(24'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(attache_x86_map)
+ MCFG_DEVICE_IO_MAP(attache_x86_io)
MCFG_QUANTUM_PERFECT_CPU("extcpu")
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -1206,67 +1206,67 @@ MACHINE_CONFIG_START(attache816_state::attache816)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8912, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_ADD("psg", AY8912, XTAL(8'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_MSM5832_ADD("rtc",XTAL(32'768))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
- MCFG_Z80PIO_IN_PA_CB(READ8(attache_state, pio_portA_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(attache_state, pio_portA_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(attache_state, pio_portB_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(attache_state, pio_portB_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, attache_state, pio_portA_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, attache_state, pio_portA_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, attache_state, pio_portB_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, attache_state, pio_portB_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(8'000'000) / 2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(8'000'000) / 2)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("brc", CLOCK, XTAL(8'000'000) / 26) // 307.692 KHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(attache816_state, x86_comms_w))
- MCFG_I8255_IN_PORTA_CB(READ8(attache816_state, x86_comms_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(attache816_state, x86_irq_enable))
- MCFG_I8255_OUT_PORTC_CB(WRITELINE(attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, attache816_state, x86_comms_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, attache816_state, x86_comms_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, attache816_state, x86_irq_enable))
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE(*this, attache816_state, x86_dsr)) MCFG_DEVCB_BIT(0)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, attache816_state, ppi_irq)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 4)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(attache_state, hreq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(attache_state, eop_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(attache_state, dma_mem_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(attache_state, dma_mem_w))
- MCFG_AM9517A_IN_IOR_0_CB(READ8(attache_state, fdc_dma_r))
- MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(attache_state, fdc_dma_w))
- // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(attache_state, fdc_dack_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, attache_state, hreq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, attache_state, eop_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, attache_state, dma_mem_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, attache_state, dma_mem_w))
+ MCFG_AM9517A_IN_IOR_0_CB(READ8(*this, attache_state, fdc_dma_r))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8(*this, attache_state, fdc_dma_w))
+ // MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(*this, attache_state, fdc_dack_w))
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("fdc:0", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", attache_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("crtc", TMS9927, 12324000)
MCFG_TMS9927_CHAR_WIDTH(8)
- MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index 711655492ef..92bb28a45ee 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -118,8 +118,8 @@ READ8_MEMBER(attckufo_state::vic_colorram_r)
//**************************************************************************
MACHINE_CONFIG_START(attckufo_state::attckufo)
- MCFG_CPU_ADD("maincpu", M6502, XTAL(14'318'181) / 14)
- MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(14'318'181) / 14)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("DSW"))
diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp
index 6f5d93fde93..fc4af5598ce 100644
--- a/src/mame/drivers/atvtrack.cpp
+++ b/src/mame/drivers/atvtrack.cpp
@@ -566,7 +566,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(atvtrack_state::atvtrack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, ATV_CPU_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", SH4LE, ATV_CPU_CLOCK)
MCFG_SH4_MD0(1)
MCFG_SH4_MD1(1)
MCFG_SH4_MD2(0)
@@ -577,11 +577,11 @@ MACHINE_CONFIG_START(atvtrack_state::atvtrack)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(ATV_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(atvtrack_main_map)
- MCFG_CPU_IO_MAP(atvtrack_main_port)
+ MCFG_DEVICE_PROGRAM_MAP(atvtrack_main_map)
+ MCFG_DEVICE_IO_MAP(atvtrack_main_port)
MCFG_CPU_FORCE_NO_DRC()
- MCFG_CPU_ADD("subcpu", SH4LE, ATV_CPU_CLOCK)
+ MCFG_DEVICE_ADD("subcpu", SH4LE, ATV_CPU_CLOCK)
MCFG_SH4_MD0(1)
MCFG_SH4_MD1(1)
MCFG_SH4_MD2(0)
@@ -592,8 +592,8 @@ MACHINE_CONFIG_START(atvtrack_state::atvtrack)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(ATV_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(atvtrack_sub_map)
- MCFG_CPU_IO_MAP(atvtrack_sub_port)
+ MCFG_DEVICE_PROGRAM_MAP(atvtrack_sub_map)
+ MCFG_DEVICE_IO_MAP(atvtrack_sub_port)
MCFG_CPU_FORCE_NO_DRC()
/* video hardware */
@@ -609,9 +609,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(smashdrv_state::smashdrv)
atvtrack(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(smashdrv_main_map)
- MCFG_CPU_IO_MAP(smashdrv_main_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(smashdrv_main_map)
+ MCFG_DEVICE_IO_MAP(smashdrv_main_port)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index d0633d0856d..3cd6cc9386d 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -497,9 +497,9 @@ void aussiebyte_state::machine_reset()
MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(aussiebyte_map)
- MCFG_CPU_IO_MAP(aussiebyte_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(aussiebyte_map)
+ MCFG_DEVICE_IO_MAP(aussiebyte_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
/* video hardware */
@@ -513,72 +513,72 @@ MACHINE_CONFIG_START(aussiebyte_state::aussiebyte)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000) /* 720kHz? needs verify */
- MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(aussiebyte_state, votrax_w))
+ MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(*this, aussiebyte_state, votrax_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(aussiebyte_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, aussiebyte_state, write_centronics_busy))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'915'200) / 4)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio1", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio1", z80sio_device, rxtxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, aussiebyte_state, ctc_z2_w)) // SIO2 Ch B, CTC Ch 3
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(aussiebyte_state, busreq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, aussiebyte_state, busreq_w))
// BAO, not used
- MCFG_Z80DMA_IN_MREQ_CB(READ8(aussiebyte_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(aussiebyte_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(aussiebyte_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(aussiebyte_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, aussiebyte_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, aussiebyte_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, aussiebyte_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, aussiebyte_state, io_write_byte))
MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_IN_PB_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
- MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, read))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(aussiebyte_state, port20_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, aussiebyte_state, port20_w))
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio1_rdya_w))
- MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio1_rdyb_w))
+ MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(*this, aussiebyte_state, sio1_rdya_w))
+ MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(*this, aussiebyte_state, sio1_rdyb_w))
MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(aussiebyte_state, sio2_rdya_w))
- MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(aussiebyte_state, sio2_rdyb_w))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(*this, aussiebyte_state, sio2_rdya_w))
+ MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(*this, aussiebyte_state, sio2_rdyb_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio_device, rxa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio2", z80sio_device, rxa_w))
MCFG_WD2797_ADD("fdc", XTAL(16'000'000) / 16)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(aussiebyte_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, aussiebyte_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, aussiebyte_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", aussiebyte_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", aussiebyte_floppies, "525qd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index ad092ecaf12..65bd643deca 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -220,13 +220,13 @@ void avalnche_state::machine_start()
MACHINE_CONFIG_START(avalnche_state::avalnche_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(avalnche_state, nmi_line_pulse, 8*60)
+ MCFG_DEVICE_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(avalnche_state, nmi_line_pulse, 8*60)
MCFG_DEVICE_ADD("latch", F9334, 0) // F8
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0")) // 1 CREDIT LAMP
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(avalnche_state, video_invert_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, avalnche_state, video_invert_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led1")) // 2 CREDIT LAMP
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(OUTPUT("led2")) // START LAMP
// Q1, Q4, Q5, Q6 are configured in audio/avalnche.cpp
@@ -252,8 +252,8 @@ MACHINE_CONFIG_START(avalnche_state::acatch)
avalnche_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(catch_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(catch_map)
/* sound hardware... */
acatch_sound(config);
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index f786cba3263..209b876ab6b 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -751,23 +751,23 @@ void avigo_state::nvram_init(nvram_device &nvram, void *base, size_t size)
MACHINE_CONFIG_START(avigo_state::avigo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(avigo_mem)
- MCFG_CPU_IO_MAP(avigo_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(avigo_mem)
+ MCFG_DEVICE_IO_MAP(avigo_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(avigo_state, com_interrupt))
-
- MCFG_RS232_PORT_ADD( "serport", default_rs232_devices, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, avigo_state, com_interrupt))
+
+ MCFG_DEVICE_ADD( "serport", RS232_PORT, default_rs232_devices, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("ns16550", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ns16550", ins8250_uart_device, cts_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -786,12 +786,12 @@ MACHINE_CONFIG_START(avigo_state::avigo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* real time clock */
MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
- MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(avigo_state, tc8521_alarm_int))
+ MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, avigo_state, tc8521_alarm_int))
/* flash ROMs */
MCFG_AMD_29F080_ADD("flash0")
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 7567549f5ae..b9a2b664f78 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -960,10 +960,10 @@ WRITE_LINE_MEMBER( avt_state::avtbingo_w )
MACHINE_CONFIG_START(avt_state::avt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(avt_map)
- MCFG_CPU_IO_MAP(avt_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(avt_map)
+ MCFG_DEVICE_IO_MAP(avt_portmap)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -981,18 +981,18 @@ MACHINE_CONFIG_START(avt_state::avt)
MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) /* guess */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("ctc0", z80ctc_device, trg3))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(avt_state, avtbingo_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE("ctc0", z80ctc_device, trg3))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, avt_state, avtbingo_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, CPU_CLOCK/2) /* 1.25 MHz.?? */
+ MCFG_DEVICE_ADD("aysnd", AY8910, CPU_CLOCK/2) /* 1.25 MHz.?? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// device never addressed by cpu
MCFG_DEVICE_ADD("ctc0", Z80CTC, CPU_CLOCK) // U27
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc0", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("ctc0", z80ctc_device, trg1))
// ZC1 not connected
// TRG2 to TP18; ZC2 to TP9; TRG3 to VSYNC; TRG0 to cpu_clock/4
@@ -1021,8 +1021,8 @@ MACHINE_CONFIG_START(avt_state::avtnfl)
MCFG_MC6845_ADD("crtc", MC6845, "screen", CRTC_CLOCK) /* guess */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("ctc0", z80ctc_device, trg3))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(avt_state, avtnfl_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE("ctc0", z80ctc_device, trg3))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, avt_state, avtnfl_w))
MACHINE_CONFIG_END
/*********************************************
diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp
index 278c3229649..6270a17cfa9 100644
--- a/src/mame/drivers/ax20.cpp
+++ b/src/mame/drivers/ax20.cpp
@@ -129,9 +129,9 @@ static void ax20_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(ax20_state::ax20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
- MCFG_CPU_PROGRAM_MAP(ax20_map)
- MCFG_CPU_IO_MAP(ax20_io)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3)
+ MCFG_DEVICE_PROGRAM_MAP(ax20_map)
+ MCFG_DEVICE_IO_MAP(ax20_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp
index 9bb54bff245..fdd9e89ef6d 100644
--- a/src/mame/drivers/aztarac.cpp
+++ b/src/mame/drivers/aztarac.cpp
@@ -152,14 +152,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(aztarac_state::aztarac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", aztarac_state, irq4_line_hold)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(aztarac_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aztarac_state, irq4_line_hold)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(aztarac_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, 2000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(aztarac_state, snd_timed_irq, 100)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(aztarac_state, snd_timed_irq, 100)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -179,16 +179,16 @@ MACHINE_CONFIG_START(aztarac_state::aztarac)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay3", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay3", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay4", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay4", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index bb63a3405ca..909986d09ed 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -276,9 +276,9 @@ WRITE8_MEMBER(b16_state::memory_write_byte)
MACHINE_CONFIG_START(b16_state::b16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8086, XTAL(14'318'181)/2) //unknown xtal
- MCFG_CPU_PROGRAM_MAP(b16_map)
- MCFG_CPU_IO_MAP(b16_io)
+ MCFG_DEVICE_ADD("maincpu",I8086, XTAL(14'318'181)/2) //unknown xtal
+ MCFG_DEVICE_PROGRAM_MAP(b16_map)
+ MCFG_DEVICE_IO_MAP(b16_io)
/* video hardware */
@@ -295,8 +295,8 @@ MACHINE_CONFIG_START(b16_state::b16)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_DEVICE_ADD("8237dma", AM9517A, XTAL(14'318'181)/2)
- MCFG_I8237_IN_MEMR_CB(READ8(b16_state, memory_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(b16_state, memory_write_byte))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, b16_state, memory_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, b16_state, memory_write_byte))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", b16)
MCFG_PALETTE_ADD("palette", 8)
diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp
index c7bf2eea000..1fed33c64a6 100644
--- a/src/mame/drivers/b2m.cpp
+++ b/src/mame/drivers/b2m.cpp
@@ -191,11 +191,11 @@ static void b2m_floppies(device_slot_interface &device)
/* Machine driver */
MACHINE_CONFIG_START(b2m_state::b2m)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(b2m_mem)
- MCFG_CPU_IO_MAP(b2m_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", b2m_state, b2m_vblank_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(b2m_mem)
+ MCFG_DEVICE_IO_MAP(b2m_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", b2m_state, b2m_vblank_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -211,39 +211,39 @@ MACHINE_CONFIG_START(b2m_state::b2m)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir1_w))
MCFG_PIT8253_CLK1(2000000)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(b2m_state,bm2_pit_out1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, b2m_state,bm2_pit_out1))
MCFG_PIT8253_CLK2(2000000)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk0))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pit8253", pit8253_device, write_clk0))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(b2m_state, b2m_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(b2m_state, b2m_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(b2m_state, b2m_8255_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(b2m_state, b2m_8255_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, b2m_state, b2m_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, b2m_state, b2m_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, b2m_state, b2m_8255_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, b2m_state, b2m_8255_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTC_CB(WRITE8(b2m_state, b2m_ext_8255_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, b2m_state, b2m_ext_8255_portc_w))
MCFG_DEVICE_ADD("ppi8255_3", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(b2m_state, b2m_romdisk_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(b2m_state, b2m_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(b2m_state, b2m_romdisk_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, b2m_state, b2m_romdisk_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, b2m_state, b2m_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, b2m_state, b2m_romdisk_portc_w))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
/* sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(b2m_state, b2m_fdc_drq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, b2m_state, b2m_fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats)
@@ -257,8 +257,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(b2m_state::b2mrom)
b2m(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(b2m_rom_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(b2m_rom_io)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index 5990e3aa9c8..687f573ac84 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -232,9 +232,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(babbage_state::keyboard_callback)
MACHINE_CONFIG_START(babbage_state::babbage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) //2.5MHz
- MCFG_CPU_PROGRAM_MAP(babbage_map)
- MCFG_CPU_IO_MAP(babbage_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK) //2.5MHz
+ MCFG_DEVICE_PROGRAM_MAP(babbage_map)
+ MCFG_DEVICE_IO_MAP(babbage_io)
MCFG_Z80_DAISY_CHAIN(babbage_daisy_chain)
/* video hardware */
@@ -243,18 +243,18 @@ MACHINE_CONFIG_START(babbage_state::babbage)
/* Devices */
MCFG_DEVICE_ADD("z80ctc", Z80CTC, MAIN_CLOCK)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(babbage_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(babbage_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(babbage_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, babbage_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, babbage_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, babbage_state, ctc_z2_w))
MCFG_DEVICE_ADD("z80pio_1", Z80PIO, MAIN_CLOCK)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(babbage_state, pio1_b_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, babbage_state, pio1_b_w))
MCFG_DEVICE_ADD("z80pio_2", Z80PIO, MAIN_CLOCK)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(babbage_state, pio2_a_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(babbage_state, pio2_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, babbage_state, pio2_a_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, babbage_state, pio2_b_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", babbage_state, keyboard_callback, attotime::from_hz(30))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp
index 70498ade9df..547ed8830bb 100644
--- a/src/mame/drivers/backfire.cpp
+++ b/src/mame/drivers/backfire.cpp
@@ -422,8 +422,8 @@ void backfire_state::machine_start()
MACHINE_CONFIG_START(backfire_state::backfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
- MCFG_CPU_PROGRAM_MAP(backfire_map)
+ MCFG_DEVICE_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
+ MCFG_DEVICE_PROGRAM_MAP(backfire_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -445,7 +445,7 @@ MACHINE_CONFIG_START(backfire_state::backfire)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(backfire_state, screen_update_left)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(backfire_state, deco32_vbl_interrupt))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, backfire_state, deco32_vbl_interrupt))
MCFG_SCREEN_ADD("rscreen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -505,7 +505,7 @@ MACHINE_CONFIG_START(backfire_state::backfire)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 28000000 / 2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index 4b93296610d..d8dcd7081b1 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -443,12 +443,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(badlands_state::badlands)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", badlands_state, vblank_int)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", badlands_state, vblank_int)
- MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", badlands_state, sound_scanline, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(badlands_state,badlands)
diff --git a/src/mame/drivers/badlandsbl.cpp b/src/mame/drivers/badlandsbl.cpp
index 396c329d206..965c1449b1c 100644
--- a/src/mame/drivers/badlandsbl.cpp
+++ b/src/mame/drivers/badlandsbl.cpp
@@ -220,12 +220,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlandsbl_state::bootleg_sound_scanline)
MACHINE_CONFIG_START(badlandsbl_state::badlandsb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* Divisor estimated */
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", badlandsbl_state, irq1_line_hold) //vblank_int)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* Divisor estimated */
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", badlandsbl_state, irq1_line_hold) //vblank_int)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(20'000'000)/12) /* Divisor estimated */
- MCFG_CPU_PROGRAM_MAP(bootleg_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(20'000'000)/12) /* Divisor estimated */
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_audio_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", badlandsbl_state, bootleg_sound_scanline, "screen", 0, 1)
// MCFG_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp
index e1586bb2ad0..1168c32cb8b 100644
--- a/src/mame/drivers/bagman.cpp
+++ b/src/mame/drivers/bagman.cpp
@@ -428,17 +428,17 @@ WRITE_LINE_MEMBER(bagman_state::vblank_irq)
MACHINE_CONFIG_START(bagman_state::bagman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, BAGMAN_H0)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 8H
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(bagman_state, flipscreen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(bagman_state, flipscreen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, bagman_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, bagman_state, flipscreen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, bagman_state, flipscreen_y_w))
// video enable register not available on earlier hardware revision(s)
// Bagman is supposed to have glitches during screen transitions
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(bagman_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, bagman_state, coin_counter_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // ????
/* video hardware */
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(bagman_state::bagman)
MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(bagman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bagman_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bagman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bagman)
MCFG_PALETTE_ADD("palette", 64)
@@ -464,35 +464,35 @@ MACHINE_CONFIG_START(bagman_state::bagman)
MCFG_TMSPROM_CTL8_BIT(2) /* bit # of ctl8 line */
MCFG_TMSPROM_RESET_BIT(6) /* bit # of rom reset */
MCFG_TMSPROM_STOP_BIT(7) /* bit # of stop */
- MCFG_TMSPROM_PDC_CB(DEVWRITELINE("tms", tms5110_device, pdc_w)) /* tms pdc func */
- MCFG_TMSPROM_CTL_CB(DEVWRITE8("tms", tms5110_device, ctl_w)) /* tms ctl func */
+ MCFG_TMSPROM_PDC_CB(WRITELINE("tms", tms5110_device, pdc_w)) /* tms pdc func */
+ MCFG_TMSPROM_CTL_CB(WRITE8("tms", tms5110_device, ctl_w)) /* tms ctl func */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, BAGMAN_H0 / 2)
+ MCFG_DEVICE_ADD("aysnd", AY8910, BAGMAN_H0 / 2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("tms", TMS5110A, 640000)
- MCFG_TMS5110_M0_CB(DEVWRITELINE("tmsprom", tmsprom_device, m0_w))
- MCFG_TMS5110_DATA_CB(DEVREADLINE("tmsprom", tmsprom_device, data_r))
+ MCFG_DEVICE_ADD("tms", TMS5110A, 640000)
+ MCFG_TMS5110_M0_CB(WRITELINE("tmsprom", tmsprom_device, m0_w))
+ MCFG_TMS5110_DATA_CB(READLINE("tmsprom", tmsprom_device, data_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("tmslatch", LS259, 0) // 7H
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, tmsprom_bit_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(bagman_state, tmsprom_bit_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(bagman_state, tmsprom_bit_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("tmsprom", tmsprom_device, enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(bagman_state, tmsprom_csq0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(bagman_state, tmsprom_csq1_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, bagman_state, tmsprom_bit_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, bagman_state, tmsprom_bit_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, bagman_state, tmsprom_bit_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("tmsprom", tmsprom_device, enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, bagman_state, tmsprom_csq0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, bagman_state, tmsprom_csq1_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bagman_state::sbagman)
bagman(config);
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(bagman_state, video_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, bagman_state, video_enable_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bagman_state::sbagmani)
@@ -507,16 +507,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bagman_state::pickin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
- MCFG_CPU_PROGRAM_MAP(pickin_map)
- MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, BAGMAN_H0)
+ MCFG_DEVICE_PROGRAM_MAP(pickin_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(bagman_state, flipscreen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(bagman_state, flipscreen_y_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(bagman_state, video_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(bagman_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, bagman_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, bagman_state, flipscreen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, bagman_state, flipscreen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, bagman_state, video_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, bagman_state, coin_counter_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ????
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // ????
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // ????
@@ -526,7 +526,7 @@ MACHINE_CONFIG_START(bagman_state::pickin)
MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(bagman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bagman_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bagman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pickin)
MCFG_PALETTE_ADD("palette", 64)
@@ -536,13 +536,13 @@ MACHINE_CONFIG_START(bagman_state::pickin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
/* maybe */
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -567,16 +567,16 @@ z80
MACHINE_CONFIG_START(bagman_state::botanic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
- MCFG_CPU_PROGRAM_MAP(pickin_map)
- MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, BAGMAN_H0)
+ MCFG_DEVICE_PROGRAM_MAP(pickin_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(bagman_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(bagman_state, flipscreen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(bagman_state, flipscreen_y_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(bagman_state, video_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(bagman_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, bagman_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, bagman_state, flipscreen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, bagman_state, flipscreen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, bagman_state, video_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, bagman_state, coin_counter_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ????
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // ????
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // ????
@@ -586,7 +586,7 @@ MACHINE_CONFIG_START(bagman_state::botanic)
MCFG_SCREEN_RAW_PARAMS(BAGMAN_HCLK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(bagman_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bagman_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bagman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bagman)
MCFG_PALETTE_ADD("palette", 64)
@@ -596,12 +596,12 @@ MACHINE_CONFIG_START(bagman_state::botanic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index 1ac7fbcca10..3ace124fe27 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -1295,13 +1295,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(balsente_state::balsente)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(20'000'000)/16) /* xtal verified but not speed */
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", balsente_state, balsente_update_analog_inputs)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(20'000'000)/16) /* xtal verified but not speed */
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", balsente_state, balsente_update_analog_inputs)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* xtal verified but not speed */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_IO_MAP(cpu2_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* xtal verified but not speed */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_IO_MAP(cpu2_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -1316,15 +1316,15 @@ MACHINE_CONFIG_START(balsente_state::balsente)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // U9H
// these outputs are generally used to control the various lamps
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(balsente_state, out0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(balsente_state, out1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(balsente_state, out2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(balsente_state, out3_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(balsente_state, out4_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(balsente_state, out5_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(balsente_state, out6_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, balsente_state, out0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, balsente_state, out1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, balsente_state, out2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, balsente_state, out3_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, balsente_state, out4_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, balsente_state, out5_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, balsente_state, out6_w))
// special case is output 7, which recalls the NVRAM data
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(balsente_state, nvrecall_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, balsente_state, nvrecall_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1382,8 +1382,8 @@ MACHINE_CONFIG_START(balsente_state::shrike)
/* basic machine hardware */
- MCFG_CPU_ADD("68k", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(shrike68k_map)
+ MCFG_DEVICE_ADD("68k", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(shrike68k_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp
index 333ef744676..ad3d78f9b4a 100644
--- a/src/mame/drivers/banctec.cpp
+++ b/src/mame/drivers/banctec.cpp
@@ -138,11 +138,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(banctec_state::banctec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(banctec_mem)
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(banctec_mem)
- MCFG_CPU_ADD("mcu", M6803, 4000000) /* Actual MCU is a Motorola 6803 and the clock frequency is still unknown */
- MCFG_CPU_PROGRAM_MAP(banctec_mcu_mem)
+ MCFG_DEVICE_ADD("mcu", M6803, 4000000) /* Actual MCU is a Motorola 6803 and the clock frequency is still unknown */
+ MCFG_DEVICE_PROGRAM_MAP(banctec_mcu_mem)
// The video signal is generated by a R6545EAP character generator chip
// The U20 EPROM holds the image data for the character set.
diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp
index 713f75ecd55..86459742ad2 100644
--- a/src/mame/drivers/bankp.cpp
+++ b/src/mame/drivers/bankp.cpp
@@ -296,10 +296,10 @@ INTERRUPT_GEN_MEMBER(bankp_state::vblank_irq)
MACHINE_CONFIG_START(bankp_state::bankp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(bankp_map)
- MCFG_CPU_IO_MAP(bankp_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bankp_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(bankp_map)
+ MCFG_DEVICE_IO_MAP(bankp_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bankp_state, vblank_irq)
/* video hardware */
@@ -316,13 +316,13 @@ MACHINE_CONFIG_START(bankp_state::bankp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, MASTER_CLOCK/6)
+ MCFG_DEVICE_ADD("sn1", SN76489, MASTER_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76489, MASTER_CLOCK/6)
+ MCFG_DEVICE_ADD("sn2", SN76489, MASTER_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn3", SN76489, MASTER_CLOCK/6)
+ MCFG_DEVICE_ADD("sn3", SN76489, MASTER_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index e6bc55a8300..31637f2fa4c 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -376,12 +376,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(baraduke_state::baraduke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) // 68A09E
- MCFG_CPU_PROGRAM_MAP(baraduke_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) // 68A09E
+ MCFG_DEVICE_PROGRAM_MAP(baraduke_map)
- MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8)
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_DEVICE_ADD("mcu", HD63701, XTAL(49'152'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_port_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
@@ -391,7 +391,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 0, 36*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(baraduke_state, screen_update_baraduke)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(baraduke_state, screen_vblank_baraduke))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, baraduke_state, screen_vblank_baraduke))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", baraduke)
@@ -401,7 +401,7 @@ MACHINE_CONFIG_START(baraduke_state::baraduke)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index 85d4c6ab5b0..a2f78ed3869 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -307,12 +307,12 @@ READ8_MEMBER(barata_state::port2_r)
MACHINE_CONFIG_START(barata_state::barata)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, CPU_CLOCK)
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(barata_state, port0_w))
+ MCFG_DEVICE_ADD("maincpu", I8051, CPU_CLOCK)
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, barata_state, port0_w))
MCFG_MCS51_PORT_P1_IN_CB(IOPORT("PORT1"))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(barata_state, port2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(barata_state, port2_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(barata_state, fpga_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, barata_state, port2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, barata_state, port2_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, barata_state, fpga_w))
MCFG_DEFAULT_LAYOUT( layout_barata )
diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp
index f5a30f25e7e..5876ececbf3 100644
--- a/src/mame/drivers/barni.cpp
+++ b/src/mame/drivers/barni.cpp
@@ -64,14 +64,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(barni_state::barni)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(4'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(4'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_ADD("subcpu", MC6809E, XTAL(4'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(subcpu_map)
+ MCFG_DEVICE_ADD("subcpu", MC6809E, XTAL(4'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_map)
- MCFG_CPU_ADD("audiocpu", M6802, 4000000) // uses own XTAL, but what is the value?
- MCFG_CPU_PROGRAM_MAP(audiocpu_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 4000000) // uses own XTAL, but what is the value?
+ MCFG_DEVICE_PROGRAM_MAP(audiocpu_map)
/* video hardware */
//MCFG_DEFAULT_LAYOUT()
diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp
index 85043a5faf0..ae94332cf28 100644
--- a/src/mame/drivers/bartop52.cpp
+++ b/src/mame/drivers/bartop52.cpp
@@ -129,8 +129,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( bartop52_state::bartop_interrupt )
MACHINE_CONFIG_START(bartop52_state::a5200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
- MCFG_CPU_PROGRAM_MAP(a5200_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
+ MCFG_DEVICE_PROGRAM_MAP(a5200_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bartop52_state, bartop_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("gtia", ATARI_GTIA, 0)
@@ -154,7 +154,7 @@ MACHINE_CONFIG_START(bartop52_state::a5200)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
+ MCFG_DEVICE_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
MCFG_POKEY_POT0_R_CB(IOPORT("analog_0"))
MCFG_POKEY_POT1_R_CB(IOPORT("analog_1"))
MCFG_POKEY_POT2_R_CB(IOPORT("analog_2"))
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index c0bc4ebc5b9..c93ff9a1bef 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -105,12 +105,12 @@ void basic52_state::kbd_put(u8 data)
MACHINE_CONFIG_START(basic52_state::basic31)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8031, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(basic52_mem)
- MCFG_CPU_IO_MAP(basic52_io)
- MCFG_MCS51_PORT_P3_IN_CB(READ8(basic52_state, unk_r))
- MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
- MCFG_MCS51_SERIAL_RX_CB(READ8(basic52_state, from_term))
+ MCFG_DEVICE_ADD("maincpu", I8031, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(basic52_mem)
+ MCFG_DEVICE_IO_MAP(basic52_io)
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, basic52_state, unk_r))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8("terminal", generic_terminal_device, write))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, basic52_state, from_term))
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
@@ -122,12 +122,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(basic52_state::basic52)
basic31(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8052, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(basic52_mem)
- MCFG_CPU_IO_MAP(basic52_io)
- MCFG_MCS51_PORT_P3_IN_CB(READ8(basic52_state, unk_r))
- MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
- MCFG_MCS51_SERIAL_RX_CB(READ8(basic52_state, from_term))
+ MCFG_DEVICE_REPLACE("maincpu", I8052, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(basic52_mem)
+ MCFG_DEVICE_IO_MAP(basic52_io)
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, basic52_state, unk_r))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8("terminal", generic_terminal_device, write))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, basic52_state, from_term))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp
index b1b794d0673..b5d1d07baa6 100644
--- a/src/mame/drivers/batman.cpp
+++ b/src/mame/drivers/batman.cpp
@@ -186,8 +186,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(batman_state::batman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp
index 10adf5a396a..e42426106cd 100644
--- a/src/mame/drivers/battlane.cpp
+++ b/src/mame/drivers/battlane.cpp
@@ -274,12 +274,12 @@ void battlane_state::machine_reset()
MACHINE_CONFIG_START(battlane_state::battlane)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(battlane_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", battlane_state, battlane_cpu1_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(battlane_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", battlane_state, battlane_cpu1_interrupt)
- MCFG_CPU_ADD("sub", M6809, 1500000) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(battlane_map)
+ MCFG_DEVICE_ADD("sub", M6809, 1500000) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(battlane_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -300,7 +300,7 @@ MACHINE_CONFIG_START(battlane_state::battlane)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp
index 59c501eca86..07b2d56f80e 100644
--- a/src/mame/drivers/battlera.cpp
+++ b/src/mame/drivers/battlera.cpp
@@ -273,12 +273,12 @@ uint32_t battlera_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
MACHINE_CONFIG_START(battlera_state::battlera)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280,21477200/3)
- MCFG_CPU_PROGRAM_MAP(battlera_map)
- MCFG_CPU_IO_MAP(battlera_portmap)
+ MCFG_DEVICE_ADD("maincpu", H6280,21477200/3)
+ MCFG_DEVICE_PROGRAM_MAP(battlera_map)
+ MCFG_DEVICE_IO_MAP(battlera_portmap)
- MCFG_CPU_ADD("audiocpu", H6280,21477200/3)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280,21477200/3)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -287,10 +287,10 @@ MACHINE_CONFIG_START(battlera_state::battlera)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD( "huc6260", HUC6260, MAIN_CLOCK )
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6270", huc6270_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6270", huc6270_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6270", huc6270_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6270", huc6270_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x20000)
@@ -301,15 +301,15 @@ MACHINE_CONFIG_START(battlera_state::battlera)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12000000 / 8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12000000 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(battlera_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, battlera_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
- MCFG_SOUND_ADD("c6280", C6280, 21477270/6)
+ MCFG_DEVICE_ADD("c6280", C6280, 21477270/6)
MCFG_C6280_CPU("audiocpu")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index 562cb85da6d..5329661a4b5 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -294,10 +294,10 @@ void battlex_state::machine_reset()
MACHINE_CONFIG_START(battlex_state::battlex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(10'000'000)/4 ) // ?
- MCFG_CPU_PROGRAM_MAP(battlex_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(battlex_state, battlex_interrupt, 400) /* controls game speed? */
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(10'000'000)/4 ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(battlex_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(battlex_state, battlex_interrupt, 400) /* controls game speed? */
/* video hardware */
@@ -314,19 +314,19 @@ MACHINE_CONFIG_START(battlex_state::battlex)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'000'000)/8) // ?
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(10'000'000)/8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(battlex_state::dodgeman)
battlex(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(dodgeman_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(dodgeman_io_map)
MCFG_VIDEO_START_OVERRIDE(battlex_state, dodgeman)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'000'000)/8) // ?
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(10'000'000)/8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index ef6a652bfe2..599d9a9ff17 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -234,11 +234,11 @@ void battlnts_state::machine_reset()
MACHINE_CONFIG_START(battlnts_state::battlnts)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL(24'000'000) / 2 /* 3000000*4? */)
- MCFG_CPU_PROGRAM_MAP(battlnts_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309, XTAL(24'000'000) / 2 /* 3000000*4? */)
+ MCFG_DEVICE_PROGRAM_MAP(battlnts_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000) / 6 /* 3579545? */)
- MCFG_CPU_PROGRAM_MAP(battlnts_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000) / 6 /* 3579545? */)
+ MCFG_DEVICE_PROGRAM_MAP(battlnts_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -250,7 +250,7 @@ MACHINE_CONFIG_START(battlnts_state::battlnts)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(battlnts_state, screen_update_battlnts)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(battlnts_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, battlnts_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", battlnts)
MCFG_PALETTE_ADD("palette", 128)
@@ -271,10 +271,10 @@ MACHINE_CONFIG_START(battlnts_state::battlnts)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3812, XTAL(24'000'000) / 8)
+ MCFG_DEVICE_ADD("ym1", YM3812, XTAL(24'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000) / 8)
+ MCFG_DEVICE_ADD("ym2", YM3812, XTAL(24'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index ba2979a3aa7..358489c2edd 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -831,9 +831,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbca)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 16_MHz_XTAL/8) /* 2.00 MHz */
- MCFG_CPU_PROGRAM_MAP(bbca_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
+ MCFG_DEVICE_ADD("maincpu", M6502, 16_MHz_XTAL/8) /* 2.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bbca_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_INPUT_MERGER_ANY_HIGH("irqs")
@@ -864,9 +864,9 @@ MACHINE_CONFIG_START(bbc_state::bbca)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(bbc_state, bbc_de_changed))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(bbc_state, bbc_hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(bbc_state, bbc_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, bbc_state, bbc_de_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, bbc_state, bbc_hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, bbc_state, bbc_vsync_changed))
MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc)
@@ -874,11 +874,11 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, 16_MHz_XTAL/4) /* 4 MHz */
+ MCFG_DEVICE_ADD("sn76489", SN76489, 16_MHz_XTAL/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* cassette relay */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(bbc_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -894,25 +894,25 @@ MACHINE_CONFIG_START(bbc_state::bbca)
/* acia */
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(bbc_state, bbc_txd_w))
- MCFG_ACIA6850_RTS_HANDLER(WRITELINE(bbc_state, bbc_rts_w))
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<0>))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, bbc_state, bbc_txd_w))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(*this, bbc_state, bbc_rts_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<0>))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(bbc_state, write_rxd_serial))
- MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
- MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, bbc_state, write_rxd_serial))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, bbc_state, write_dcd_serial))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, bbc_state, write_cts_serial))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 16_MHz_XTAL / 13)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bbc_state, write_acia_clock))
/* system via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 16_MHz_XTAL / 16)
- MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
- MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_portb))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, bbc_state, bbcb_via_system_read_porta))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, bbc_state, bbcb_via_system_read_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, bbc_state, bbcb_via_system_write_porta))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, bbc_state, bbcb_via_system_write_portb))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<1>))
/* EPROM sockets */
bbc_eprom_sockets(config);
@@ -922,8 +922,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcb)
bbca(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bbcb_nofdc_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bbcb_nofdc_mem)
MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcb)
MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcb)
@@ -935,17 +935,17 @@ MACHINE_CONFIG_START(bbc_state::bbcb)
/* speech hardware */
MCFG_DEVICE_ADD("vsm", SPEECHROM, 0)
- MCFG_SOUND_ADD("tms5220", TMS5220, 640000)
+ MCFG_DEVICE_ADD("tms5220", TMS5220, 640000)
MCFG_TMS52XX_SPEECHROM("vsm")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* user via */
MCFG_DEVICE_ADD("via6522_1", VIA6522, 16_MHz_XTAL / 16)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_READPB_HANDLER(READ8("userport", bbc_userport_slot_device, pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8("userport", bbc_userport_slot_device, pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<2>))
/* adc */
MCFG_DEVICE_ADD("upd7002", UPD7002, 0)
@@ -954,21 +954,21 @@ MACHINE_CONFIG_START(bbc_state::bbcb)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* fdc */
MCFG_BBC_FDC_SLOT_ADD("fdc", bbc_fdc_devices, "acorn8271", false)
- MCFG_BBC_FDC_SLOT_INTRQ_HANDLER(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_BBC_FDC_SLOT_DRQ_HANDLER(WRITELINE(bbc_state, fdc_drq_w))
+ MCFG_BBC_FDC_SLOT_INTRQ_HANDLER(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_BBC_FDC_SLOT_DRQ_HANDLER(WRITELINE(*this, bbc_state, fdc_drq_w))
/* econet */
MCFG_DEVICE_ADD("mc6854", MC6854, 0)
- MCFG_MC6854_OUT_TXD_CB(DEVWRITELINE(ECONET_TAG, econet_device, data_w))
- MCFG_MC6854_OUT_IRQ_CB(WRITELINE(bbc_state, adlc_irq_w))
+ MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, data_w))
+ MCFG_MC6854_OUT_IRQ_CB(WRITELINE(*this, bbc_state, adlc_irq_w))
MCFG_ECONET_ADD()
- MCFG_ECONET_CLK_CALLBACK(WRITELINE(bbc_state, econet_clk_w))
- MCFG_ECONET_DATA_CALLBACK(DEVWRITELINE("mc6854", mc6854_device, set_rx))
+ MCFG_ECONET_CLK_CALLBACK(WRITELINE(*this, bbc_state, econet_clk_w))
+ MCFG_ECONET_DATA_CALLBACK(WRITELINE("mc6854", mc6854_device, set_rx))
MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, nullptr)
/* analogue port */
@@ -976,17 +976,17 @@ MACHINE_CONFIG_START(bbc_state::bbcb)
/* 1mhz bus port */
MCFG_BBC_1MHZBUS_SLOT_ADD("1mhzbus", bbc_1mhzbus_devices, nullptr)
- MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<3>))
- MCFG_BBC_1MHZBUS_SLOT_NMI_HANDLER(WRITELINE(bbc_state, bus_nmi_w))
+ MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<3>))
+ MCFG_BBC_1MHZBUS_SLOT_NMI_HANDLER(WRITELINE(*this, bbc_state, bus_nmi_w))
/* tube port */
MCFG_BBC_TUBE_SLOT_ADD("tube", bbc_extube_devices, nullptr)
- MCFG_BBC_TUBE_SLOT_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<4>))
+ MCFG_BBC_TUBE_SLOT_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<4>))
/* user port */
MCFG_BBC_USERPORT_SLOT_ADD("userport", bbc_userport_devices, nullptr)
- MCFG_BBC_USERPORT_CB1_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb1))
- MCFG_BBC_USERPORT_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb2))
+ MCFG_BBC_USERPORT_CB1_HANDLER(WRITELINE("via6522_1", via6522_device, write_cb1))
+ MCFG_BBC_USERPORT_CB2_HANDLER(WRITELINE("via6522_1", via6522_device, write_cb2))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("cass_ls_b", "bbcb_cass")
@@ -998,15 +998,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcb_de)
bbcb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bbcb_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bbcb_mem)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
MCFG_DEVICE_ADD("i8271", I8271, 0)
- MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_I8271_HDL_CALLBACK(WRITELINE(bbc_state, motor_w))
- MCFG_I8271_OPT_CALLBACK(WRITELINE(bbc_state, side_w))
+ MCFG_I8271_IRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_I8271_HDL_CALLBACK(WRITELINE(*this, bbc_state, motor_w))
+ MCFG_I8271_OPT_CALLBACK(WRITELINE(*this, bbc_state, side_w))
MCFG_FLOPPY_DRIVE_ADD("i8271:0", bbc_floppies_525, "525qd", bbc_state::floppy_formats_bbc)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("i8271:1", bbc_floppies_525, "525qd", bbc_state::floppy_formats_bbc)
@@ -1020,8 +1020,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcb_us)
bbcb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bbcb_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bbcb_mem)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1032,9 +1032,9 @@ MACHINE_CONFIG_START(bbc_state::bbcb_us)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
MCFG_DEVICE_ADD("i8271", I8271, 0)
- MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_I8271_HDL_CALLBACK(WRITELINE(bbc_state, motor_w))
- MCFG_I8271_OPT_CALLBACK(WRITELINE(bbc_state, side_w))
+ MCFG_I8271_IRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_I8271_HDL_CALLBACK(WRITELINE(*this, bbc_state, motor_w))
+ MCFG_I8271_OPT_CALLBACK(WRITELINE(*this, bbc_state, side_w))
MCFG_FLOPPY_DRIVE_ADD("i8271:0", bbc_floppies_525, "525qd", bbc_state::floppy_formats_bbc)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -1049,9 +1049,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcbp)
bbcb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") /* M6512 */
- MCFG_CPU_PROGRAM_MAP(bbcbp_mem)
- MCFG_CPU_OPCODES_MAP(bbcbp_fetch)
+ MCFG_DEVICE_MODIFY("maincpu") /* M6512 */
+ MCFG_DEVICE_PROGRAM_MAP(bbcbp_mem)
+ MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch)
MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp)
MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp)
@@ -1059,8 +1059,8 @@ MACHINE_CONFIG_START(bbc_state::bbcbp)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
MCFG_WD1770_ADD("wd1770", 16_MHz_XTAL / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", bbc_state::floppy_formats_bbc)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -1072,9 +1072,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcbp128)
bbcbp(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") /* M6512 */
- MCFG_CPU_PROGRAM_MAP(bbcbp128_mem)
- MCFG_CPU_OPCODES_MAP(bbcbp_fetch)
+ MCFG_DEVICE_MODIFY("maincpu") /* M6512 */
+ MCFG_DEVICE_PROGRAM_MAP(bbcbp128_mem)
+ MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch)
MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcbp)
MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcbp)
@@ -1091,17 +1091,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(torch_state::torchf)
bbcb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bbcb_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bbcb_mem)
MCFG_MACHINE_RESET_OVERRIDE(bbc_state, torch)
/* fdc */
MCFG_DEVICE_REMOVE("fdc")
MCFG_DEVICE_ADD("i8271", I8271, 0)
- MCFG_I8271_IRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_I8271_HDL_CALLBACK(WRITELINE(bbc_state, motor_w))
- MCFG_I8271_OPT_CALLBACK(WRITELINE(bbc_state, side_w))
+ MCFG_I8271_IRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_I8271_HDL_CALLBACK(WRITELINE(*this, bbc_state, motor_w))
+ MCFG_I8271_OPT_CALLBACK(WRITELINE(*this, bbc_state, side_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED("i8271:0", bbc_floppies_525, "525qd", bbc_state::floppy_formats_bbc)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -1155,11 +1155,11 @@ MACHINE_CONFIG_START(bbc_state::abc110)
/* Add ADAPTEC ACB-4000 Winchester Disc Controller */
//MCFG_DEVICE_ADD(SCSIBUS_TAG, SCSI_PORT, 0)
//MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
- //MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit0))
- //MCFG_SCSI_BSY_HANDLER(WRITELINE(bbc_state, scsi_bsy_w))
- //MCFG_SCSI_REQ_HANDLER(WRITELINE(bbc_state, scsi_req_w))
- //MCFG_SCSI_IO_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6))
- //MCFG_SCSI_CD_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
+ //MCFG_SCSI_MSG_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit0))
+ //MCFG_SCSI_BSY_HANDLER(WRITELINE(*this, bbc_state, scsi_bsy_w))
+ //MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, bbc_state, scsi_req_w))
+ //MCFG_SCSI_IO_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit6))
+ //MCFG_SCSI_CD_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
//MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", ACB4070, SCSI_ID_0)
//MCFG_SCSI_OUTPUT_LATCH_ADD("scsi_data_out", SCSIBUS_TAG)
@@ -1231,9 +1231,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::reutapm)
bbcbp(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") /* M6512 */
- MCFG_CPU_PROGRAM_MAP(reutapm_mem)
- MCFG_CPU_OPCODES_MAP(bbcbp_fetch)
+ MCFG_DEVICE_MODIFY("maincpu") /* M6512 */
+ MCFG_DEVICE_PROGRAM_MAP(reutapm_mem)
+ MCFG_DEVICE_OPCODES_MAP(bbcbp_fetch)
/* sound hardware */
MCFG_DEVICE_REMOVE("mono")
@@ -1296,10 +1296,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbc_state::bbcm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, 16_MHz_XTAL/8) /* 2.00 MHz */
- MCFG_CPU_PROGRAM_MAP(bbcm_mem)
- MCFG_CPU_OPCODES_MAP(bbcm_fetch)
- MCFG_CPU_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
+ MCFG_DEVICE_ADD("maincpu", M65SC02, 16_MHz_XTAL/8) /* 2.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bbcm_mem)
+ MCFG_DEVICE_OPCODES_MAP(bbcm_fetch)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bbc_state, bbcb_keyscan, 1000) /* scan keyboard */
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_INPUT_MERGER_ANY_HIGH("irqs")
@@ -1331,19 +1331,19 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(bbc_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(bbc_state, bbc_de_changed))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(bbc_state, bbc_hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(bbc_state, bbc_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, bbc_state, bbc_de_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, bbc_state, bbc_hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, bbc_state, bbc_vsync_changed))
MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489", SN76489, 16_MHz_XTAL/4) /* 4 MHz */
+ MCFG_DEVICE_ADD("sn76489", SN76489, 16_MHz_XTAL/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* cassette relay */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(bbc_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1353,7 +1353,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522_1", via6522_device, write_ca1)) MCFG_DEVCB_INVERT /* ack seems to be inverted? */
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* cassette */
@@ -1380,17 +1380,17 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* acia */
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(bbc_state, bbc_txd_w))
- MCFG_ACIA6850_RTS_HANDLER(WRITELINE(bbc_state, bbc_rts_w))
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<0>))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, bbc_state, bbc_txd_w))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(*this, bbc_state, bbc_rts_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<0>))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(bbc_state, write_rxd_serial))
- MCFG_RS232_DCD_HANDLER(WRITELINE(bbc_state, write_dcd_serial))
- MCFG_RS232_CTS_HANDLER(WRITELINE(bbc_state, write_cts_serial))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, bbc_state, write_rxd_serial))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, bbc_state, write_dcd_serial))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, bbc_state, write_cts_serial))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 16_MHz_XTAL / 13)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bbc_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bbc_state, write_acia_clock))
/* adc */
MCFG_DEVICE_ADD("upd7002", UPD7002, 0)
@@ -1399,24 +1399,24 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* system via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 16_MHz_XTAL / 16)
- MCFG_VIA6522_READPA_HANDLER(READ8(bbc_state, bbcb_via_system_read_porta))
- MCFG_VIA6522_READPB_HANDLER(READ8(bbc_state, bbcb_via_system_read_portb))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_porta))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bbc_state, bbcb_via_system_write_portb))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, bbc_state, bbcb_via_system_read_porta))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, bbc_state, bbcb_via_system_read_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, bbc_state, bbcb_via_system_write_porta))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, bbc_state, bbcb_via_system_write_portb))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<1>))
/* user via */
MCFG_DEVICE_ADD("via6522_1", VIA6522, 16_MHz_XTAL / 16)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_READPB_HANDLER(DEVREAD8("userport", bbc_userport_slot_device, pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("userport", bbc_userport_slot_device, pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_READPB_HANDLER(READ8("userport", bbc_userport_slot_device, pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8("userport", bbc_userport_slot_device, pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<2>))
/* fdc */
MCFG_WD1770_ADD("wd1770", 16_MHz_XTAL / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd1770:0", bbc_floppies_525, "525qd", bbc_state::floppy_formats_bbc)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -1425,11 +1425,11 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* econet */
MCFG_DEVICE_ADD("mc6854", MC6854, 0)
- MCFG_MC6854_OUT_TXD_CB(DEVWRITELINE(ECONET_TAG, econet_device, data_w))
- MCFG_MC6854_OUT_IRQ_CB(WRITELINE(bbc_state, adlc_irq_w))
+ MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, data_w))
+ MCFG_MC6854_OUT_IRQ_CB(WRITELINE(*this, bbc_state, adlc_irq_w))
MCFG_ECONET_ADD()
- MCFG_ECONET_CLK_CALLBACK(WRITELINE(bbc_state, econet_clk_w))
- MCFG_ECONET_DATA_CALLBACK(DEVWRITELINE("mc6854", mc6854_device, set_rx))
+ MCFG_ECONET_CLK_CALLBACK(WRITELINE(*this, bbc_state, econet_clk_w))
+ MCFG_ECONET_DATA_CALLBACK(WRITELINE("mc6854", mc6854_device, set_rx))
MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, nullptr)
/* analogue port */
@@ -1437,19 +1437,19 @@ MACHINE_CONFIG_START(bbc_state::bbcm)
/* 1mhz bus port */
MCFG_BBC_1MHZBUS_SLOT_ADD("1mhzbus", bbc_1mhzbus_devices, nullptr)
- MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<3>))
- MCFG_BBC_1MHZBUS_SLOT_NMI_HANDLER(WRITELINE(bbc_state, bus_nmi_w))
+ MCFG_BBC_1MHZBUS_SLOT_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<3>))
+ MCFG_BBC_1MHZBUS_SLOT_NMI_HANDLER(WRITELINE(*this, bbc_state, bus_nmi_w))
/* tube ports */
MCFG_BBC_TUBE_SLOT_ADD("intube", bbc_intube_devices, nullptr)
- MCFG_BBC_TUBE_SLOT_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<4>))
+ MCFG_BBC_TUBE_SLOT_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<4>))
MCFG_BBC_TUBE_SLOT_ADD("extube", bbc_extube_devices, nullptr)
- MCFG_BBC_TUBE_SLOT_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<5>))
+ MCFG_BBC_TUBE_SLOT_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<5>))
/* user port */
MCFG_BBC_USERPORT_SLOT_ADD("userport", bbc_userport_devices, nullptr)
- MCFG_BBC_USERPORT_CB1_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb1))
- MCFG_BBC_USERPORT_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb2))
+ MCFG_BBC_USERPORT_CB1_HANDLER(WRITELINE("via6522_1", via6522_device, write_cb1))
+ MCFG_BBC_USERPORT_CB2_HANDLER(WRITELINE("via6522_1", via6522_device, write_cb2))
MACHINE_CONFIG_END
@@ -1614,8 +1614,8 @@ MACHINE_CONFIG_START(bbc_state::bbcmc)
MCFG_DEVICE_REMOVE("wd1770")
MCFG_WD1772_ADD("wd1772", 16_MHz_XTAL / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bbc_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD_FIXED("wd1772:0", bbc_floppies_35, "35dd", bbc_state::floppy_formats_bbc)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -1631,8 +1631,8 @@ MACHINE_CONFIG_START(bbc_state::bbcmc)
/* user via */
MCFG_DEVICE_MODIFY("via6522_1")
// TODO: Joyport connected to PB0-PB4 only. PB5-PB7 are expansion port.
- MCFG_VIA6522_READPB_HANDLER(DEVREAD8("joyport", bbc_joyport_slot_device, pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITE8("joyport", bbc_joyport_slot_device, pb_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8("joyport", bbc_joyport_slot_device, pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8("joyport", bbc_joyport_slot_device, pb_w))
/* cartridge sockets */
MCFG_DEVICE_REMOVE("exp_rom1")
@@ -1651,8 +1651,8 @@ MACHINE_CONFIG_START(bbc_state::bbcmc)
/* expansion ports */
MCFG_BBC_JOYPORT_ADD("joyport", bbc_joyport_devices, "joystick")
- MCFG_BBC_JOYPORT_CB1_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb1))
- MCFG_BBC_JOYPORT_CB2_HANDLER(DEVWRITELINE("via6522_1", via6522_device, write_cb2))
+ MCFG_BBC_JOYPORT_CB1_HANDLER(WRITELINE("via6522_1", via6522_device, write_cb1))
+ MCFG_BBC_JOYPORT_CB2_HANDLER(WRITELINE("via6522_1", via6522_device, write_cb2))
MCFG_DEVICE_REMOVE("analogue")
MCFG_DEVICE_REMOVE("intube")
diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp
index 4d74b875940..fa4c5db0ce1 100644
--- a/src/mame/drivers/bbcbc.cpp
+++ b/src/mame/drivers/bbcbc.cpp
@@ -119,16 +119,16 @@ static const z80_daisy_config bbcbc_daisy_chain[] =
MACHINE_CONFIG_START(bbcbc_state::bbcbc)
- MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK / 8 )
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD( "maincpu", Z80, MAIN_CLOCK / 8 )
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(bbcbc_daisy_chain)
MCFG_DEVICE_ADD("z80pio", Z80PIO, MAIN_CLOCK/8)
//MCFG_Z80PIO_OUT_PA_CB(???)
//MCFG_Z80PIO_IN_STROBE_CB(???)
- MCFG_Z80PIO_IN_PB_CB(READ8(bbcbc_state, input_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(bbcbc_state, input_select_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, bbcbc_state, input_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, bbcbc_state, input_select_w))
MCFG_DEVICE_ADD( "tms9129", TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp
index fdd2ab80dc7..39cf2a438ee 100644
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@@ -655,13 +655,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(bbusters_state::bbusters)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(bbusters_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bbusters_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(bbusters_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bbusters_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000) /* Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_NVRAM_ADD_0FILL("eeprom")
@@ -671,8 +671,8 @@ MACHINE_CONFIG_START(bbusters_state::bbusters)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(bbusters_state, screen_update_bbuster)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("spriteram2", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("spriteram2", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bbusters)
@@ -689,7 +689,7 @@ MACHINE_CONFIG_START(bbusters_state::bbusters)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
@@ -700,13 +700,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bbusters_state::mechatt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(mechatt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bbusters_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(mechatt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bbusters_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sounda_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000) /* Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sounda_portmap)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -714,7 +714,7 @@ MACHINE_CONFIG_START(bbusters_state::mechatt)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(bbusters_state, screen_update_mechatt)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mechatt)
@@ -730,7 +730,7 @@ MACHINE_CONFIG_START(bbusters_state::mechatt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2608, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2608, 8000000)
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index e5af07d7498..aee97a41edf 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -386,9 +386,9 @@ DRIVER_INIT_MEMBER( bcs3_state, bcs3d )
MACHINE_CONFIG_START(bcs3_state::bcs3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) /2)
- MCFG_CPU_PROGRAM_MAP(bcs3_mem)
- MCFG_CPU_IO_MAP(bcs3_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) /2)
+ MCFG_DEVICE_PROGRAM_MAP(bcs3_mem)
+ MCFG_DEVICE_IO_MAP(bcs3_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
/* video hardware */
@@ -404,8 +404,8 @@ MACHINE_CONFIG_START(bcs3_state::bcs3)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(5'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(bcs3_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(bcs3_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, bcs3_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, bcs3_state, ctc_z1_w))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
@@ -413,9 +413,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bcs3_state::bcs3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(7'000'000) /2)
- MCFG_CPU_PROGRAM_MAP(bcs3a_mem)
- MCFG_CPU_IO_MAP(bcs3_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(7'000'000) /2)
+ MCFG_DEVICE_PROGRAM_MAP(bcs3a_mem)
+ MCFG_DEVICE_IO_MAP(bcs3_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
/* video hardware */
@@ -431,8 +431,8 @@ MACHINE_CONFIG_START(bcs3_state::bcs3a)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(7'000'000) / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(bcs3_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(bcs3_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, bcs3_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, bcs3_state, ctc_z1_w))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp
index e93e3017dac..067d914b009 100644
--- a/src/mame/drivers/beaminv.cpp
+++ b/src/mame/drivers/beaminv.cpp
@@ -343,9 +343,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(beaminv_state::beaminv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
/* video hardware */
diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp
index 473a3259ecb..c9002de41a2 100644
--- a/src/mame/drivers/beathead.cpp
+++ b/src/mame/drivers/beathead.cpp
@@ -340,8 +340,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(beathead_state::beathead)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index 2e51eada11c..570186d80a8 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -147,42 +147,42 @@ static void pci_devices(device_slot_interface &device)
MACHINE_CONFIG_START(bebox_state::bebox)
/* basic machine hardware */
- MCFG_CPU_ADD("ppc1", PPC603, 66000000) /* 66 MHz */
- MCFG_CPU_PROGRAM_MAP(bebox_mem)
+ MCFG_DEVICE_ADD("ppc1", PPC603, 66000000) /* 66 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bebox_mem)
- MCFG_CPU_ADD("ppc2", PPC603, 66000000) /* 66 MHz */
- MCFG_CPU_PROGRAM_MAP(bebox_slave_mem)
+ MCFG_DEVICE_ADD("ppc2", PPC603, 66000000) /* 66 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bebox_slave_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(bebox_state, bebox_timer0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, bebox_state, bebox_timer0_w))
MCFG_PIT8253_CLK1(4772720/4) /* dram refresh */
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("kbdc", kbdc8042_device, write_out2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("kbdc", kbdc8042_device, write_out2))
MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(bebox_state, bebox_dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(bebox_state, bebox_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(bebox_state, bebox_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(bebox_state, bebox_dma_write_byte))
- MCFG_I8237_IN_IOR_2_CB(READ8(bebox_state, bebox_dma8237_fdc_dack_r))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(bebox_state, bebox_dma8237_fdc_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(bebox_state, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(bebox_state, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(bebox_state, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(bebox_state, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, bebox_state, bebox_dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, bebox_state, bebox_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, bebox_state, bebox_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, bebox_state, bebox_dma_write_byte))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, bebox_state, bebox_dma8237_fdc_dack_r))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, bebox_state, bebox_dma8237_fdc_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, bebox_state, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, bebox_state, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, bebox_state, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, bebox_state, pc_dack3_w))
MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(bebox_state, bebox_pic8259_master_set_int_line))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, bebox_state, bebox_pic8259_master_set_int_line))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(bebox_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, bebox_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(bebox_state, bebox_pic8259_slave_set_int_line))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, bebox_state, bebox_pic8259_slave_set_int_line))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD( "ns16550_0", NS16550, 0 ) /* TODO: Verify model */
@@ -199,7 +199,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym3812", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ym3812", YM3812, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_FUJITSU_29F016A_ADD("flash")
@@ -215,7 +215,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_LEGACY_SCSI_PORT("scsi")
MCFG_IDE_CONTROLLER_ADD( "ide", ata_devices, "hdd", nullptr, false ) /* FIXME */
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(bebox_state, bebox_ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, bebox_state, bebox_ide_interrupt))
/* pci */
MCFG_PCI_BUS_ADD("pcibus", 0)
@@ -227,8 +227,8 @@ MACHINE_CONFIG_START(bebox_state::bebox)
/*MCFG_PCI_BUS_DEVICE(12, nullptr, scsi53c810_pci_read, scsi53c810_pci_write)*/
MCFG_SMC37C78_ADD("smc37c78")
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(bebox_state, fdc_interrupt))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, bebox_state, fdc_interrupt))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
MCFG_FLOPPY_DRIVE_ADD("smc37c78:0", bebox_floppies, "35hd", bebox_state::floppy_formats)
MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
@@ -236,7 +236,7 @@ MACHINE_CONFIG_START(bebox_state::bebox)
MCFG_DEVICE_ADD("kbdc", KBDC8042, 0)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_STANDARD)
MCFG_KBDC8042_SYSTEM_RESET_CB(INPUTLINE("ppc1", INPUT_LINE_RESET))
- MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(bebox_state, bebox_keyboard_interrupt))
+ MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE(*this, bebox_state, bebox_keyboard_interrupt))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -246,11 +246,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bebox_state::bebox2)
bebox(config);
- MCFG_CPU_REPLACE("ppc1", PPC603E, 133000000) /* 133 MHz */
- MCFG_CPU_PROGRAM_MAP(bebox_mem)
+ MCFG_DEVICE_REPLACE("ppc1", PPC603E, 133000000) /* 133 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bebox_mem)
- MCFG_CPU_REPLACE("ppc2", PPC603E, 133000000) /* 133 MHz */
- MCFG_CPU_PROGRAM_MAP(bebox_slave_mem)
+ MCFG_DEVICE_REPLACE("ppc2", PPC603E, 133000000) /* 133 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bebox_slave_mem)
MACHINE_CONFIG_END
static INPUT_PORTS_START( bebox )
diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp
index 1ca364f58bd..4310d0b9779 100644
--- a/src/mame/drivers/beehive.cpp
+++ b/src/mame/drivers/beehive.cpp
@@ -292,9 +292,9 @@ uint32_t beehive_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
MACHINE_CONFIG_START(beehive_state::beehive)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(beehive_mem)
- MCFG_CPU_IO_MAP(beehive_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(beehive_mem)
+ MCFG_DEVICE_IO_MAP(beehive_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index ad78b0f5588..27b5cad9b5f 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -468,8 +468,8 @@ void beezer_state::machine_reset()
MACHINE_CONFIG_START(beezer_state::beezer)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(12'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("sysbank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(banked_map)
@@ -481,12 +481,12 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", beezer_state, scanline_cb, "screen", 0, 1)
MCFG_DEVICE_ADD("via_u6", VIA6522, XTAL(12'000'000) / 12)
- MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, via_system_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(beezer_state, via_system_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, via_system_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, via_system_pb_w))
- MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE("via_u18", via6522_device, write_ca2))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("via_u18", via6522_device, write_ca1))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, beezer_state, via_system_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, beezer_state, via_system_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, beezer_state, via_system_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, beezer_state, via_system_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE("via_u18", via6522_device, write_ca2))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE("via_u18", via6522_device, write_ca1))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_WATCHDOG_ADD("watchdog")
@@ -504,34 +504,34 @@ MACHINE_CONFIG_START(beezer_state::beezer)
MCFG_PALETTE_INIT_OWNER(beezer_state, beezer)
// sound hardware
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_INPUT_MERGER_ANY_HIGH("audio_irqs")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("via_u18", VIA6522, XTAL(4'000'000) / 4)
- MCFG_VIA6522_READPA_HANDLER(READ8(beezer_state, via_audio_pa_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(beezer_state, via_audio_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(beezer_state, via_audio_pb_w))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("via_u6", via6522_device, write_cb1))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(beezer_state, dmod_clr_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(beezer_state, dmod_data_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("audio_irqs", input_merger_device, in_w<0>))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, beezer_state, via_audio_pa_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, beezer_state, via_audio_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, beezer_state, via_audio_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("via_u6", via6522_device, write_cb1))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, beezer_state, dmod_clr_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, beezer_state, dmod_data_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("audio_irqs", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(4'000'000) / 4)
- MCFG_PTM6840_O1_CB(WRITELINE(beezer_state, ptm_o1_w))
- MCFG_PTM6840_O2_CB(WRITELINE(beezer_state, ptm_o2_w))
- MCFG_PTM6840_O3_CB(WRITELINE(beezer_state, ptm_o3_w))
- MCFG_PTM6840_IRQ_CB(DEVWRITELINE("audio_irqs", input_merger_device, in_w<1>))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, beezer_state, ptm_o1_w))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, beezer_state, ptm_o2_w))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, beezer_state, ptm_o3_w))
+ MCFG_PTM6840_IRQ_CB(WRITELINE("audio_irqs", input_merger_device, in_w<1>))
// schematics show an input labeled VCO to channel 2, but the source is unknown
MCFG_MM5837_ADD("noise")
MCFG_MM5837_VDD(12)
- MCFG_MM5837_OUTPUT_CB(WRITELINE(beezer_state, noise_w))
+ MCFG_MM5837_OUTPUT_CB(WRITELINE(*this, beezer_state, noise_w))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC76, 0)
+ MCFG_DEVICE_ADD("dac", DAC76, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/belatra.cpp b/src/mame/drivers/belatra.cpp
index 2bf1b93fe68..305b41f2850 100644
--- a/src/mame/drivers/belatra.cpp
+++ b/src/mame/drivers/belatra.cpp
@@ -71,8 +71,8 @@ static INPUT_PORTS_START( belatra )
INPUT_PORTS_END
MACHINE_CONFIG_START(belatra_state::belatra)
- MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess...
- MCFG_CPU_PROGRAM_MAP(belatra_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 54000000) // guess...
+ MCFG_DEVICE_PROGRAM_MAP(belatra_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
/* unknown sound */
diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp
index 29f50b852ed..0459f86a5d0 100644
--- a/src/mame/drivers/berzerk.cpp
+++ b/src/mame/drivers/berzerk.cpp
@@ -1114,9 +1114,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(berzerk_state::berzerk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(berzerk_map)
- MCFG_CPU_IO_MAP(berzerk_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(berzerk_map)
+ MCFG_DEVICE_IO_MAP(berzerk_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1131,9 +1131,9 @@ MACHINE_CONFIG_START(berzerk_state::berzerk)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speech", S14001A, S14001_CLOCK/16/8) /* placeholder - the clock is software controllable */
+ MCFG_DEVICE_ADD("speech", S14001A, S14001_CLOCK/16/8) /* placeholder - the clock is software controllable */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD("exidy", EXIDY, 0)
+ MCFG_DEVICE_ADD("exidy", EXIDY, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
@@ -1142,8 +1142,8 @@ MACHINE_CONFIG_START(berzerk_state::frenzy)
berzerk(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(frenzy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(frenzy_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/besta.cpp b/src/mame/drivers/besta.cpp
index ea84bb7d332..15988cd441b 100644
--- a/src/mame/drivers/besta.cpp
+++ b/src/mame/drivers/besta.cpp
@@ -138,8 +138,8 @@ void besta_state::machine_reset()
/* CP31 processor board */
MACHINE_CONFIG_START(besta_state::besta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68030, 2*16670000)
- MCFG_CPU_PROGRAM_MAP(besta_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, 2*16670000)
+ MCFG_DEVICE_PROGRAM_MAP(besta_mem)
MCFG_DEVICE_ADD ("pit1", PIT68230, 16670000 / 2) // XXX verify clock
diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp
index 4fe0780db7d..9596869674b 100644
--- a/src/mame/drivers/bestleag.cpp
+++ b/src/mame/drivers/bestleag.cpp
@@ -380,9 +380,9 @@ static GFXDECODE_START( bestleag )
GFXDECODE_END
MACHINE_CONFIG_START(bestleag_state::bestleag)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(bestleag_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bestleag_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(bestleag_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bestleag_state, irq6_line_hold)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index fb7e06d64bb..6c0fac6b429 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -343,23 +343,23 @@ void beta_state::machine_start()
MACHINE_CONFIG_START(beta_state::beta)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(beta_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(beta_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_beta )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(M6532_TAG, MOS6532_NEW, XTAL(4'000'000)/4)
- MCFG_MOS6530n_IN_PA_CB(READ8(beta_state, riot_pa_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(beta_state, riot_pa_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(beta_state, riot_pb_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(beta_state, riot_pb_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, beta_state, riot_pa_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, beta_state, riot_pa_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, beta_state, riot_pb_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, beta_state, riot_pb_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE(M6502_TAG, M6502_IRQ_LINE))
/* EPROM socket */
diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp
index 4099bf49981..eb03095d69b 100644
--- a/src/mame/drivers/bfcobra.cpp
+++ b/src/mame/drivers/bfcobra.cpp
@@ -1642,14 +1642,14 @@ INTERRUPT_GEN_MEMBER(bfcobra_state::vblank_gen)
}
MACHINE_CONFIG_START(bfcobra_state::bfcobra)
- MCFG_CPU_ADD("maincpu", Z80, Z80_XTAL)
- MCFG_CPU_PROGRAM_MAP(z80_prog_map)
- MCFG_CPU_IO_MAP(z80_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bfcobra_state, vblank_gen)
+ MCFG_DEVICE_ADD("maincpu", Z80, Z80_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(z80_prog_map)
+ MCFG_DEVICE_IO_MAP(z80_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bfcobra_state, vblank_gen)
- MCFG_CPU_ADD("audiocpu", MC6809, M6809_XTAL) // MC6809P
- MCFG_CPU_PROGRAM_MAP(m6809_prog_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bfcobra_state, timer_irq, 1000)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, M6809_XTAL) // MC6809P
+ MCFG_DEVICE_PROGRAM_MAP(m6809_prog_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfcobra_state, timer_irq, 1000)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1669,26 +1669,26 @@ MACHINE_CONFIG_START(bfcobra_state::bfcobra)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, M6809_XTAL / 4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, M6809_XTAL / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
/* ACIAs */
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_rxd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(bfcobra_state, z80_acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_rxd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, bfcobra_state, z80_acia_irq))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("acia6850_0", acia6850_device, write_rxd))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("acia6850_0", acia6850_device, write_rxd))
MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(bfcobra_state, data_acia_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(bfcobra_state, m6809_data_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, bfcobra_state, data_acia_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, bfcobra_state, m6809_data_irq))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16) // What are the correct ACIA clocks ?
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bfcobra_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bfcobra_state, write_acia_clock))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp
index 342e5a778c7..e6e8bf54ef3 100644
--- a/src/mame/drivers/bfm_ad5.cpp
+++ b/src/mame/drivers/bfm_ad5.cpp
@@ -80,9 +80,9 @@ INTERRUPT_GEN_MEMBER(adder5_state::ad5_fake_timer_int)
}
MACHINE_CONFIG_START(adder5_state::bfm_ad5)
- MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */
- MCFG_CPU_PROGRAM_MAP(ad5_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(adder5_state, ad5_fake_timer_int, 1000)
+ MCFG_DEVICE_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */
+ MCFG_DEVICE_PROGRAM_MAP(ad5_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(adder5_state, ad5_fake_timer_int, 1000)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index 3321008fb6a..17c6606ea4b 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -1079,9 +1079,9 @@ INPUT_PORTS_END
/////////////////////////////////////////////////////////////////////////////////////
MACHINE_CONFIG_START(bfm_sc1_state::scorpion1)
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
- MCFG_CPU_PROGRAM_MAP(sc1_base) // setup read and write memorymap
- MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc1_state, timer_irq, 1000) // generate 1000 IRQ's per second
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(sc1_base) // setup read and write memorymap
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc1_state, timer_irq, 1000) // generate 1000 IRQ's per second
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
@@ -1090,24 +1090,24 @@ MACHINE_CONFIG_START(bfm_sc1_state::scorpion1)
MCFG_BFMBD1_ADD("vfd0",0)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("aysnd",AY8912, MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEFAULT_LAYOUT(layout_sc1_vfd)
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc1_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<0>))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc1_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<1>))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc1_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<2>))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc1_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<3>))
MCFG_STARPOINT_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc1_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<4>))
MCFG_STARPOINT_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc1_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<5>))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
@@ -1120,8 +1120,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bfm_sc1_state::scorpion1_adder2)
scorpion1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sc1_adder2) // setup read and write memorymap
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sc1_adder2) // setup read and write memorymap
MCFG_DEFAULT_LAYOUT(layout_sc1_vid)
@@ -1134,10 +1134,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bfm_sc1_state::scorpion1_viper)
scorpion1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sc1_viper) // setup read and write memorymap
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sc1_viper) // setup read and write memorymap
- MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd",UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index 48b809f7684..611a3313a09 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -2276,9 +2276,9 @@ void bfm_sc2_state::machine_start()
}
MACHINE_CONFIG_START(bfm_sc2_vid_state::scorpion2_vid)
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz
- MCFG_CPU_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap
- MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc2_vid_state, timer_irq, 1000) // generate 1000 IRQ's per second
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc2_vid_state, timer_irq, 1000) // generate 1000 IRQ's per second
MCFG_QUANTUM_TIME(attotime::from_hz(960)) // needed for serial communication !!
MCFG_WATCHDOG_ADD("watchdog")
@@ -2294,10 +2294,10 @@ MACHINE_CONFIG_START(bfm_sc2_vid_state::scorpion2_vid)
MCFG_BFM_ADDER2_ADD("adder2")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3747,9 +3747,9 @@ void bfm_sc2_dmd_state::machine_start()
/* machine driver for scorpion2 board */
MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2)
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
- MCFG_CPU_PROGRAM_MAP(memmap_no_vid)
- MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc2_awp_state, timer_irq, 1000)
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/4 )
+ MCFG_DEVICE_PROGRAM_MAP(memmap_no_vid)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc2_awp_state, timer_irq, 1000)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
@@ -3758,10 +3758,10 @@ MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2)
MCFG_BFMBD1_ADD("vfd1",1)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd",UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd",YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3771,17 +3771,17 @@ MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2)
MCFG_DEFAULT_LAYOUT(layout_sc2_vfd)
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_awp_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<0>))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_awp_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<1>))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_awp_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<2>))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_awp_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<3>))
MCFG_STARPOINT_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_awp_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<4>))
MCFG_STARPOINT_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_awp_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<5>))
_8meters(config);
MACHINE_CONFIG_END
@@ -3807,18 +3807,18 @@ MACHINE_CONFIG_END
/* machine driver for scorpion2 board + matrix board */
MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01)
MCFG_QUANTUM_TIME(attotime::from_hz(960)) // needed for serial communication !!
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
- MCFG_CPU_PROGRAM_MAP(memmap_no_vid)
- MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc2_dmd_state, timer_irq, 1000)
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/4 )
+ MCFG_DEVICE_PROGRAM_MAP(memmap_no_vid)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_sc2_dmd_state, timer_irq, 1000)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(120000,100e-9))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd",YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd",UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3827,20 +3827,20 @@ MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_sc2_dmd)
MCFG_DEVICE_ADD("dm01", BFM_DM01, 0)
- MCFG_BFM_DM01_BUSY_CB(WRITELINE(bfm_sc2_dmd_state, bfmdm01_busy))
+ MCFG_BFM_DM01_BUSY_CB(WRITELINE(*this, bfm_sc2_dmd_state, bfmdm01_busy))
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_dmd_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_dmd_state, reel_optic_cb<0>))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_dmd_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_dmd_state, reel_optic_cb<1>))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_dmd_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_dmd_state, reel_optic_cb<2>))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_dmd_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_dmd_state, reel_optic_cb<3>))
MCFG_STARPOINT_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_dmd_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_dmd_state, reel_optic_cb<4>))
MCFG_STARPOINT_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_dmd_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_dmd_state, reel_optic_cb<5>))
_8meters(config);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index 7e1492085f9..1376f85e342 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -893,11 +893,11 @@ WRITE_LINE_MEMBER(sc4_state::bfmdm01_busy)
}
MACHINE_CONFIG_START(sc4_state::sc4_common)
- MCFG_CPU_ADD("maincpu", M68307, 16000000) // 68307! (EC000 core)
- MCFG_CPU_PROGRAM_MAP(sc4_map)
- MCFG_MC68307_SERIAL_A_TX_CALLBACK(WRITELINE(sc4_state, m68307_duart_txa))
- MCFG_MC68307_SERIAL_INPORT_CALLBACK(READ8(sc4_state, m68307_duart_input_r))
- MCFG_MC68307_SERIAL_OUTPORT_CALLBACK(WRITE8(sc4_state, m68307_duart_output_w))
+ MCFG_DEVICE_ADD("maincpu", M68307, 16000000) // 68307! (EC000 core)
+ MCFG_DEVICE_PROGRAM_MAP(sc4_map)
+ MCFG_MC68307_SERIAL_A_TX_CALLBACK(WRITELINE(*this, sc4_state, m68307_duart_txa))
+ MCFG_MC68307_SERIAL_INPORT_CALLBACK(READ8(*this, sc4_state, m68307_duart_input_r))
+ MCFG_MC68307_SERIAL_OUTPORT_CALLBACK(WRITE8(*this, sc4_state, m68307_duart_output_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -906,16 +906,16 @@ MACHINE_CONFIG_START(sc4_state::sc4_common)
MCFG_DEVICE_ADD("duart68681", MC68681, 16000000/4) // ?? Mhz
MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(sc4_state, bfm_sc4_duart_txa))
- MCFG_MC68681_INPORT_CALLBACK(READ8(sc4_state, bfm_sc4_duart_input_r))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(sc4_state, bfm_sc4_duart_output_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, sc4_state, bfm_sc4_duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, sc4_state, bfm_sc4_duart_txa))
+ MCFG_MC68681_INPORT_CALLBACK(READ8(*this, sc4_state, bfm_sc4_duart_input_r))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, sc4_state, bfm_sc4_duart_output_w))
MCFG_BFMBDA_ADD("vfd0",0)
// MCFG_DEFAULT_LAYOUT(layout_bfm_sc4)
- MCFG_SOUND_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -924,17 +924,17 @@ MACHINE_CONFIG_START(sc4_state::sc4)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//Standard 3 reels
@@ -942,11 +942,11 @@ MACHINE_CONFIG_START(sc4_state::sc4_3reel)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MACHINE_CONFIG_END
@@ -955,13 +955,13 @@ MACHINE_CONFIG_START(sc4_state::sc4_4reel)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MACHINE_CONFIG_END
//4 reels, with the last connected to RL4 not RL3
@@ -970,14 +970,14 @@ MACHINE_CONFIG_START(sc4_state::sc4_4reel_alt)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MACHINE_CONFIG_END
@@ -986,15 +986,15 @@ MACHINE_CONFIG_START(sc4_state::sc4_5reel)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MACHINE_CONFIG_END
//5 reels, with RL4 skipped
@@ -1002,16 +1002,16 @@ MACHINE_CONFIG_START(sc4_state::sc4_5reel_alt)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
@@ -1021,17 +1021,17 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_std)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//6 reels, last 200 steps
@@ -1039,17 +1039,17 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_alt)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//6 reels, RL4 200 steps
@@ -1057,17 +1057,17 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_alta)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//6 reels, 3 48 step, 3 200 step
@@ -1075,17 +1075,17 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_altb)
sc4_common(config);
MCFG_STARPOINT_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//5 reels, last one 200 steps
@@ -1093,15 +1093,15 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_5r)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MACHINE_CONFIG_END
@@ -1111,16 +1111,16 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_5ra)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//5 reels, last one 200 steps, RL5 skipped
@@ -1128,16 +1128,16 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_5rb)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//5 reels, RL5 200 steps, RL4 skipped
@@ -1145,16 +1145,16 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_5rc)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
//4 reels, last one 200 steps
@@ -1162,13 +1162,13 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_4r)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MACHINE_CONFIG_END
//4 reels, last one 200 steps, RL4 skipped
@@ -1176,14 +1176,14 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_4ra)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MACHINE_CONFIG_END
@@ -1192,38 +1192,38 @@ MACHINE_CONFIG_START(sc4_state::sc4_200_4rb)
sc4_common(config);
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc4_state::sc4_4reel_200)
sc4_common(config);
MCFG_STARPOINT_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc4_state::sc4_3reel_200)
sc4_common(config);
MCFG_STARPOINT_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc4_state::sc4_3reel_200_48)
@@ -1231,13 +1231,13 @@ MACHINE_CONFIG_START(sc4_state::sc4_3reel_200_48)
sc4_common(config);
MCFG_STARPOINT_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc4_state::sc4_no_reels)
@@ -1254,8 +1254,8 @@ void sc4_adder4_state::machine_start()
MACHINE_CONFIG_START(sc4_adder4_state::sc4_adder4)
sc4_common(config);
- MCFG_CPU_ADD("adder4", M68340, 25175000) // 68340 (CPU32 core)
- MCFG_CPU_PROGRAM_MAP(sc4_adder4_map)
+ MCFG_DEVICE_ADD("adder4", M68340, 25175000) // 68340 (CPU32 core)
+ MCFG_DEVICE_PROGRAM_MAP(sc4_adder4_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc4_state::sc4dmd)
@@ -1264,18 +1264,18 @@ MACHINE_CONFIG_START(sc4_state::sc4dmd)
//MCFG_DEFAULT_LAYOUT(layout_sc4_dmd)
MCFG_DEVICE_ADD("dm01", BFM_DM01, 0)
- MCFG_BFM_DM01_BUSY_CB(WRITELINE(sc4_state, bfmdm01_busy))
+ MCFG_BFM_DM01_BUSY_CB(WRITELINE(*this, sc4_state, bfmdm01_busy))
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel1_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel2_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel3_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel4_optic_cb))
MCFG_STARPOINT_RM20_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, sc4_state, reel5_optic_cb))
MACHINE_CONFIG_END
INPUT_PORTS_START( sc4_raw ) // completley unmapped, but named inputs for all the ports, used for testing.
diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp
index 62e98f95867..704028b5dff 100644
--- a/src/mame/drivers/bfm_sc5.cpp
+++ b/src/mame/drivers/bfm_sc5.cpp
@@ -211,8 +211,8 @@ WRITE8_MEMBER(bfm_sc5_state::bfm_sc5_duart_output_w)
}
MACHINE_CONFIG_START(bfm_sc5_state::bfm_sc5)
- MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */
- MCFG_CPU_PROGRAM_MAP(sc5_map)
+ MCFG_DEVICE_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */
+ MCFG_DEVICE_PROGRAM_MAP(sc5_map)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
/* sound hardware */
@@ -220,16 +220,16 @@ MACHINE_CONFIG_START(bfm_sc5_state::bfm_sc5)
MCFG_DEVICE_ADD("duart68681", MC68681, 16000000/4) // ?? Mhz
MCFG_MC68681_SET_EXTERNAL_CLOCKS(16000000/2/8, 16000000/2/16, 16000000/2/16, 16000000/2/8)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(bfm_sc5_state, bfm_sc5_duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(bfm_sc5_state, bfm_sc5_duart_txa))
- MCFG_MC68681_INPORT_CALLBACK(READ8(bfm_sc5_state, bfm_sc5_duart_input_r))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(bfm_sc5_state, bfm_sc5_duart_output_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, bfm_sc5_state, bfm_sc5_duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, bfm_sc5_state, bfm_sc5_duart_txa))
+ MCFG_MC68681_INPORT_CALLBACK(READ8(*this, bfm_sc5_state, bfm_sc5_duart_input_r))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, bfm_sc5_state, bfm_sc5_duart_output_w))
MCFG_BFMBDA_ADD("vfd0",0)
MCFG_DEFAULT_LAYOUT(layout_bfm_sc5)
- MCFG_SOUND_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp
index 8833281136c..9c0bfc9f791 100644
--- a/src/mame/drivers/bfm_swp.cpp
+++ b/src/mame/drivers/bfm_swp.cpp
@@ -204,8 +204,8 @@ void bfm_swp_state::machine_start()
MACHINE_CONFIG_START(bfm_swp_state::bfm_swp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(bfm_swp_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(bfm_swp_map)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -217,7 +217,7 @@ MACHINE_CONFIG_START(bfm_swp_state::bfm_swp)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 10000000 )
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 10000000 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bfmsys83.cpp b/src/mame/drivers/bfmsys83.cpp
index 5b4e3c65649..65fd275cf9c 100644
--- a/src/mame/drivers/bfmsys83.cpp
+++ b/src/mame/drivers/bfmsys83.cpp
@@ -35,11 +35,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bfmsys83_state::bfmsys83)
- MCFG_CPU_ADD("maincpu", M6802, 40000000/4)
- MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_ADD("maincpu", M6802, 40000000/4)
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd",AY8912, 40000000/4)
+ MCFG_DEVICE_ADD("aysnd",AY8912, 40000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index 7819d48b2bb..01957cbf473 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -389,31 +389,31 @@ void bfmsys85_state::memmap(address_map &map)
// machine driver for system85 board //////////////////////////////////////
MACHINE_CONFIG_START(bfmsys85_state::bfmsys85)
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
- MCFG_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
- MCFG_CPU_PERIODIC_INT_DRIVER(bfmsys85_state, timer_irq, 1000) // generate 1000 IRQ's per second
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(memmap) // setup read and write memorymap
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfmsys85_state, timer_irq, 1000) // generate 1000 IRQ's per second
MCFG_MSC1937_ADD("vfd",0)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(bfmsys85_state,sys85_data_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, bfmsys85_state,sys85_data_w))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 31250*16) // What are the correct ACIA clocks ?
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bfmsys85_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bfmsys85_state, write_acia_clock))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip
+ MCFG_DEVICE_ADD("aysnd",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_NVRAM_ADD_0FILL("nvram") // load/save nv RAM
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfmsys85_state, reel0_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfmsys85_state, reel0_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfmsys85_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfmsys85_state, reel1_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfmsys85_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfmsys85_state, reel2_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfmsys85_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfmsys85_state, reel3_optic_cb))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
diff --git a/src/mame/drivers/bgt.cpp b/src/mame/drivers/bgt.cpp
index 1b85c9b4ad5..a971303c9fc 100644
--- a/src/mame/drivers/bgt.cpp
+++ b/src/mame/drivers/bgt.cpp
@@ -50,9 +50,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bgt_state::bgt)
- MCFG_CPU_ADD("maincpu", V30, 12000000 ) // ? unknown CPU.. definitely x86 based tho
- MCFG_CPU_PROGRAM_MAP(bgt_map)
- MCFG_CPU_IO_MAP(bgt_io)
+ MCFG_DEVICE_ADD("maincpu", V30, 12000000 ) // ? unknown CPU.. definitely x86 based tho
+ MCFG_DEVICE_PROGRAM_MAP(bgt_map)
+ MCFG_DEVICE_IO_MAP(bgt_io)
MACHINE_CONFIG_END
ROM_START( bg_ddb )
diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp
index b9868123972..d9b3ebd7529 100644
--- a/src/mame/drivers/big10.cpp
+++ b/src/mame/drivers/big10.cpp
@@ -230,9 +230,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(big10_state::big10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -243,10 +243,10 @@ MACHINE_CONFIG_START(big10_state::big10)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* guess */
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* guess */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(big10_state, mux_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, big10_state, mux_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW )
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index f6efc16d38b..0137fcb58dc 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -548,9 +548,9 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row )
MACHINE_CONFIG_START(bigbord2_state::bigbord2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(bigbord2_mem)
- MCFG_CPU_IO_MAP(bigbord2_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(bigbord2_mem)
+ MCFG_DEVICE_IO_MAP(bigbord2_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
/* video hardware */
@@ -561,31 +561,31 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("ctc_clock", CLOCK, MAIN_CLOCK)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bigbord2_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bigbord2_state, clock_w))
/* devices */
MCFG_DEVICE_ADD("dma", Z80DMA, MAIN_CLOCK)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(bigbord2_state, busreq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, bigbord2_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(bigbord2_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(bigbord2_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(bigbord2_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(bigbord2_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, bigbord2_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, bigbord2_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, bigbord2_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, bigbord2_state, io_write_byte))
MCFG_DEVICE_ADD("sio", Z80SIO, MAIN_CLOCK)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_SYNCA_CB(DEVWRITELINE("ctc1", z80ctc_device, trg2))
- MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(bigbord2_state, sio_wrdya_w))
- MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(bigbord2_state, sio_wrdyb_w))
+ MCFG_Z80SIO_OUT_SYNCA_CB(WRITELINE("ctc1", z80ctc_device, trg2))
+ MCFG_Z80SIO_OUT_WRDYA_CB(WRITELINE(*this, bigbord2_state, sio_wrdya_w))
+ MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE(*this, bigbord2_state, sio_wrdyb_w))
MCFG_DEVICE_ADD("ctc1", Z80CTC, MAIN_CLOCK)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("ctc2", Z80CTC, MAIN_CLOCK)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) // to SIO Ch B
- MCFG_Z80CTC_ZC1_CB(WRITELINE(bigbord2_state, ctc_z1_w)) // to SIO Ch A
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc2", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxtxcb_w)) // to SIO Ch B
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, bigbord2_state, ctc_z1_w)) // to SIO Ch A
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc2", z80ctc_device, trg3))
MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // 2MHz for 8 inch, or 1MHz otherwise (jumper-selectable)
//MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", ??)) // info missing from schematic
@@ -598,22 +598,22 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(bigbord2_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("ctc1", z80ctc_device, trg3))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE("ctc1", z80ctc_device, trg3))
MCFG_DEVICE_ADD("proglatch", LS259, 0) // U41
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("outlatch1", ls259_device, clear_w)) // FCRST - also resets the 8877
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("outlatch1", ls259_device, clear_w)) // FCRST - also resets the 8877
MCFG_DEVICE_ADD("syslatch1", LS259, 0) // U14
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(MEMBANK("bankr")) // D_S
MCFG_DEVCB_CHAIN_OUTPUT(MEMBANK("bankv"))
MCFG_DEVCB_CHAIN_OUTPUT(MEMBANK("banka"))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(bigbord2_state, side_select_w)) // SIDSEL
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(bigbord2_state, smc1_w)) // SMC1
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(bigbord2_state, smc2_w)) // SMC2
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("fdc", mb8877_device, dden_w)) // DDEN
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(bigbord2_state, head_load_w)) // HLD
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(bigbord2_state, disk_motor_w)) // MOTOR
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("beeper", beep_device, set_state)) // BELL
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, bigbord2_state, side_select_w)) // SIDSEL
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, bigbord2_state, smc1_w)) // SMC1
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, bigbord2_state, smc2_w)) // SMC2
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("fdc", mb8877_device, dden_w)) // DDEN
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, bigbord2_state, head_load_w)) // HLD
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, bigbord2_state, disk_motor_w)) // MOTOR
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("beeper", beep_device, set_state)) // BELL
MCFG_DEVICE_ADD("outlatch1", LS259, 0) // U96
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(bigbord2_state::bigbord2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) // actual frequency is unknown
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) // actual frequency is unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp
index bd4f5d296a3..e2d35a5a4b8 100644
--- a/src/mame/drivers/bigevglf.cpp
+++ b/src/mame/drivers/bigevglf.cpp
@@ -380,24 +380,24 @@ void bigevglf_state::machine_reset()
MACHINE_CONFIG_START(bigevglf_state::bigevglf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(bigevglf_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bigevglf_state, irq0_line_hold) /* vblank */
-
- MCFG_CPU_ADD("sub", Z80,10000000/2) /* 5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_IO_MAP(bigevglf_sub_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bigevglf_state, irq0_line_hold) /* vblank */
-
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bigevglf_state, irq0_line_hold, 2*60) /* IRQ generated by ???;
+ MCFG_DEVICE_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(bigevglf_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bigevglf_state, irq0_line_hold) /* vblank */
+
+ MCFG_DEVICE_ADD("sub", Z80,10000000/2) /* 5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_IO_MAP(bigevglf_sub_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bigevglf_state, irq0_line_hold) /* vblank */
+
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bigevglf_state, irq0_line_hold, 2*60) /* IRQ generated by ???;
2 irqs/frame give good music tempo but also SOUND ERROR in test mode,
4 irqs/frame give SOUND OK in test mode but music seems to be running too fast */
MCFG_GENERIC_LATCH_8_ADD("soundlatch1")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
@@ -424,10 +424,10 @@ MACHINE_CONFIG_START(bigevglf_state::bigevglf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, 8000000/4)
+ MCFG_DEVICE_ADD("aysnd", YM2149, 8000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, 8000000/4)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors */
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(bigevglf_state::bigevglf)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp
index 65c4580b291..32d47aa7409 100644
--- a/src/mame/drivers/bigstrkb.cpp
+++ b/src/mame/drivers/bigstrkb.cpp
@@ -202,9 +202,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(bigstrkb_state::bigstrkb)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(bigstrkb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bigstrkb_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(bigstrkb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bigstrkb_state, irq6_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bigstrkb)
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index d5d2871ce2a..84115a651df 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -300,11 +300,11 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(binbug_state::binbug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(binbug_mem)
- MCFG_CPU_DATA_MAP(binbug_data)
- MCFG_S2650_SENSE_INPUT(READLINE(binbug_state, binbug_serial_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(binbug_state, binbug_serial_w))
+ MCFG_DEVICE_ADD("maincpu",S2650, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(binbug_mem)
+ MCFG_DEVICE_DATA_MAP(binbug_data)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, binbug_state, binbug_serial_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, binbug_state, binbug_serial_w))
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
@@ -319,7 +319,7 @@ MACHINE_CONFIG_START(binbug_state::binbug)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* Keyboard */
- MCFG_RS232_PORT_ADD("keyboard", default_rs232_devices, "keyboard")
+ MCFG_DEVICE_ADD("keyboard", RS232_PORT, default_rs232_devices, "keyboard")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", keyboard)
/* Cassette */
@@ -537,9 +537,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(dg680_state::uart_tick)
MACHINE_CONFIG_START(dg680_state::dg680)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(dg680_mem)
- MCFG_CPU_IO_MAP(dg680_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(dg680_mem)
+ MCFG_DEVICE_IO_MAP(dg680_io)
MCFG_Z80_DAISY_CHAIN(dg680_daisy_chain)
/* video hardware */
@@ -567,14 +567,14 @@ MACHINE_CONFIG_START(dg680_state::dg680)
/* Devices */
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(8'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1))
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(8'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(dg680_state, porta_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, dg680_state, porta_r))
// OUT_ARDY - this activates to ask for kbd data but not known if actually used
- MCFG_Z80PIO_IN_PB_CB(READ8(dg680_state, portb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(dg680_state, portb_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, dg680_state, portb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, dg680_state, portb_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc0", dg680_state, time_tick, attotime::from_hz(200))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc3", dg680_state, uart_tick, attotime::from_hz(4800))
diff --git a/src/mame/drivers/bingo.cpp b/src/mame/drivers/bingo.cpp
index 00c3fe2d5c1..bfbe0b09b44 100644
--- a/src/mame/drivers/bingo.cpp
+++ b/src/mame/drivers/bingo.cpp
@@ -48,8 +48,8 @@ DRIVER_INIT_MEMBER(bingo_state,bingo)
MACHINE_CONFIG_START(bingo_state::bingo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 1000000)
- MCFG_CPU_PROGRAM_MAP(bingo_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(bingo_map)
MACHINE_CONFIG_END
class seeben_state : public driver_device
@@ -91,8 +91,8 @@ DRIVER_INIT_MEMBER(seeben_state,seeben)
MACHINE_CONFIG_START(seeben_state::seeben)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, 1000000)
- MCFG_CPU_PROGRAM_MAP(seeben_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(seeben_map)
MACHINE_CONFIG_END
class splin_state : public driver_device
@@ -136,8 +136,8 @@ DRIVER_INIT_MEMBER(splin_state,splin)
MACHINE_CONFIG_START(splin_state::splin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80186, 16000000)
- MCFG_CPU_PROGRAM_MAP(splin_map)
+ MCFG_DEVICE_ADD("maincpu", I80186, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(splin_map)
MACHINE_CONFIG_END
ROM_START(cntinntl)
diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp
index 97c753ad8e0..d508b61ba29 100644
--- a/src/mame/drivers/bingoc.cpp
+++ b/src/mame/drivers/bingoc.cpp
@@ -177,15 +177,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bingoc_state::bingoc)
- MCFG_CPU_ADD("maincpu", M68000,8000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bingoc_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,8000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bingoc_state, irq2_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io)
+ MCFG_DEVICE_ADD("soundcpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io)
#if SOUND_TEST
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bingoc_state, nmi_line_pulse)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bingoc_state, nmi_line_pulse)
#endif
MCFG_DEVICE_ADD("uart1", I8251, 4000000) // unknown
@@ -219,7 +219,7 @@ MACHINE_CONFIG_START(bingoc_state::bingoc)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index 8f558926231..3e5077546cd 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -379,9 +379,9 @@ PALETTE_INIT_MEMBER(bingoman_state, bingoman)
MACHINE_CONFIG_START(bingoman_state::bingoman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type */
- MCFG_CPU_PROGRAM_MAP(bingoman_prg_map)
- MCFG_CPU_IO_MAP(bingoman_io_map)
+ MCFG_DEVICE_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type */
+ MCFG_DEVICE_PROGRAM_MAP(bingoman_prg_map)
+ MCFG_DEVICE_IO_MAP(bingoman_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index e39b451aad0..c96d6d9f7a8 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -691,13 +691,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(bingor_state::bingor)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(bingor_map)
- MCFG_CPU_IO_MAP(bingor_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(bingor_map)
+ MCFG_DEVICE_IO_MAP(bingor_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
// Other interrupts generated by internal timers
- MCFG_CPU_ADD("pic", PIC16C57, 12000000) //?? Mhz
+ MCFG_DEVICE_ADD("pic", PIC16C57, 12000000) //?? Mhz
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bingor)
//MCFG_NVRAM_ADD_0FILL("nvram")
@@ -719,8 +719,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bingor_state::bingor2)
bingor(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bingor2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bingor2_map)
MACHINE_CONFIG_END
@@ -780,17 +780,17 @@ void bingor_state::slave_io(address_map &map)
}
MACHINE_CONFIG_START(bingor_state::vip2000)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(vip2000_map)
- MCFG_CPU_IO_MAP(vip2000_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vip2000_map)
+ MCFG_DEVICE_IO_MAP(vip2000_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bingor_state, nmi_line_pulse, 30)
// Other interrupts generated by internal timers
MCFG_ATMEL_49F4096_ADD("flash")
- MCFG_CPU_ADD("slavecpu", I80C31, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(slave_map)
- MCFG_CPU_IO_MAP(slave_io)
+ MCFG_DEVICE_ADD("slavecpu", I80C31, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_IO_MAP(slave_io)
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
@@ -806,7 +806,7 @@ MACHINE_CONFIG_START(bingor_state::vip2000)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ284, 1250000) // probably clocked by square wave output of 80186 timer 0
+ MCFG_DEVICE_ADD("ymz", YMZ284, 1250000) // probably clocked by square wave output of 80186 timer 0
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bingowav.cpp b/src/mame/drivers/bingowav.cpp
index a66b29c8d1d..7618319ef14 100644
--- a/src/mame/drivers/bingowav.cpp
+++ b/src/mame/drivers/bingowav.cpp
@@ -113,8 +113,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bingowav_state::bingowav)
- MCFG_CPU_ADD("maincpu", M68000, 12000000) // actually TMP63803F-16
- MCFG_CPU_PROGRAM_MAP(bingowav_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) // actually TMP63803F-16
+ MCFG_DEVICE_PROGRAM_MAP(bingowav_main_map)
MCFG_DEVICE_ADD("maintmp", TMP68301, 0) // wrong
MCFG_TMP68301_CPU("maincpu")
@@ -125,12 +125,12 @@ MACHINE_CONFIG_START(bingowav_state::bingowav)
MCFG_DEVICE_ADD("mainiol", TE7750, 0)
MCFG_TE7750_IOS_CB(CONSTANT(4))
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(bingowav_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(bingowav_audio_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -140,12 +140,12 @@ MACHINE_CONFIG_START(bingowav_state::bingowav)
MCFG_TC0140SYT_MASTER_CPU("maincpu")
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
- MCFG_CPU_ADD("termcpu", M68000, 12000000) // actually TMP63803F-16
- MCFG_CPU_PROGRAM_MAP(bingowav_drive_map)
+ MCFG_DEVICE_ADD("termcpu", M68000, 12000000) // actually TMP63803F-16
+ MCFG_DEVICE_PROGRAM_MAP(bingowav_drive_map)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("ctrlcpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(bingowav_control_map)
+ MCFG_DEVICE_ADD("ctrlcpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(bingowav_control_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index 65a3b0ba156..82c91cbe04e 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -387,31 +387,31 @@ void bionicc_state::machine_reset()
MACHINE_CONFIG_START(bionicc_state::bionicc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz - verified in schematics */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz - verified in schematics */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bionicc_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* FIXME: interrupt timing
* schematics indicate that nmi_line is set on M680000 access with AB1=1
* and IOCS=0 (active low), see pages A-1/10, A-4/10 in schematics
*/
- MCFG_CPU_PERIODIC_INT_DRIVER(bionicc_state, nmi_line_pulse, 4*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bionicc_state, nmi_line_pulse, 4*60)
/* Protection MCU Intel C8751H-88 runs at 24MHz / 4 = 6MHz */
- MCFG_CPU_ADD("mcu", I8751, XTAL(24'000'000) / 4)
- MCFG_CPU_IO_MAP(mcu_io)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(bionicc_state, out1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(bionicc_state, out3_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(24'000'000) / 4)
+ MCFG_DEVICE_IO_MAP(mcu_io)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, bionicc_state, out1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, bionicc_state, out3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
/* FIXME: should be 257 visible horizontal pixels, first visible pixel should be repeated, back porch/front porch should be separated */
MCFG_SCREEN_RAW_PARAMS(XTAL(24'000'000) / 4, 386, 0, 256, 260, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(bionicc_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bionicc)
diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp
index 575345bb880..bb5815182a1 100644
--- a/src/mame/drivers/bishi.cpp
+++ b/src/mame/drivers/bishi.cpp
@@ -448,8 +448,8 @@ void bishi_state::machine_reset()
MACHINE_CONFIG_START(bishi_state::bishi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bishi_state, bishi_scanline, "screen", 0, 1)
/* video hardware */
@@ -479,7 +479,7 @@ MACHINE_CONFIG_START(bishi_state::bishi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
+ MCFG_DEVICE_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */
MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_1))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index c9c28465ea0..863f1b7e2d0 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -504,75 +504,75 @@ MACHINE_CONFIG_START(bitgraph_state::bg_motherboard)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD(ACIA0_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_H_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_H_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(RS232_H_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(RS232_H_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
- MCFG_RS232_PORT_ADD(RS232_H_TAG, default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA0_TAG, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA0_TAG, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA0_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_H_TAG, RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA0_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA0_TAG, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA0_TAG, acia6850_device, write_cts))
MCFG_DEVICE_ADD(ACIA1_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_K_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_K_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(RS232_K_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(RS232_K_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
- MCFG_RS232_PORT_ADD(RS232_K_TAG, default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA1_TAG, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA1_TAG, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA1_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_K_TAG, RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA1_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA1_TAG, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA1_TAG, acia6850_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", kbd_rs232_defaults)
MCFG_DEVICE_ADD(ACIA2_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(RS232_D_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(RS232_D_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
- MCFG_RS232_PORT_ADD(RS232_D_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA2_TAG, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA2_TAG, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA2_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_D_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA2_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA2_TAG, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA2_TAG, acia6850_device, write_cts))
// XXX actual part may be something else
MCFG_DEVICE_ADD(COM8116_A_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(bitgraph_state, com8116_a_fr_w))
- MCFG_COM8116_FT_HANDLER(WRITELINE(bitgraph_state, com8116_a_ft_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, bitgraph_state, com8116_a_fr_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(*this, bitgraph_state, com8116_a_ft_w))
MCFG_DEVICE_ADD(COM8116_B_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(bitgraph_state, com8116_b_fr_w))
- MCFG_COM8116_FT_HANDLER(WRITELINE(bitgraph_state, com8116_b_ft_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, bitgraph_state, com8116_b_fr_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(*this, bitgraph_state, com8116_b_ft_w))
MCFG_DEVICE_ADD(PIA_TAG, PIA6821, 0)
- MCFG_PIA_READCA1_HANDLER(READLINE(bitgraph_state, pia_ca1_r))
- MCFG_PIA_CB2_HANDLER(WRITELINE(bitgraph_state, pia_cb2_w))
- MCFG_PIA_READPA_HANDLER(READ8(bitgraph_state, pia_pa_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(bitgraph_state, pia_pa_w))
- MCFG_PIA_READPB_HANDLER(READ8(bitgraph_state, pia_pb_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(bitgraph_state, pia_pb_w))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, bitgraph_state, pia_ca1_r))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, bitgraph_state, pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, bitgraph_state, pia_pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, bitgraph_state, pia_pa_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, bitgraph_state, pia_pb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, bitgraph_state, pia_pb_w))
MCFG_DEVICE_ADD(EAROM_TAG, ER2055, 0)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(PSG_TAG, AY8912, XTAL(1'294'400))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(bitgraph_state, earom_write))
+ MCFG_DEVICE_ADD(PSG_TAG, AY8912, XTAL(1'294'400))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, bitgraph_state, earom_write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
#ifdef UNUSED_FUNCTION
MACHINE_CONFIG_START(bitgraph_state::bg_ppu)
- MCFG_CPU_ADD(PPU_TAG, I8035, XTAL(6'900'000))
- MCFG_CPU_IO_MAP(ppu_io)
-// MCFG_MCS48_PORT_T0_IN_CB(READLINE(bitgraph_state, ppu_t0_r))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
+ MCFG_DEVICE_ADD(PPU_TAG, I8035, XTAL(6'900'000))
+ MCFG_DEVICE_IO_MAP(ppu_io)
+// MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, bitgraph_state, ppu_t0_r))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("i8243", i8243_device, prog_w))
- MCFG_I8243_ADD("i8243", NOOP, WRITE8(bitgraph_state, ppu_i8243_w))
+ MCFG_I8243_ADD("i8243", NOOP, WRITE8(*this, bitgraph_state, ppu_i8243_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
- MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5))
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
@@ -581,37 +581,37 @@ MACHINE_CONFIG_END
#endif
MACHINE_CONFIG_START(bitgraph_state::bitgrpha)
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(6'900'000))
- MCFG_CPU_PROGRAM_MAP(bitgrapha_mem)
+ MCFG_DEVICE_ADD(M68K_TAG, M68000, XTAL(6'900'000))
+ MCFG_DEVICE_PROGRAM_MAP(bitgrapha_mem)
bg_motherboard(config);
MCFG_DEVICE_ADD("system_clock", CLOCK, 40)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bitgraph_state, system_clock_write))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bitgraph_state, system_clock_write))
MCFG_DEVICE_ADD(ACIA3_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_M_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_M_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(RS232_M_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(RS232_M_TAG, rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE(M68K_TAG, M68K_IRQ_1))
- MCFG_RS232_PORT_ADD(RS232_M_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA3_TAG, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA3_TAG, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA3_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_M_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA3_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA3_TAG, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA3_TAG, acia6850_device, write_cts))
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("128K")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bitgraph_state::bitgrphb)
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(6'900'000))
- MCFG_CPU_PROGRAM_MAP(bitgraphb_mem)
+ MCFG_DEVICE_ADD(M68K_TAG, M68000, XTAL(6'900'000))
+ MCFG_DEVICE_PROGRAM_MAP(bitgraphb_mem)
bg_motherboard(config);
// bg_ppu(config);
MCFG_DEVICE_ADD("system_clock", CLOCK, 1040)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(bitgraph_state, system_clock_write))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, bitgraph_state, system_clock_write))
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("512K")
diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp
index a85fef41078..8580acd4f3c 100644
--- a/src/mame/drivers/bk.cpp
+++ b/src/mame/drivers/bk.cpp
@@ -166,10 +166,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bk_state::bk0010)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", T11, 3000000)
+ MCFG_DEVICE_ADD("maincpu", T11, 3000000)
MCFG_T11_INITIAL_MODE(0x36ff) /* initial mode word has DAL15,14,11,8 pulled low */
- MCFG_CPU_PROGRAM_MAP(bk0010_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(bk_state,bk0010_irq_callback)
+ MCFG_DEVICE_PROGRAM_MAP(bk0010_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(bk_state,bk0010_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -197,8 +197,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bk_state::bk0010fd)
bk0010(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bk0010fd_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bk0010fd_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 3bc2c610757..4d873a81178 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -392,18 +392,18 @@ MACHINE_RESET_MEMBER(bking_state,bking3)
MACHINE_CONFIG_START(bking_state::bking)
/* basic machine hardware */
- MCFG_CPU_ADD("main_cpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(bking_map)
- MCFG_CPU_IO_MAP(bking_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bking_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("main_cpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bking_map)
+ MCFG_DEVICE_IO_MAP(bking_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bking_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(bking_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bking_audio_map)
/* interrupts (from Jungle King hardware, might be wrong): */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
/* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */
- MCFG_CPU_PERIODIC_INT_DRIVER(bking_state, irq0_line_hold, (double)6000000/(4*16*16*10*16))
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bking_state, irq0_line_hold, (double)6000000/(4*16*16*10*16))
MCFG_WATCHDOG_ADD("watchdog")
@@ -414,7 +414,7 @@ MACHINE_CONFIG_START(bking_state::bking)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(bking_state, screen_update_bking)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bking_state, screen_vblank_bking))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bking_state, screen_vblank_bking))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bking)
@@ -425,20 +425,20 @@ MACHINE_CONFIG_START(bking_state::bking)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(6'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bking_state, port_b_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, bking_state, port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -447,8 +447,8 @@ MACHINE_CONFIG_START(bking_state::bking3)
bking(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("main_cpu")
- MCFG_CPU_IO_MAP(bking3_io_map)
+ MCFG_DEVICE_MODIFY("main_cpu")
+ MCFG_DEVICE_IO_MAP(bking3_io_map)
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index 568c43bb125..e156ada0249 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -477,16 +477,16 @@ void blackt96_state::tile_callback(int &tile, int& fx, int& fy, int& region)
MACHINE_CONFIG_START(blackt96_state::blackt96)
- MCFG_CPU_ADD("maincpu", M68000, 18000000 /2)
- MCFG_CPU_PROGRAM_MAP(blackt96_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blackt96_state, irq1_line_hold)
-
- MCFG_CPU_ADD("audiocpu", PIC16C57, 8000000) /* ? */
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(blackt96_state, blackt96_soundio_port_a_w))
- MCFG_PIC16C5x_READ_B_CB(READ8(blackt96_state, blackt96_soundio_port_b_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(blackt96_state, blackt96_soundio_port_b_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(blackt96_state, blackt96_soundio_port_c_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(blackt96_state, blackt96_soundio_port_c_w))
+ MCFG_DEVICE_ADD("maincpu", M68000, 18000000 /2)
+ MCFG_DEVICE_PROGRAM_MAP(blackt96_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blackt96_state, irq1_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, 8000000) /* ? */
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, blackt96_state, blackt96_soundio_port_a_w))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, blackt96_state, blackt96_soundio_port_b_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, blackt96_state, blackt96_soundio_port_b_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, blackt96_state, blackt96_soundio_port_c_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, blackt96_state, blackt96_soundio_port_c_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", blackt96)
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index e66a3ac3396..ba57f709efc 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -305,12 +305,12 @@ void bladestl_state::machine_reset()
MACHINE_CONFIG_START(bladestl_state::bladestl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) // divider not verified (from 007342 custom)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD(m_maincpu, HD6309E, XTAL(24'000'000) / 8) // divider not verified (from 007342 custom)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bladestl_state, bladestl_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD(m_audiocpu, MC6809E, XTAL(24'000'000) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -325,18 +325,18 @@ MACHINE_CONFIG_START(bladestl_state::bladestl)
MCFG_SCREEN_UPDATE_DRIVER(bladestl_state, screen_update_bladestl)
MCFG_SCREEN_PALETTE("palette")
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", bladestl)
+ MCFG_GFXDECODE_ADD(m_gfxdecode, "palette", bladestl)
MCFG_PALETTE_ADD("palette", 32 + 16*16)
MCFG_PALETTE_INDIRECT_ENTRIES(32+16)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_PALETTE_INIT_OWNER(bladestl_state, bladestl)
- MCFG_K007342_ADD("k007342")
+ MCFG_K007342_ADD(m_k007342)
MCFG_K007342_GFXNUM(0)
MCFG_K007342_CALLBACK_OWNER(bladestl_state, bladestl_tile_callback)
MCFG_K007342_GFXDECODE("gfxdecode")
- MCFG_K007420_ADD("k007420")
+ MCFG_K007420_ADD(m_k007420)
MCFG_K007420_BANK_LIMIT(0x3ff)
MCFG_K007420_CALLBACK_OWNER(bladestl_state, bladestl_sprite_callback)
MCFG_K007420_PALETTE("palette")
@@ -348,26 +348,26 @@ MACHINE_CONFIG_START(bladestl_state::bladestl)
called at initialization time */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6809_IRQ_LINE))
+ MCFG_GENERIC_LATCH_8_ADD(m_soundlatch)
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, M6809_IRQ_LINE))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("upd", UPD7759, XTAL(640'000))
+ MCFG_DEVICE_ADD(m_upd7759, UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("upd", upd775x_device, port_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bladestl_state, bladestl_port_B_w))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(m_upd7759, upd775x_device, port_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, bladestl_state, bladestl_port_B_w))
MCFG_SOUND_ROUTE(0, "filter1", 0.45)
MCFG_SOUND_ROUTE(1, "filter2", 0.45)
MCFG_SOUND_ROUTE(2, "filter3", 0.45)
MCFG_SOUND_ROUTE(3, "mono", 0.45)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD(m_filter1, FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD(m_filter2, FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD(m_filter3, FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index d2214ccffc8..9d61f13c287 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -1704,9 +1704,9 @@ void blitz68k_state::ramdac_map(address_map &map)
}
MACHINE_CONFIG_START(blitz68k_state::ilpag)
- MCFG_CPU_ADD("maincpu", M68000, 11059200 ) // ?
- MCFG_CPU_PROGRAM_MAP(ilpag_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq4_line_hold) //3 & 6 used, mcu comms?
+ MCFG_DEVICE_ADD("maincpu", M68000, 11059200 ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(ilpag_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq4_line_hold) //3 & 6 used, mcu comms?
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1764,16 +1764,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(blitz68k_state::steaser_mcu_sim)
MACHINE_CONFIG_START(blitz68k_state::steaser)
ilpag(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(steaser_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) //3, 4 & 6 used, mcu comms?
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(steaser_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) //3, 4 & 6 used, mcu comms?
MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", blitz68k_state, steaser_mcu_sim, attotime::from_hz(10000))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::cjffruit)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400)/2)
- MCFG_CPU_PROGRAM_MAP(cjffruit_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'118'400)/2)
+ MCFG_DEVICE_PROGRAM_MAP(cjffruit_map)
// MC68HC705C8P (Sound MCU)
@@ -1790,7 +1790,7 @@ MACHINE_CONFIG_START(blitz68k_state::cjffruit)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq1))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq1))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -1800,9 +1800,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::bankrob)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(bankrob_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(bankrob_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
// MC68HC705C8P (MCU1)
@@ -1822,7 +1822,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankrob)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq3))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -1832,9 +1832,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::bankroba)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200) )
- MCFG_CPU_PROGRAM_MAP(bankroba_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200) )
+ MCFG_DEVICE_PROGRAM_MAP(bankroba_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc
// irq 3,4 read from MCUs
// MC68HC705C8P (MCU)
@@ -1852,7 +1852,7 @@ MACHINE_CONFIG_START(blitz68k_state::bankroba)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq5))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq5))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -1862,8 +1862,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::deucesw2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400) / 2)
- MCFG_CPU_PROGRAM_MAP(deucesw2_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'118'400) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(deucesw2_map)
// irq 2 reads from MCUs
// MC68HC705C8P (MCU)
@@ -1881,7 +1881,7 @@ MACHINE_CONFIG_START(blitz68k_state::deucesw2)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq3))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -1891,9 +1891,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::dualgame)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200) )
- MCFG_CPU_PROGRAM_MAP(dualgame_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200) )
+ MCFG_DEVICE_PROGRAM_MAP(dualgame_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
// MC68HC705C8P (MCU1)
@@ -1912,7 +1912,7 @@ MACHINE_CONFIG_START(blitz68k_state::dualgame)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq3))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -1922,9 +1922,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::hermit)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'118'400)/2 )
- MCFG_CPU_PROGRAM_MAP(hermit_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'118'400)/2 )
+ MCFG_DEVICE_PROGRAM_MAP(hermit_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc
// MC68HC705C8P (MCU)
@@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(blitz68k_state::hermit)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq1))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq1))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -1951,9 +1951,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blitz68k_state::maxidbl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(maxidbl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(maxidbl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
// irq 2 reads from MCUs
// MC68HC705C8P (MCU1)
@@ -1975,7 +1975,7 @@ MACHINE_CONFIG_START(blitz68k_state::maxidbl)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_ADDR_CHANGED_CB(blitz68k_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(blitz68k_state, crtc_vsync_irq3))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, blitz68k_state, crtc_vsync_irq3))
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index 09321a8a3e0..c0aa71169bc 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -293,19 +293,19 @@ void blktiger_state::machine_reset()
MACHINE_CONFIG_START(blktiger_state::blktiger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(blktiger_map)
- MCFG_CPU_IO_MAP(blktiger_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(blktiger_map)
+ MCFG_DEVICE_IO_MAP(blktiger_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(blktiger_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(blktiger_sound_map)
- MCFG_CPU_ADD("mcu", I8751, XTAL(24'000'000)/4) /* ??? */
- MCFG_MCS51_PORT_P0_IN_CB(READ8(blktiger_state, blktiger_from_main_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(blktiger_state, blktiger_to_main_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(24'000'000)/4) /* ??? */
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, blktiger_state, blktiger_from_main_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, blktiger_state, blktiger_to_main_w))
// other ports unknown
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blktiger_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -316,7 +316,7 @@ MACHINE_CONFIG_START(blktiger_state::blktiger)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(blktiger_state, screen_update_blktiger)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", blktiger)
@@ -331,18 +331,18 @@ MACHINE_CONFIG_START(blktiger_state::blktiger)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(blktiger_state::blktigerbl)
blktiger(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(blktigerbl_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(blktigerbl_io_map)
MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index defcec824ef..47f94dc00e7 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -350,9 +350,9 @@ MACHINE_RESET_MEMBER(blmbycar_state,blmbycar)
MACHINE_CONFIG_START(blmbycar_state::blmbycar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
- MCFG_CPU_PROGRAM_MAP(blmbycar_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blmbycar_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(blmbycar_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blmbycar_state, irq1_line_hold)
MCFG_MACHINE_START_OVERRIDE(blmbycar_state,blmbycar)
MCFG_MACHINE_RESET_OVERRIDE(blmbycar_state,blmbycar)
@@ -397,8 +397,8 @@ MACHINE_CONFIG_START(blmbycar_state::watrball)
blmbycar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(watrball_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(watrball_map)
MCFG_MACHINE_START_OVERRIDE(blmbycar_state,watrball)
MCFG_MACHINE_RESET_OVERRIDE(blmbycar_state,watrball)
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 2b4f1c6dff0..e901307dbc7 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -467,9 +467,9 @@ void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int para
//**************************************************************************
MACHINE_CONFIG_START(blockade_state::blockade)
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(20'790'000) / 10)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(20'790'000) / 10)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -484,12 +484,12 @@ MACHINE_CONFIG_START(blockade_state::blockade)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(blockade_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(blockade)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index f4b10356129..e42d31afe05 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -279,9 +279,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(blockhl_state::blockhl)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) // Konami 052526
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_KONAMICPU_LINE_CB(WRITE8(blockhl_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) // Konami 052526
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, blockhl_state, banking_callback))
MCFG_DEVICE_ADD("bank5800", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank5800_map)
@@ -290,8 +290,8 @@ MACHINE_CONFIG_START(blockhl_state::blockhl)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(12)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x0800)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp
index 0b982065b92..8d89b16f923 100644
--- a/src/mame/drivers/blockout.cpp
+++ b/src/mame/drivers/blockout.cpp
@@ -307,12 +307,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(blockout_state::blockout_scanline)
MACHINE_CONFIG_START(blockout_state::blockout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MAIN_CLOCK) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", blockout_state, blockout_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, AUDIO_CLOCK) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, AUDIO_CLOCK) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
@@ -332,7 +332,7 @@ MACHINE_CONFIG_START(blockout_state::blockout)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_YM2151_ADD("ymsnd", AUDIO_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(blockout_state,irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, blockout_state,irq_handler))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
@@ -343,8 +343,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(blockout_state::agress)
blockout(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(agress_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(agress_map)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/blocktax.cpp b/src/mame/drivers/blocktax.cpp
index fbd8035707f..d50399a31f8 100644
--- a/src/mame/drivers/blocktax.cpp
+++ b/src/mame/drivers/blocktax.cpp
@@ -73,7 +73,7 @@ static INPUT_PORTS_START( blocktax )
INPUT_PORTS_END
MACHINE_CONFIG_START(blocktax_state::blocktax)
- MCFG_CPU_ADD("maincpu", I80C51, 30_MHz_XTAL/2) /* P89C51RD2HBA (80C51 with internal flash rom) */
+ MCFG_DEVICE_ADD("maincpu", I80C51, 30_MHz_XTAL/2) /* P89C51RD2HBA (80C51 with internal flash rom) */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index 46b35a55dde..4943ca12cc8 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -524,12 +524,12 @@ WRITE16_MEMBER( bloodbro_state::weststry_layer_scroll_w )
MACHINE_CONFIG_START(bloodbro_state::bloodbro)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(bloodbro_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(bloodbro_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bloodbro_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(7'159'090)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(7'159'090)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
// video hardware
@@ -542,8 +542,8 @@ MACHINE_CONFIG_START(bloodbro_state::bloodbro)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(bloodbro_state, layer_en_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(bloodbro_state, layer_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, bloodbro_state, layer_en_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, bloodbro_state, layer_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bloodbro)
@@ -553,8 +553,8 @@ MACHINE_CONFIG_START(bloodbro_state::bloodbro)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(7'159'090)/2)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(7'159'090)/2)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH)
@@ -563,20 +563,20 @@ MACHINE_CONFIG_START(bloodbro_state::bloodbro)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bloodbro_state::weststry)
bloodbro(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(weststry_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(weststry_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bloodbro_state, irq6_line_hold)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK(XTAL(20'000'000)/4) /* 5MHz - verified on PCB */
- MCFG_CPU_PROGRAM_MAP(weststry_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_CLOCK(XTAL(20'000'000)/4) /* 5MHz - verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(weststry_sound_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", weststry)
MCFG_PALETTE_MODIFY("palette")
@@ -594,20 +594,20 @@ MACHINE_CONFIG_START(bloodbro_state::weststry)
MCFG_OKIM6295_REPLACE("oki", XTAL(20'000'000)/16, PIN7_HIGH) /* 1.25MHz - verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(20'000'000)/4) /* ~4.9MHz - see notes at top */
- MCFG_YM3812_IRQ_HANDLER(WRITELINE(bloodbro_state, weststry_opl_irq_w))
+ MCFG_DEVICE_REPLACE("ymsnd", YM3812, XTAL(20'000'000)/4) /* ~4.9MHz - see notes at top */
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE(*this, bloodbro_state, weststry_opl_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_MODIFY("seibu_sound")
- MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8(bloodbro_state, weststry_opl_w))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8(*this, bloodbro_state, weststry_opl_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bloodbro_state::skysmash)
bloodbro(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(skysmash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bloodbro_state, irq2_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(skysmash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bloodbro_state, irq2_line_hold)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(bloodbro_state, screen_update_skysmash)
diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp
index e8cc9350c27..37978c25eeb 100644
--- a/src/mame/drivers/blstroid.cpp
+++ b/src/mame/drivers/blstroid.cpp
@@ -177,8 +177,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(blstroid_state::blstroid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -202,7 +202,7 @@ MACHINE_CONFIG_START(blstroid_state::blstroid)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 320*2, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(blstroid_state, screen_update_blstroid)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(blstroid_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, blstroid_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(blstroid_state,blstroid)
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index 54292de4fee..71bf0f1c36a 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -349,14 +349,14 @@ void blueprnt_state::machine_reset()
MACHINE_CONFIG_START(blueprnt_state::blueprnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz
- MCFG_CPU_PROGRAM_MAP(blueprnt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", blueprnt_state, irq0_line_hold)
-
- MCFG_CPU_ADD("audiocpu", Z80, 10000000/2/2/2) // 1.25 MHz (2H)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(blueprnt_state, irq0_line_hold, 4*60) // IRQs connected to 32V
+ MCFG_DEVICE_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(blueprnt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", blueprnt_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, 10000000/2/2/2) // 1.25 MHz (2H)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(blueprnt_state, irq0_line_hold, 4*60) // IRQs connected to 32V
// NMIs are caused by the main CPU
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -382,12 +382,12 @@ MACHINE_CONFIG_START(blueprnt_state::blueprnt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 10000000/2/2/2)
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(blueprnt_state, dipsw_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 10000000/2/2/2)
+ MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, blueprnt_state, dipsw_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 10000000/2/2/2/2)
+ MCFG_DEVICE_ADD("ay2", AY8910, 10000000/2/2/2/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DILSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DILSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -397,8 +397,8 @@ MACHINE_CONFIG_START(blueprnt_state::grasspin)
blueprnt(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(grasspin_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(grasspin_map)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 755aa4bd3ea..2a8221414e6 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -456,9 +456,9 @@ void bmcbowl_state::ramdac_map(address_map &map)
}
MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(21'477'272) / 2 )
- MCFG_CPU_PROGRAM_MAP(bmcbowl_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bmcbowl_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(21'477'272) / 2 )
+ MCFG_DEVICE_PROGRAM_MAP(bmcbowl_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bmcbowl_state, irq2_line_hold)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -475,13 +475,13 @@ MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545) ) // guessed chip type, clock not verified
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545) ) // guessed chip type, clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545) / 2)
- MCFG_AY8910_PORT_A_READ_CB(READ8(bmcbowl_state, dips1_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(bmcbowl_state, input_mux_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(3'579'545) / 2)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, bmcbowl_state, dips1_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, bmcbowl_state, input_mux_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
@@ -491,10 +491,10 @@ MACHINE_CONFIG_START(bmcbowl_state::bmcbowl)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_READPB_HANDLER(READ8(bmcbowl_state,via_b_in))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(bmcbowl_state, via_a_out))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(bmcbowl_state, via_b_out))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(bmcbowl_state, via_ca2_out))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, bmcbowl_state,via_b_in))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, bmcbowl_state, via_a_out))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, bmcbowl_state, via_b_out))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, bmcbowl_state, via_ca2_out))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_4))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index 2fd2ae2a20f..b651f7ccce5 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -809,8 +809,8 @@ void bmcpokr_state::ramdac_map(address_map &map)
}
MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(42'000'000) / 4) // 68000 @10.50MHz (42/4)
- MCFG_CPU_PROGRAM_MAP(bmcpokr_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(42'000'000) / 4) // 68000 @10.50MHz (42/4)
+ MCFG_DEVICE_PROGRAM_MAP(bmcpokr_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bmcpokr_state, interrupt, "screen", 0, 1)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -832,7 +832,7 @@ MACHINE_CONFIG_START(bmcpokr_state::bmcpokr)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(42'000'000) / 12) // UM3567 @3.50MHz (42/12)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(42'000'000) / 12) // UM3567 @3.50MHz (42/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
@@ -843,8 +843,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bmcpokr_state::mjmaglmp)
bmcpokr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjmaglmp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjmaglmp_map)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index cfce4002fdf..378f2e2ab24 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -338,9 +338,9 @@ void bmjr_state::machine_reset()
MACHINE_CONFIG_START(bmjr_state::bmjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL(4'000'000)/4) //unknown clock / divider
- MCFG_CPU_PROGRAM_MAP(bmjr_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bmjr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M6800, XTAL(4'000'000)/4) //unknown clock / divider
+ MCFG_DEVICE_PROGRAM_MAP(bmjr_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bmjr_state, irq0_line_hold)
/* video hardware */
@@ -357,7 +357,7 @@ MACHINE_CONFIG_START(bmjr_state::bmjr)
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1200) // guesswork
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200) // guesswork
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index 5a3824e13c8..21171ab7953 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -970,9 +970,9 @@ static void bml3_cards(device_slot_interface &device)
MACHINE_CONFIG_START(bml3_state::bml3_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6809, CPU_CLOCK)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bml3_state, bml3_timer_firq)
-// MCFG_CPU_PERIODIC_INT_DRIVER(bml3_state, bml3_firq, 45)
+ MCFG_DEVICE_ADD("maincpu",M6809, CPU_CLOCK)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bml3_state, bml3_timer_firq)
+// MCFG_DEVICE_PERIODIC_INT_DRIVER(bml3_state, bml3_firq, 45)
// MCFG_MACHINE_RESET_OVERRIDE(bml3_state,bml3)
@@ -999,16 +999,16 @@ MACHINE_CONFIG_START(bml3_state::bml3_common)
MCFG_TIMER_DRIVER_ADD_PERIODIC("bml3_p", bml3_state, bml3_p, attotime::from_hz(40000))
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(bml3_state, bml3_piaA_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, bml3_state, bml3_piaA_w))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(bml3_state, bml3_acia_tx_w))
- MCFG_ACIA6850_RTS_HANDLER(WRITELINE(bml3_state, bml3_acia_rts_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(bml3_state, bml3_acia_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, bml3_state, bml3_acia_tx_w))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(*this, bml3_state, bml3_acia_rts_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, bml3_state, bml3_acia_irq_w))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 9600) // 600 baud x 16(divider) = 9600
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
MCFG_CASSETTE_ADD( "cassette" )
@@ -1016,15 +1016,15 @@ MACHINE_CONFIG_START(bml3_state::bml3_common)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* slot devices */
MCFG_DEVICE_ADD("bml3bus", BML3BUS, 0)
MCFG_BML3BUS_CPU("maincpu")
- MCFG_BML3BUS_OUT_NMI_CB(WRITELINE(bml3_state, bml3bus_nmi_w))
- MCFG_BML3BUS_OUT_IRQ_CB(WRITELINE(bml3_state, bml3bus_irq_w))
- MCFG_BML3BUS_OUT_FIRQ_CB(WRITELINE(bml3_state, bml3bus_firq_w))
+ MCFG_BML3BUS_OUT_NMI_CB(WRITELINE(*this, bml3_state, bml3bus_nmi_w))
+ MCFG_BML3BUS_OUT_IRQ_CB(WRITELINE(*this, bml3_state, bml3bus_irq_w))
+ MCFG_BML3BUS_OUT_FIRQ_CB(WRITELINE(*this, bml3_state, bml3bus_firq_w))
/* Default to MP-1805 disk (3" or 5.25" SS/SD), as our MB-6892 ROM dump includes
the MP-1805 ROM.
User may want to switch this to MP-1802 (5.25" DS/DD).
@@ -1041,13 +1041,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bml3_state::bml3)
bml3_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(bml3_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(bml3_mem)
#if 0
// TODO: slot device for sound card
// audio
- MCFG_SOUND_ADD("ym2203", YM2203, 2000000) //unknown clock / divider
+ MCFG_DEVICE_ADD("ym2203", YM2203, 2000000) //unknown clock / divider
MCFG_YM2203_AY8910_INTF(&ay8910_config)
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
@@ -1058,16 +1058,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bml3_state::bml3mk2)
bml3_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(bml3mk2_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(bml3mk2_mem)
// TODO: anything to add here?
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bml3_state::bml3mk5)
bml3_common(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(bml3mk5_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(bml3mk5_mem)
// TODO: anything to add here?
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index 02dec497e9e..84871e083eb 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -806,14 +806,14 @@ void bnstars_state::bnstars_sound_map(address_map &map)
MACHINE_CONFIG_START(bnstars_state::bnstars)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
- MCFG_CPU_PROGRAM_MAP(bnstars_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(ms32_state,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", V70, 20000000) // 20MHz
+ MCFG_DEVICE_PROGRAM_MAP(bnstars_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(ms32_state,irq_callback)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bnstars_state, ms32_interrupt, "lscreen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // Unverified; it's possibly higher than 4MHz
- MCFG_CPU_PROGRAM_MAP(bnstars_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // Unverified; it's possibly higher than 4MHz
+ MCFG_DEVICE_PROGRAM_MAP(bnstars_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
@@ -852,13 +852,13 @@ MACHINE_CONFIG_START(bnstars_state::bnstars)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymf1", YMF271, 16934400)
+ MCFG_DEVICE_ADD("ymf1", YMF271, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
// MCFG_SOUND_ROUTE(2, "lspeaker", 1.0) Output 2/3 not used?
// MCFG_SOUND_ROUTE(3, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ymf2", YMF271, 16934400)
+ MCFG_DEVICE_ADD("ymf2", YMF271, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
// MCFG_SOUND_ROUTE(2, "lspeaker", 1.0) Output 2/3 not used?
diff --git a/src/mame/drivers/bntyhunt.cpp b/src/mame/drivers/bntyhunt.cpp
index 122a9431406..040da8dce8d 100644
--- a/src/mame/drivers/bntyhunt.cpp
+++ b/src/mame/drivers/bntyhunt.cpp
@@ -54,8 +54,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bntyhunt_state::bntyhunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM, 200000000) /* Probably a Pentium or higher .. ?? Mhz*/
- MCFG_CPU_PROGRAM_MAP(bntyhunt_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 200000000) /* Probably a Pentium or higher .. ?? Mhz*/
+ MCFG_DEVICE_PROGRAM_MAP(bntyhunt_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp
index 6691b143539..713ac4c340a 100644
--- a/src/mame/drivers/bob85.cpp
+++ b/src/mame/drivers/bob85.cpp
@@ -209,11 +209,11 @@ READ_LINE_MEMBER( bob85_state::sid_r )
MACHINE_CONFIG_START(bob85_state::bob85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(bob85_mem)
- MCFG_CPU_IO_MAP(bob85_io)
- MCFG_I8085A_SID(READLINE(bob85_state, sid_r))
- MCFG_I8085A_SOD(WRITELINE(bob85_state, sod_w))
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(bob85_mem)
+ MCFG_DEVICE_IO_MAP(bob85_io)
+ MCFG_I8085A_SID(READLINE(*this, bob85_state, sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, bob85_state, sod_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_bob85)
diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp
index e4b4ead65a8..a8d6e48ba85 100644
--- a/src/mame/drivers/bogeyman.cpp
+++ b/src/mame/drivers/bogeyman.cpp
@@ -232,9 +232,9 @@ WRITE8_MEMBER(bogeyman_state::colbank_w)
MACHINE_CONFIG_START(bogeyman_state::bogeyman)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M6502, 1500000) /* Verified */
- MCFG_CPU_PROGRAM_MAP(bogeyman_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bogeyman_state, irq0_line_hold, 16*60) // Controls sound
+ MCFG_DEVICE_ADD("maincpu", M6502, 1500000) /* Verified */
+ MCFG_DEVICE_PROGRAM_MAP(bogeyman_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bogeyman_state, irq0_line_hold, 16*60) // Controls sound
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -257,11 +257,11 @@ MACHINE_CONFIG_START(bogeyman_state::bogeyman)
MCFG_SPEAKER_STANDARD_MONO("mono")
// verified to be YM2149s from PCB pic
- MCFG_SOUND_ADD("ay1", YM2149, 1500000) /* Verified */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(bogeyman_state, colbank_w))
+ MCFG_DEVICE_ADD("ay1", YM2149, 1500000) /* Verified */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, bogeyman_state, colbank_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", YM2149, 1500000) /* Verified */
+ MCFG_DEVICE_ADD("ay2", YM2149, 1500000) /* Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp
index 6b3485bf4a1..ecbd5edc216 100644
--- a/src/mame/drivers/bombjack.cpp
+++ b/src/mame/drivers/bombjack.cpp
@@ -352,12 +352,12 @@ WRITE_LINE_MEMBER(bombjack_state::vblank_irq)
MACHINE_CONFIG_START(bombjack_state::bombjack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) /* Confirmed from PCB */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000)) /* Confirmed from PCB */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* Confirmed from PCB */
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_IO_MAP(audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* Confirmed from PCB */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_IO_MAP(audio_io_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(bombjack_state::bombjack)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(bombjack_state, screen_update_bombjack)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bombjack_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bombjack_state, vblank_irq))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bombjack)
@@ -380,13 +380,13 @@ MACHINE_CONFIG_START(bombjack_state::bombjack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* Confirmed from PCB */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* Confirmed from PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay3", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.13)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp
index 29eccd5f3e2..07f96e7c6c8 100644
--- a/src/mame/drivers/boogwing.cpp
+++ b/src/mame/drivers/boogwing.cpp
@@ -342,13 +342,13 @@ DECO16IC_BANK_CB_MEMBER(boogwing_state::bank_callback2)
MACHINE_CONFIG_START(boogwing_state::boogwing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MAIN_XTAL/2) /* DE102 */
- MCFG_CPU_PROGRAM_MAP(boogwing_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", boogwing_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, MAIN_XTAL/2) /* DE102 */
+ MCFG_DEVICE_PROGRAM_MAP(boogwing_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", boogwing_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, SOUND_XTAL/4)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, SOUND_XTAL/4)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -417,7 +417,7 @@ MACHINE_CONFIG_START(boogwing_state::boogwing)
MCFG_YM2151_ADD("ymsnd", SOUND_XTAL/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ2 */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(boogwing_state, sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, boogwing_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index be2272245a9..b519e6971e7 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -303,12 +303,12 @@ void bottom9_state::machine_reset()
MACHINE_CONFIG_START(bottom9_state::bottom9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) // 63C09E
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) // 63C09E
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bottom9_state, bottom9_sound_interrupt, 8*60) /* irq is triggered by the main CPU */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bottom9_state, bottom9_sound_interrupt, 8*60) /* irq is triggered by the main CPU */
MCFG_WATCHDOG_ADD("watchdog")
@@ -320,7 +320,7 @@ MACHINE_CONFIG_START(bottom9_state::bottom9)
MCFG_SCREEN_VISIBLE_AREA(14*8, (64-14)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(bottom9_state, screen_update_bottom9)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bottom9_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bottom9_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_ENABLE_SHADOWS()
@@ -344,13 +344,13 @@ MACHINE_CONFIG_START(bottom9_state::bottom9)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232_1", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(bottom9_state, volume_callback0))
+ MCFG_DEVICE_ADD("k007232_1", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, bottom9_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_SOUND_ADD("k007232_2", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(bottom9_state, volume_callback1))
+ MCFG_DEVICE_ADD("k007232_2", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, bottom9_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp
index 098efc405fc..9e25d5c2b5c 100644
--- a/src/mame/drivers/bowltry.cpp
+++ b/src/mame/drivers/bowltry.cpp
@@ -100,9 +100,9 @@ uint32_t bowltry_state::screen_update_bowltry(screen_device &screen, bitmap_rgb3
MACHINE_CONFIG_START(bowltry_state::bowltry)
- MCFG_CPU_ADD("maincpu", H83008, 16000000 )
- MCFG_CPU_PROGRAM_MAP( bowltry_map )
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", bowltry_state, irq0_line_hold) // uses vector $64, IMIAB according to the manual (timer/compare B, internal to the CPU)
+ MCFG_DEVICE_ADD("maincpu", H83008, 16000000 )
+ MCFG_DEVICE_PROGRAM_MAP( bowltry_map )
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bowltry_state, irq0_line_hold) // uses vector $64, IMIAB according to the manual (timer/compare B, internal to the CPU)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index eea60b8509d..bb17ed48de2 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -489,8 +489,8 @@ void boxer_state::machine_reset()
MACHINE_CONFIG_START(boxer_state::boxer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16)
- MCFG_CPU_PROGRAM_MAP(boxer_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16)
+ MCFG_DEVICE_PROGRAM_MAP(boxer_map)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/bpmmicro.cpp b/src/mame/drivers/bpmmicro.cpp
index 52a04f2d4aa..dc2d1c58023 100644
--- a/src/mame/drivers/bpmmicro.cpp
+++ b/src/mame/drivers/bpmmicro.cpp
@@ -364,9 +364,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bpmmicro_state::bpmmicro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL(32'000'000)/4) /* divider is guessed, cpu is an AMD N80L286-16/S part */
- MCFG_CPU_PROGRAM_MAP(i286_mem)
- MCFG_CPU_IO_MAP(i286_io)
+ MCFG_DEVICE_ADD("maincpu", I80286, XTAL(32'000'000)/4) /* divider is guessed, cpu is an AMD N80L286-16/S part */
+ MCFG_DEVICE_PROGRAM_MAP(i286_mem)
+ MCFG_DEVICE_IO_MAP(i286_io)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom_u38")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp
index 4b097c06da8..07e9215dd35 100644
--- a/src/mame/drivers/br8641.cpp
+++ b/src/mame/drivers/br8641.cpp
@@ -160,14 +160,14 @@ static const z80_daisy_config daisy_chain_intf[] =
MACHINE_CONFIG_START(brandt8641_state::brandt8641)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) // U4 ,4MHz crystal on board
- MCFG_CPU_PROGRAM_MAP(brandt8641_mem)
- MCFG_CPU_IO_MAP(brandt8641_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000)) // U4 ,4MHz crystal on board
+ MCFG_DEVICE_PROGRAM_MAP(brandt8641_mem)
+ MCFG_DEVICE_IO_MAP(brandt8641_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// Z80APIO U9
@@ -178,9 +178,9 @@ MACHINE_CONFIG_START(brandt8641_state::brandt8641)
MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(brandt8641_state, port08_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(brandt8641_state, port08_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(brandt8641_state, port09_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, brandt8641_state, port08_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, brandt8641_state, port08_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, brandt8641_state, port09_w))
MCFG_DEVICE_ADD("pio3", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index 3c389b6375d..8f8a7b10324 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -376,11 +376,11 @@ WRITE_LINE_MEMBER(brkthru_state::vblank_irq)
MACHINE_CONFIG_START(brkthru_state::brkthru)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(brkthru_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(brkthru_map)
- MCFG_CPU_ADD("audiocpu", MC6809, MASTER_CLOCK/2) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, MASTER_CLOCK/2) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -394,7 +394,7 @@ MACHINE_CONFIG_START(brkthru_state::brkthru)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 8, 248, 272, 8, 248)
MCFG_SCREEN_UPDATE_DRIVER(brkthru_state, screen_update_brkthru)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(brkthru_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, brkthru_state, vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -402,13 +402,13 @@ MACHINE_CONFIG_START(brkthru_state::brkthru)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ym2", YM3526, MASTER_CLOCK/4)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -417,11 +417,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(brkthru_state::darwin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(darwin_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(darwin_map)
- MCFG_CPU_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(brkthru_state::darwin)
tuned by Shingo SUZUKI(VSyncMAME Project) 2000/10/19 */
MCFG_SCREEN_UPDATE_DRIVER(brkthru_state, screen_update_brkthru)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(brkthru_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, brkthru_state, vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -454,13 +454,13 @@ MACHINE_CONFIG_START(brkthru_state::darwin)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3526, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ym2", YM3526, MASTER_CLOCK/4)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp
index 7ebab78f12b..0597d11b02a 100644
--- a/src/mame/drivers/bsktball.cpp
+++ b/src/mame/drivers/bsktball.cpp
@@ -242,18 +242,18 @@ void bsktball_state::machine_reset()
MACHINE_CONFIG_START(bsktball_state::bsktball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,750000)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,750000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bsktball_state, bsktball_scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("outlatch", F9334, 0) // M6
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // Coin Counter
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led0")) // LED 1
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led1")) // LED 2
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(bsktball_state, ld1_w)) // LD 1
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(bsktball_state, ld2_w)) // LD 2
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<BSKTBALL_NOISE_EN>)) // Noise Reset
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(bsktball_state, nmion_w)) // NMI On
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, bsktball_state, ld1_w)) // LD 1
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, bsktball_state, ld2_w)) // LD 2
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<BSKTBALL_NOISE_EN>)) // Noise Reset
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, bsktball_state, nmion_w)) // NMI On
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -272,7 +272,7 @@ MACHINE_CONFIG_START(bsktball_state::bsktball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(bsktball)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index d156ae222fc..e90be5f07b9 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -1280,11 +1280,11 @@ MACHINE_RESET_MEMBER(btime_state,mmonkey)
MACHINE_CONFIG_START(btime_state::btime)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO_CPU7, HCLK2) /* seletable between H2/H4 via jumper */
- MCFG_CPU_PROGRAM_MAP(btime_map)
+ MCFG_DEVICE_ADD("maincpu", DECO_CPU7, HCLK2) /* seletable between H2/H4 via jumper */
+ MCFG_DEVICE_PROGRAM_MAP(btime_map)
- MCFG_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, HCLK1/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("8vck", btime_state, audio_nmi_gen, "screen", 0, 8)
MCFG_INPUT_MERGER_ALL_HIGH("audionmi")
@@ -1311,22 +1311,22 @@ MACHINE_CONFIG_START(btime_state::btime)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, HCLK2)
+ MCFG_DEVICE_ADD("ay1", AY8910, HCLK2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(5), RES_K(5), RES_K(5))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(btime_state, ay_audio_nmi_enable_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, btime_state, ay_audio_nmi_enable_w))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 1)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 2)
- MCFG_SOUND_ADD("ay2", AY8910, HCLK2)
+ MCFG_DEVICE_ADD("ay2", AY8910, HCLK2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(1), RES_K(5), RES_K(5))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 3)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 4)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 5)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(btime_sound)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1336,11 +1336,11 @@ MACHINE_CONFIG_START(btime_state::cookrace)
btime(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", DECO_C10707, HCLK2)
- MCFG_CPU_PROGRAM_MAP(cookrace_map)
+ MCFG_DEVICE_REPLACE("maincpu", DECO_C10707, HCLK2)
+ MCFG_DEVICE_PROGRAM_MAP(cookrace_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", cookrace)
@@ -1354,8 +1354,8 @@ MACHINE_CONFIG_START(btime_state::lnc)
btime(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", DECO_C10707, HCLK2)
- MCFG_CPU_PROGRAM_MAP(lnc_map)
+ MCFG_DEVICE_REPLACE("maincpu", DECO_C10707, HCLK2)
+ MCFG_DEVICE_PROGRAM_MAP(lnc_map)
MCFG_MACHINE_RESET_OVERRIDE(btime_state,lnc)
@@ -1386,8 +1386,8 @@ MACHINE_CONFIG_START(btime_state::mmonkey)
wtennis(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mmonkey_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mmonkey_map)
MCFG_MACHINE_START_OVERRIDE(btime_state,mmonkey)
MCFG_MACHINE_RESET_OVERRIDE(btime_state,mmonkey)
@@ -1397,9 +1397,9 @@ MACHINE_CONFIG_START(btime_state::bnj)
btime(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", DECO_C10707, HCLK4)
- MCFG_CPU_CLOCK(HCLK4)
- MCFG_CPU_PROGRAM_MAP(bnj_map)
+ MCFG_DEVICE_REPLACE("maincpu", DECO_C10707, HCLK4)
+ MCFG_DEVICE_CLOCK(HCLK4)
+ MCFG_DEVICE_PROGRAM_MAP(bnj_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", bnj)
@@ -1416,8 +1416,8 @@ MACHINE_CONFIG_START(btime_state::sdtennis)
bnj(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("audiocpu", DECO_C10707, HCLK1/3/2)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_REPLACE("audiocpu", DECO_C10707, HCLK1/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MACHINE_CONFIG_END
@@ -1425,8 +1425,8 @@ MACHINE_CONFIG_START(btime_state::zoar)
btime(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zoar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zoar_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", zoar)
@@ -1439,13 +1439,13 @@ MACHINE_CONFIG_START(btime_state::zoar)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) // 256 * 240, confirmed
/* sound hardware */
- MCFG_SOUND_REPLACE("ay1", AY8910, HCLK1)
+ MCFG_DEVICE_REPLACE("ay1", AY8910, HCLK1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(5), RES_K(5), RES_K(5))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(btime_state, ay_audio_nmi_enable_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, btime_state, ay_audio_nmi_enable_w))
- MCFG_SOUND_REPLACE("ay2", AY8910, HCLK1)
+ MCFG_DEVICE_REPLACE("ay2", AY8910, HCLK1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
@@ -1454,12 +1454,12 @@ MACHINE_CONFIG_START(btime_state::disco)
btime(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(HCLK4)
- MCFG_CPU_PROGRAM_MAP(disco_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(HCLK4)
+ MCFG_DEVICE_PROGRAM_MAP(disco_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(disco_audio_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(disco_audio_map)
MCFG_DEVICE_MODIFY("soundlatch")
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
@@ -1481,8 +1481,8 @@ MACHINE_CONFIG_START(btime_state::tisland)
btime(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tisland_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tisland_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", zoar)
diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp
index bd92a126a25..97c2ae6abcb 100644
--- a/src/mame/drivers/btoads.cpp
+++ b/src/mame/drivers/btoads.cpp
@@ -305,8 +305,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(btoads_state::btoads)
- MCFG_CPU_ADD("maincpu", TMS34020, CPU_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34020, CPU_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -314,10 +314,10 @@ MACHINE_CONFIG_START(btoads_state::btoads)
MCFG_TMS340X0_TO_SHIFTREG_CB(btoads_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(btoads_state, from_shiftreg) /* read from shiftreg function */
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(btoads_state, irq0_line_assert, 183)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(btoads_state, irq0_line_assert, 183)
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp
index 8a02db792bb..bc94e6f8096 100644
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@@ -847,16 +847,16 @@ MACHINE_RESET_MEMBER(bublbobl_state,tokio)
MACHINE_CONFIG_START(bublbobl_state::tokio)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(tokio_map_mcu)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(tokio_map_mcu)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(tokio_subcpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("subcpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(tokio_subcpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(tokio_sound_map) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
+ MCFG_DEVICE_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(tokio_sound_map) // NMIs are triggered by the main CPU, IRQs are triggered by the YM2203
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, MAIN_XTAL/8) // 3 Mhz
@@ -886,11 +886,11 @@ MACHINE_CONFIG_START(bublbobl_state::tokio)
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("main_to_sound")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<1>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<1>))
MCFG_GENERIC_LATCH_8_ADD("sound_to_main")
- MCFG_SOUND_ADD("ymsnd", YM2203, MAIN_XTAL/8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MAIN_XTAL/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.08)
MCFG_SOUND_ROUTE(1, "mono", 0.08)
@@ -908,18 +908,18 @@ MACHINE_CONFIG_START(bublbobl_state::bublboblp)
MCFG_DEVICE_REMOVE("watchdog")
MCFG_WATCHDOG_ADD("watchdog") // this adds back a watchdog, but due to the way MAME handles watchdogs, it will never fire unless it first gets at least one pulse, which it never will.
- MCFG_CPU_REPLACE("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(tokio_map) // no mcu or resistors at all
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(tokio_map) // no mcu or resistors at all
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bublbobl_state::tokiob)
tokio(config);
MCFG_DEVICE_REMOVE("bmcu") // no mcu, but see below...
- MCFG_CPU_REPLACE("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(tokio_map_bootleg) // resistor tying mcu's footprint PA6 pin low so mcu reads always return 0xBF
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(tokio_map_bootleg) // resistor tying mcu's footprint PA6 pin low so mcu reads always return 0xBF
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
MACHINE_CONFIG_END
@@ -963,15 +963,15 @@ MACHINE_RESET_MEMBER(bublbobl_state,bublbobl)
MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(bublbobl_maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(bublbobl_maincpu_map)
- MCFG_CPU_ADD("subcpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(subcpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("subcpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(sound_map) // IRQs are triggered by the YM2203
+ MCFG_DEVICE_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map) // IRQs are triggered by the YM2203
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
@@ -1002,23 +1002,23 @@ MACHINE_CONFIG_START(bublbobl_state::bublbobl_nomcu)
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("main_to_sound")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<1>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<1>))
MCFG_GENERIC_LATCH_8_ADD("sound_to_main")
- MCFG_SOUND_ADD("ym1", YM2203, MAIN_XTAL/8)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("soundirq", input_merger_device, in_w<0>))
+ MCFG_DEVICE_ADD("ym1", YM2203, MAIN_XTAL/8)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<0>))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM3526, MAIN_XTAL/8)
- MCFG_YM3526_IRQ_HANDLER(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
+ MCFG_DEVICE_ADD("ym2", YM3526, MAIN_XTAL/8)
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(bublbobl_state::bublbobl)
bublbobl_nomcu(config);
- MCFG_CPU_ADD("mcu", M6801, XTAL(4'000'000)) // actually 6801U4 - xtal is 4MHz, divided by 4 internally
- MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_ADD("mcu", M6801, XTAL(4'000'000)) // actually 6801U4 - xtal is 4MHz, divided by 4 internally
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("mcu", M6801_IRQ_LINE)) // same clock latches the INT pin on the second Z80
@@ -1045,9 +1045,9 @@ MACHINE_CONFIG_START(bublbobl_state::boblbobl)
bublbobl_nomcu(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bublbobl_state, irq0_line_hold) // interrupt mode 1, unlike Bubble Bobble
MCFG_MACHINE_START_OVERRIDE(bublbobl_state, boblbobl)
MCFG_MACHINE_RESET_OVERRIDE(bublbobl_state, boblbobl)
@@ -1080,11 +1080,11 @@ MACHINE_CONFIG_START(bub68705_state::bub68705)
bublbobl_nomcu(config);
/* basic machine hardware */
- MCFG_CPU_ADD("mcu", M68705P3, XTAL(4'000'000)) // xtal is 4MHz, divided by 4 internally
+ MCFG_DEVICE_ADD("mcu", M68705P3, XTAL(4'000'000)) // xtal is 4MHz, divided by 4 internally
MCFG_M68705_PORTC_R_CB(IOPORT("IN0"))
- MCFG_M68705_PORTA_W_CB(WRITE8(bub68705_state, port_a_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(bub68705_state, port_b_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", bub68705_state, bublbobl_m68705_interrupt) // ??? should come from the same clock which latches the INT pin on the second Z80
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, bub68705_state, port_a_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, bub68705_state, port_b_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", bub68705_state, bublbobl_m68705_interrupt) // ??? should come from the same clock which latches the INT pin on the second Z80
MCFG_MACHINE_START_OVERRIDE(bub68705_state, bub68705)
MCFG_MACHINE_RESET_OVERRIDE(bub68705_state, bub68705)
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index 56873fd31e2..db5077c9870 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -453,13 +453,13 @@ void buggychl_state::machine_reset()
MACHINE_CONFIG_START(buggychl_state::buggychl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(48'000'000)/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */
- MCFG_CPU_PROGRAM_MAP(buggychl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", buggychl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(48'000'000)/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */
+ MCFG_DEVICE_PROGRAM_MAP(buggychl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", buggychl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz according to schematics */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, ((((XTAL(8'000'000)/2)/2)/256)/64)) // timer irq
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz according to schematics */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, ((((XTAL(8'000'000)/2)/2)/256)/64)) // timer irq
// schematics shows a 61.035 (x2?) Hz, similar to flstory.cpp and other Taito MSM5232 based games.
// apparently schematics also shows a switch for the timer irq that makes it to run at half speed, no idea where this is located.
/* audiocpu nmi is caused by (main->sound semaphore)&&(sound_nmi_enabled), identical to bubble bobble. */
@@ -493,7 +493,7 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -502,17 +502,17 @@ MACHINE_CONFIG_START(buggychl_state::buggychl)
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("ay1", YM2149, XTAL(8'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(buggychl_state, ta7630_volbal_ay1_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(buggychl_state, port_b_0_w))
+ MCFG_DEVICE_ADD("ay1", YM2149, XTAL(8'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggychl_state, ta7630_volbal_ay1_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggychl_state, port_b_0_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", YM2149, XTAL(8'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(buggychl_state, ta7630_volbal_ay2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(buggychl_state, port_b_1_w))
+ MCFG_DEVICE_ADD("ay2", YM2149, XTAL(8'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggychl_state, ta7630_volbal_ay2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggychl_state, port_b_1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6) /* default 0.39 uF capacitors (not verified) */
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index 19b8bffaae2..2ad2c9517fc 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -1108,47 +1108,47 @@ void bulletf_state::machine_reset()
MACHINE_CONFIG_START(bullet_state::bullet)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(bullet_mem)
- MCFG_CPU_IO_MAP(bullet_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(bullet_mem)
+ MCFG_DEVICE_IO_MAP(bullet_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
// devices
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(bullet_state, dart_rxtxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, bullet_state, dart_rxtxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL(4'915'200)/4))
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(16'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(bullet_state, dartardy_w))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(bullet_state, dartbrdy_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(*this, bullet_state, dartardy_w))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(*this, bullet_state, dartbrdy_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(bullet_state, dma_mreq_r))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(bullet_state, dma_mreq_w))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(bullet_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(bullet_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, bullet_state, dma_mreq_r))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, bullet_state, dma_mreq_w))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, bullet_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, bullet_state, io_write_byte))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_IN_PB_CB(READ8(bullet_state, pio_pb_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, bullet_state, pio_pb_r))
MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z80DART_TAG, z80dart_device, dcda_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bullet_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", bullet_525_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", bullet_525_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -1159,19 +1159,19 @@ MACHINE_CONFIG_START(bullet_state::bullet)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":7", bullet_8_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bullet_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(bullet_state, write_centronics_perror))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(bullet_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(bullet_state, write_centronics_fault))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bullet_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, bullet_state, write_centronics_perror))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, bullet_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, bullet_state, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
// software lists
MCFG_SOFTWARE_LIST_ADD("flop_list", "wmbullet")
@@ -1188,49 +1188,49 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bulletf_state::bulletf)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(bulletf_mem)
- MCFG_CPU_IO_MAP(bulletf_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(bulletf_mem)
+ MCFG_DEVICE_IO_MAP(bulletf_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
// devices
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(bullet_state, dart_rxtxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, bullet_state, dart_rxtxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", bullet_state, ctc_tick, attotime::from_hz(XTAL(4'915'200)/4))
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(16'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(bullet_state, dartardy_w))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(bullet_state, dartbrdy_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_WRDYA_CB(WRITELINE(*this, bullet_state, dartardy_w))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_WRDYB_CB(WRITELINE(*this, bullet_state, dartbrdy_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(16'000'000)/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(bullet_state, dma_mreq_r))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(bullet_state, dma_mreq_w))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(bullet_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(bullet_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, bullet_state, dma_mreq_r))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, bullet_state, dma_mreq_w))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, bullet_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, bullet_state, io_write_byte))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(DEVREAD8("scsi_ctrl_in", input_buffer_device, read))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(bulletf_state, pio_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(bulletf_state, cstrb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8("scsi_ctrl_in", input_buffer_device, read))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, bulletf_state, pio_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, bulletf_state, cstrb_w))
MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, rib_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(Z80DART_TAG, z80dart_device, rib_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bullet_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", bullet_525_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", bullet_525_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -1243,23 +1243,23 @@ MACHINE_CONFIG_START(bulletf_state::bulletf)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":9", bullet_35_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bullet_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bullet_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
MCFG_DEVICE_ADD(SCSIBUS_TAG, SCSI_PORT, 0)
- MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit3))
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit4))
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit5))
- MCFG_SCSI_REQ_HANDLER(WRITELINE(bulletf_state, req_w))
- MCFG_SCSI_IO_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit3))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit4))
+ MCFG_SCSI_CD_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit5))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, bulletf_state, req_w))
+ MCFG_SCSI_IO_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit7))
MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
MCFG_SCSI_OUTPUT_LATCH_ADD("scsi_data_out", SCSIBUS_TAG)
diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp
index 8c9146a93f9..ff187ecd958 100644
--- a/src/mame/drivers/busicom.cpp
+++ b/src/mame/drivers/busicom.cpp
@@ -226,7 +226,7 @@ void busicom_state::machine_reset()
MACHINE_CONFIG_START(busicom_state::busicom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I4004, 750000)
+ MCFG_DEVICE_ADD("maincpu", I4004, 750000)
MCFG_I4004_ROM_MAP(busicom_rom)
MCFG_I4004_RAM_MEMORY_MAP(busicom_mem)
MCFG_I4004_ROM_PORTS_MAP(busicom_rp)
diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp
index 85a524136ba..52ca4a06c08 100644
--- a/src/mame/drivers/buster.cpp
+++ b/src/mame/drivers/buster.cpp
@@ -322,9 +322,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(buster_state::buster)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(3'579'545)) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(mainmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", buster_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(3'579'545)) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mainmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", buster_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -345,7 +345,7 @@ MACHINE_CONFIG_START(buster_state::buster)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000/2)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 3c1f6dfabaf..888acf24ae5 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -549,9 +549,9 @@ GFXDECODE_END
/* Machine Driver */
MACHINE_CONFIG_START(bw12_state::common)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(bw12_mem)
- MCFG_CPU_IO_MAP(bw12_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(bw12_mem)
+ MCFG_DEVICE_IO_MAP(bw12_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
@@ -571,7 +571,7 @@ MACHINE_CONFIG_START(bw12_state::common)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // ls273.ic5 + mc1408.ic4
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // ls273.ic5 + mc1408.ic4
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -580,29 +580,29 @@ MACHINE_CONFIG_START(bw12_state::common)
MCFG_UPD765A_ADD(UPD765_TAG, false, true)
MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(bw12_state, pia_pa_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_PIA_CB2_HANDLER(WRITELINE(bw12_state, pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, bw12_state, pia_pa_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, bw12_state, pia_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_PIA_IRQB_HANDLER(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(16'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(PIT8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(1'843'200))
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(bw12_state, pit_out0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, bw12_state, pit_out0_w))
MCFG_PIT8253_CLK1(XTAL(1'843'200))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
MCFG_PIT8253_CLK2(XTAL(1'843'200))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(bw12_state, pit_out2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, bw12_state, pit_out2_w))
MCFG_DEVICE_ADD(AY3600PRO002_TAG, AY3600, 0)
MCFG_AY3600_MATRIX_X0(IOPORT("X0"))
@@ -614,26 +614,26 @@ MACHINE_CONFIG_START(bw12_state::common)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(bw12_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(bw12_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(bw12_state, ay3600_data_ready_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, bw12_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, bw12_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, bw12_state, ay3600_data_ready_w))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsb_w))
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(PIA6821_TAG, pia6821_device, ca1_w))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bw12_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(bw12_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(bw12_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(PIA6821_TAG, pia6821_device, ca1_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bw12_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, bw12_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, bw12_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index 3a3328c6e4e..cbad8c05804 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -575,9 +575,9 @@ void bw2_state::machine_start()
MACHINE_CONFIG_START(bw2_state::bw2)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(bw2_mem)
- MCFG_CPU_IO_MAP(bw2_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(bw2_mem)
+ MCFG_DEVICE_IO_MAP(bw2_io)
// video hardware
MCFG_DEFAULT_LAYOUT(layout_lcd)
@@ -593,40 +593,40 @@ MACHINE_CONFIG_START(bw2_state::bw2)
// devices
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000)/4) // 8251 USART TXC, RXC
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_TAG, i8251_device, write_rxc))
MCFG_PIT8253_CLK1(11000) // LCD controller
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(I8253_TAG, pit8253_device, write_clk2))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(I8253_TAG, pit8253_device, write_clk2))
MCFG_PIT8253_CLK2(0) // Floppy /MTRON
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(bw2_state, mtron_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, bw2_state, mtron_w))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(bw2_state, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(bw2_state, ppi_pb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(bw2_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(bw2_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, bw2_state, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, bw2_state, ppi_pb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, bw2_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, bw2_state, ppi_pc_w))
MCFG_DEVICE_ADD(MSM6255_TAG, MSM6255, XTAL(16'000'000))
MCFG_DEVICE_ADDRESS_MAP(0, lcdc_map)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(bw2_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, bw2_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
MCFG_WD2797_ADD(WD2797_TAG, XTAL(16'000'000)/16)
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bw2_state, fdc_drq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, bw2_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", bw2_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, nullptr, bw2_state::floppy_formats)
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index 4b6e88b690c..8e810d25def 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -737,9 +737,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bwidow_state::bwidow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(bwidow_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bwidow_state, irq0_line_assert, CLOCK_3KHZ / 12)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(bwidow_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bwidow_state, irq0_line_assert, CLOCK_3KHZ / 12)
MCFG_ATARIVGEAROM_ADD("earom")
@@ -761,8 +761,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(bwidow_state::bwidowp)
bwidow(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bwidowp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bwidowp_map)
MCFG_WATCHDOG_ADD("watchdog")
MACHINE_CONFIG_END
@@ -785,8 +785,8 @@ MACHINE_CONFIG_START(bwidow_state::lunarbat)
gravitar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spacduel_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spacduel_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -798,8 +798,8 @@ MACHINE_CONFIG_START(bwidow_state::spacduel)
gravitar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spacduel_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spacduel_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index 6dbf809e1bc..3437775e06e 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -366,16 +366,16 @@ void bwing_state::bwing_postload()
MACHINE_CONFIG_START(bwing_state::bwing)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(bwp1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(bwp1_map)
- MCFG_CPU_ADD("sub", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(bwp2_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(bwp2_map)
- MCFG_CPU_ADD("audiocpu", DECO16, 2000000)
- MCFG_CPU_PROGRAM_MAP(bwp3_map)
- MCFG_CPU_IO_MAP(bwp3_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bwing_state, bwp3_interrupt, 1000)
+ MCFG_DEVICE_ADD("audiocpu", DECO16, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(bwp3_map)
+ MCFG_DEVICE_IO_MAP(bwp3_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bwing_state, bwp3_interrupt, 1000)
MCFG_QUANTUM_TIME(attotime::from_hz(18000)) // high enough?
@@ -405,13 +405,13 @@ MACHINE_CONFIG_START(bwing_state::bwing)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8912, XTAL(24'000'000) / 2 / 8)
+ MCFG_DEVICE_ADD("ay1", AY8912, XTAL(24'000'000) / 2 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL(24'000'000) / 2 / 8)
+ MCFG_DEVICE_ADD("ay2", AY8912, XTAL(24'000'000) / 2 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
+ MCFG_DEVICE_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index 60b5f3824a7..c3acde7233e 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -993,8 +993,8 @@ void by17_state::machine_reset()
MACHINE_CONFIG_START(by17_state::by17)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
- MCFG_CPU_PROGRAM_MAP(by17_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
+ MCFG_DEVICE_PROGRAM_MAP(by17_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup
@@ -1006,27 +1006,27 @@ MACHINE_CONFIG_START(by17_state::by17)
/* Devices */
MCFG_DEVICE_ADD("pia_u10", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by17_state, u10_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by17_state, u10_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(by17_state, u10_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by17_state, u10_b_w))
- MCFG_PIA_READCA1_HANDLER(READLINE(by17_state, u10_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(by17_state, u10_cb1_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by17_state, u10_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by17_state, u10_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by17_state, u10_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by17_state, u10_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, by17_state, u10_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by17_state, u10_b_w))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, by17_state, u10_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, by17_state, u10_cb1_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by17_state, u10_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by17_state, u10_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_z_freq", by17_state, timer_z_freq, attotime::from_hz(100)) // Mains Line Frequency * 2
MCFG_TIMER_DRIVER_ADD("timer_z_pulse", by17_state, timer_z_pulse) // Active pulse length from Zero Crossing detector
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by17_state, u11_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by17_state, u11_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by17_state, u11_b_w))
- MCFG_PIA_READCA1_HANDLER(READLINE(by17_state, u11_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(by17_state, u11_cb1_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by17_state, u11_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by17_state, u11_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by17_state, u11_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by17_state, u11_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by17_state, u11_b_w))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, by17_state, u11_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, by17_state, u11_cb1_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by17_state, u11_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by17_state, u11_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d_freq", by17_state, u11_timer, attotime::from_hz(317)) // 555 timer
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index 602adac17e8..ef66760ba81 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -1096,8 +1096,8 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(by35_state::by35)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
- MCFG_CPU_PROGRAM_MAP(by35_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
+ MCFG_DEVICE_PROGRAM_MAP(by35_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup
@@ -1109,27 +1109,27 @@ MACHINE_CONFIG_START(by35_state::by35)
/* Devices */
MCFG_DEVICE_ADD("pia_u10", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by35_state, u10_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by35_state, u10_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(by35_state, u10_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by35_state, u10_b_w))
- MCFG_PIA_READCA1_HANDLER(READLINE(by35_state, u10_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(by35_state, u10_cb1_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by35_state, u10_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by35_state, u10_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by35_state, u10_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by35_state, u10_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, by35_state, u10_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by35_state, u10_b_w))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, by35_state, u10_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, by35_state, u10_cb1_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by35_state, u10_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by35_state, u10_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_z_freq", by35_state, timer_z_freq, attotime::from_hz(100)) // Mains Line Frequency * 2
MCFG_TIMER_DRIVER_ADD("timer_z_pulse", by35_state, timer_z_pulse) // Active pulse length from Zero Crossing detector
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by35_state, u11_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by35_state, u11_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by35_state, u11_b_w))
- MCFG_PIA_READCA1_HANDLER(READLINE(by35_state, u11_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(by35_state, u11_cb1_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by35_state, u11_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by35_state, u11_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by35_state, u11_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by35_state, u11_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by35_state, u11_b_w))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, by35_state, u11_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, by35_state, u11_cb1_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by35_state, u11_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by35_state, u11_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d_freq", by35_state, u11_timer, attotime::from_hz(317)) // 555 timer
@@ -1138,13 +1138,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(as2888_state::as2888_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(as2888)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_MODIFY("pia_u11")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(as2888_state, u11_b_as2888_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(as2888_state, u11_cb2_as2888_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, as2888_state, u11_b_as2888_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, as2888_state, u11_cb2_as2888_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s_freq", as2888_state, timer_s, attotime::from_hz(353000)) // Inverter clock on AS-2888 sound board
MCFG_TIMER_DRIVER_ADD("timer_as2888", as2888_state, timer_as2888)
@@ -1160,8 +1160,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(by35_state::nuovo)
by35(config);
- MCFG_CPU_REPLACE("maincpu", M6802, 2000000) // ? MHz ? Large crystal next to CPU, schematics don't indicate speed.
- MCFG_CPU_PROGRAM_MAP(nuovo_map)
+ MCFG_DEVICE_REPLACE("maincpu", M6802, 2000000) // ? MHz ? Large crystal next to CPU, schematics don't indicate speed.
+ MCFG_DEVICE_PROGRAM_MAP(nuovo_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index a427761af69..7eb842fa50c 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -380,9 +380,9 @@ TIMER_DEVICE_CALLBACK_MEMBER( by6803_state::pia0_timer )
MACHINE_CONFIG_START(by6803_state::by6803)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(by6803_map)
- MCFG_CPU_IO_MAP(by6803_io)
+ MCFG_DEVICE_ADD("maincpu", M6803, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(by6803_map)
+ MCFG_DEVICE_IO_MAP(by6803_io)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -394,24 +394,24 @@ MACHINE_CONFIG_START(by6803_state::by6803)
/* Devices */
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by6803_state, pia0_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by6803_state, pia0_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(by6803_state, pia0_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by6803_state, pia0_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by6803_state, pia0_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by6803_state, pia0_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by6803_state, pia0_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by6803_state, pia0_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, by6803_state, pia0_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by6803_state, pia0_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by6803_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by6803_state, pia0_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6803_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6803_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_z", by6803_state, pia0_timer, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by6803_state, pia1_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by6803_state, pia1_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by6803_state, pia1_b_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by6803_state, pia1_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by6803_state, pia1_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by6803_state, pia1_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by6803_state, pia1_b_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by6803_state, pia1_cb2_w))
//MCFG_SPEAKER_STANDARD_MONO("speaker")
- //MCFG_SOUND_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK, 0) // Cheap Squeak Turbo
+ //MCFG_DEVICE_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK) // Cheap Squeak Turbo
//MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/by68701.cpp b/src/mame/drivers/by68701.cpp
index 42ebe38b41f..40eaa42f5ac 100644
--- a/src/mame/drivers/by68701.cpp
+++ b/src/mame/drivers/by68701.cpp
@@ -48,8 +48,8 @@ DRIVER_INIT_MEMBER(by68701_state,by68701)
MACHINE_CONFIG_START(by68701_state::by68701)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, 3579545/4)
- MCFG_CPU_PROGRAM_MAP(by68701_map)
+ MCFG_DEVICE_ADD("maincpu", M6803, 3579545/4)
+ MCFG_DEVICE_PROGRAM_MAP(by68701_map)
MACHINE_CONFIG_END
/*------------------
diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp
index 872f4fec269..997c2f65010 100644
--- a/src/mame/drivers/byvid.cpp
+++ b/src/mame/drivers/byvid.cpp
@@ -755,46 +755,46 @@ uint32_t by133_state::screen_update_granny(screen_device &screen, bitmap_rgb32 &
MACHINE_CONFIG_START(by133_state::babypac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545)/4) // no xtal, just 2 chips
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(3'579'545)/4) // no xtal, just 2 chips
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("videocpu", MC6809, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(video_map)
+ MCFG_DEVICE_ADD("videocpu", MC6809, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(video_map)
- MCFG_CPU_ADD("audiocpu", M6803, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", M6803, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia_u7", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by133_state, u7_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by133_state, u7_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(by133_state, u7_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, u7_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by133_state, u7_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, u7_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by133_state, u7_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by133_state, u7_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, by133_state, u7_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by133_state, u7_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by133_state, u7_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by133_state, u7_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("videocpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("videocpu", M6809_FIRQ_LINE))
MCFG_DEVICE_ADD("pia_u10", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by133_state, u10_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by133_state, u10_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(by133_state, u10_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, u10_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by133_state, u10_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, u10_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by133_state, u10_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by133_state, u10_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, by133_state, u10_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by133_state, u10_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by133_state, u10_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by133_state, u10_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("babypac1", by133_state, u10_timer, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(by133_state, u11_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(by133_state, u11_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(by133_state, u11_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(by133_state, u11_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(by133_state, u11_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(by133_state, u11_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, by133_state, u11_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, by133_state, u11_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, by133_state, u11_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, by133_state, u11_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, by133_state, u11_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, by133_state, u11_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("babypac2", by133_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
@@ -808,20 +808,20 @@ MACHINE_CONFIG_START(by133_state::babypac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", ZN429E, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // U32 (Vidiot) or U6 (Cheap Squeak)
+ MCFG_DEVICE_ADD("dac", ZN429E, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // U32 (Vidiot) or U6 (Cheap Squeak)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("beee")
- MCFG_SOUND_ADD("beeper", BEEP, 600)
+ MCFG_DEVICE_ADD("beeper", BEEP, 600)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "beee", 0.10)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(by133_state::granny)
babypac(config);
MCFG_DEVICE_REMOVE("videocpu")
- MCFG_CPU_ADD("videocpu", MC6809, XTAL(8'000'000)) // MC68B09P (XTAL value hard to read)
- MCFG_CPU_PROGRAM_MAP(granny_map)
+ MCFG_DEVICE_ADD("videocpu", MC6809, XTAL(8'000'000)) // MC68B09P (XTAL value hard to read)
+ MCFG_DEVICE_PROGRAM_MAP(granny_map)
MCFG_DEVICE_REMOVE("screen")
diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp
index a0bb0e31538..dd5eb8b5c7c 100644
--- a/src/mame/drivers/bzone.cpp
+++ b/src/mame/drivers/bzone.cpp
@@ -541,9 +541,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bzone_state::bzone_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, BZONE_MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(bzone_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(bzone_state, bzone_interrupt, BZONE_CLOCK_3KHZ / 12)
+ MCFG_DEVICE_ADD("maincpu", M6502, BZONE_MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(bzone_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bzone_state, bzone_interrupt, BZONE_CLOCK_3KHZ / 12)
MCFG_WATCHDOG_ADD("watchdog")
@@ -577,8 +577,8 @@ MACHINE_CONFIG_START(redbaron_state::redbaron)
bzone_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(redbaron_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(redbaron_map)
MCFG_ATARIVGEAROM_ADD("earom")
@@ -590,11 +590,11 @@ MACHINE_CONFIG_START(redbaron_state::redbaron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, 1500000)
- MCFG_POKEY_ALLPOT_R_CB(READ8(redbaron_state, redbaron_joy_r))
+ MCFG_DEVICE_ADD("pokey", POKEY, 1500000)
+ MCFG_POKEY_ALLPOT_R_CB(READ8(*this, redbaron_state, redbaron_joy_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("custom", REDBARON, 0)
+ MCFG_DEVICE_ADD("custom", REDBARON, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index cb7eb38c857..b377c40946b 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -160,9 +160,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(c10_state::c10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(c10_mem)
- MCFG_CPU_IO_MAP(c10_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(c10_mem)
+ MCFG_DEVICE_IO_MAP(c10_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 6afdb4147dc..ac95038ced5 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -1695,16 +1695,16 @@ void c128_state::machine_reset()
MACHINE_CONFIG_START(c128_state::ntsc)
// basic hardware
- MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL(14'318'181)*2/3.5/2)
- MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_ADD(Z80A_TAG, Z80, XTAL(14'318'181)*2/3.5/2)
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
MCFG_QUANTUM_PERFECT_CPU(Z80A_TAG)
- MCFG_CPU_ADD(M8502_TAG, M8502, XTAL(14'318'181)*2/3.5/8)
+ MCFG_DEVICE_ADD(M8502_TAG, M8502, XTAL(14'318'181)*2/3.5/8)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M8502_PORT_CALLBACKS(READ8(c128_state, cpu_r), WRITE8(c128_state, cpu_w))
+ MCFG_M8502_PORT_CALLBACKS(READ8(*this, c128_state, cpu_r), WRITE8(*this, c128_state, cpu_w))
MCFG_M8502_PORT_PULLS(0x07, 0x20)
- MCFG_CPU_PROGRAM_MAP(m8502_mem)
+ MCFG_DEVICE_PROGRAM_MAP(m8502_mem)
MCFG_QUANTUM_PERFECT_CPU(M8502_TAG)
// video hardware
@@ -1719,8 +1719,8 @@ MACHINE_CONFIG_START(c128_state::ntsc)
MCFG_DEVICE_ADD(MOS8564_TAG, MOS8564, XTAL(14'318'181)*2/3.5)
MCFG_MOS6566_CPU(M8502_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c128_state, vic_irq_w))
- MCFG_MOS8564_K_CALLBACK(WRITE8(c128_state, vic_k_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, c128_state, vic_irq_w))
+ MCFG_MOS8564_K_CALLBACK(WRITE8(*this, c128_state, vic_k_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_VIC_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -1734,67 +1734,67 @@ MACHINE_CONFIG_START(c128_state::ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)*2/3.5/8)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c128_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c128_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)*2/3.5/8)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c128_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c128_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
// devices
MCFG_DEVICE_ADD(MOS8722_TAG, MOS8722, XTAL(14'318'181)*2/3.5/8)
- MCFG_MOS8722_Z80EN_CALLBACK(WRITELINE(c128_state, mmu_z80en_w))
- MCFG_MOS8722_FSDIR_CALLBACK(WRITELINE(c128_state, mmu_fsdir_w))
- MCFG_MOS8722_GAME_CALLBACK(READLINE(c128_state, mmu_game_r))
- MCFG_MOS8722_EXROM_CALLBACK(READLINE(c128_state, mmu_exrom_r))
- MCFG_MOS8722_SENSE40_CALLBACK(READLINE(c128_state, mmu_sense40_r))
+ MCFG_MOS8722_Z80EN_CALLBACK(WRITELINE(*this, c128_state, mmu_z80en_w))
+ MCFG_MOS8722_FSDIR_CALLBACK(WRITELINE(*this, c128_state, mmu_fsdir_w))
+ MCFG_MOS8722_GAME_CALLBACK(READLINE(*this, c128_state, mmu_game_r))
+ MCFG_MOS8722_EXROM_CALLBACK(READLINE(*this, c128_state, mmu_exrom_r))
+ MCFG_MOS8722_SENSE40_CALLBACK(READLINE(*this, c128_state, mmu_sense40_r))
MCFG_MOS8721_ADD(MOS8721_TAG)
MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(14'318'181)*2/3.5/8)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia1_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c128_state, cia1_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c128_state, cia1_sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c128_state, cia1_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c128_state, cia1_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c128_state, cia1_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c128_state, cia1_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c128_state, cia1_sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c128_state, cia1_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia1_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c128_state, cia1_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia1_pb_w))
MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(14'318'181)*2/3.5/8)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia2_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c128_state, cia2_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c128_state, cia2_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c128_state, cia2_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c128_state, cia2_pb_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c128_state, cia2_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c128_state, cia2_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia2_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c128_state, cia2_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia2_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS8564_TAG, mos8564_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS8564_TAG, mos8564_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(14'318'181)*2/3.5/8, c64_expansion_cards, nullptr)
- MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c128_state, exp_irq_w))
- MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c128_state, exp_nmi_w))
- MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c128_state, exp_reset_w))
- MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(c128_state, exp_dma_cd_r))
- MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(c128_state, exp_dma_cd_w))
- MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(c128_state, exp_dma_w))
+ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, c128_state, exp_irq_w))
+ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(*this, c128_state, exp_nmi_w))
+ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(*this, c128_state, exp_reset_w))
+ MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(*this, c128_state, exp_dma_cd_r))
+ MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(*this, c128_state, exp_dma_cd_w))
+ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(*this, c128_state, exp_dma_w))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, c64_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(c128_state, exp_reset_w))
- MCFG_PET_USER_PORT_4_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_5_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_6_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_7_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_9_HANDLER(DEVWRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
- MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(c128_state, write_user_pb0))
- MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(c128_state, write_user_pb1))
- MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(c128_state, write_user_pb2))
- MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(c128_state, write_user_pb3))
- MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(c128_state, write_user_pb4))
- MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(c128_state, write_user_pb5))
- MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(c128_state, write_user_pb6))
- MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(c128_state, write_user_pb7))
- MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(c128_state, write_user_pa2))
+ MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(*this, c128_state, exp_reset_w))
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_9_HANDLER(WRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(*this, c128_state, write_user_pb0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(*this, c128_state, write_user_pb1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(*this, c128_state, write_user_pb2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(*this, c128_state, write_user_pb3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(*this, c128_state, write_user_pb4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(*this, c128_state, write_user_pb5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(*this, c128_state, write_user_pb6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(*this, c128_state, write_user_pb7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(*this, c128_state, write_user_pa2))
MCFG_QUICKLOAD_ADD("quickload", c128_state, cbm_c64, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -1831,8 +1831,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::c128)
ntsc(config);
MCFG_CBM_IEC_ADD("c1571")
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w))
- MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(*this, c128_state, iec_srq_w))
+ MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(*this, c128_state, iec_data_w))
MACHINE_CONFIG_END
@@ -1843,8 +1843,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::c128dcr)
ntsc(config);
MCFG_CBM_IEC_ADD("c1571") // TODO c1571cr
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w))
- MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(*this, c128_state, iec_srq_w))
+ MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(*this, c128_state, iec_data_w))
MACHINE_CONFIG_END
@@ -1855,8 +1855,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::c128d81)
ntsc(config);
MCFG_CBM_IEC_ADD(nullptr)
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w))
- MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(*this, c128_state, iec_srq_w))
+ MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(*this, c128_state, iec_data_w))
MCFG_DEVICE_MODIFY("iec8")
MCFG_DEVICE_SLOT_INTERFACE(c128d81_iec_devices, "c1563", false)
@@ -1869,16 +1869,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::pal)
// basic hardware
- MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL(17'734'472)*2/4.5/2)
- MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_ADD(Z80A_TAG, Z80, XTAL(17'734'472)*2/4.5/2)
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
MCFG_QUANTUM_PERFECT_CPU(Z80A_TAG)
- MCFG_CPU_ADD(M8502_TAG, M8502, XTAL(17'734'472)*2/4.5/8)
+ MCFG_DEVICE_ADD(M8502_TAG, M8502, XTAL(17'734'472)*2/4.5/8)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M8502_PORT_CALLBACKS(READ8(c128_state, cpu_r), WRITE8(c128_state, cpu_w))
+ MCFG_M8502_PORT_CALLBACKS(READ8(*this, c128_state, cpu_r), WRITE8(*this, c128_state, cpu_w))
MCFG_M8502_PORT_PULLS(0x07, 0x20)
- MCFG_CPU_PROGRAM_MAP(m8502_mem)
+ MCFG_DEVICE_PROGRAM_MAP(m8502_mem)
MCFG_QUANTUM_PERFECT_CPU(M8502_TAG)
// video hardware
@@ -1893,8 +1893,8 @@ MACHINE_CONFIG_START(c128_state::pal)
MCFG_DEVICE_ADD(MOS8566_TAG, MOS8566, XTAL(17'734'472)*2/4.5)
MCFG_MOS6566_CPU(M8502_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c128_state, vic_irq_w))
- MCFG_MOS8564_K_CALLBACK(WRITE8(c128_state, vic_k_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, c128_state, vic_irq_w))
+ MCFG_MOS8564_K_CALLBACK(WRITE8(*this, c128_state, vic_k_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_VIC_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -1908,67 +1908,67 @@ MACHINE_CONFIG_START(c128_state::pal)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)*2/4.5/8)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c128_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c128_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)*2/4.5/8)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c128_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c128_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
// devices
MCFG_DEVICE_ADD(MOS8722_TAG, MOS8722, XTAL(17'734'472)*2/4.5/8)
- MCFG_MOS8722_Z80EN_CALLBACK(WRITELINE(c128_state, mmu_z80en_w))
- MCFG_MOS8722_FSDIR_CALLBACK(WRITELINE(c128_state, mmu_fsdir_w))
- MCFG_MOS8722_GAME_CALLBACK(READLINE(c128_state, mmu_game_r))
- MCFG_MOS8722_EXROM_CALLBACK(READLINE(c128_state, mmu_exrom_r))
- MCFG_MOS8722_SENSE40_CALLBACK(READLINE(c128_state, mmu_sense40_r))
+ MCFG_MOS8722_Z80EN_CALLBACK(WRITELINE(*this, c128_state, mmu_z80en_w))
+ MCFG_MOS8722_FSDIR_CALLBACK(WRITELINE(*this, c128_state, mmu_fsdir_w))
+ MCFG_MOS8722_GAME_CALLBACK(READLINE(*this, c128_state, mmu_game_r))
+ MCFG_MOS8722_EXROM_CALLBACK(READLINE(*this, c128_state, mmu_exrom_r))
+ MCFG_MOS8722_SENSE40_CALLBACK(READLINE(*this, c128_state, mmu_sense40_r))
MCFG_MOS8721_ADD(MOS8721_TAG)
MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(17'734'472)*2/4.5/8)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia1_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(WRITELINE(c128_state, cia1_cnt_w))
- MCFG_MOS6526_SP_CALLBACK(WRITELINE(c128_state, cia1_sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c128_state, cia1_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c128_state, cia1_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c128_state, cia1_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c128_state, cia1_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(*this, c128_state, cia1_cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(*this, c128_state, cia1_sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c128_state, cia1_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia1_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c128_state, cia1_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia1_pb_w))
MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(17'734'472)*2/4.5/8)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c128_state, cia2_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c128_state, cia2_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c128_state, cia2_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c128_state, cia2_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c128_state, cia2_pb_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c128_state, cia2_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c128_state, cia2_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia2_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c128_state, cia2_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c128_state, cia2_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS8566_TAG, mos8566_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS8566_TAG, mos8566_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(17'734'472)*2/4.5/8, c64_expansion_cards, nullptr)
- MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c128_state, exp_irq_w))
- MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c128_state, exp_nmi_w))
- MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c128_state, exp_reset_w))
- MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(c128_state, exp_dma_cd_r))
- MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(c128_state, exp_dma_cd_w))
- MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(c128_state, exp_dma_w))
+ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, c128_state, exp_irq_w))
+ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(*this, c128_state, exp_nmi_w))
+ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(*this, c128_state, exp_reset_w))
+ MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(*this, c128_state, exp_dma_cd_r))
+ MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(*this, c128_state, exp_dma_cd_w))
+ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(*this, c128_state, exp_dma_w))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, c64_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(c128_state, exp_reset_w))
- MCFG_PET_USER_PORT_4_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_5_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_6_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_7_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_9_HANDLER(DEVWRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
- MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(c128_state, write_user_pb0))
- MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(c128_state, write_user_pb1))
- MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(c128_state, write_user_pb2))
- MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(c128_state, write_user_pb3))
- MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(c128_state, write_user_pb4))
- MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(c128_state, write_user_pb5))
- MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(c128_state, write_user_pb6))
- MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(c128_state, write_user_pb7))
- MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(c128_state, write_user_pa2))
+ MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(*this, c128_state, exp_reset_w))
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_9_HANDLER(WRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(*this, c128_state, write_user_pb0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(*this, c128_state, write_user_pb1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(*this, c128_state, write_user_pb2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(*this, c128_state, write_user_pb3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(*this, c128_state, write_user_pb4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(*this, c128_state, write_user_pb5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(*this, c128_state, write_user_pb6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(*this, c128_state, write_user_pb7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(*this, c128_state, write_user_pa2))
MCFG_QUICKLOAD_ADD("quickload", c128_state, cbm_c64, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -2005,8 +2005,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::c128pal)
pal(config);
MCFG_CBM_IEC_ADD("c1571")
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w))
- MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(*this, c128_state, iec_srq_w))
+ MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(*this, c128_state, iec_data_w))
MACHINE_CONFIG_END
@@ -2017,8 +2017,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c128_state::c128dcrp)
pal(config);
MCFG_CBM_IEC_ADD("c1571") // TODO c1571cr
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(c128_state, iec_srq_w))
- MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(c128_state, iec_data_w))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(*this, c128_state, iec_srq_w))
+ MCFG_CBM_IEC_BUS_DATA_CALLBACK(WRITELINE(*this, c128_state, iec_data_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index b9004fb54a1..25dc47a1d4b 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -1329,17 +1329,17 @@ void c64_state::machine_reset()
MACHINE_CONFIG_START(c64_state::ntsc)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(14'318'181)/14)
- MCFG_CPU_PROGRAM_MAP(c64_mem)
+ MCFG_DEVICE_ADD(M6510_TAG, M6510, XTAL(14'318'181)/14)
+ MCFG_DEVICE_PROGRAM_MAP(c64_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M6510_PORT_CALLBACKS(READ8(c64_state, cpu_r), WRITE8(c64_state, cpu_w))
+ MCFG_M6510_PORT_CALLBACKS(READ8(*this, c64_state, cpu_r), WRITE8(*this, c64_state, cpu_w))
MCFG_M6510_PORT_PULLS(0x17, 0xc8)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
MCFG_DEVICE_ADD(MOS6567_TAG, MOS6567, XTAL(14'318'181)/14)
MCFG_MOS6566_CPU(M6510_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -1351,63 +1351,63 @@ MACHINE_CONFIG_START(c64_state::ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)/14)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)/14)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c64_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA_TAG)
MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(14'318'181)/14)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia1_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64_state, cia1_pa_r))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia1_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c64_state, cia1_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c64_state, cia1_pa_r))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c64_state, cia1_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia1_pb_w))
MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(14'318'181)/14)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia2_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64_state, cia2_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia2_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia2_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia2_pb_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c64_state, cia2_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c64_state, cia2_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia2_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c64_state, cia2_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia2_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", WRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
MCFG_CBM_IEC_ADD("c1541")
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
- MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
+ MCFG_CBM_IEC_BUS_ATN_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6567_TAG, mos6567_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(14'318'181)/14, c64_expansion_cards, nullptr)
- MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c64_state, exp_irq_w))
- MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c64_state, exp_nmi_w))
- MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c64_state, exp_reset_w))
- MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(c64_state, read))
- MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(c64_state, write))
- MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(c64_state, exp_dma_w))
+ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, c64_state, exp_irq_w))
+ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(*this, c64_state, exp_nmi_w))
+ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(*this, c64_state, exp_reset_w))
+ MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(*this, c64_state, read))
+ MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(*this, c64_state, write))
+ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(*this, c64_state, exp_dma_w))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, c64_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(c64_state, exp_reset_w))
- MCFG_PET_USER_PORT_4_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_5_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_6_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_7_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_9_HANDLER(DEVWRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
- MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(c64_state, write_user_pb0))
- MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(c64_state, write_user_pb1))
- MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(c64_state, write_user_pb2))
- MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(c64_state, write_user_pb3))
- MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(c64_state, write_user_pb4))
- MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(c64_state, write_user_pb5))
- MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(c64_state, write_user_pb6))
- MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(c64_state, write_user_pb7))
- MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(c64_state, write_user_pa2))
+ MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(*this, c64_state, exp_reset_w))
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_9_HANDLER(WRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(*this, c64_state, write_user_pb0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(*this, c64_state, write_user_pb1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(*this, c64_state, write_user_pb2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(*this, c64_state, write_user_pb3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(*this, c64_state, write_user_pb4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(*this, c64_state, write_user_pb5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(*this, c64_state, write_user_pb6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(*this, c64_state, write_user_pb7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(*this, c64_state, write_user_pa2))
MCFG_QUICKLOAD_ADD("quickload", c64_state, cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -1445,8 +1445,8 @@ MACHINE_CONFIG_START(sx64_state::ntsc_sx)
ntsc(config);
// basic hardware
- MCFG_CPU_MODIFY(M6510_TAG)
- MCFG_M6510_PORT_CALLBACKS(READ8(sx64_state, cpu_r), WRITE8(sx64_state, cpu_w))
+ MCFG_DEVICE_MODIFY(M6510_TAG)
+ MCFG_M6510_PORT_CALLBACKS(READ8(*this, sx64_state, cpu_r), WRITE8(*this, sx64_state, cpu_w))
MCFG_M6510_PORT_PULLS(0x07, 0xc0)
// devices
@@ -1474,9 +1474,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c64c_state::ntsc_c)
ntsc(config);
- MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL(14'318'181)/14)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
+ MCFG_DEVICE_REPLACE(MOS6581_TAG, MOS8580, XTAL(14'318'181)/14)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c64_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -1487,17 +1487,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c64_state::pal)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(17'734'472)/18)
- MCFG_CPU_PROGRAM_MAP(c64_mem)
+ MCFG_DEVICE_ADD(M6510_TAG, M6510, XTAL(17'734'472)/18)
+ MCFG_DEVICE_PROGRAM_MAP(c64_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M6510_PORT_CALLBACKS(READ8(c64_state, cpu_r), WRITE8(c64_state, cpu_w))
+ MCFG_M6510_PORT_CALLBACKS(READ8(*this, c64_state, cpu_r), WRITE8(*this, c64_state, cpu_w))
MCFG_M6510_PORT_PULLS(0x17, 0xc8)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
MCFG_DEVICE_ADD(MOS6569_TAG, MOS6569, XTAL(17'734'472)/18)
MCFG_MOS6566_CPU(M6510_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -1509,64 +1509,64 @@ MACHINE_CONFIG_START(c64_state::pal)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)/18)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)/18)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c64_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA_TAG)
MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia1_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64_state, cia1_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia1_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c64_state, cia1_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c64_state, cia1_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia1_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c64_state, cia1_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia1_pb_w))
MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia2_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64_state, cia2_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia2_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia2_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia2_pb_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c64_state, cia2_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c64_state, cia2_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia2_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c64_state, cia2_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia2_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", WRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
MCFG_CBM_IEC_ADD("c1541")
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
- MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
+ MCFG_CBM_IEC_BUS_ATN_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6569_TAG, mos6569_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(17'734'472)/18, c64_expansion_cards, nullptr)
- MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c64_state, exp_irq_w))
- MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c64_state, exp_nmi_w))
- MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c64_state, exp_reset_w))
- MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(c64_state, read))
- MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(c64_state, write))
- MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(c64_state, exp_dma_w))
+ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, c64_state, exp_irq_w))
+ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(*this, c64_state, exp_nmi_w))
+ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(*this, c64_state, exp_reset_w))
+ MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(*this, c64_state, read))
+ MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(*this, c64_state, write))
+ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(*this, c64_state, exp_dma_w))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, c64_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(c64_state, exp_reset_w))
- MCFG_PET_USER_PORT_4_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_5_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_6_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_7_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_9_HANDLER(DEVWRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
- MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(c64_state, write_user_pb0))
- MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(c64_state, write_user_pb1))
- MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(c64_state, write_user_pb2))
- MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(c64_state, write_user_pb3))
- MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(c64_state, write_user_pb4))
- MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(c64_state, write_user_pb5))
- MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(c64_state, write_user_pb6))
- MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(c64_state, write_user_pb7))
- MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(c64_state, write_user_pa2))
+ MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(*this, c64_state, exp_reset_w))
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_9_HANDLER(WRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(*this, c64_state, write_user_pb0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(*this, c64_state, write_user_pb1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(*this, c64_state, write_user_pb2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(*this, c64_state, write_user_pb3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(*this, c64_state, write_user_pb4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(*this, c64_state, write_user_pb5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(*this, c64_state, write_user_pb6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(*this, c64_state, write_user_pb7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(*this, c64_state, write_user_pa2))
MCFG_QUICKLOAD_ADD("quickload", c64_state, cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -1594,8 +1594,8 @@ MACHINE_CONFIG_START(sx64_state::pal_sx)
pal(config);
// basic hardware
- MCFG_CPU_MODIFY(M6510_TAG)
- MCFG_M6510_PORT_CALLBACKS(READ8(sx64_state, cpu_r), WRITE8(sx64_state, cpu_w))
+ MCFG_DEVICE_MODIFY(M6510_TAG)
+ MCFG_M6510_PORT_CALLBACKS(READ8(*this, sx64_state, cpu_r), WRITE8(*this, sx64_state, cpu_w))
MCFG_M6510_PORT_PULLS(0x07, 0xc0)
// devices
@@ -1610,9 +1610,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c64c_state::pal_c)
pal(config);
- MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL(17'734'472)/18)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
+ MCFG_DEVICE_REPLACE(MOS6581_TAG, MOS8580, XTAL(17'734'472)/18)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c64_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -1623,17 +1623,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c64gs_state::pal_gs)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(17'734'472)/18)
- MCFG_CPU_PROGRAM_MAP(c64_mem)
+ MCFG_DEVICE_ADD(M6510_TAG, M6510, XTAL(17'734'472)/18)
+ MCFG_DEVICE_PROGRAM_MAP(c64_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M6510_PORT_CALLBACKS(READ8(c64gs_state, cpu_r), WRITE8(c64gs_state, cpu_w))
+ MCFG_M6510_PORT_CALLBACKS(READ8(*this, c64gs_state, cpu_r), WRITE8(*this, c64gs_state, cpu_w))
MCFG_M6510_PORT_PULLS(0x07, 0xc0)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
MCFG_DEVICE_ADD(MOS6569_TAG, MOS8565, XTAL(17'734'472)/18)
MCFG_MOS6566_CPU(M6510_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(c64_state, vic_irq_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, c64_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -1645,63 +1645,63 @@ MACHINE_CONFIG_START(c64gs_state::pal_gs)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS8580, XTAL(17'734'472)/18)
- MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS8580, XTAL(17'734'472)/18)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, c64_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, c64_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA_TAG)
MCFG_DEVICE_ADD(MOS6526_1_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia1_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64gs_state, cia1_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64gs_state, cia1_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia1_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c64_state, cia1_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c64gs_state, cia1_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia1_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c64gs_state, cia1_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia1_pb_w))
MCFG_DEVICE_ADD(MOS6526_2_TAG, MOS6526, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c64_state, cia2_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c64_state, cia2_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c64_state, cia2_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c64_state, cia2_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c64_state, cia2_pb_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c64_state, cia2_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c64_state, cia2_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia2_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c64_state, cia2_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c64_state, cia2_pb_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
MCFG_CBM_IEC_ADD(nullptr)
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
- MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(MOS6526_1_TAG, mos6526_device, flag_w))
+ MCFG_CBM_IEC_BUS_ATN_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6569_TAG, mos6569_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_C64_EXPANSION_SLOT_ADD(C64_EXPANSION_SLOT_TAG, XTAL(17'734'472)/18, c64_expansion_cards, nullptr)
- MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(c64_state, exp_irq_w))
- MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(c64_state, exp_nmi_w))
- MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(c64_state, exp_reset_w))
- MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(c64_state, read))
- MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(c64_state, write))
- MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(c64_state, exp_dma_w))
+ MCFG_C64_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, c64_state, exp_irq_w))
+ MCFG_C64_EXPANSION_SLOT_NMI_CALLBACK(WRITELINE(*this, c64_state, exp_nmi_w))
+ MCFG_C64_EXPANSION_SLOT_RESET_CALLBACK(WRITELINE(*this, c64_state, exp_reset_w))
+ MCFG_C64_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(*this, c64_state, read))
+ MCFG_C64_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(*this, c64_state, write))
+ MCFG_C64_EXPANSION_SLOT_DMA_CALLBACK(WRITELINE(*this, c64_state, exp_dma_w))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, c64_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(c64_state, exp_reset_w))
- MCFG_PET_USER_PORT_4_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_5_HANDLER(DEVWRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_6_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
- MCFG_PET_USER_PORT_7_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
- MCFG_PET_USER_PORT_9_HANDLER(DEVWRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
- MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(c64_state, write_user_pb0))
- MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(c64_state, write_user_pb1))
- MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(c64_state, write_user_pb2))
- MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(c64_state, write_user_pb3))
- MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(c64_state, write_user_pb4))
- MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(c64_state, write_user_pb5))
- MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(c64_state, write_user_pb6))
- MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(c64_state, write_user_pb7))
- MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(c64_state, write_user_pa2))
+ MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(*this, c64_state, exp_reset_w))
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(MOS6526_1_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, cnt_w))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, sp_w))
+ MCFG_PET_USER_PORT_9_HANDLER(WRITELINE(CBM_IEC_TAG, cbm_iec_device, atn_w))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(MOS6526_2_TAG, mos6526_device, flag_w))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(*this, c64_state, write_user_pb0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(*this, c64_state, write_user_pb1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(*this, c64_state, write_user_pb2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(*this, c64_state, write_user_pb3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(*this, c64_state, write_user_pb4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(*this, c64_state, write_user_pb5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(*this, c64_state, write_user_pb6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(*this, c64_state, write_user_pb7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(*this, c64_state, write_user_pa2))
MCFG_QUICKLOAD_ADD("quickload", c64_state, cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS)
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index ef870a3c4de..fec2185c107 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -686,23 +686,23 @@ WRITE_LINE_MEMBER(c65_state::cia0_irq)
MACHINE_CONFIG_START(c65_state::c65)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M4510, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(c65_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", c65_state, vic3_vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", M4510, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(c65_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", c65_state, vic3_vblank_irq)
MCFG_DEVICE_ADD("cia_0", MOS6526, MAIN_CLOCK)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, cia0_irq))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, cia0_porta_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, cia0_porta_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c65_state, cia0_portb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c65_state, cia0_portb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c65_state, cia0_irq))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c65_state, cia0_porta_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c65_state, cia0_porta_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, c65_state, cia0_portb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, c65_state, cia0_portb_w))
MCFG_DEVICE_ADD("cia_1", MOS6526, MAIN_CLOCK)
MCFG_MOS6526_TOD(60)
-// MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(c65_state, c65_cia1_interrupt))
-// MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(c65_state, c65_cia1_port_a_r))
-// MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(c65_state, c65_cia1_port_a_w))
+// MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, c65_state, c65_cia1_interrupt))
+// MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, c65_state, c65_cia1_port_a_r))
+// MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, c65_state, c65_cia1_port_a_w))
/* video hardware */
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index 353dd2c3fa5..348fbd8df98 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -256,9 +256,9 @@ void c80_state::machine_start()
MACHINE_CONFIG_START(c80_state::c80)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) /* U880D */
- MCFG_CPU_PROGRAM_MAP(c80_mem)
- MCFG_CPU_IO_MAP(c80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 2500000) /* U880D */
+ MCFG_DEVICE_PROGRAM_MAP(c80_mem)
+ MCFG_DEVICE_IO_MAP(c80_io)
MCFG_Z80_DAISY_CHAIN(c80_daisy_chain)
/* video hardware */
@@ -267,10 +267,10 @@ MACHINE_CONFIG_START(c80_state::c80)
/* devices */
MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, 2500000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(c80_state, pio1_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(c80_state, pio1_pa_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(c80_state, pio1_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(c80_state, pio1_brdy_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, c80_state, pio1_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, c80_state, pio1_pa_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, c80_state, pio1_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, c80_state, pio1_brdy_w))
MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, 2500000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp
index 65ba9a95074..8440f9511c5 100644
--- a/src/mame/drivers/c900.cpp
+++ b/src/mame/drivers/c900.cpp
@@ -116,10 +116,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(c900_state::c900)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8001, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_DATA_MAP(data_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z8001, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_DATA_MAP(data_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(c900_state, kbd_put))
@@ -130,14 +130,14 @@ MACHINE_CONFIG_START(c900_state::c900)
//MCFG_SCC8030_ADD("scc", 6'000'000, 326400, 0, 326400, 0)
/* Port A */
- //MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- //MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- //MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- //MCFG_Z80SCC_OUT_INT_CB(WRITELINE(lwriter_state, scc_int))
+ //MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ //MCFG_Z80SCC_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ //MCFG_Z80SCC_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ //MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, lwriter_state, scc_int))
//MCFG_RS232_PORT_ADD ("rs232a", default_rs232_devices, "terminal")
- //MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc8030_device, rxa_w))
- //MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc8030_device, ctsa_w))
+ //MCFG_RS232_RXD_HANDLER (WRITELINE ("scc", scc8030_device, rxa_w))
+ //MCFG_RS232_CTS_HANDLER (WRITELINE ("scc", scc8030_device, ctsa_w))
MACHINE_CONFIG_END
ROM_START( c900 )
diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp
index 598a84116a7..002b574cc10 100644
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@@ -504,13 +504,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(cabal_state::cabal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cabal_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cabal_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_OPCODES_MAP(sound_decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_OPCODES_MAP(sound_decrypted_opcodes_map)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_ROM("audiocpu")
@@ -531,26 +531,26 @@ MACHINE_CONFIG_START(cabal_state::cabal)
/* sound hardware */
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
+ MCFG_DEVICE_ADD("adpcm1", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
+ MCFG_DEVICE_ADD("adpcm2", SEIBU_ADPCM, 8000) /* it should use the msm5205 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cabal_state::cabalt)
cabal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(trackball_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(trackball_main_map)
MCFG_DEVICE_ADD("upd4701l", UPD4701A, 0)
MCFG_UPD4701_PORTX("IN0")
@@ -566,8 +566,8 @@ MACHINE_CONFIG_START(cabal_state::cabalbl2)
MCFG_DEVICE_REMOVE("sei80bu")
MCFG_DEVICE_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(cabalbl2_sound_map)
- MCFG_CPU_OPCODES_MAP(cabalbl2_predecrypted_opcodes_map)
+ MCFG_DEVICE_PROGRAM_MAP(cabalbl2_sound_map)
+ MCFG_DEVICE_OPCODES_MAP(cabalbl2_predecrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -575,23 +575,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cabal_state::cabalbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cabalbl_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cabal_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cabalbl_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cabal_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cabalbl_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cabalbl_sound_map)
/* there are 2x z80s for the ADPCM */
- MCFG_CPU_ADD("adpcm_1", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cabalbl_talk1_map)
- MCFG_CPU_IO_MAP(cabalbl_talk1_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(cabal_state, irq0_line_hold, 8000)
+ MCFG_DEVICE_ADD("adpcm_1", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cabalbl_talk1_map)
+ MCFG_DEVICE_IO_MAP(cabalbl_talk1_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cabal_state, irq0_line_hold, 8000)
- MCFG_CPU_ADD("adpcm_2", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cabalbl_talk2_map)
- MCFG_CPU_IO_MAP(cabalbl_talk2_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(cabal_state, irq0_line_hold, 8000)
+ MCFG_DEVICE_ADD("adpcm_2", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cabalbl_talk2_map)
+ MCFG_DEVICE_IO_MAP(cabalbl_talk2_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cabal_state, irq0_line_hold, 8000)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -622,11 +622,11 @@ MACHINE_CONFIG_START(cabal_state::cabalbl)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL(12'000'000)/32) /* verified on pcb (no resonator) */
+ MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(12'000'000)/32) /* verified on pcb (no resonator) */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL(12'000'000)/32) /* verified on pcb (no resonator)*/
+ MCFG_DEVICE_ADD("msm2", MSM5205, XTAL(12'000'000)/32) /* verified on pcb (no resonator)*/
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index ec1b1323451..e27c373ce78 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -359,10 +359,10 @@ INTERRUPT_GEN_MEMBER(cabaret_state::cabaret_interrupt)
MACHINE_CONFIG_START(cabaret_state::cabaret)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(cabaret_map)
- MCFG_CPU_IO_MAP(cabaret_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cabaret_state, cabaret_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cabaret_map)
+ MCFG_DEVICE_IO_MAP(cabaret_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cabaret_state, cabaret_interrupt)
MCFG_DEVICE_ADD("ppi1", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("BUTTONS2"))
@@ -371,11 +371,11 @@ MACHINE_CONFIG_START(cabaret_state::cabaret)
MCFG_DEVICE_ADD("ppi2", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("BUTTONS1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(cabaret_state, ppi2_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(cabaret_state, ppi2_c_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, cabaret_state, ppi2_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, cabaret_state, ppi2_c_w))
MCFG_DEVICE_ADD("ppi3", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(cabaret_state, nmi_and_coins_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, cabaret_state, nmi_and_coins_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0xf0))
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("DSW2"))
@@ -395,7 +395,7 @@ MACHINE_CONFIG_START(cabaret_state::cabaret)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp
index c56047b7688..7751c31ee69 100644
--- a/src/mame/drivers/calchase.cpp
+++ b/src/mame/drivers/calchase.cpp
@@ -678,15 +678,15 @@ void calchase_state::machine_reset()
}
MACHINE_CONFIG_START(calchase_state::calchase)
- MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU
- MCFG_CPU_PROGRAM_MAP(calchase_map)
- MCFG_CPU_IO_MAP(calchase_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU
+ MCFG_DEVICE_PROGRAM_MAP(calchase_map)
+ MCFG_DEVICE_IO_MAP(calchase_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, DEVICE_SELF, calchase_state, intel82439tx_pci_r, intel82439tx_pci_w)
@@ -697,28 +697,28 @@ MACHINE_CONFIG_START(calchase_state::calchase)
MCFG_DEVICE_REMOVE("rtc")
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(calchase_state::hostinv)
- MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU
- MCFG_CPU_PROGRAM_MAP(calchase_map)
- MCFG_CPU_IO_MAP(calchase_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU
+ MCFG_DEVICE_PROGRAM_MAP(calchase_map)
+ MCFG_DEVICE_IO_MAP(calchase_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "cdrom", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, DEVICE_SELF, calchase_state, intel82439tx_pci_r, intel82439tx_pci_w)
@@ -729,8 +729,8 @@ MACHINE_CONFIG_START(calchase_state::hostinv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/calcune.cpp b/src/mame/drivers/calcune.cpp
index ddde31472bf..218de396985 100644
--- a/src/mame/drivers/calcune.cpp
+++ b/src/mame/drivers/calcune.cpp
@@ -249,11 +249,11 @@ MACHINE_START_MEMBER(calcune_state,calcune)
}
MACHINE_CONFIG_START(calcune_state::calcune)
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
- MCFG_CPU_PROGRAM_MAP(calcune_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(calcune_state,genesis_int_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(calcune_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(calcune_state,genesis_int_callback)
- MCFG_CPU_ADD("z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
+ MCFG_DEVICE_ADD("z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
MCFG_DEVICE_DISABLE() /* no code is ever uploaded for the Z80, so it's unused here even if it is present on the PCB */
MCFG_MACHINE_START_OVERRIDE(calcune_state,calcune)
@@ -268,9 +268,9 @@ MACHINE_CONFIG_START(calcune_state::calcune)
MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0)
MCFG_SEGA315_5313_IS_PAL(false)
- MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(calcune_state, vdp_sndirqline_callback_genesis_z80));
- MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(calcune_state, vdp_lv6irqline_callback_genesis_68k));
- MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(calcune_state, vdp_lv4irqline_callback_genesis_68k));
+ MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, calcune_state, vdp_sndirqline_callback_genesis_z80));
+ MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, calcune_state, vdp_lv6irqline_callback_genesis_68k));
+ MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, calcune_state, vdp_lv4irqline_callback_genesis_68k));
MCFG_SEGA315_5313_ALT_TIMING(1);
MCFG_SEGA315_5313_PAL_WRITE_BASE(0x0000);
MCFG_SEGA315_5313_PALETTE("palette")
@@ -278,9 +278,9 @@ MACHINE_CONFIG_START(calcune_state::calcune)
MCFG_DEVICE_ADD("gen_vdp2", SEGA315_5313, 0)
MCFG_SEGA315_5313_IS_PAL(false)
// are these not hooked up or should they OR with the other lines?
-// MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(calcune_state, vdp_sndirqline_callback_genesis_z80));
-// MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(calcune_state, vdp_lv6irqline_callback_genesis_68k));
-// MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(calcune_state, vdp_lv4irqline_callback_genesis_68k));
+// MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, calcune_state, vdp_sndirqline_callback_genesis_z80));
+// MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, calcune_state, vdp_lv6irqline_callback_genesis_68k));
+// MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, calcune_state, vdp_lv4irqline_callback_genesis_68k));
MCFG_SEGA315_5313_ALT_TIMING(1);
MCFG_SEGA315_5313_PAL_WRITE_BASE(0x0c0);
MCFG_SEGA315_5313_PALETTE("palette")
@@ -295,12 +295,12 @@ MACHINE_CONFIG_START(calcune_state::calcune)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
/* sound hardware - VDP */
- MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
+ MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index 5d821c71f50..179aaf8cff0 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -2573,20 +2573,20 @@ WRITE_LINE_MEMBER(calomega_state::write_acia_clock)
MACHINE_CONFIG_START(calomega_state::sys903)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
- MCFG_CPU_PROGRAM_MAP(sys903_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", calomega_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(sys903_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", calomega_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(calomega_state,s903_mux_port_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_903a_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state,s903_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state,lamps_903a_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("SW1"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, lamps_903b_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, s903_mux_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, lamps_903b_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, s903_mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2607,16 +2607,16 @@ MACHINE_CONFIG_START(calomega_state::sys903)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */
+ MCFG_DEVICE_ADD("ay8912", AY8912, SND_CLOCK) /* confirmed */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW3")) /* from schematics */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* acia */
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(calomega_state, write_acia_tx))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, calomega_state, write_acia_tx))
MCFG_DEVICE_ADD("aciabaud", CLOCK, UART_CLOCK)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(calomega_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, calomega_state, write_acia_clock))
MACHINE_CONFIG_END
@@ -2625,11 +2625,11 @@ MACHINE_CONFIG_START(calomega_state::s903mod)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(s903mod_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(s903mod_map)
/* sound hardware */
- MCFG_SOUND_MODIFY("ay8912")
+ MCFG_DEVICE_MODIFY("ay8912")
MCFG_AY8910_PORT_A_READ_CB(NOOP)
MCFG_DEVICE_REMOVE("acia6850_0")
@@ -2643,18 +2643,18 @@ MACHINE_CONFIG_START(calomega_state::sys905)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sys905_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sys905_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(calomega_state,s905_mux_port_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state,lamps_905_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state,s905_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state,lamps_905_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, s905_mux_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, s905_mux_w))
/* sound hardware */
- MCFG_SOUND_MODIFY("ay8912")
+ MCFG_DEVICE_MODIFY("ay8912")
MCFG_AY8910_PORT_A_READ_CB(NOOP)
MCFG_DEVICE_REMOVE("acia6850_0")
@@ -2668,26 +2668,26 @@ MACHINE_CONFIG_START(calomega_state::sys906)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */
- MCFG_CPU_PROGRAM_MAP(sys906_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, CPU_CLOCK) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(sys906_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(calomega_state, pia0_ain_r))
- MCFG_PIA_READPB_HANDLER(READ8(calomega_state, pia0_bin_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, pia0_aout_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, pia0_bout_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(calomega_state, pia0_ca2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state, pia0_ain_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, calomega_state, pia0_bin_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, pia0_aout_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, pia0_bout_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, calomega_state, pia0_ca2_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA_READPA_HANDLER(READ8(calomega_state, pia1_ain_r))
- MCFG_PIA_READPB_HANDLER(READ8(calomega_state, pia1_bin_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(calomega_state, pia1_aout_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(calomega_state, pia1_bout_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, calomega_state, pia1_ain_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, calomega_state, pia1_bin_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, calomega_state, pia1_aout_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, calomega_state, pia1_bout_w))
MCFG_GFXDECODE_MODIFY("gfxdecode", sys906)
/* sound hardware */
- MCFG_SOUND_MODIFY("ay8912")
+ MCFG_DEVICE_MODIFY("ay8912")
MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW2")) /* From PCB pic. Value is stored at $0539 */
MCFG_DEVICE_REMOVE("acia6850_0")
diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp
index ae6a92f1605..e58b03e2960 100644
--- a/src/mame/drivers/calorie.cpp
+++ b/src/mame/drivers/calorie.cpp
@@ -466,15 +466,15 @@ void calorie_state::machine_reset()
MACHINE_CONFIG_START(calorie_state::calorie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(calorie_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", calorie_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(calorie_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", calorie_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,3000000) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(calorie_sound_map)
- MCFG_CPU_IO_MAP(calorie_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(calorie_state, irq0_line_hold, 64)
+ MCFG_DEVICE_ADD("audiocpu", Z80,3000000) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(calorie_sound_map)
+ MCFG_DEVICE_IO_MAP(calorie_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(calorie_state, irq0_line_hold, 64)
/* video hardware */
@@ -495,22 +495,22 @@ MACHINE_CONFIG_START(calorie_state::calorie)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", YM2149, 1500000)
+ MCFG_DEVICE_ADD("ay1", YM2149, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
- MCFG_SOUND_ADD("ay2", YM2149, 1500000)
+ MCFG_DEVICE_ADD("ay2", YM2149, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
- MCFG_SOUND_ADD("ay3", YM2149, 1500000)
+ MCFG_DEVICE_ADD("ay3", YM2149, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(calorie_state::caloriee)
calorie(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0004,4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(calorie_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", calorie_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_317_0004,4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(calorie_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", calorie_state, irq0_line_hold)
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index 9503e218318..07a7c9670a6 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -848,7 +848,7 @@ MACHINE_CONFIG_START(camplynx_state::lynx_common)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.375) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.375) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
@@ -866,9 +866,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(camplynx_state::lynx48k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 24_MHz_XTAL / 6)
- MCFG_CPU_PROGRAM_MAP(lynx48k_mem)
- MCFG_CPU_IO_MAP(lynx48k_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 24_MHz_XTAL / 6)
+ MCFG_DEVICE_PROGRAM_MAP(lynx48k_mem)
+ MCFG_DEVICE_IO_MAP(lynx48k_io)
MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx48k)
@@ -898,8 +898,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(camplynx_state::lynx96k)
lynx48k(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(lynx96k_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(lynx96k_io)
lynx_disk(config);
@@ -911,9 +911,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(camplynx_state::lynx128k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 24_MHz_XTAL / 4)
- MCFG_CPU_PROGRAM_MAP(lynx128k_mem)
- MCFG_CPU_IO_MAP(lynx128k_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 24_MHz_XTAL / 4)
+ MCFG_DEVICE_PROGRAM_MAP(lynx128k_mem)
+ MCFG_DEVICE_IO_MAP(lynx128k_io)
MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx128k)
diff --git a/src/mame/drivers/candela.cpp b/src/mame/drivers/candela.cpp
index e116df387cc..93328a61844 100644
--- a/src/mame/drivers/candela.cpp
+++ b/src/mame/drivers/candela.cpp
@@ -667,15 +667,15 @@ DEVICE_INPUT_DEFAULTS_END
#define CAN09T_ACIA_CLOCK (CAN09T_BAUDGEN_CLOCK / 12)
MACHINE_CONFIG_START(can09t_state::can09t)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'915'200)) // IPL crystal
- MCFG_CPU_PROGRAM_MAP(can09t_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'915'200)) // IPL crystal
+ MCFG_DEVICE_PROGRAM_MAP(can09t_map)
/* --PIA inits----------------------- */
MCFG_DEVICE_ADD(SYSPIA_TAG, PIA6821, 0) // CPU board
- MCFG_PIA_READPA_HANDLER(READ8(can09t_state, syspia_A_r))
- MCFG_PIA_READPB_HANDLER(READ8(can09t_state, syspia_B_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(can09t_state, syspia_B_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(can09t_state, syspia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, can09t_state, syspia_A_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, can09t_state, syspia_B_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, can09t_state, syspia_B_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, can09t_state, syspia_cb2_w))
/* 0xE1FB 0xB112 (SYSPIA Control A) = 0x00 - Channel A IRQ disabled */
/* 0xE1FB 0xB113 (SYSPIA Control B) = 0x00 - Channel B IRQ disabled */
/* 0xE203 0xB110 (SYSPIA DDR A) = 0x00 - Port A all inputs */
@@ -684,7 +684,7 @@ MACHINE_CONFIG_START(can09t_state::can09t)
/* 0xE20A 0xB113 (SYSPIA Control B) = 0x34 - CB2 is low and lock DDRB */
/* 0xE20E 0xB111 (SYSPIA port B) = 0x10 - Data to port B */
MCFG_DEVICE_ADD(USRPIA_TAG, PIA6821, 0) // CPU board
- MCFG_PIA_CB2_HANDLER(WRITELINE(can09t_state, usrpia_cb2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, can09t_state, usrpia_cb2_w))
/* 0xE212 0xB122 (USRPIA Control A) = 0x00 - Channel A IRQ disabled */
/* 0xE212 0xB123 (USRPIA Control B) = 0x00 - Channel B IRQ disabled */
/* 0xE215 0xB120 (USRPIA DDR A) = 0x00 - Port A all inputs */
@@ -698,21 +698,21 @@ MACHINE_CONFIG_START(can09t_state::can09t)
/* RS232 usage: mame can09t -window -debug -rs232 terminal */
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE ("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE ("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE ("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE ("acia", acia6850_device, write_cts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE ("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE ("rs232", rs232_port_device, write_rts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE ("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE ("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD ("acia_clock", CLOCK, CAN09T_ACIA_CLOCK)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE (can09t_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE (*this, can09t_state, write_acia_clock))
MACHINE_CONFIG_END
#define CAN09_X1_CLOCK XTAL(22'118'400) /* UKI 22118.40 Khz */
#define CAN09_CPU_CLOCK (CAN09_X1_CLOCK / 16) /* ~1.38MHz Divider needs to be check but is the most likelly */
MACHINE_CONFIG_START(can09_state::can09)
- MCFG_CPU_ADD("maincpu", MC6809E, CAN09_CPU_CLOCK) // MC68A09EP
- MCFG_CPU_PROGRAM_MAP(can09_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, CAN09_CPU_CLOCK) // MC68A09EP
+ MCFG_DEVICE_PROGRAM_MAP(can09_map)
/* RAM banks */
MCFG_RAM_ADD(RAM_TAG)
@@ -764,11 +764,11 @@ MACHINE_CONFIG_START(can09_state::can09)
/* --PIA inits----------------------- */
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0) // CPU board
- MCFG_PIA_READPA_HANDLER(READ8(can09_state, pia1_A_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(can09_state, pia1_A_w))
- MCFG_PIA_READPB_HANDLER(READ8(can09_state, pia1_B_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(can09_state, pia1_B_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(can09_state, pia1_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, can09_state, pia1_A_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, can09_state, pia1_A_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, can09_state, pia1_B_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, can09_state, pia1_B_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, can09_state, pia1_cb2_w))
/* 0xFF7D 0xE035 (PIA1 Control A) = 0x00 - Channel A IRQ disabled */
/* 0xFF81 0xE037 (PIA1 Control B) = 0x00 - Channel A IRQ disabled */
/* 0xFF85 0xE034 (PIA1 DDR A) = 0x1F - Port A mixed mode */
diff --git a/src/mame/drivers/canon_s80.cpp b/src/mame/drivers/canon_s80.cpp
index a4e6f68320d..56bb3e094be 100644
--- a/src/mame/drivers/canon_s80.cpp
+++ b/src/mame/drivers/canon_s80.cpp
@@ -41,8 +41,8 @@ void canons80_state::canons80_map(address_map &map)
MACHINE_CONFIG_START(canons80_state::canons80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6301, 5000000) /* hd63a01xop 5 MHz guessed: TODO: check on PCB */
- MCFG_CPU_PROGRAM_MAP(canons80_map)
+ MCFG_DEVICE_ADD("maincpu", HD6301, 5000000) /* hd63a01xop 5 MHz guessed: TODO: check on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(canons80_map)
MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(canons80_state, canons80)
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 66f95ce0792..228716baddd 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -241,17 +241,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(canyon_state::canyon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000) / 16)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", canyon_state, nmi_line_pulse)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'096'000) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", canyon_state, nmi_line_pulse)
MCFG_DEVICE_ADD("outlatch", F9334, 0) // C7
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<CANYON_WHISTLE1_EN>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<CANYON_WHISTLE2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("discrete", discrete_device, write_line<CANYON_WHISTLE1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<CANYON_WHISTLE2_EN>))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led0")) // 1 PLAYER LAMP
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led1")) // 2 PLAYER LAMP
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<CANYON_ATTRACT1_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<CANYON_ATTRACT2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<CANYON_ATTRACT1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<CANYON_ATTRACT2_EN>))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -272,7 +272,7 @@ MACHINE_CONFIG_START(canyon_state::canyon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(canyon)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index bd3cb473447..15099f19cc7 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -319,15 +319,15 @@ void capbowl_state::machine_reset()
MACHINE_CONFIG_START(capbowl_state::capbowl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP
- MCFG_CPU_PROGRAM_MAP(capbowl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", capbowl_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP
+ MCFG_DEVICE_PROGRAM_MAP(capbowl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", capbowl_state, interrupt)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6) * 15.5) // ~0.3s
- MCFG_CPU_ADD("audiocpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, MASTER_CLOCK / 4) // MC68B09EP
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
// MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(100000.0, 100000.0, 0.1e-6) * 15.5) // TODO
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
@@ -351,16 +351,16 @@ MACHINE_CONFIG_START(capbowl_state::capbowl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 2)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK / 2)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
- MCFG_AY8910_PORT_A_READ_CB(DEVREADLINE("ticket", ticket_dispenser_device, line_r)) MCFG_DEVCB_BIT(7)
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITELINE("ticket", ticket_dispenser_device, motor_w)) MCFG_DEVCB_BIT(7) /* Also a status LED. See memory map above */
+ MCFG_AY8910_PORT_A_READ_CB(READLINE("ticket", ticket_dispenser_device, line_r)) MCFG_DEVCB_BIT(7)
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITELINE("ticket", ticket_dispenser_device, motor_w)) MCFG_DEVCB_BIT(7) /* Also a status LED. See memory map above */
MCFG_SOUND_ROUTE(0, "speaker", 0.07)
MCFG_SOUND_ROUTE(1, "speaker", 0.07)
MCFG_SOUND_ROUTE(2, "speaker", 0.07)
MCFG_SOUND_ROUTE(3, "speaker", 0.75)
- MCFG_SOUND_ADD("dac", DAC0832, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC0832, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -371,8 +371,8 @@ MACHINE_CONFIG_START(capbowl_state::bowlrama)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bowlrama_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bowlrama_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/capcom.cpp b/src/mame/drivers/capcom.cpp
index 9cbc14466ad..0fd1f2a7c20 100644
--- a/src/mame/drivers/capcom.cpp
+++ b/src/mame/drivers/capcom.cpp
@@ -48,8 +48,8 @@ DRIVER_INIT_MEMBER(capcom_state,capcom)
MACHINE_CONFIG_START(capcom_state::capcom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16670000) // M68306
- MCFG_CPU_PROGRAM_MAP(capcom_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16670000) // M68306
+ MCFG_DEVICE_PROGRAM_MAP(capcom_map)
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp
index 93151990c6f..ba373f7609b 100644
--- a/src/mame/drivers/capr1.cpp
+++ b/src/mame/drivers/capr1.cpp
@@ -201,9 +201,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(capr1_state::cspin2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) // clock frequency unknown
- MCFG_CPU_PROGRAM_MAP(cspin2_map)
- //MCFG_CPU_PERIODIC_INT_DRIVER(capr1_state, nmi_line_pulse, 20)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) // clock frequency unknown
+ MCFG_DEVICE_PROGRAM_MAP(cspin2_map)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(capr1_state, nmi_line_pulse, 20)
MCFG_DEVICE_ADD("te7750", TE7750, 0) // guess
MCFG_TE7750_IOS_CB(CONSTANT(7))
@@ -215,14 +215,14 @@ MACHINE_CONFIG_START(capr1_state::cspin2)
MCFG_TE7750_IN_PORT6_CB(IOPORT("IN6"))
MCFG_TE7750_IN_PORT7_CB(IOPORT("IN7"))
MCFG_TE7750_IN_PORT8_CB(IOPORT("IN8"))
- MCFG_TE7750_OUT_PORT9_CB(WRITE8(capr1_state, output_w))
+ MCFG_TE7750_OUT_PORT9_CB(WRITE8(*this, capr1_state, output_w))
/* no video! */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2203, 4000000) // clock frequency unknown
+ MCFG_DEVICE_ADD("ym", YM2203, 4000000) // clock frequency unknown
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("maincpu", 0))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("INB"))
diff --git a/src/mame/drivers/caprcyc.cpp b/src/mame/drivers/caprcyc.cpp
index 0c9be4059b7..5a693c1d2d2 100644
--- a/src/mame/drivers/caprcyc.cpp
+++ b/src/mame/drivers/caprcyc.cpp
@@ -66,8 +66,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(caprcyc_state::caprcyc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", VR4300BE, 100000000) // cpu configuration is unknown
- MCFG_CPU_PROGRAM_MAP(caprcyc_map)
+ MCFG_DEVICE_ADD("maincpu", VR4300BE, 100000000) // cpu configuration is unknown
+ MCFG_DEVICE_PROGRAM_MAP(caprcyc_map)
/* no video! */
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index 58fcbc2a981..cedf996be91 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -319,13 +319,13 @@ PALETTE_INIT_MEMBER(cardline_state, cardline)
MACHINE_CONFIG_START(cardline_state::cardline)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", I80C32, MASTER_CLOCK)
MCFG_MCS51_PORT1_CONFIG(0x10)
- MCFG_CPU_PROGRAM_MAP(mem_prg)
- MCFG_CPU_IO_MAP(mem_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(cardline_state, hsync_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(cardline_state, video_w))
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", cardline_state, irq1_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(mem_prg)
+ MCFG_DEVICE_IO_MAP(mem_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cardline_state, hsync_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, cardline_state, video_w))
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cardline_state, irq1_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -346,8 +346,8 @@ MACHINE_CONFIG_START(cardline_state::cardline)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(cardline_state, crtc_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(cardline_state, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(cardline_state, hsync_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(cardline_state, vsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, cardline_state, hsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, cardline_state, vsync_changed))
MCFG_DEFAULT_LAYOUT(layout_cardline)
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index fd987a94566..a2727cd5240 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -358,13 +358,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(carjmbre_state::carjmbre)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", carjmbre_state, vblank_nmi)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", carjmbre_state, vblank_nmi)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -384,10 +384,10 @@ MACHINE_CONFIG_START(carjmbre_state::carjmbre)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/6/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/6/2)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'432'000)/6/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp
index 6370d0f7a8b..de2a375a8e8 100644
--- a/src/mame/drivers/carpolo.cpp
+++ b/src/mame/drivers/carpolo.cpp
@@ -235,36 +235,36 @@ GFXDECODE_END
MACHINE_CONFIG_START(carpolo_state::carpolo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000)/12) /* 940.75 kHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", carpolo_state, carpolo_timer_interrupt) /* this not strictly VBLANK,
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(11'289'000)/12) /* 940.75 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", carpolo_state, carpolo_timer_interrupt) /* this not strictly VBLANK,
but it's supposed to happen 60
times a sec, so it's a good place */
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(carpolo_state, pia_0_port_b_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(carpolo_state, pia_0_port_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(carpolo_state, pia_0_port_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(carpolo_state, coin1_interrupt_clear_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(carpolo_state,coin2_interrupt_clear_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, carpolo_state, pia_0_port_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, carpolo_state, pia_0_port_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, carpolo_state, pia_0_port_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, carpolo_state, coin1_interrupt_clear_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, carpolo_state,coin2_interrupt_clear_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(carpolo_state, pia_1_port_a_r))
- MCFG_PIA_READPB_HANDLER(READ8(carpolo_state, pia_1_port_b_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(carpolo_state, coin3_interrupt_clear_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(carpolo_state, coin4_interrupt_clear_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, carpolo_state, pia_1_port_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, carpolo_state, pia_1_port_b_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, carpolo_state, coin3_interrupt_clear_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, carpolo_state, coin4_interrupt_clear_w))
MCFG_DEVICE_ADD("7474_2s_1", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(carpolo_state, carpolo_7474_2s_1_q_cb))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, carpolo_state, carpolo_7474_2s_1_q_cb))
MCFG_DEVICE_ADD("7474_2s_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(carpolo_state, carpolo_7474_2s_2_q_cb))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, carpolo_state, carpolo_7474_2s_2_q_cb))
MCFG_DEVICE_ADD("7474_2u_1", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(carpolo_state, carpolo_7474_2u_1_q_cb))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, carpolo_state, carpolo_7474_2u_1_q_cb))
MCFG_DEVICE_ADD("7474_2u_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(carpolo_state, carpolo_7474_2u_2_q_cb))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, carpolo_state, carpolo_7474_2u_2_q_cb))
MCFG_DEVICE_ADD("7474_1f_1", TTL7474, 0)
MCFG_DEVICE_ADD("7474_1f_2", TTL7474, 0)
@@ -279,8 +279,8 @@ MACHINE_CONFIG_START(carpolo_state::carpolo)
MCFG_74148_OUTPUT_CB(carpolo_state, ttl74148_3s_cb)
MCFG_TTL153_ADD("74153_1k")
- MCFG_TTL153_ZA_CB(WRITELINE(carpolo_state, ls153_za_w)) // pia1 pb5
- MCFG_TTL153_ZB_CB(WRITELINE(carpolo_state, ls153_zb_w)) // pia1 pb4
+ MCFG_TTL153_ZA_CB(WRITELINE(*this, carpolo_state, ls153_za_w)) // pia1 pb5
+ MCFG_TTL153_ZB_CB(WRITELINE(*this, carpolo_state, ls153_zb_w)) // pia1 pb4
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -289,7 +289,7 @@ MACHINE_CONFIG_START(carpolo_state::carpolo)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 239, 0, 255)
MCFG_SCREEN_UPDATE_DRIVER(carpolo_state, screen_update_carpolo)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(carpolo_state, screen_vblank_carpolo))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, carpolo_state, screen_vblank_carpolo))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", carpolo)
diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp
index 2737d5e9b1d..b2617c98156 100644
--- a/src/mame/drivers/carrera.cpp
+++ b/src/mame/drivers/carrera.cpp
@@ -315,9 +315,9 @@ PALETTE_INIT_MEMBER(carrera_state, carrera)
MACHINE_CONFIG_START(carrera_state::carrera)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6)
- MCFG_CPU_PROGRAM_MAP(carrera_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK / 6)
+ MCFG_DEVICE_PROGRAM_MAP(carrera_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -340,10 +340,10 @@ MACHINE_CONFIG_START(carrera_state::carrera)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/12)
/* these are set as input, but I have no idea which input port it uses is for the AY */
- MCFG_AY8910_PORT_A_READ_CB(READ8(carrera_state, unknown_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(carrera_state, unknown_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, carrera_state, unknown_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, carrera_state, unknown_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp
index 4589d603642..35c8e239c02 100644
--- a/src/mame/drivers/casloopy.cpp
+++ b/src/mame/drivers/casloopy.cpp
@@ -519,11 +519,11 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart )
MACHINE_CONFIG_START(casloopy_state::casloopy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",SH2A,8000000)
- MCFG_CPU_PROGRAM_MAP(casloopy_map)
+ MCFG_DEVICE_ADD("maincpu",SH2A,8000000)
+ MCFG_DEVICE_PROGRAM_MAP(casloopy_map)
-// MCFG_CPU_ADD("subcpu",V60,8000000)
-// MCFG_CPU_PROGRAM_MAP(casloopy_sub_map)
+// MCFG_DEVICE_ADD("subcpu",V60,8000000)
+// MCFG_DEVICE_PROGRAM_MAP(casloopy_sub_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/castle.cpp b/src/mame/drivers/castle.cpp
index 25769b94c91..87a15b55eef 100644
--- a/src/mame/drivers/castle.cpp
+++ b/src/mame/drivers/castle.cpp
@@ -84,11 +84,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(castle_state::castle_V1rvE)
- MCFG_CPU_ADD("maincpu", HD6303Y, 1000000)
- MCFG_CPU_PROGRAM_MAP(V1rvE_mastermap)
+ MCFG_DEVICE_ADD("maincpu", HD6303Y, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(V1rvE_mastermap)
- MCFG_CPU_ADD("slavecpu", HD6303Y, 1000000)
- MCFG_CPU_PROGRAM_MAP(V1rvE_slavemap)
+ MCFG_DEVICE_ADD("slavecpu", HD6303Y, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(V1rvE_slavemap)
MACHINE_CONFIG_END
@@ -100,8 +100,8 @@ void castle_state::V2rvA_map(address_map &map)
MACHINE_CONFIG_START(castle_state::castle_V2rvA)
- MCFG_CPU_ADD("maincpu", HD6303Y, 1000000)
- MCFG_CPU_PROGRAM_MAP(V2rvA_map)
+ MCFG_DEVICE_ADD("maincpu", HD6303Y, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(V2rvA_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index aeeb6cfd476..84aa917e203 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -334,10 +334,10 @@ PALETTE_INIT_MEMBER(caswin_state, caswin)
MACHINE_CONFIG_START(caswin_state::vvillage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(vvillage_mem)
- MCFG_CPU_IO_MAP(vvillage_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", caswin_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(vvillage_mem)
+ MCFG_DEVICE_IO_MAP(vvillage_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", caswin_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -356,7 +356,7 @@ MACHINE_CONFIG_START(caswin_state::vvillage)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 4000000 / 4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 4000000 / 4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp
index 35224150507..a1feae3198c 100644
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@@ -1058,9 +1058,9 @@ WRITE_LINE_MEMBER(cat_state::prn_ack_ff) // switch the flipflop state on the ris
MACHINE_CONFIG_START(cat_state::cat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(19'968'000)/4)
- MCFG_CPU_PROGRAM_MAP(cat_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cat_state,cat_int_ack)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(19'968'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(cat_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cat_state,cat_int_ack)
MCFG_MACHINE_START_OVERRIDE(cat_state,cat)
MCFG_MACHINE_RESET_OVERRIDE(cat_state,cat)
@@ -1079,18 +1079,18 @@ MACHINE_CONFIG_START(cat_state::cat)
MCFG_VIDEO_START_OVERRIDE(cat_state,cat)
MCFG_DEVICE_ADD( "duartn68681", MC68681, (XTAL(19'968'000)*2)/11 ) // duart is normally clocked by 3.6864mhz xtal, but cat seemingly uses a divider from the main xtal instead which probably yields 3.63054545Mhz. There is a trace to cut and a mounting area to allow using an actual 3.6864mhz xtal if you so desire
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(cat_state, cat_duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txa))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(cat_state, cat_duart_txb))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(cat_state, cat_duart_output))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, cat_state, cat_duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, cat_state, cat_duart_txa))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, cat_state, cat_duart_txb))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, cat_state, cat_duart_output))
MCFG_CENTRONICS_ADD("ctx", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(cat_state, prn_ack_ff))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("duartn68681", mc68681_device, ip4_w)) MCFG_DEVCB_XOR(1)
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, cat_state, prn_ack_ff))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("duartn68681", mc68681_device, ip4_w)) MCFG_DEVCB_XOR(1)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("ctx_data_out", "ctx")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index 475b963c33e..11ffacc8b10 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -2097,9 +2097,9 @@ MACHINE_RESET_MEMBER(cave_state,cave)
MACHINE_CONFIG_START(cave_state::dfeveron)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(dfeveron_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(dfeveron_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2124,8 +2124,8 @@ MACHINE_CONFIG_START(cave_state::dfeveron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2138,9 +2138,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::ddonpach)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(ddonpach_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(ddonpach_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2165,8 +2165,8 @@ MACHINE_CONFIG_START(cave_state::ddonpach)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2178,9 +2178,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::donpachi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(donpachi_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(donpachi_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2225,9 +2225,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::esprade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(esprade_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(esprade_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2252,8 +2252,8 @@ MACHINE_CONFIG_START(cave_state::esprade)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2265,9 +2265,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::gaia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(gaia_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(gaia_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2293,8 +2293,8 @@ MACHINE_CONFIG_START(cave_state::gaia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2306,9 +2306,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::guwange)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(guwange_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(guwange_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2333,8 +2333,8 @@ MACHINE_CONFIG_START(cave_state::guwange)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2345,13 +2345,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::hotdogst)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(hotdogst_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(hotdogst_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 32_MHz_XTAL/8)
- MCFG_CPU_PROGRAM_MAP(hotdogst_sound_map)
- MCFG_CPU_IO_MAP(hotdogst_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 32_MHz_XTAL/8)
+ MCFG_DEVICE_PROGRAM_MAP(hotdogst_sound_map)
+ MCFG_DEVICE_IO_MAP(hotdogst_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2379,7 +2379,7 @@ MACHINE_CONFIG_START(cave_state::hotdogst)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, 32_MHz_XTAL/8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 32_MHz_XTAL/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
@@ -2399,9 +2399,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::korokoro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(korokoro_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(korokoro_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2426,15 +2426,15 @@ MACHINE_CONFIG_START(cave_state::korokoro)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::crusherm)
korokoro(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(crusherm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(crusherm_map)
MACHINE_CONFIG_END
@@ -2445,13 +2445,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::mazinger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mazinger_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mazinger_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 4_MHz_XTAL) // Bidirectional communication
- MCFG_CPU_PROGRAM_MAP(mazinger_sound_map)
- MCFG_CPU_IO_MAP(mazinger_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4_MHz_XTAL) // Bidirectional communication
+ MCFG_DEVICE_PROGRAM_MAP(mazinger_sound_map)
+ MCFG_DEVICE_IO_MAP(mazinger_sound_portmap)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
@@ -2482,7 +2482,7 @@ MACHINE_CONFIG_START(cave_state::mazinger)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, 4_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 4_MHz_XTAL)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
@@ -2502,13 +2502,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::metmqstr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(metmqstr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(metmqstr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 32_MHz_XTAL / 4)
- MCFG_CPU_PROGRAM_MAP(metmqstr_sound_map)
- MCFG_CPU_IO_MAP(metmqstr_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 32_MHz_XTAL / 4)
+ MCFG_DEVICE_PROGRAM_MAP(metmqstr_sound_map)
+ MCFG_DEVICE_IO_MAP(metmqstr_sound_portmap)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
@@ -2562,9 +2562,9 @@ MACHINE_CONFIG_START(cave_state::pacslot)
MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 28_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(pacslot_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 28_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(pacslot_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
@@ -2606,8 +2606,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::paceight)
pacslot(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(paceight_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(paceight_map)
MACHINE_CONFIG_END
/***************************************************************************
Poka Poka Satan
@@ -2621,9 +2621,9 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::timer_lev2_cb )
MACHINE_CONFIG_START(cave_state::ppsatan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(ppsatan_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt_ppsatan)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(ppsatan_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt_ppsatan)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1)) /* a guess, and certainly wrong */
@@ -2684,13 +2684,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::pwrinst2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(pwrinst2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pwrinst2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL / 2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(pwrinst2_sound_map)
- MCFG_CPU_IO_MAP(pwrinst2_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pwrinst2_sound_map)
+ MCFG_DEVICE_IO_MAP(pwrinst2_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_MACHINE_RESET_OVERRIDE(cave_state,cave)
@@ -2718,7 +2718,7 @@ MACHINE_CONFIG_START(cave_state::pwrinst2)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, 16_MHz_XTAL / 4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 16_MHz_XTAL / 4)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
@@ -2756,16 +2756,16 @@ MACHINE_RESET_MEMBER(cave_state,sailormn)
MACHINE_CONFIG_START(cave_state::sailormn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(sailormn_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(sailormn_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
// could be a wachdog, but if it is then our watchdog address is incorrect as there are periods where the game doesn't write it.
MCFG_TIMER_DRIVER_ADD("startup", cave_state, sailormn_startup)
- MCFG_CPU_ADD("audiocpu", Z80, 8_MHz_XTAL) // Bidirectional Communication
- MCFG_CPU_PROGRAM_MAP(sailormn_sound_map)
- MCFG_CPU_IO_MAP(sailormn_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8_MHz_XTAL) // Bidirectional Communication
+ MCFG_DEVICE_PROGRAM_MAP(sailormn_sound_map)
+ MCFG_DEVICE_IO_MAP(sailormn_sound_portmap)
// MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2820,9 +2820,9 @@ MACHINE_CONFIG_START(cave_state::tekkencw)
MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 28_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(tekkencw_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 28_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tekkencw_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
@@ -2861,8 +2861,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::tekkenbs)
tekkencw(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tekkenbs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tekkenbs_map)
MACHINE_CONFIG_END
@@ -2875,9 +2875,9 @@ MACHINE_CONFIG_START(cave_state::tjumpman)
MCFG_NVRAM_ADD_0FILL("nvram")
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 28_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(tjumpman_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 28_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tjumpman_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
@@ -2922,9 +2922,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cave_state::uopoko)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(uopoko_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(uopoko_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt)
MCFG_MACHINE_START_OVERRIDE(cave_state,cave)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2948,8 +2948,8 @@ MACHINE_CONFIG_START(cave_state::uopoko)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, cave_state, sound_irq_gen))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cavepc.cpp b/src/mame/drivers/cavepc.cpp
index 9487b15739f..50f69e1ece9 100644
--- a/src/mame/drivers/cavepc.cpp
+++ b/src/mame/drivers/cavepc.cpp
@@ -113,9 +113,9 @@ void cavepc_state::machine_reset()
MACHINE_CONFIG_START(cavepc_state::cavepc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 200000000) /* AMD Athlon 64 X2 5050e Brisbane 2.60GHz, 1024KB L2 Cache ! */
- MCFG_CPU_PROGRAM_MAP(cavepc_map)
- MCFG_CPU_IO_MAP(cavepc_io)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 200000000) /* AMD Athlon 64 X2 5050e Brisbane 2.60GHz, 1024KB L2 Cache ! */
+ MCFG_DEVICE_PROGRAM_MAP(cavepc_map)
+ MCFG_DEVICE_IO_MAP(cavepc_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp
index 54fe316ce5c..8f629c1a767 100644
--- a/src/mame/drivers/cb2001.cpp
+++ b/src/mame/drivers/cb2001.cpp
@@ -821,11 +821,11 @@ PALETTE_INIT_MEMBER(cb2001_state, cb2001)
}
MACHINE_CONFIG_START(cb2001_state::cb2001)
- MCFG_CPU_ADD("maincpu", V35, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game
+ MCFG_DEVICE_ADD("maincpu", V35, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game
MCFG_V25_CONFIG(cb2001_decryption_table)
- MCFG_CPU_PROGRAM_MAP(cb2001_map)
- MCFG_CPU_IO_MAP(cb2001_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cb2001_state, vblank_irq)
+ MCFG_DEVICE_PROGRAM_MAP(cb2001_map)
+ MCFG_DEVICE_IO_MAP(cb2001_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cb2001_state, vblank_irq)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -851,7 +851,7 @@ MACHINE_CONFIG_START(cb2001_state::cb2001)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000) // wrong
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000) // wrong
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index b9f3cab512d..bf7d0ae31c2 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -265,8 +265,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(cball_state::cball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(12'096'000) / 16) /* ? */
- MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(12'096'000) / 16) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
/* video hardware */
diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp
index 566cd4c6df9..89d9648a6c8 100644
--- a/src/mame/drivers/cbasebal.cpp
+++ b/src/mame/drivers/cbasebal.cpp
@@ -264,11 +264,11 @@ void cbasebal_state::machine_reset()
MACHINE_CONFIG_START(cbasebal_state::cbasebal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 6000000) /* ??? */
- MCFG_CPU_PROGRAM_MAP(cbasebal_map)
- MCFG_CPU_IO_MAP(cbasebal_portmap)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cbasebal_state, irq0_line_hold) /* ??? */
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(cbasebal_map)
+ MCFG_DEVICE_IO_MAP(cbasebal_portmap)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cbasebal_state, irq0_line_hold) /* ??? */
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -293,7 +293,7 @@ MACHINE_CONFIG_START(cbasebal_state::cbasebal)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index b8a61292605..4d74dfbf873 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -2314,15 +2314,15 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc)
MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
// basic hardware
- MCFG_CPU_ADD(M6509_TAG, M6509, XTAL(14'318'181)/14)
+ MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(14'318'181)/14)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_CPU_PROGRAM_MAP(p500_mem)
+ MCFG_DEVICE_PROGRAM_MAP(p500_mem)
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
// video hardware
MCFG_DEVICE_ADD(MOS6567_TAG, MOS6567, XTAL(14'318'181)/14)
MCFG_MOS6566_CPU(M6509_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(p500_state, vic_irq_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, p500_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -2334,79 +2334,79 @@ MACHINE_CONFIG_START(p500_state::p500_ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)/14)
- MCFG_MOS6581_POTX_CALLBACK(READ8(p500_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(p500_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(14'318'181)/14)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, p500_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, p500_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA1_TAG)
MCFG_PLS100_ADD(PLA2_TAG)
MCFG_DEVICE_ADD(MOS6525_1_TAG, TPI6525, 0)
- MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(p500_state, tpi1_irq_w))
- MCFG_TPI6525_IN_PA_CB(READ8(cbm2_state, tpi1_pa_r))
- MCFG_TPI6525_OUT_PA_CB(WRITE8(cbm2_state, tpi1_pa_w))
- MCFG_TPI6525_IN_PB_CB(READ8(cbm2_state, tpi1_pb_r))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi1_pb_w))
- MCFG_TPI6525_OUT_CA_CB(WRITELINE(p500_state, tpi1_ca_w))
- MCFG_TPI6525_OUT_CB_CB(WRITELINE(p500_state, tpi1_cb_w))
+ MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(*this, p500_state, tpi1_irq_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, cbm2_state, tpi1_pa_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, cbm2_state, tpi1_pa_w))
+ MCFG_TPI6525_IN_PB_CB(READ8(*this, cbm2_state, tpi1_pb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, tpi1_pb_w))
+ MCFG_TPI6525_OUT_CA_CB(WRITELINE(*this, p500_state, tpi1_ca_w))
+ MCFG_TPI6525_OUT_CB_CB(WRITELINE(*this, p500_state, tpi1_cb_w))
MCFG_DEVICE_ADD(MOS6525_2_TAG, TPI6525, 0)
- MCFG_TPI6525_OUT_PA_CB(WRITE8(cbm2_state, tpi2_pa_w))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi2_pb_w))
- MCFG_TPI6525_IN_PC_CB(READ8(p500_state, tpi2_pc_r))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(p500_state, tpi2_pc_w))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, cbm2_state, tpi2_pa_w))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, tpi2_pb_w))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, p500_state, tpi2_pc_r))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, p500_state, tpi2_pc_w))
MCFG_DEVICE_ADD(MOS6551A_TAG, MOS6551, VIC6567_CLOCK)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_MOS6551_RXC_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_etc))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_MOS6551_RXC_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_etc))
MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL(14'318'181)/14)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(cbm2_state, cia_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cbm2_state, cia_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(cbm2_state, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w))
- MCFG_DS75160A_ADD(DS75160A_TAG, DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, cbm2_state, cia_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w))
+ MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w))
MCFG_DEVICE_ADD(DS75161A_TAG, DS75161A, 0)
- MCFG_DS75161A_IN_REN_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ren_r))
- MCFG_DS75161A_IN_IFC_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ifc_r))
- MCFG_DS75161A_IN_NDAC_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ndac_r))
- MCFG_DS75161A_IN_NRFD_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, nrfd_r))
- MCFG_DS75161A_IN_DAV_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, dav_r))
- MCFG_DS75161A_IN_EOI_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, eoi_r))
- MCFG_DS75161A_IN_ATN_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, atn_r))
- MCFG_DS75161A_IN_SRQ_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r))
- MCFG_DS75161A_OUT_REN_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
- MCFG_DS75161A_OUT_IFC_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_DS75161A_OUT_NDAC_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_DS75161A_OUT_NRFD_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
- MCFG_DS75161A_OUT_DAV_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_DS75161A_OUT_EOI_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_DS75161A_OUT_ATN_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_DS75161A_OUT_SRQ_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, srq_w))
+ MCFG_DS75161A_IN_REN_CB(READLINE(IEEE488_TAG, ieee488_device, ren_r))
+ MCFG_DS75161A_IN_IFC_CB(READLINE(IEEE488_TAG, ieee488_device, ifc_r))
+ MCFG_DS75161A_IN_NDAC_CB(READLINE(IEEE488_TAG, ieee488_device, ndac_r))
+ MCFG_DS75161A_IN_NRFD_CB(READLINE(IEEE488_TAG, ieee488_device, nrfd_r))
+ MCFG_DS75161A_IN_DAV_CB(READLINE(IEEE488_TAG, ieee488_device, dav_r))
+ MCFG_DS75161A_IN_EOI_CB(READLINE(IEEE488_TAG, ieee488_device, eoi_r))
+ MCFG_DS75161A_IN_ATN_CB(READLINE(IEEE488_TAG, ieee488_device, atn_r))
+ MCFG_DS75161A_IN_SRQ_CB(READLINE(IEEE488_TAG, ieee488_device, srq_r))
+ MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
+ MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w))
MCFG_CBM_IEEE488_ADD("c8050")
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6567_TAG, mos6567_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6567_TAG, mos6567_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, nullptr)
MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL(14'318'181)/14, cbm2_expansion_cards, nullptr)
MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, cbm2_user_port_cards, nullptr)
- MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(p500_state, user_irq_w))
- MCFG_CBM2_USER_PORT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
- MCFG_CBM2_USER_PORT_CNT_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
- MCFG_CBM2_USER_PORT_FLAG_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_cts))
+ MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(*this, p500_state, user_irq_w))
+ MCFG_CBM2_USER_PORT_SP_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, sp_w))
+ MCFG_CBM2_USER_PORT_CNT_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
+ MCFG_CBM2_USER_PORT_FLAG_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_cts))
MCFG_QUICKLOAD_ADD("quickload", p500_state, p500, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -2430,15 +2430,15 @@ MACHINE_CONFIG_START(p500_state::p500_pal)
MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
// basic hardware
- MCFG_CPU_ADD(M6509_TAG, M6509, XTAL(17'734'472)/18)
+ MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(17'734'472)/18)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_CPU_PROGRAM_MAP(p500_mem)
+ MCFG_DEVICE_PROGRAM_MAP(p500_mem)
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
// video hardware
MCFG_DEVICE_ADD(MOS6569_TAG, MOS6569, XTAL(17'734'472)/18)
MCFG_MOS6566_CPU(M6509_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(p500_state, vic_irq_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, p500_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -2450,76 +2450,76 @@ MACHINE_CONFIG_START(p500_state::p500_pal)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)/18)
- MCFG_MOS6581_POTX_CALLBACK(READ8(p500_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(p500_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(17'734'472)/18)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, p500_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, p500_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA1_TAG)
MCFG_PLS100_ADD(PLA2_TAG)
MCFG_DEVICE_ADD(MOS6525_1_TAG, TPI6525, 0)
- MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(p500_state, tpi1_irq_w))
- MCFG_TPI6525_IN_PA_CB(READ8(cbm2_state, tpi1_pa_r))
- MCFG_TPI6525_OUT_PA_CB(WRITE8(cbm2_state, tpi1_pa_w))
- MCFG_TPI6525_IN_PB_CB(READ8(cbm2_state, tpi1_pb_r))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi1_pb_w))
- MCFG_TPI6525_OUT_CA_CB(WRITELINE(p500_state, tpi1_ca_w))
- MCFG_TPI6525_OUT_CB_CB(WRITELINE(p500_state, tpi1_cb_w))
+ MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(*this, p500_state, tpi1_irq_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, cbm2_state, tpi1_pa_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, cbm2_state, tpi1_pa_w))
+ MCFG_TPI6525_IN_PB_CB(READ8(*this, cbm2_state, tpi1_pb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, tpi1_pb_w))
+ MCFG_TPI6525_OUT_CA_CB(WRITELINE(*this, p500_state, tpi1_ca_w))
+ MCFG_TPI6525_OUT_CB_CB(WRITELINE(*this, p500_state, tpi1_cb_w))
MCFG_DEVICE_ADD(MOS6525_2_TAG, TPI6525, 0)
- MCFG_TPI6525_OUT_PA_CB(WRITE8(cbm2_state, tpi2_pa_w))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi2_pb_w))
- MCFG_TPI6525_IN_PC_CB(READ8(p500_state, tpi2_pc_r))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(p500_state, tpi2_pc_w))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, cbm2_state, tpi2_pa_w))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, tpi2_pb_w))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, p500_state, tpi2_pc_r))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, p500_state, tpi2_pc_w))
MCFG_DEVICE_ADD(MOS6551A_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL(17'734'472)/18)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(cbm2_state, cia_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cbm2_state, cia_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(cbm2_state, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w))
- MCFG_DS75160A_ADD(DS75160A_TAG, DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, cbm2_state, cia_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w))
+ MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w))
MCFG_DEVICE_ADD(DS75161A_TAG, DS75161A, 0)
- MCFG_DS75161A_IN_REN_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ren_r))
- MCFG_DS75161A_IN_IFC_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ifc_r))
- MCFG_DS75161A_IN_NDAC_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ndac_r))
- MCFG_DS75161A_IN_NRFD_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, nrfd_r))
- MCFG_DS75161A_IN_DAV_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, dav_r))
- MCFG_DS75161A_IN_EOI_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, eoi_r))
- MCFG_DS75161A_IN_ATN_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, atn_r))
- MCFG_DS75161A_IN_SRQ_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r))
- MCFG_DS75161A_OUT_REN_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
- MCFG_DS75161A_OUT_IFC_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_DS75161A_OUT_NDAC_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_DS75161A_OUT_NRFD_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
- MCFG_DS75161A_OUT_DAV_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_DS75161A_OUT_EOI_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_DS75161A_OUT_ATN_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_DS75161A_OUT_SRQ_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, srq_w))
+ MCFG_DS75161A_IN_REN_CB(READLINE(IEEE488_TAG, ieee488_device, ren_r))
+ MCFG_DS75161A_IN_IFC_CB(READLINE(IEEE488_TAG, ieee488_device, ifc_r))
+ MCFG_DS75161A_IN_NDAC_CB(READLINE(IEEE488_TAG, ieee488_device, ndac_r))
+ MCFG_DS75161A_IN_NRFD_CB(READLINE(IEEE488_TAG, ieee488_device, nrfd_r))
+ MCFG_DS75161A_IN_DAV_CB(READLINE(IEEE488_TAG, ieee488_device, dav_r))
+ MCFG_DS75161A_IN_EOI_CB(READLINE(IEEE488_TAG, ieee488_device, eoi_r))
+ MCFG_DS75161A_IN_ATN_CB(READLINE(IEEE488_TAG, ieee488_device, atn_r))
+ MCFG_DS75161A_IN_SRQ_CB(READLINE(IEEE488_TAG, ieee488_device, srq_r))
+ MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
+ MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w))
MCFG_CBM_IEEE488_ADD("c8050")
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6569_TAG, mos6569_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6569_TAG, mos6569_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, nullptr)
MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL(17'734'472)/18, cbm2_expansion_cards, nullptr)
MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, cbm2_user_port_cards, nullptr)
- MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(p500_state, user_irq_w))
- MCFG_CBM2_USER_PORT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
- MCFG_CBM2_USER_PORT_CNT_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
- MCFG_CBM2_USER_PORT_FLAG_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_cts))
+ MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(*this, p500_state, user_irq_w))
+ MCFG_CBM2_USER_PORT_SP_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, sp_w))
+ MCFG_CBM2_USER_PORT_CNT_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
+ MCFG_CBM2_USER_PORT_FLAG_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_cts))
MCFG_QUICKLOAD_ADD("quickload", p500_state, p500, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -2543,9 +2543,9 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
MCFG_MACHINE_RESET_OVERRIDE(cbm2_state, cbm2)
// basic hardware
- MCFG_CPU_ADD(M6509_TAG, M6509, XTAL(18'000'000)/9)
+ MCFG_DEVICE_ADD(M6509_TAG, M6509, XTAL(18'000'000)/9)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_CPU_PROGRAM_MAP(cbm2_mem)
+ MCFG_DEVICE_PROGRAM_MAP(cbm2_mem)
MCFG_QUANTUM_PERFECT_CPU(M6509_TAG)
// video hardware
@@ -2566,72 +2566,72 @@ MACHINE_CONFIG_START(cbm2_state::cbm2lp_ntsc)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(18'000'000)/9)
- MCFG_MOS6581_POTX_CALLBACK(READ8(cbm2_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(cbm2_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(18'000'000)/9)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, cbm2_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, cbm2_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_PLS100_ADD(PLA1_TAG)
MCFG_DEVICE_ADD(MOS6525_1_TAG, TPI6525, 0)
- MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(cbm2_state, tpi1_irq_w))
- MCFG_TPI6525_IN_PA_CB(READ8(cbm2_state, tpi1_pa_r))
- MCFG_TPI6525_OUT_PA_CB(WRITE8(cbm2_state, tpi1_pa_w))
- MCFG_TPI6525_IN_PA_CB(READ8(cbm2_state, tpi1_pb_r))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi1_pb_w))
- MCFG_TPI6525_OUT_CA_CB(WRITELINE(cbm2_state, tpi1_ca_w))
+ MCFG_TPI6525_OUT_IRQ_CB(WRITELINE(*this, cbm2_state, tpi1_irq_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, cbm2_state, tpi1_pa_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, cbm2_state, tpi1_pa_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(*this, cbm2_state, tpi1_pb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, tpi1_pb_w))
+ MCFG_TPI6525_OUT_CA_CB(WRITELINE(*this, cbm2_state, tpi1_ca_w))
MCFG_DEVICE_ADD(MOS6525_2_TAG, TPI6525, 0)
- MCFG_TPI6525_OUT_PA_CB(WRITE8(cbm2_state, tpi2_pa_w))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, tpi2_pb_w))
- MCFG_TPI6525_IN_PC_CB(READ8(cbm2_state, tpi2_pc_r))
+ MCFG_TPI6525_OUT_PA_CB(WRITE8(*this, cbm2_state, tpi2_pa_w))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, tpi2_pb_w))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, cbm2_state, tpi2_pc_r))
MCFG_DEVICE_ADD(MOS6551A_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(MOS6525_1_TAG, tpi6525_device, i4_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526A, XTAL(18'000'000)/9)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(cbm2_state, cia_pa_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cbm2_state, cia_pa_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(cbm2_state, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w))
- MCFG_MOS6526_PC_CALLBACK(DEVWRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w))
- MCFG_DS75160A_ADD(DS75160A_TAG, DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i2_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pa_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, cbm2_state, cia_pa_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(CBM2_USER_PORT_TAG, cbm2_user_port_device, d2_w))
+ MCFG_MOS6526_PC_CALLBACK(WRITELINE(CBM2_USER_PORT_TAG, cbm2_user_port_device, pc_w))
+ MCFG_DS75160A_ADD(DS75160A_TAG, READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w))
MCFG_DEVICE_ADD(DS75161A_TAG, DS75161A, 0)
- MCFG_DS75161A_IN_REN_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ren_r))
- MCFG_DS75161A_IN_IFC_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ifc_r))
- MCFG_DS75161A_IN_NDAC_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, ndac_r))
- MCFG_DS75161A_IN_NRFD_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, nrfd_r))
- MCFG_DS75161A_IN_DAV_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, dav_r))
- MCFG_DS75161A_IN_EOI_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, eoi_r))
- MCFG_DS75161A_IN_ATN_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, atn_r))
- MCFG_DS75161A_IN_SRQ_CB(DEVREADLINE(IEEE488_TAG, ieee488_device, srq_r))
- MCFG_DS75161A_OUT_REN_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
- MCFG_DS75161A_OUT_IFC_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_DS75161A_OUT_NDAC_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_DS75161A_OUT_NRFD_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
- MCFG_DS75161A_OUT_DAV_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_DS75161A_OUT_EOI_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_DS75161A_OUT_ATN_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_DS75161A_OUT_SRQ_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, srq_w))
+ MCFG_DS75161A_IN_REN_CB(READLINE(IEEE488_TAG, ieee488_device, ren_r))
+ MCFG_DS75161A_IN_IFC_CB(READLINE(IEEE488_TAG, ieee488_device, ifc_r))
+ MCFG_DS75161A_IN_NDAC_CB(READLINE(IEEE488_TAG, ieee488_device, ndac_r))
+ MCFG_DS75161A_IN_NRFD_CB(READLINE(IEEE488_TAG, ieee488_device, nrfd_r))
+ MCFG_DS75161A_IN_DAV_CB(READLINE(IEEE488_TAG, ieee488_device, dav_r))
+ MCFG_DS75161A_IN_EOI_CB(READLINE(IEEE488_TAG, ieee488_device, eoi_r))
+ MCFG_DS75161A_IN_ATN_CB(READLINE(IEEE488_TAG, ieee488_device, atn_r))
+ MCFG_DS75161A_IN_SRQ_CB(READLINE(IEEE488_TAG, ieee488_device, srq_r))
+ MCFG_DS75161A_OUT_REN_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_DS75161A_OUT_IFC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_DS75161A_OUT_NDAC_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_DS75161A_OUT_NRFD_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
+ MCFG_DS75161A_OUT_DAV_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_DS75161A_OUT_EOI_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_DS75161A_OUT_ATN_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_DS75161A_OUT_SRQ_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w))
MCFG_CBM_IEEE488_ADD("c8050")
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MOS6525_1_TAG, tpi6525_device, i1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, nullptr, WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, nullptr)
MCFG_CBM2_EXPANSION_SLOT_ADD(CBM2_EXPANSION_SLOT_TAG, XTAL(18'000'000)/9, cbm2_expansion_cards, nullptr)
MCFG_CBM2_USER_PORT_ADD(CBM2_USER_PORT_TAG, cbm2_user_port_cards, nullptr)
- MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(cbm2_state, user_irq_w))
- MCFG_CBM2_USER_PORT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
- MCFG_CBM2_USER_PORT_CNT_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
- MCFG_CBM2_USER_PORT_FLAG_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MOS6551A_TAG, mos6551_device, write_cts))
+ MCFG_CBM2_USER_PORT_IRQ_CALLBACK(WRITELINE(*this, cbm2_state, user_irq_w))
+ MCFG_CBM2_USER_PORT_SP_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, sp_w))
+ MCFG_CBM2_USER_PORT_CNT_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
+ MCFG_CBM2_USER_PORT_FLAG_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MOS6551A_TAG, mos6551_device, write_cts))
MCFG_QUICKLOAD_ADD("quickload", cbm2_state, cbmb, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -2703,7 +2703,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cbm2_state::cbm2hp_ntsc)
cbm2lp_ntsc(config);
MCFG_DEVICE_MODIFY(MOS6525_2_TAG)
- MCFG_TPI6525_IN_PC_CB(READ8(cbm2hp_state, tpi2_pc_r))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, cbm2hp_state, tpi2_pc_r))
MACHINE_CONFIG_END
@@ -2735,26 +2735,26 @@ MACHINE_CONFIG_START(cbm2hp_state::bx256hp)
b256hp(config);
MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_ntsc)
- MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(ext_mem)
- MCFG_CPU_IO_MAP(ext_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(EXT_I8259A_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ext_mem)
+ MCFG_DEVICE_IO_MAP(ext_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(EXT_I8259A_TAG, pic8259_device, inta_cb)
MCFG_DEVICE_ADD(EXT_I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(EXT_I8088_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(EXT_MOS6525_TAG, TPI6525, 0)
- MCFG_TPI6525_IN_PA_CB(DEVREAD8(EXT_MOS6526_TAG, mos6526_device, pa_r))
- MCFG_TPI6525_IN_PB_CB(READ8(cbm2_state, ext_tpi_pb_r))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, ext_tpi_pb_w))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(cbm2_state, ext_tpi_pc_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(EXT_MOS6526_TAG, mos6526_device, pa_r))
+ MCFG_TPI6525_IN_PB_CB(READ8(*this, cbm2_state, ext_tpi_pb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, ext_tpi_pb_w))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, cbm2_state, ext_tpi_pc_w))
MCFG_DEVICE_ADD(EXT_MOS6526_TAG, MOS6526, XTAL(18'000'000)/9)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(cbm2_state, ext_cia_irq_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(DEVREAD8(EXT_MOS6525_TAG, tpi6525_device, pa_r))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(cbm2_state, ext_cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(cbm2_state, ext_cia_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, cbm2_state, ext_cia_irq_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(EXT_MOS6525_TAG, tpi6525_device, pa_r))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, ext_cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, cbm2_state, ext_cia_pb_w))
MCFG_SOFTWARE_LIST_ADD("flop_list2", "bx256hp_flop")
MACHINE_CONFIG_END
@@ -2770,7 +2770,7 @@ MACHINE_CONFIG_START(cbm2_state::cbm2hp_pal)
// devices
MCFG_DEVICE_MODIFY(MOS6525_2_TAG)
- MCFG_TPI6525_IN_PC_CB(READ8(cbm2hp_state, tpi2_pc_r))
+ MCFG_TPI6525_IN_PC_CB(READ8(*this, cbm2hp_state, tpi2_pc_r))
MCFG_DEVICE_MODIFY(MOS6526_TAG)
MCFG_MOS6526_TOD(50)
@@ -2805,26 +2805,26 @@ MACHINE_CONFIG_START(cbm2hp_state::cbm730)
cbm720(config);
MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2x_pal)
- MCFG_CPU_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(ext_mem)
- MCFG_CPU_IO_MAP(ext_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(EXT_I8259A_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(EXT_I8088_TAG, I8088, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ext_mem)
+ MCFG_DEVICE_IO_MAP(ext_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(EXT_I8259A_TAG, pic8259_device, inta_cb)
MCFG_DEVICE_ADD(EXT_I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(EXT_I8088_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(EXT_MOS6525_TAG, TPI6525, 0)
- MCFG_TPI6525_IN_PA_CB(DEVREAD8(EXT_MOS6526_TAG, mos6526_device, pa_r))
- MCFG_TPI6525_IN_PB_CB(READ8(cbm2_state, ext_tpi_pb_r))
- MCFG_TPI6525_OUT_PB_CB(WRITE8(cbm2_state, ext_tpi_pb_w))
- MCFG_TPI6525_OUT_PC_CB(WRITE8(cbm2_state, ext_tpi_pc_w))
+ MCFG_TPI6525_IN_PA_CB(READ8(EXT_MOS6526_TAG, mos6526_device, pa_r))
+ MCFG_TPI6525_IN_PB_CB(READ8(*this, cbm2_state, ext_tpi_pb_r))
+ MCFG_TPI6525_OUT_PB_CB(WRITE8(*this, cbm2_state, ext_tpi_pb_w))
+ MCFG_TPI6525_OUT_PC_CB(WRITE8(*this, cbm2_state, ext_tpi_pc_w))
MCFG_DEVICE_ADD(EXT_MOS6526_TAG, MOS6526, XTAL(18'000'000)/9)
MCFG_MOS6526_TOD(50)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(cbm2_state, ext_cia_irq_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(DEVREAD8(EXT_MOS6525_TAG, tpi6525_device, pa_r))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(cbm2_state, ext_cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(cbm2_state, ext_cia_pb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, cbm2_state, ext_cia_irq_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(EXT_MOS6525_TAG, tpi6525_device, pa_r))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, cbm2_state, ext_cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, cbm2_state, ext_cia_pb_w))
MCFG_SOFTWARE_LIST_ADD("flop_list2", "bx256hp_flop")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp
index a06c445d4e2..83c0e35c6eb 100644
--- a/src/mame/drivers/cbuster.cpp
+++ b/src/mame/drivers/cbuster.cpp
@@ -308,12 +308,12 @@ void cbuster_state::machine_reset()
MACHINE_CONFIG_START(cbuster_state::twocrude)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 @ 12MHz Verified */
- MCFG_CPU_PROGRAM_MAP(twocrude_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cbuster_state, irq4_line_assert)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 @ 12MHz Verified */
+ MCFG_DEVICE_PROGRAM_MAP(twocrude_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cbuster_state, irq4_line_assert)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45, 6MHz Verified */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45, 6MHz Verified */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(58)
@@ -371,7 +371,7 @@ MACHINE_CONFIG_START(cbuster_state::twocrude)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
// YM2203_PITCH_HACK - Pitch is too low at 1.3425MHz (see also stfight.cpp)
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/24 * 3) /* 1.3425MHz Verified */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/24 * 3) /* 1.3425MHz Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) /* 3.58MHz Verified */
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp
index b57a96815db..e98fb550a00 100644
--- a/src/mame/drivers/cc40.cpp
+++ b/src/mame/drivers/cc40.cpp
@@ -580,10 +580,10 @@ void cc40_state::machine_start()
MACHINE_CONFIG_START(cc40_state::cc40)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS70C20, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_TMS7000_IN_PORTA_CB(READ8(cc40_state, keyboard_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(cc40_state, keyboard_w))
+ MCFG_DEVICE_ADD("maincpu", TMS70C20, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, cc40_state, keyboard_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, cc40_state, keyboard_w))
MCFG_NVRAM_ADD_0FILL("sysram.0")
MCFG_NVRAM_ADD_0FILL("sysram.1")
@@ -608,7 +608,7 @@ MACHINE_CONFIG_START(cc40_state::cc40)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index eeb95fc58b8..5d0319acddd 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -457,8 +457,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(ccastles_state::ccastles)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -478,12 +478,12 @@ MACHINE_CONFIG_START(ccastles_state::ccastles)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK/8)
/* NOTE: 1k + 0.2k is not 100% exact, but should not make an audible difference */
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1) + RES_K(0.2), CAP_U(0.01), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK/8)
/* NOTE: 1k + 0.2k is not 100% exact, but should not make an audible difference */
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1) + RES_K(0.2), CAP_U(0.01), 5.0)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("IN1"))
diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp
index 103c038a425..40f2dbbec6b 100644
--- a/src/mame/drivers/cchance.cpp
+++ b/src/mame/drivers/cchance.cpp
@@ -214,9 +214,9 @@ void cchance_state::machine_reset()
MACHINE_CONFIG_START(cchance_state::cchance)
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cchance_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cchance_state, irq0_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cchance)
@@ -230,7 +230,7 @@ MACHINE_CONFIG_START(cchance_state::cchance)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(cchance_state, screen_update_tnzs)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cchance_state, screen_vblank_tnzs))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cchance_state, screen_vblank_tnzs))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 512)
@@ -238,7 +238,7 @@ MACHINE_CONFIG_START(cchance_state::cchance)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, 1500000/2)
+ MCFG_DEVICE_ADD("aysnd", YM2149, 1500000/2)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp
index 425c00ebace..2ddd85aaec4 100644
--- a/src/mame/drivers/cchasm.cpp
+++ b/src/mame/drivers/cchasm.cpp
@@ -150,18 +150,18 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(cchasm_state::cchasm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
- MCFG_CPU_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_ADD("maincpu", M68000, CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
- MCFG_CPU_ADD("audiocpu", Z80, 3584229) /* 3.58 MHz (from schematics) */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3584229) /* 3.58 MHz (from schematics) */
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_DEVICE_ADD("ctc", Z80CTC, 3584229 /* same as "audiocpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(cchasm_state, ctc_timer_1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(cchasm_state, ctc_timer_2_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, cchasm_state, ctc_timer_1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, cchasm_state, ctc_timer_2_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -181,14 +181,14 @@ MACHINE_CONFIG_START(cchasm_state::cchasm)
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
MCFG_GENERIC_LATCH_8_ADD("soundlatch4")
- MCFG_SOUND_ADD("ay1", AY8910, 1818182)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1818182)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
- MCFG_SOUND_ADD("ay2", AY8910, 1818182)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1818182)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
- MCFG_SOUND_ADD("dac1", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac1", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 52bbb1bce02..fb287abce42 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -1112,14 +1112,14 @@ WRITE_LINE_MEMBER(cclimber_state::bagmanf_vblank_irq)
MACHINE_CONFIG_START(cclimber_state::root)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(cclimber_map)
- MCFG_CPU_IO_MAP(cclimber_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cclimber_map)
+ MCFG_DEVICE_IO_MAP(cclimber_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cclimber_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cclimber_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cclimber_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cclimber_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_y_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1129,7 +1129,7 @@ MACHINE_CONFIG_START(cclimber_state::root)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_cclimber)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cclimber_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cclimber)
MCFG_PALETTE_ADD("palette", 16*4+8*4)
@@ -1142,7 +1142,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::cclimber)
root(config);
MCFG_DEVICE_MODIFY("mainlatch") // 7J on CCG-1
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -1152,14 +1152,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::cclimberx)
cclimber(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::ckongb)
cclimber(config);
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cclimber_state, nmi_mask_w)) //used by Crazy Kong Bootleg with alt levels and speed up
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cclimber_state, nmi_mask_w)) //used by Crazy Kong Bootleg with alt levels and speed up
MACHINE_CONFIG_END
@@ -1167,12 +1167,12 @@ MACHINE_CONFIG_START(cclimber_state::cannonb)
cclimber(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cannonb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cannonb_map)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cclimber_state, flip_screen_x_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(cclimber_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_x_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, cclimber_state, flip_screen_y_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // not used
/* video hardware */
@@ -1183,11 +1183,11 @@ MACHINE_CONFIG_START(cclimber_state::bagmanf)
cclimber(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bagmanf_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bagmanf_map)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cclimber_state, bagmanf_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, bagmanf_vblank_irq))
MACHINE_CONFIG_END
@@ -1195,15 +1195,15 @@ MACHINE_CONFIG_START(cclimber_state::yamato)
root(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(yamato_map)
- MCFG_CPU_IO_MAP(yamato_portmap)
- MCFG_CPU_OPCODES_MAP(yamato_decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(yamato_map)
+ MCFG_DEVICE_IO_MAP(yamato_portmap)
+ MCFG_DEVICE_OPCODES_MAP(yamato_decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
- MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */
- MCFG_CPU_PROGRAM_MAP(yamato_audio_map)
- MCFG_CPU_IO_MAP(yamato_audio_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3072000) /* 3.072 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(yamato_audio_map)
+ MCFG_DEVICE_IO_MAP(yamato_audio_portmap)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1215,10 +1215,10 @@ MACHINE_CONFIG_START(cclimber_state::yamato)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ay1", AY8910, 1536000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1536000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 1536000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1536000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
@@ -1226,17 +1226,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::toprollr)
cclimber(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(toprollr_map)
- MCFG_CPU_IO_MAP(cclimber_portmap)
- MCFG_CPU_OPCODES_MAP(toprollr_decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5018, MASTER_CLOCK/3/2) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(toprollr_map)
+ MCFG_DEVICE_IO_MAP(cclimber_portmap)
+ MCFG_DEVICE_OPCODES_MAP(toprollr_decrypted_opcodes_map)
MCFG_SEGACRPT_SET_SIZE(0)
MCFG_SEGACRPT_SET_NUMBANKS(3)
MCFG_SEGACRPT_SET_BANKSIZE(0x6000)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(cclimber_state, toprollr_rombank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(cclimber_state, toprollr_rombank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, cclimber_state, toprollr_rombank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, cclimber_state, toprollr_rombank_w))
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", toprollr)
@@ -1253,20 +1253,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::swimmer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(swimmer_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(swimmer_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cclimber_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cclimber_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cclimber_state, flip_screen_y_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cclimber_state, sidebg_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cclimber_state, palette_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cclimber_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cclimber_state, sidebg_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cclimber_state, palette_bank_w))
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(4'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(swimmer_audio_map)
- MCFG_CPU_IO_MAP(swimmer_audio_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(cclimber_state, nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(4'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(swimmer_audio_map)
+ MCFG_DEVICE_IO_MAP(swimmer_audio_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cclimber_state, nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1276,7 +1276,7 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(cclimber_state, screen_update_swimmer)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cclimber_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", swimmer)
MCFG_PALETTE_ADD("palette", 32*8+4*8+1)
@@ -1289,18 +1289,18 @@ MACHINE_CONFIG_START(cclimber_state::swimmer)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(4'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(4'000'000)/2) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(4'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(4'000'000)/2) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cclimber_state::guzzler)
swimmer(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(guzzler_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(guzzler_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp
index 97fc1fb232a..89125a79c87 100644
--- a/src/mame/drivers/ccs2810.cpp
+++ b/src/mame/drivers/ccs2810.cpp
@@ -905,50 +905,50 @@ static void ccs_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(ccs_state::ccs2810)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ccs2810_mem)
- MCFG_CPU_IO_MAP(ccs2810_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ccs2810_mem)
+ MCFG_DEVICE_IO_MAP(ccs2810_io)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
/* Devices */
MCFG_DEVICE_ADD("ins8250", INS8250, XTAL(1'843'200))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_OUT1_CB(DEVWRITELINE("rs232", rs232_port_device, write_spds)) // RLSD
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ins8250", ins8250_device, rx_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ins8250", ins8250_device, ri_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ins8250", ins8250_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ins8250", ins8250_device, dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ins8250", ins8250_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_OUT1_CB(WRITELINE("rs232", rs232_port_device, write_spds)) // RLSD
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ins8250", ins8250_device, rx_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ins8250", ins8250_device, ri_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ins8250", ins8250_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ins8250", ins8250_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ins8250", ins8250_device, cts_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ccs_state::ccs2422)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ccs2810_mem)
- MCFG_CPU_IO_MAP(ccs2422_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ccs2810_mem)
+ MCFG_DEVICE_IO_MAP(ccs2422_io)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
/* Devices */
MCFG_DEVICE_ADD("ins8250", INS8250, XTAL(1'843'200))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_OUT1_CB(DEVWRITELINE("rs232", rs232_port_device, write_etc)) // RLSD
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ins8250", ins8250_device, rx_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ins8250", ins8250_device, ri_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ins8250", ins8250_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ins8250", ins8250_device, dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ins8250", ins8250_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_OUT1_CB(WRITELINE("rs232", rs232_port_device, write_etc)) // RLSD
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ins8250", ins8250_device, rx_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ins8250", ins8250_device, ri_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ins8250", ins8250_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ins8250", ins8250_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ins8250", ins8250_device, cts_w))
MCFG_MB8877_ADD("fdc", XTAL(16'000'000) / 8) // UB1793 or MB8877
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ccs_floppies, "8sssd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp
index 56b80845024..8850b3adbe7 100644
--- a/src/mame/drivers/ccs300.cpp
+++ b/src/mame/drivers/ccs300.cpp
@@ -117,28 +117,28 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(ccs300_state::ccs300)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(ccs300_mem)
- MCFG_CPU_IO_MAP(ccs300_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ccs300_mem)
+ MCFG_DEVICE_IO_MAP(ccs300_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(ccs300_state, ccs300)
/* video hardware */
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxca_w))
/* Devices */
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) // must be exactly here
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index c818eda1e2f..d00175697c9 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -287,16 +287,16 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 )
MACHINE_CONFIG_START(cd2650_state::cd2650)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL(14'192'640) / 12) // 1.182720MHz according to RE schematic
- MCFG_CPU_PROGRAM_MAP(cd2650_mem)
- MCFG_CPU_IO_MAP(cd2650_io)
- MCFG_CPU_DATA_MAP(cd2650_data)
- MCFG_S2650_SENSE_INPUT(READLINE(cd2650_state, cass_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(cd2650_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu", S2650, XTAL(14'192'640) / 12) // 1.182720MHz according to RE schematic
+ MCFG_DEVICE_PROGRAM_MAP(cd2650_mem)
+ MCFG_DEVICE_IO_MAP(cd2650_io)
+ MCFG_DEVICE_DATA_MAP(cd2650_data)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, cd2650_state, cass_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, cd2650_state, cass_w))
MCFG_DEVICE_ADD("outlatch", F9334, 0) // IC26
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cd2650_state, tape_deck_on_w)) // TD ON
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("beeper", beep_device, set_state)) // OUT6
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cd2650_state, tape_deck_on_w)) // TD ON
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("beeper", beep_device, set_state)) // OUT6
// Q1-Q7 = OUT 0-6, not defined in RE
// The connection of OUT6 to a 700-1200 Hz noise generator is suggested
// in Central Data 2650 Newsletter, Volume 1, Issue 3 for use with the
@@ -318,7 +318,7 @@ MACHINE_CONFIG_START(cd2650_state::cd2650)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("beeper", BEEP, 950) // guess
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp
index dc0c2c16462..4bac2b08ad5 100644
--- a/src/mame/drivers/cdc721.cpp
+++ b/src/mame/drivers/cdc721.cpp
@@ -234,9 +234,9 @@ static const z80_daisy_config cdc721_daisy_chain[] =
MACHINE_CONFIG_START(cdc721_state::cdc721)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 6_MHz_XTAL) // Zilog Z8400B (Z80B)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6_MHz_XTAL) // Zilog Z8400B (Z80B)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(cdc721_daisy_chain) // FIXME: vector is independently generated
MCFG_DEVICE_ADD("block0", ADDRESS_MAP_BANK, 0)
@@ -284,8 +284,8 @@ MACHINE_CONFIG_START(cdc721_state::cdc721)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(cdc721_state, interrupt_mask_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(cdc721_state, misc_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, cdc721_state, interrupt_mask_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, cdc721_state, misc_w))
MCFG_DEVICE_ADD("uart1", INS8250, 1843200)
MCFG_DEVICE_ADD("uart2", INS8250, 1843200)
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index aaa7840b5b0..d679ac39444 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -776,8 +776,8 @@ WRITE8_MEMBER( cdi_state::slave_io_w )
// CD-i Mono-I system base
MACHINE_CONFIG_START(cdi_state::cdimono1_base)
- MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
- MCFG_CPU_PROGRAM_MAP(cdimono1_mem)
+ MCFG_DEVICE_ADD("maincpu", SCC68070, CLOCK_A/2)
+ MCFG_DEVICE_PROGRAM_MAP(cdimono1_mem)
MCFG_MCD212_ADD("mcd212")
MCFG_MCD212_SET_SCREEN("screen")
@@ -807,13 +807,13 @@ MACHINE_CONFIG_START(cdi_state::cdimono1_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD( "dac1", DMADAC, 0 )
+ MCFG_DEVICE_ADD( "dac1", DMADAC )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
- MCFG_SOUND_ADD( "dac2", DMADAC, 0 )
+ MCFG_DEVICE_ADD( "dac2", DMADAC )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
- MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_DEVICE_ADD( "cdda", CDDA )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
@@ -822,8 +822,8 @@ MACHINE_CONFIG_END
// CD-i model 220 (Mono-II, NTSC)
MACHINE_CONFIG_START(cdi_state::cdimono2)
- MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
- MCFG_CPU_PROGRAM_MAP(cdimono2_mem)
+ MCFG_DEVICE_ADD("maincpu", SCC68070, CLOCK_A/2)
+ MCFG_DEVICE_PROGRAM_MAP(cdimono2_mem)
MCFG_MCD212_ADD("mcd212")
MCFG_MCD212_SET_SCREEN("screen")
@@ -849,10 +849,10 @@ MACHINE_CONFIG_START(cdi_state::cdimono2)
MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 )
MCFG_CDI68070_ADD("scc68070")
- MCFG_CPU_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
- MCFG_CPU_PROGRAM_MAP(cdimono2_servo_mem)
- MCFG_CPU_ADD("slave", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
- MCFG_CPU_PROGRAM_MAP(cdimono2_slave_mem)
+ MCFG_DEVICE_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
+ MCFG_DEVICE_PROGRAM_MAP(cdimono2_servo_mem)
+ MCFG_DEVICE_ADD("slave", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
+ MCFG_DEVICE_PROGRAM_MAP(cdimono2_slave_mem)
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("cdi_cdrom")
@@ -862,13 +862,13 @@ MACHINE_CONFIG_START(cdi_state::cdimono2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD( "dac1", DMADAC, 0 )
+ MCFG_DEVICE_ADD( "dac1", DMADAC )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
- MCFG_SOUND_ADD( "dac2", DMADAC, 0 )
+ MCFG_DEVICE_ADD( "dac2", DMADAC )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
- MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_DEVICE_ADD( "cdda", CDDA )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
@@ -876,8 +876,8 @@ MACHINE_CONFIG_START(cdi_state::cdimono2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cdi_state::cdi910)
- MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
- MCFG_CPU_PROGRAM_MAP(cdi910_mem)
+ MCFG_DEVICE_ADD("maincpu", SCC68070, CLOCK_A/2)
+ MCFG_DEVICE_PROGRAM_MAP(cdi910_mem)
MCFG_MCD212_ADD("mcd212")
MCFG_MCD212_SET_SCREEN("screen")
@@ -903,10 +903,10 @@ MACHINE_CONFIG_START(cdi_state::cdi910)
MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 )
MCFG_CDI68070_ADD("scc68070")
- MCFG_CPU_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
- MCFG_CPU_PROGRAM_MAP(cdimono2_servo_mem)
- MCFG_CPU_ADD("slave", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
- MCFG_CPU_PROGRAM_MAP(cdimono2_slave_mem)
+ MCFG_DEVICE_ADD("servo", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
+ MCFG_DEVICE_PROGRAM_MAP(cdimono2_servo_mem)
+ MCFG_DEVICE_ADD("slave", M68HC05EG, 2000000) /* Unknown clock speed, docs say 2MHz internal clock */
+ MCFG_DEVICE_PROGRAM_MAP(cdimono2_slave_mem)
MCFG_CDROM_ADD( "cdrom" )
MCFG_CDROM_INTERFACE("cdi_cdrom")
@@ -916,13 +916,13 @@ MACHINE_CONFIG_START(cdi_state::cdi910)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD( "dac1", DMADAC, 0 )
+ MCFG_DEVICE_ADD( "dac1", DMADAC )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
- MCFG_SOUND_ADD( "dac2", DMADAC, 0 )
+ MCFG_DEVICE_ADD( "dac2", DMADAC )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
- MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_DEVICE_ADD( "cdda", CDDA )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
@@ -942,9 +942,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cdi_state::quizard)
cdimono1_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cdimono1_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cdi_state, mcu_frame)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cdimono1_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, mcu_frame)
MACHINE_CONFIG_END
@@ -957,8 +957,8 @@ MACHINE_CONFIG_START(cdi_state::quizard1)
quizard(config);
MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard1 )
- MCFG_CPU_ADD("mcu", I8751, 8000000)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(cdi_state, quizard_mcu_p1_r))
+ MCFG_DEVICE_ADD("mcu", I8751, 8000000)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cdi_state, quizard_mcu_p1_r))
// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, irq0_line_pulse)
MACHINE_CONFIG_END
@@ -977,8 +977,8 @@ MACHINE_CONFIG_START(cdi_state::quizard4)
quizard(config);
MCFG_MACHINE_RESET_OVERRIDE(cdi_state, quizard4 )
- MCFG_CPU_ADD("mcu", I8751, 8000000)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(cdi_state, quizard_mcu_p1_r))
+ MCFG_DEVICE_ADD("mcu", I8751, 8000000)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, cdi_state, quizard_mcu_p1_r))
// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cdi_state, irq0_line_pulse)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp
index 29af21b5d95..4cbdf1d0751 100644
--- a/src/mame/drivers/cedar_magnet.cpp
+++ b/src/mame/drivers/cedar_magnet.cpp
@@ -768,10 +768,10 @@ INTERRUPT_GEN_MEMBER(cedar_magnet_state::irq)
MACHINE_CONFIG_START(cedar_magnet_state::cedar_magnet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(cedar_magnet_map)
- MCFG_CPU_IO_MAP(cedar_magnet_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cedar_magnet_state, irq)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cedar_magnet_map)
+ MCFG_DEVICE_IO_MAP(cedar_magnet_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cedar_magnet_state, irq)
MCFG_DEVICE_ADD("bank0", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(cedar_bank0)
@@ -796,17 +796,17 @@ MACHINE_CONFIG_START(cedar_magnet_state::cedar_magnet)
MCFG_DEVICE_ADD("z80pio_ic48", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_state, ic48_pio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_state, ic48_pio_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_state, ic48_pio_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_state, ic48_pio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_state, ic48_pio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_state, ic48_pio_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_state, ic48_pio_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_state, ic48_pio_pb_w))
MCFG_DEVICE_ADD("z80pio_ic49", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
-// MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_state, ic49_pio_pa_r)) // NOT USED
-// MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_state, ic49_pio_pa_w)) // NOT USED
- MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_state, ic49_pio_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_state, ic49_pio_pb_w))
+// MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_state, ic49_pio_pa_r)) // NOT USED
+// MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_state, ic49_pio_pa_w)) // NOT USED
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_state, ic49_pio_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_state, ic49_pio_pb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 4fbde5cab67..027d1f3f235 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -1714,7 +1714,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(centiped_state::centiped_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
MCFG_MACHINE_START_OVERRIDE(centiped_state,centiped)
MCFG_MACHINE_RESET_OVERRIDE(centiped_state,centiped)
@@ -1722,9 +1722,9 @@ MACHINE_CONFIG_START(centiped_state::centiped_base)
MCFG_ATARIVGEAROM_ADD("earom")
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(centiped_state, coin_counter_left_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(centiped_state, coin_counter_center_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(centiped_state, coin_counter_right_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, centiped_state, coin_counter_left_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, centiped_state, coin_counter_center_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, centiped_state, coin_counter_right_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // LED 1
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // LED 2
@@ -1750,11 +1750,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(centiped_state::centiped)
centiped_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(centiped_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(centiped_map)
MCFG_DEVICE_MODIFY("outlatch") // M10
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(centiped_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1769,24 +1769,24 @@ MACHINE_CONFIG_START(centiped_state::centipedj)
centiped(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(centipedj_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(centipedj_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(centiped_state::caterplr)
centiped_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(caterplr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(caterplr_map)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(centiped_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 12096000/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 12096000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1796,17 +1796,17 @@ MACHINE_CONFIG_START(centiped_state::centipdb)
centiped_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(centipdb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(centipdb_map)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(centiped_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 12096000/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(centiped_state, caterplr_unknown_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 12096000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, centiped_state, caterplr_unknown_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -1815,17 +1815,17 @@ MACHINE_CONFIG_START(centiped_state::magworm)
centiped_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(magworm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(magworm_map)
MCFG_MACHINE_RESET_OVERRIDE(centiped_state,magworm)
MCFG_DEVICE_MODIFY("outlatch") // 12A
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(centiped_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 12096000/8) // AY-3-8912 at 2/3H
+ MCFG_DEVICE_ADD("aysnd", AY8912, 12096000/8) // AY-3-8912 at 2/3H
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -1835,13 +1835,13 @@ MACHINE_CONFIG_START(centiped_state::milliped)
centiped_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(milliped_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(milliped_map)
MCFG_DEVICE_MODIFY("outlatch") // 12E
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(centiped_state, input_select_w)) // TBEN
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(centiped_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(centiped_state, control_select_w)) // CNTRLSEL
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, centiped_state, input_select_w)) // TBEN
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, control_select_w)) // CNTRLSEL
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", milliped)
@@ -1869,8 +1869,8 @@ MACHINE_CONFIG_START(centiped_state::multiped)
milliped(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(multiped_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(multiped_map)
MCFG_DEVICE_REMOVE("earom")
MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
@@ -1881,8 +1881,8 @@ MACHINE_CONFIG_START(centiped_state::warlords)
centiped_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(warlords_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(warlords_map)
// these extra LEDs also appear on Centipede schematics
MCFG_DEVICE_MODIFY("outlatch") // P9
@@ -1915,8 +1915,8 @@ MACHINE_CONFIG_START(centiped_state::mazeinv)
milliped(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mazeinv_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mazeinv_map)
MCFG_DEVICE_MODIFY("outlatch")
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP)
@@ -1929,18 +1929,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(centiped_state::bullsdrt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 12096000/8)
- MCFG_CPU_PROGRAM_MAP(bullsdrt_map)
- MCFG_CPU_IO_MAP(bullsdrt_port_map)
- MCFG_CPU_DATA_MAP(bullsdrt_data_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, 12096000/8)
+ MCFG_DEVICE_PROGRAM_MAP(bullsdrt_map)
+ MCFG_DEVICE_IO_MAP(bullsdrt_port_map)
+ MCFG_DEVICE_DATA_MAP(bullsdrt_data_map)
MCFG_ATARIVGEAROM_ADD("earom")
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(centiped_state, bullsdrt_coin_count_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, centiped_state, bullsdrt_coin_count_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(centiped_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, centiped_state, flip_screen_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -1960,7 +1960,7 @@ MACHINE_CONFIG_START(centiped_state::bullsdrt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76496, 12096000/8)
+ MCFG_DEVICE_ADD("snsnd", SN76496, 12096000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp
index 83fe8088c97..d80151d6598 100644
--- a/src/mame/drivers/cesclass.cpp
+++ b/src/mame/drivers/cesclass.cpp
@@ -252,10 +252,10 @@ PALETTE_INIT_MEMBER(cesclassic_state, cesclassic)
MACHINE_CONFIG_START(cesclassic_state::cesclassic)
- MCFG_CPU_ADD("maincpu", M68000, 24000000/2 )
- MCFG_CPU_PROGRAM_MAP(cesclassic_map)
- MCFG_CPU_VBLANK_INT_DRIVER("l_lcd", cesclassic_state, irq2_line_assert) // TODO: unknown sources
- MCFG_CPU_PERIODIC_INT_DRIVER(cesclassic_state, irq3_line_assert, 60*8)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24000000/2 )
+ MCFG_DEVICE_PROGRAM_MAP(cesclassic_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("l_lcd", cesclassic_state, irq2_line_assert) // TODO: unknown sources
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cesclassic_state, irq3_line_assert, 60*8)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp
index aa8b5ec3f7f..683307d00bb 100644
--- a/src/mame/drivers/cfx9850.cpp
+++ b/src/mame/drivers/cfx9850.cpp
@@ -283,14 +283,14 @@ u32 cfx9850_state::screen_update_cfx9850(screen_device &screen, bitmap_ind16 &bi
MACHINE_CONFIG_START(cfx9850_state::cfx9850)
- MCFG_CPU_ADD("maincpu", HCD62121, 4300000) /* X1 - 4.3 MHz */
- MCFG_CPU_PROGRAM_MAP(cfx9850)
- MCFG_HCD62121_KOL_CB(WRITE8(cfx9850_state, kol_w))
- MCFG_HCD62121_KOH_CB(WRITE8(cfx9850_state, koh_w))
- MCFG_HCD62121_PORT_CB(WRITE8(cfx9850_state, port_w))
- MCFG_HCD62121_OPT_CB(WRITE8(cfx9850_state, opt_w))
- MCFG_HCD62121_KI_CB(READ8(cfx9850_state, ki_r))
- MCFG_HCD62121_IN0_CB(READ8(cfx9850_state, in0_r))
+ MCFG_DEVICE_ADD("maincpu", HCD62121, 4300000) /* X1 - 4.3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cfx9850)
+ MCFG_HCD62121_KOL_CB(WRITE8(*this, cfx9850_state, kol_w))
+ MCFG_HCD62121_KOH_CB(WRITE8(*this, cfx9850_state, koh_w))
+ MCFG_HCD62121_PORT_CB(WRITE8(*this, cfx9850_state, port_w))
+ MCFG_HCD62121_OPT_CB(WRITE8(*this, cfx9850_state, opt_w))
+ MCFG_HCD62121_KI_CB(READ8(*this, cfx9850_state, ki_r))
+ MCFG_HCD62121_IN0_CB(READ8(*this, cfx9850_state, in0_r))
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index 5718bf52fb9..745b6cc443e 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -480,29 +480,29 @@ void cgc7900_state::machine_reset()
MACHINE_CONFIG_START(cgc7900_state::cgc7900)
/* basic machine hardware */
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(28'480'000)/4)
- MCFG_CPU_PROGRAM_MAP(cgc7900_mem)
-
- MCFG_CPU_ADD(I8035_TAG, I8035, 1000000)
- MCFG_CPU_PROGRAM_MAP(keyboard_mem)
- //MCFG_MCS48_PORT_P1_IN_CB(READ8())
- //MCFG_MCS48_PORT_P1_OUT_CB(WRITE8())
- //MCFG_MCS48_PORT_P2_IN_CB(READ8())
- //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8())
- //MCFG_MCS48_PORT_T1_IN_CB(READLINE())
- //MCFG_MCS48_PORT_BUS_IN_CB(READ8())
- //MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8())
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, XTAL(28'480'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(cgc7900_mem)
+
+ MCFG_DEVICE_ADD(I8035_TAG, I8035, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(keyboard_mem)
+ //MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, ))
+ //MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ))
+ //MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, ))
+ //MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ))
+ //MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ))
+ //MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, ))
+ //MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, ))
MCFG_DEVICE_DISABLE()
-/* MCFG_CPU_ADD(AM2910_TAG, AM2910, XTAL(17'360'000))
- MCFG_CPU_PROGRAM_MAP(omti10_mem)*/
+/* MCFG_DEVICE_ADD(AM2910_TAG, AM2910, XTAL(17'360'000))
+ MCFG_DEVICE_PROGRAM_MAP(omti10_mem)*/
/* video hardware */
cgc7900_video(config);
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(28'480'000)/16)
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, XTAL(28'480'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -510,33 +510,33 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900)
MCFG_GENERIC_KEYBOARD_CB(PUT(cgc7900_state, kbd_put))
MCFG_DEVICE_ADD(MM58167_TAG, MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(WRITELINE(cgc7900_state, irq<0x0>))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, cgc7900_state, irq<0x0>))
MCFG_DEVICE_ADD(K1135A_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(cgc7900_state, write_rs232_clock))
- MCFG_COM8116_FT_HANDLER(WRITELINE(cgc7900_state, write_rs449_clock))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, cgc7900_state, write_rs232_clock))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(*this, cgc7900_state, write_rs449_clock))
MCFG_DEVICE_ADD(INS8251_0_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0xf>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0x3>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0xf>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0x3>))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8251_0_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8251_0_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8251_0_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8251_0_TAG, i8251_device, write_dsr))
MCFG_DEVICE_ADD(INS8251_1_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs449", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs449", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs449", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0x8>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(cgc7900_state, irq<0x1>))
-
- MCFG_RS232_PORT_ADD("rs449", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8251_1_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8251_1_TAG, i8251_device, write_dsr))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs449", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs449", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs449", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0x8>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, cgc7900_state, irq<0x1>))
+
+ MCFG_DEVICE_ADD("rs449", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8251_1_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8251_1_TAG, i8251_device, write_dsr))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp
index 2e0b91a03e2..6de6d3d2aed 100644
--- a/src/mame/drivers/cgenie.cpp
+++ b/src/mame/drivers/cgenie.cpp
@@ -440,9 +440,9 @@ const rgb_t cgenie_state::m_palette_nz[] =
MACHINE_CONFIG_START(cgenie_state::cgenie)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(17'734'470) / 8) // 2.2168 MHz
- MCFG_CPU_PROGRAM_MAP(cgenie_mem)
- MCFG_CPU_IO_MAP(cgenie_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(17'734'470) / 8) // 2.2168 MHz
+ MCFG_DEVICE_PROGRAM_MAP(cgenie_mem)
+ MCFG_DEVICE_IO_MAP(cgenie_io)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -457,11 +457,11 @@ MACHINE_CONFIG_START(cgenie_state::cgenie)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(17'734'470) / 8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("par", cg_parallel_slot_device, pa_r))
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("par", cg_parallel_slot_device, pa_w))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("par", cg_parallel_slot_device, pb_r))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("par", cg_parallel_slot_device, pb_w))
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(17'734'470) / 8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("par", cg_parallel_slot_device, pa_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("par", cg_parallel_slot_device, pa_w))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("par", cg_parallel_slot_device, pb_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("par", cg_parallel_slot_device, pb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_CASSETTE_ADD("cassette")
@@ -472,9 +472,9 @@ MACHINE_CONFIG_START(cgenie_state::cgenie)
MCFG_SOFTWARE_LIST_ADD("cass_list", "cgenie_cass")
// serial port
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(cgenie_state, rs232_rx_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(cgenie_state, rs232_dcd_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, cgenie_state, rs232_rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, cgenie_state, rs232_dcd_w))
// cartridge expansion slot
MCFG_CG_EXP_SLOT_ADD("exp")
diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp
index 28c80b80d86..9d205c9e5ca 100644
--- a/src/mame/drivers/chaknpop.cpp
+++ b/src/mame/drivers/chaknpop.cpp
@@ -365,9 +365,9 @@ void chaknpop_state::machine_reset()
MACHINE_CONFIG_START(chaknpop_state::chaknpop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000) / 6) // Verified on PCB
- MCFG_CPU_PROGRAM_MAP(chaknpop_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", chaknpop_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'000'000) / 6) // Verified on PCB
+ MCFG_DEVICE_PROGRAM_MAP(chaknpop_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", chaknpop_state, irq0_line_hold)
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'000'000) / 6) // Verified on PCB
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
@@ -388,14 +388,14 @@ MACHINE_CONFIG_START(chaknpop_state::chaknpop)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'000'000) / 12) // Verified on PCB
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'000'000) / 12) // Verified on PCB
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'000'000) / 12) /* Verified on PCB */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(chaknpop_state, unknown_port_1_w)) // ??
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(chaknpop_state, unknown_port_2_w)) // ??
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'000'000) / 12) /* Verified on PCB */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, chaknpop_state, unknown_port_1_w)) // ??
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, chaknpop_state, unknown_port_2_w)) // ??
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp
index 164dcc16872..cc8f9705425 100644
--- a/src/mame/drivers/cham24.cpp
+++ b/src/mame/drivers/cham24.cpp
@@ -314,8 +314,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(cham24_state::cham24)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cham24_map)
+ MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cham24_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 70c56d19ded..89c4ac164bd 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -523,19 +523,19 @@ INTERRUPT_GEN_MEMBER(champbas_state::vblank_irq)
MACHINE_CONFIG_START(champbas_state::talbot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(champbasj_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(champbasj_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(champbas_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, champbas_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // !WORK board output (no use?)
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // no gfxbank
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(champbas_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, champbas_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // no palettebank
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // n.c.
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, champbas_state, mcu_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, champbas_state, mcu_switch_w))
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
@@ -562,7 +562,7 @@ MACHINE_CONFIG_START(champbas_state::talbot)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -570,22 +570,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::champbas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(champbas_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(champbas_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 9D; 8G on Champion Baseball II Double Board Configuration
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(champbas_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, champbas_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // !WORK board output (no use?)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(champbas_state, gfxbank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(champbas_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(champbas_state, palette_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, champbas_state, gfxbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, champbas_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, champbas_state, palette_bank_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // n.c.
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // no MCU
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // no MCU
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(champbas_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(champbas_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 0x10)
@@ -609,10 +609,10 @@ MACHINE_CONFIG_START(champbas_state::champbas)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -621,12 +621,12 @@ MACHINE_CONFIG_START(champbas_state::champbasj)
champbas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(champbasj_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(champbasj_map)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, champbas_state, mcu_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, champbas_state, mcu_switch_w))
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // note: 8302 rom on champbb2 (same device!)
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
@@ -637,24 +637,24 @@ MACHINE_CONFIG_START(champbas_state::champbasja)
champbas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(champbasja_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(champbasja_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::champbasjb)
champbas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(champbasjb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(champbasjb_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::champbb2)
champbasj(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(champbb2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(champbb2_map)
MACHINE_CONFIG_END
@@ -662,10 +662,10 @@ MACHINE_CONFIG_START(champbas_state::tbasebal)
champbas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tbasebal_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tbasebal_map)
- MCFG_CPU_ADD("mcu", M68705P3, XTAL(18'432'000)/6) // ?Mhz
+ MCFG_DEVICE_ADD("mcu", M68705P3, XTAL(18'432'000)/6) // ?Mhz
MACHINE_CONFIG_END
@@ -673,24 +673,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::exctsccr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6 )
- MCFG_CPU_PROGRAM_MAP(exctsccr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6 )
+ MCFG_DEVICE_PROGRAM_MAP(exctsccr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(champbas_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, champbas_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // !WORK board output (no use?)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(champbas_state, gfxbank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(champbas_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, champbas_state, gfxbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, champbas_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // no palettebank
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // n.c.
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, champbas_state, mcu_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, champbas_state, mcu_switch_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4 )
- MCFG_CPU_PROGRAM_MAP(exctsccr_sound_map)
- MCFG_CPU_IO_MAP(exctsccr_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(champbas_state, nmi_line_pulse, 4000) // 4 kHz, updates the dac
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4 )
+ MCFG_DEVICE_PROGRAM_MAP(exctsccr_sound_map)
+ MCFG_DEVICE_IO_MAP(exctsccr_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(champbas_state, nmi_line_pulse, 4000) // 4 kHz, updates the dac
MCFG_TIMER_DRIVER_ADD_PERIODIC("exc_snd_irq", champbas_state, exctsccr_sound_irq, attotime::from_hz(75)) // irq source unknown, determines music tempo
MCFG_TIMER_START_DELAY(attotime::from_hz(75))
@@ -721,20 +721,20 @@ MACHINE_CONFIG_START(champbas_state::exctsccr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* AY (melody) clock is specified by a VR (0.9 - 3.9 MHz) */
- MCFG_SOUND_ADD("ay1", AY8910, 1940000) /* VR has a factory mark and this is the value read */
+ MCFG_DEVICE_ADD("ay1", AY8910, 1940000) /* VR has a factory mark and this is the value read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("ay3", AY8910, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("ay4", AY8910, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("ay4", AY8910, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.08)
- MCFG_SOUND_ADD("dac1", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -744,22 +744,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(champbas_state::exctsccrb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(exctsccrb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(exctsccrb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", champbas_state, vblank_irq)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(champbas_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, champbas_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // !WORK board output (no use?)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(champbas_state, gfxbank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(champbas_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, champbas_state, gfxbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, champbas_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // no palettebank
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // n.c.
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(champbas_state, mcu_start_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(champbas_state, mcu_switch_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, champbas_state, mcu_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, champbas_state, mcu_switch_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(champbas_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(champbas_sound_map)
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(18'432'000)/6/8) // champbasj 8201 on pcb, though unused
MCFG_QUANTUM_PERFECT_CPU("alpha_8201:mcu")
@@ -786,10 +786,10 @@ MACHINE_CONFIG_START(champbas_state::exctsccrb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp
index d36923f38aa..4101218b4f7 100644
--- a/src/mame/drivers/champbwl.cpp
+++ b/src/mame/drivers/champbwl.cpp
@@ -490,9 +490,9 @@ WRITE_LINE_MEMBER(champbwl_state::screen_vblank_champbwl)
MACHINE_CONFIG_START(champbwl_state::champbwl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16000000/4) /* 4MHz */
- MCFG_CPU_PROGRAM_MAP(champbwl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", champbwl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16000000/4) /* 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(champbwl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", champbwl_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -509,7 +509,7 @@ MACHINE_CONFIG_START(champbwl_state::champbwl)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(champbwl_state, screen_update_champbwl)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(champbwl_state, screen_vblank_champbwl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, champbwl_state, screen_vblank_champbwl))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", champbwl)
@@ -520,7 +520,7 @@ MACHINE_CONFIG_START(champbwl_state::champbwl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -555,9 +555,9 @@ MACHINE_START_MEMBER(champbwl_state,doraemon)
MACHINE_CONFIG_START(champbwl_state::doraemon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(doraemon)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", champbwl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(doraemon)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", champbwl_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -573,7 +573,7 @@ MACHINE_CONFIG_START(champbwl_state::doraemon)
MCFG_SCREEN_SIZE(320, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(champbwl_state, screen_update_doraemon)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(champbwl_state, screen_vblank_doraemon))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, champbwl_state, screen_vblank_doraemon))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", champbwl)
@@ -583,7 +583,7 @@ MACHINE_CONFIG_START(champbwl_state::doraemon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL(14'318'181))
+ MCFG_DEVICE_ADD("x1snd", X1_010, XTAL(14'318'181))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index be917571ca5..f6116bf13d6 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -390,8 +390,8 @@ void chanbara_state::machine_reset()
MACHINE_CONFIG_START(chanbara_state::chanbara)
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(chanbara_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(chanbara_map)
/* video hardware */
@@ -412,10 +412,10 @@ MACHINE_CONFIG_START(chanbara_state::chanbara)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12000000/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("maincpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(chanbara_state, chanbara_ay_out_0_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(chanbara_state, chanbara_ay_out_1_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, chanbara_state, chanbara_ay_out_0_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, chanbara_state, chanbara_ay_out_1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 01e68eadba4..1519d5abe5c 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -452,10 +452,10 @@ void chance32_state::machine_reset()
MACHINE_CONFIG_START(chance32_state::chance32)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2)
- MCFG_CPU_PROGRAM_MAP(chance32_map)
- MCFG_CPU_IO_MAP(chance32_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", chance32_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(chance32_map)
+ MCFG_DEVICE_IO_MAP(chance32_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", chance32_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp
index c5638801a7b..7f3779ac1da 100644
--- a/src/mame/drivers/changela.cpp
+++ b/src/mame/drivers/changela.cpp
@@ -418,22 +418,22 @@ void changela_state::machine_reset()
MACHINE_CONFIG_START(changela_state::changela)
- MCFG_CPU_ADD("maincpu", Z80,5000000)
- MCFG_CPU_PROGRAM_MAP(changela_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,5000000)
+ MCFG_DEVICE_PROGRAM_MAP(changela_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", changela_state, changela_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("mcu", M68705P3, 2500000)
+ MCFG_DEVICE_ADD("mcu", M68705P3, 2500000)
MCFG_M68705_PORTB_R_CB(IOPORT("MCU"))
- MCFG_M68705_PORTA_W_CB(WRITE8(changela_state, changela_68705_port_a_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(changela_state, changela_68705_port_c_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", changela_state, chl_mcu_irq)
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, changela_state, changela_68705_port_a_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, changela_state, changela_68705_port_c_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", changela_state, chl_mcu_irq)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // U44 on Sound I/O Board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(changela_state, collision_reset_0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(changela_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(changela_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(changela_state, mcu_pc_0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(changela_state, collision_reset_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, changela_state, collision_reset_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, changela_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, changela_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, changela_state, mcu_pc_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, changela_state, collision_reset_1_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -449,12 +449,12 @@ MACHINE_CONFIG_START(changela_state::changela)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1250000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, 1250000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWC"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWD"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp
index 8f7c6daa3e1..da81723aa6d 100644
--- a/src/mame/drivers/channelf.cpp
+++ b/src/mame/drivers/channelf.cpp
@@ -212,9 +212,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(channelf_state::channelf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", F8, 3579545/2) /* Colorburst/2 */
- MCFG_CPU_PROGRAM_MAP(channelf_map)
- MCFG_CPU_IO_MAP(channelf_io)
+ MCFG_DEVICE_ADD("maincpu", F8, 3579545/2) /* Colorburst/2 */
+ MCFG_DEVICE_PROGRAM_MAP(channelf_map)
+ MCFG_DEVICE_IO_MAP(channelf_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -231,7 +231,7 @@ MACHINE_CONFIG_START(channelf_state::channelf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", CHANNELF_SOUND, 0)
+ MCFG_DEVICE_ADD("custom", CHANNELF_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
channelf_cart(config);
@@ -239,9 +239,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(channelf_state::sabavdpl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */
- MCFG_CPU_PROGRAM_MAP(channelf_map)
- MCFG_CPU_IO_MAP(channelf_io)
+ MCFG_DEVICE_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */
+ MCFG_DEVICE_PROGRAM_MAP(channelf_map)
+ MCFG_DEVICE_IO_MAP(channelf_io)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
/* video hardware */
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(channelf_state::sabavdpl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", CHANNELF_SOUND, 0)
+ MCFG_DEVICE_ADD("custom", CHANNELF_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
channelf_cart(config);
@@ -267,9 +267,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(channelf_state::channlf2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", F8, 3579545/2) /* Colorburst / 2 */
- MCFG_CPU_PROGRAM_MAP(channelf_map)
- MCFG_CPU_IO_MAP(channelf_io)
+ MCFG_DEVICE_ADD("maincpu", F8, 3579545/2) /* Colorburst / 2 */
+ MCFG_DEVICE_PROGRAM_MAP(channelf_map)
+ MCFG_DEVICE_IO_MAP(channelf_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -286,7 +286,7 @@ MACHINE_CONFIG_START(channelf_state::channlf2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", CHANNELF_SOUND, 0)
+ MCFG_DEVICE_ADD("custom", CHANNELF_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
channelf_cart(config);
@@ -295,9 +295,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(channelf_state::sabavpl2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */
- MCFG_CPU_PROGRAM_MAP(channelf_map)
- MCFG_CPU_IO_MAP(channelf_io)
+ MCFG_DEVICE_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */
+ MCFG_DEVICE_PROGRAM_MAP(channelf_map)
+ MCFG_DEVICE_IO_MAP(channelf_io)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
/* video hardware */
@@ -314,7 +314,7 @@ MACHINE_CONFIG_START(channelf_state::sabavpl2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", CHANNELF_SOUND, 0)
+ MCFG_DEVICE_ADD("custom", CHANNELF_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
channelf_cart(config);
diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp
index 069f7e53cda..65e617ca518 100644
--- a/src/mame/drivers/chaos.cpp
+++ b/src/mame/drivers/chaos.cpp
@@ -150,10 +150,10 @@ void chaos_state::machine_reset()
MACHINE_CONFIG_START(chaos_state::chaos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_DATA_MAP(data_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_DATA_MAP(data_map)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp
index 517cd3e5d41..b2781a84fe8 100644
--- a/src/mame/drivers/cheekyms.cpp
+++ b/src/mame/drivers/cheekyms.cpp
@@ -124,10 +124,10 @@ INTERRUPT_GEN_MEMBER(cheekyms_state::vblank_irq)
MACHINE_CONFIG_START(cheekyms_state::cheekyms)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cheekyms_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cheekyms_state, vblank_irq)
/* video hardware */
@@ -148,14 +148,14 @@ MACHINE_CONFIG_START(cheekyms_state::cheekyms)
#if 0
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac0", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac1", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac4", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac5", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac6", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac7", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac0", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac1", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac4", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac5", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac6", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac7", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp
index 33d8685c461..a66b8d17148 100644
--- a/src/mame/drivers/chessmst.cpp
+++ b/src/mame/drivers/chessmst.cpp
@@ -381,79 +381,79 @@ static const z80_daisy_config chessmstdm_daisy_chain[] =
MACHINE_CONFIG_START(chessmst_state::chessmst)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 9.8304_MHz_XTAL/4) // U880 Z80 clone
- MCFG_CPU_PROGRAM_MAP(chessmst_mem)
- MCFG_CPU_IO_MAP(chessmst_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 9.8304_MHz_XTAL/4) // U880 Z80 clone
+ MCFG_DEVICE_PROGRAM_MAP(chessmst_mem)
+ MCFG_DEVICE_IO_MAP(chessmst_io)
MCFG_Z80_DAISY_CHAIN(chessmst_daisy_chain)
MCFG_DEVICE_ADD("z80pio1", Z80PIO, 9.8304_MHz_XTAL/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(chessmst_state, pio1_port_a_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio1_port_b_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, chessmst_state, pio1_port_a_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio1_port_b_w))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, 9.8304_MHz_XTAL/4)
- MCFG_Z80PIO_IN_PA_CB(READ8(chessmst_state, pio2_port_a_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio2_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, chessmst_state, pio2_port_a_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio2_port_b_w))
MCFG_DEFAULT_LAYOUT(layout_chessmst)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(chessmst_state::chessmsta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL/4) // U880 Z80 clone
- MCFG_CPU_PROGRAM_MAP(chessmst_mem)
- MCFG_CPU_IO_MAP(chessmst_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL/4) // U880 Z80 clone
+ MCFG_DEVICE_PROGRAM_MAP(chessmst_mem)
+ MCFG_DEVICE_IO_MAP(chessmst_io)
MCFG_Z80_DAISY_CHAIN(chessmst_daisy_chain)
MCFG_DEVICE_ADD("z80pio1", Z80PIO, 8_MHz_XTAL/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(chessmst_state, pio1_port_a_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio1_port_b_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, chessmst_state, pio1_port_a_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio1_port_b_w))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, 8_MHz_XTAL/4)
- MCFG_Z80PIO_IN_PA_CB(READ8(chessmst_state, pio2_port_a_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio2_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, chessmst_state, pio2_port_a_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio2_port_b_w))
MCFG_DEFAULT_LAYOUT(layout_chessmst)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(chessmst_state::chessmstdm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL/2) // U880 Z80 clone
- MCFG_CPU_PROGRAM_MAP(chessmstdm)
- MCFG_CPU_IO_MAP(chessmstdm_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL/2) // U880 Z80 clone
+ MCFG_DEVICE_PROGRAM_MAP(chessmstdm)
+ MCFG_DEVICE_IO_MAP(chessmstdm_io)
MCFG_Z80_DAISY_CHAIN(chessmstdm_daisy_chain)
MCFG_DEVICE_ADD("z80pio1", Z80PIO, 8_MHz_XTAL/4)
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(chessmst_state, pio1_port_a_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio1_port_b_dm_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, chessmst_state, pio1_port_a_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio1_port_b_dm_w))
MCFG_Z80PIO_IN_PB_CB(IOPORT("EXTRA"))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, 8_MHz_XTAL/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(chessmst_state, pio2_port_a_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(chessmst_state, pio2_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, chessmst_state, pio2_port_a_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio2_port_b_w))
MCFG_DEFAULT_LAYOUT(layout_chessmstdm)
MCFG_DEVICE_ADD("555_timer", CLOCK, 500) // from 555 timer
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(chessmst_state, timer_555_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, chessmst_state, timer_555_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "chessmstdm_cart")
diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp
index c59b1ceeae5..22b3d44bd6a 100644
--- a/src/mame/drivers/chesstrv.cpp
+++ b/src/mame/drivers/chesstrv.cpp
@@ -273,9 +273,9 @@ void borisdpl_state::machine_start()
MACHINE_CONFIG_START(chesstrv_state::chesstrv)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", F8, 3000000 ) // Fairchild 3870
- MCFG_CPU_PROGRAM_MAP( chesstrv_mem )
- MCFG_CPU_IO_MAP( chesstrv_io )
+ MCFG_DEVICE_ADD( "maincpu", F8, 3000000 ) // Fairchild 3870
+ MCFG_DEVICE_PROGRAM_MAP( chesstrv_mem )
+ MCFG_DEVICE_IO_MAP( chesstrv_io )
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_chesstrv )
@@ -283,9 +283,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(borisdpl_state::borisdpl)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", F8, 30000000 ) // Motorola SC80265P
- MCFG_CPU_PROGRAM_MAP( chesstrv_mem )
- MCFG_CPU_IO_MAP( borisdpl_io )
+ MCFG_DEVICE_ADD( "maincpu", F8, 30000000 ) // Motorola SC80265P
+ MCFG_DEVICE_PROGRAM_MAP( chesstrv_mem )
+ MCFG_DEVICE_IO_MAP( borisdpl_io )
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_borisdpl )
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index 27d363e70de..1fa1d026746 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -326,23 +326,23 @@ TIMER_DEVICE_CALLBACK_MEMBER(chexx_state::update)
MACHINE_CONFIG_START(chexx_state::chexx83)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(chexx83_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(chexx83_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("update", chexx_state, update, attotime::from_hz(60))
// via
MCFG_DEVICE_ADD("via6522", VIA6522, MAIN_CLOCK/4)
- MCFG_VIA6522_READPA_HANDLER(READ8(chexx_state, via_a_in))
- MCFG_VIA6522_READPB_HANDLER(READ8(chexx_state, via_b_in))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, chexx_state, via_a_in))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, chexx_state, via_b_in))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(chexx_state, via_a_out))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(chexx_state, via_b_out))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, chexx_state, via_a_out))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, chexx_state, via_b_out))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(chexx_state, via_ca2_out))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(chexx_state, via_cb1_out))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(chexx_state, via_cb2_out))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(chexx_state, via_irq_out))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, chexx_state, via_ca2_out))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, chexx_state, via_cb1_out))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, chexx_state, via_cb2_out))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, chexx_state, via_irq_out))
// Layout
MCFG_DEFAULT_LAYOUT(layout_chexx)
@@ -355,10 +355,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(chexx_state::faceoffh)
chexx83(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(faceoffh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(faceoffh_map)
- MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/2)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 3e5b20ea55d..fc85e2ff8fb 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -1851,9 +1851,9 @@ void chihiro_state::an2131sc_configuration(device_t *device)
MACHINE_CONFIG_START(chihiro_state::chihiro_base)
xbox_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(chihiro_map)
- MCFG_CPU_IO_MAP(chihiro_map_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(chihiro_map)
+ MCFG_DEVICE_IO_MAP(chihiro_map_io)
//MCFG_BUS_MASTER_IDE_CONTROLLER_ADD("ide", ide_baseboard, nullptr, "bb", true)
MCFG_DEVICE_MODIFY(":pci:09.0:ide:0")
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index 9cd02c1b445..4910930cf2a 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -560,15 +560,15 @@ MACHINE_RESET_MEMBER(chinagat_state,chinagat)
MACHINE_CONFIG_START(chinagat_state::chinagat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", chinagat_state, chinagat_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -605,23 +605,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(chinagat_state::saiyugoub1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", chinagat_state, chinagat_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz oscillator */
- MCFG_CPU_PROGRAM_MAP(saiyugoub1_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(saiyugoub1_sound_map)
- MCFG_CPU_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
- MCFG_CPU_PROGRAM_MAP(i8748_map)
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(chinagat_state, saiyugoub1_mcu_command_r))
+ MCFG_DEVICE_ADD("mcu", I8748, 9263750) /* 9.263750 MHz oscillator, divided by 3*5 internally */
+ MCFG_DEVICE_PROGRAM_MAP(i8748_map)
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, chinagat_state, saiyugoub1_mcu_command_r))
//MCFG_MCS48_PORT_T0_CLK_CUSTOM(chinagat_state, saiyugoub1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(chinagat_state, saiyugoub1_m5205_irq_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(chinagat_state, saiyugoub1_adpcm_rom_addr_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(chinagat_state, saiyugoub1_adpcm_control_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, chinagat_state, saiyugoub1_m5205_irq_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, chinagat_state, saiyugoub1_adpcm_rom_addr_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, chinagat_state, saiyugoub1_adpcm_control_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -652,8 +652,8 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub1)
MCFG_SOUND_ROUTE(0, "mono", 0.80)
MCFG_SOUND_ROUTE(1, "mono", 0.80)
- MCFG_SOUND_ADD("adpcm", MSM5205, 9263750 / 24)
- MCFG_MSM5205_VCLK_CB(WRITELINE(chinagat_state, saiyugoub1_m5205_irq_w)) /* Interrupt function */
+ MCFG_DEVICE_ADD("adpcm", MSM5205, 9263750 / 24)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, chinagat_state, saiyugoub1_m5205_irq_w)) /* Interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* vclk input mode (6030Hz, 4-bit) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -661,15 +661,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(chinagat_state::saiyugoub2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", chinagat_state, chinagat_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz oscillator */
- MCFG_CPU_PROGRAM_MAP(ym2203c_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(3'579'545)) /* 3.579545 MHz oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(ym2203c_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* heavy interleaving to sync up sprite<->main cpu's */
@@ -694,14 +694,14 @@ MACHINE_CONFIG_START(chinagat_state::saiyugoub2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, 3579545)
+ MCFG_DEVICE_ADD("ym1", YM2203, 3579545)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_SOUND_ADD("ym2", YM2203, 3579545)
+ MCFG_DEVICE_ADD("ym2", YM2203, 3579545)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index 82221bdc519..7f7b438cbcd 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -506,18 +506,18 @@ DRIVER_INIT_MEMBER( chinsan_state, chinsan )
// C1-00114-B
MACHINE_CONFIG_START(chinsan_state::chinsan)
- MCFG_CPU_ADD("maincpu", MC8123, XTAL(10'000'000)/2) // 317-5012
- MCFG_CPU_PROGRAM_MAP(chinsan_map)
- MCFG_CPU_IO_MAP(chinsan_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", chinsan_state, vblank_int)
+ MCFG_DEVICE_ADD("maincpu", MC8123, XTAL(10'000'000)/2) // 317-5012
+ MCFG_DEVICE_PROGRAM_MAP(chinsan_map)
+ MCFG_DEVICE_IO_MAP(chinsan_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", chinsan_state, vblank_int)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(chinsan_state, input_select_w))
- MCFG_I8255_IN_PORTB_CB(READ8(chinsan_state, input_p2_r))
- MCFG_I8255_IN_PORTC_CB(READ8(chinsan_state, input_p1_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, chinsan_state, input_select_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, chinsan_state, input_p2_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, chinsan_state, input_p1_r))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -534,7 +534,7 @@ MACHINE_CONFIG_START(chinsan_state::chinsan)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(10'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(10'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -542,8 +542,8 @@ MACHINE_CONFIG_START(chinsan_state::chinsan)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("adpcm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(chinsan_state, adpcm_int_w))
+ MCFG_DEVICE_ADD("adpcm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, chinsan_state, adpcm_int_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) // 8kHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -552,10 +552,10 @@ MACHINE_CONFIG_START(chinsan_state::mayumi)
chinsan(config);
// standard Z80 instead of MC-8123
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(chinsan_map)
- MCFG_CPU_IO_MAP(mayumi_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", chinsan_state, vblank_int)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(chinsan_map)
+ MCFG_DEVICE_IO_MAP(mayumi_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", chinsan_state, vblank_int)
// no ADPCM
MCFG_DEVICE_REMOVE("adpcm")
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index 7ffcfa9a18b..d6880b30b8f 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -319,11 +319,11 @@ WRITE_LINE_MEMBER(chqflag_state::background_brt_w)
MACHINE_CONFIG_START(chqflag_state::chqflag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(chqflag_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(chqflag_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(chqflag_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(chqflag_sound_map)
MCFG_DEVICE_ADD("bank1000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank1000_map)
@@ -354,7 +354,7 @@ MACHINE_CONFIG_START(chqflag_state::chqflag)
MCFG_K051960_CB(chqflag_state, sprite_callback)
MCFG_K051960_IRQ_HANDLER(INPUTLINE("maincpu", KONAMI_IRQ_LINE))
MCFG_K051960_NMI_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_K051960_VREG_CONTRAST_HANDLER(WRITELINE(chqflag_state,background_brt_w))
+ MCFG_K051960_VREG_CONTRAST_HANDLER(WRITELINE(*this, chqflag_state,background_brt_w))
MCFG_DEVICE_ADD("k051316_1", K051316, 0)
MCFG_GFX_PALETTE("palette")
@@ -382,13 +382,13 @@ MACHINE_CONFIG_START(chqflag_state::chqflag)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
- MCFG_SOUND_ADD("k007232_1", K007232, XTAL(3'579'545)) /* verified on pcb */
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(chqflag_state, volume_callback0))
+ MCFG_DEVICE_ADD("k007232_1", K007232, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, chqflag_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_SOUND_ADD("k007232_2", K007232, XTAL(3'579'545)) /* verified on pcb */
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(chqflag_state, volume_callback1))
+ MCFG_DEVICE_ADD("k007232_2", K007232, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, chqflag_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index b14df442ee9..c504a818d7d 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -361,10 +361,10 @@ void chsuper_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(chsuper_state::chsuper)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 4) /* HD64180RP8, 8 MHz? */
- MCFG_CPU_PROGRAM_MAP(chsuper_prg_map)
- MCFG_CPU_IO_MAP(chsuper_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", chsuper_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 4) /* HD64180RP8, 8 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(chsuper_prg_map)
+ MCFG_DEVICE_IO_MAP(chsuper_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", chsuper_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -385,7 +385,7 @@ MACHINE_CONFIG_START(chsuper_state::chsuper)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index d447dbfb80b..9e00e76e42e 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -399,12 +399,12 @@ void cidelsa_state::machine_reset()
MACHINE_CONFIG_START(cidelsa_state::destryer)
/* basic system hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
- MCFG_CPU_PROGRAM_MAP(destryer_map)
- MCFG_CPU_IO_MAP(destryer_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
+ MCFG_DEVICE_PROGRAM_MAP(destryer_map)
+ MCFG_DEVICE_IO_MAP(destryer_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(cidelsa_state, clear_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(cidelsa_state, q_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -414,12 +414,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cidelsa_state::destryera)
/* basic system hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
- MCFG_CPU_PROGRAM_MAP(destryera_map)
- MCFG_CPU_IO_MAP(destryer_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
+ MCFG_DEVICE_PROGRAM_MAP(destryera_map)
+ MCFG_DEVICE_IO_MAP(destryer_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(cidelsa_state, clear_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(cidelsa_state, q_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -429,12 +429,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cidelsa_state::altair)
/* basic system hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, ALTAIR_CHR1)
- MCFG_CPU_PROGRAM_MAP(altair_map)
- MCFG_CPU_IO_MAP(altair_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, ALTAIR_CHR1)
+ MCFG_DEVICE_PROGRAM_MAP(altair_map)
+ MCFG_DEVICE_IO_MAP(altair_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(cidelsa_state, clear_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(cidelsa_state, q_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -450,7 +450,7 @@ MACHINE_CONFIG_START(cidelsa_state::altair)
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN2"))
MCFG_DEVICE_ADD("ic26", CDP1852, ALTAIR_CHR1 / 8) // clock is CDP1802 TPB
MCFG_CDP1852_MODE_CALLBACK(VCC)
- MCFG_CDP1852_DO_CALLBACK(WRITE8(cidelsa_state, altair_out1_w))
+ MCFG_CDP1852_DO_CALLBACK(WRITE8(*this, cidelsa_state, altair_out1_w))
/* sound and video hardware */
altair_video(config);
@@ -458,23 +458,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(draco_state::draco)
/* basic system hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DRACO_CHR1)
- MCFG_CPU_PROGRAM_MAP(draco_map)
- MCFG_CPU_IO_MAP(draco_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, DRACO_CHR1)
+ MCFG_DEVICE_PROGRAM_MAP(draco_map)
+ MCFG_DEVICE_IO_MAP(draco_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(cidelsa_state, clear_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(cidelsa_state, q_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_CPU_ADD(COP402N_TAG, COP402, DRACO_SND_CHR1)
- MCFG_CPU_PROGRAM_MAP(draco_sound_map)
+ MCFG_DEVICE_ADD(COP402N_TAG, COP402, DRACO_SND_CHR1)
+ MCFG_DEVICE_PROGRAM_MAP(draco_sound_map)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
- MCFG_COP400_WRITE_D_CB(WRITE8(draco_state, sound_bankswitch_w))
- MCFG_COP400_WRITE_G_CB(WRITE8(draco_state, sound_g_w))
- MCFG_COP400_READ_L_CB(READ8(draco_state, psg_r))
- MCFG_COP400_WRITE_L_CB(WRITE8(draco_state, psg_w))
- MCFG_COP400_READ_IN_CB(READ8(draco_state, sound_in_r))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, draco_state, sound_bankswitch_w))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, draco_state, sound_g_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, draco_state, psg_r))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, draco_state, psg_w))
+ MCFG_COP400_READ_IN_CB(READ8(*this, draco_state, sound_in_r))
/* input/output hardware */
MCFG_DEVICE_ADD("ic29", CDP1852, 0) // clock is really tied to CDP1869 CMSEL (pin 37)
@@ -488,7 +488,7 @@ MACHINE_CONFIG_START(draco_state::draco)
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN2"))
MCFG_DEVICE_ADD("ic32", CDP1852, ALTAIR_CHR1 / 8) // clock is CDP1802 TPB
MCFG_CDP1852_MODE_CALLBACK(VCC)
- MCFG_CDP1852_DO_CALLBACK(WRITE8(draco_state, out1_w))
+ MCFG_CDP1852_DO_CALLBACK(WRITE8(*this, draco_state, out1_w))
/* sound and video hardware */
draco_video(config);
diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp
index 256175aca33..8258541710b 100644
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@@ -975,16 +975,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cinemat_state::cinemat_nojmi_4k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CCPU, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("maincpu", CCPU, MASTER_CLOCK/4)
MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback), this))
- MCFG_CCPU_EXTERNAL_FUNC(READ8(cinemat_state,joystick_read))
- MCFG_CPU_PROGRAM_MAP(program_map_4k)
- MCFG_CPU_DATA_MAP(data_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_CCPU_EXTERNAL_FUNC(READ8(*this, cinemat_state,joystick_read))
+ MCFG_DEVICE_PROGRAM_MAP(program_map_4k)
+ MCFG_DEVICE_DATA_MAP(data_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 7J on CCG-1
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(cinemat_state, coin_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(cinemat_state, vector_control_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, cinemat_state, coin_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, cinemat_state, vector_control_w))
/* video hardware */
MCFG_VECTOR_ADD("vector")
@@ -999,37 +999,37 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cinemat_state::cinemat_jmi_4k)
cinemat_nojmi_4k(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback), this))
- MCFG_CCPU_EXTERNAL_FUNC(DEVREAD8("maincpu",ccpu_cpu_device,read_jmi))
+ MCFG_CCPU_EXTERNAL_FUNC(READ8("maincpu",ccpu_cpu_device,read_jmi))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cinemat_state::cinemat_nojmi_8k)
cinemat_nojmi_4k(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(program_map_8k)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(program_map_8k)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cinemat_state::cinemat_jmi_8k)
cinemat_jmi_4k(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(program_map_8k)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(program_map_8k)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cinemat_state::cinemat_jmi_16k)
cinemat_jmi_4k(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(program_map_16k)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(program_map_16k)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cinemat_state::cinemat_jmi_32k)
cinemat_jmi_4k(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(program_map_32k)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(program_map_32k)
MACHINE_CONFIG_END
@@ -1079,7 +1079,7 @@ MACHINE_CONFIG_START(cinemat_state::tailg)
tailg_sound(config);
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(cinemat_state, mux_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, mux_select_w))
MACHINE_CONFIG_END
@@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(cinemat_state::boxingb)
MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_color)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(cinemat_state, mux_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, mux_select_w))
MACHINE_CONFIG_END
@@ -1152,9 +1152,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cinemat_state::qb3)
cinemat_jmi_32k(config);
qb3_sound(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_DATA_MAP(data_map_qb3)
- MCFG_CPU_IO_MAP(io_map_qb3)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_DATA_MAP(data_map_qb3)
+ MCFG_DEVICE_IO_MAP(io_map_qb3)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 1120, 0, 780)
MCFG_VIDEO_START_OVERRIDE(cinemat_state,cinemat_qb3color)
diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp
index 79f5c261639..3382872938e 100644
--- a/src/mame/drivers/circus.cpp
+++ b/src/mame/drivers/circus.cpp
@@ -286,8 +286,8 @@ void circus_state::machine_reset()
MACHINE_CONFIG_START(circus_state::circus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
- MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
+ MCFG_DEVICE_PROGRAM_MAP(circus_map)
/* video hardware */
@@ -307,12 +307,12 @@ MACHINE_CONFIG_START(circus_state::circus)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(circus_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(circus)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -321,8 +321,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(circus_state::robotbwl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
- MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
+ MCFG_DEVICE_PROGRAM_MAP(circus_map)
// does not generate irq!
@@ -342,12 +342,12 @@ MACHINE_CONFIG_START(circus_state::robotbwl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(robotbwl_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(robotbwl)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -363,8 +363,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(circus_state::crash_scanline)
MACHINE_CONFIG_START(circus_state::crash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
- MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
+ MCFG_DEVICE_PROGRAM_MAP(circus_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", circus_state, crash_scanline, "screen", 0, 1)
@@ -384,12 +384,12 @@ MACHINE_CONFIG_START(circus_state::crash)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(crash_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(crash)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -397,8 +397,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(circus_state::ripcord)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
- MCFG_CPU_PROGRAM_MAP(circus_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(11'289'000) / 16) /* 705.562kHz */
+ MCFG_DEVICE_PROGRAM_MAP(circus_map)
/* video hardware */
@@ -418,12 +418,12 @@ MACHINE_CONFIG_START(circus_state::ripcord)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(ripcord_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(circus)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index 5bd3d21549e..658176a16ef 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -347,22 +347,22 @@ WRITE_LINE_MEMBER(circusc_state::vblank_irq)
MACHINE_CONFIG_START(circusc_state::circusc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, 2048000) /* 2 MHz? */
- MCFG_CPU_PROGRAM_MAP(circusc_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, 2048000) /* 2 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(circusc_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 2C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(circusc_state, flipscreen_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(circusc_state, irq_mask_w)) // INTST
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, circusc_state, flipscreen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, circusc_state, irq_mask_w)) // INTST
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // MUT - not used
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(circusc_state, coin_counter_1_w)) // COIN1
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(circusc_state, coin_counter_2_w)) // COIN2
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(circusc_state, spritebank_w)) // OBJ CHENG
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, circusc_state, coin_counter_1_w)) // COIN1
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, circusc_state, coin_counter_2_w)) // COIN2
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, circusc_state, spritebank_w)) // OBJ CHENG
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -373,7 +373,7 @@ MACHINE_CONFIG_START(circusc_state::circusc)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(circusc_state, screen_update_circusc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(circusc_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, circusc_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", circusc)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -385,17 +385,17 @@ MACHINE_CONFIG_START(circusc_state::circusc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76496, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("sn1", SN76496, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 0)
- MCFG_SOUND_ADD("sn2", SN76496, XTAL(14'318'181)/8)
+ MCFG_DEVICE_ADD("sn2", SN76496, XTAL(14'318'181)/8)
MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 1)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 2) // ls374.7g + r44+r45+r47+r48+r50+r56+r57+r58+r59 (20k) + r46+r49+r51+r52+r53+r54+r55 (10k) + upc324.3h
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "fltdisc", 1.0, 2) // ls374.7g + r44+r45+r47+r48+r50+r56+r57+r58+r59 (20k) + r46+r49+r51+r52+r53+r54+r55 (10k) + upc324.3h
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("fltdisc", DISCRETE, 0)
+ MCFG_DEVICE_ADD("fltdisc", DISCRETE)
MCFG_DISCRETE_INTF(circusc)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 5874dad3b8a..077704681ab 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -1933,21 +1933,21 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::bigrun_scanline)
MACHINE_CONFIG_START(cischeat_state::bigrun)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu1", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(bigrun_map)
+ MCFG_DEVICE_ADD("cpu1", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(bigrun_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cischeat_state, bigrun_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("cpu2", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(bigrun_map2)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cischeat_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("cpu2", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(bigrun_map2)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cischeat_state, irq4_line_hold)
- MCFG_CPU_ADD("cpu3", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(bigrun_map3)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cischeat_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("cpu3", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(bigrun_map3)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cischeat_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", M68000, 6000000)
- MCFG_CPU_PROGRAM_MAP(bigrun_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cischeat_state, irq4_line_hold, 16*30)
+ MCFG_DEVICE_ADD("soundcpu", M68000, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(bigrun_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cischeat_state, irq4_line_hold, 16*30)
MCFG_QUANTUM_TIME(attotime::from_hz(1200))
@@ -1994,17 +1994,17 @@ MACHINE_CONFIG_START(cischeat_state::cischeat)
bigrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(cischeat_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(cischeat_map)
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PROGRAM_MAP(cischeat_map2)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PROGRAM_MAP(cischeat_map2)
- MCFG_CPU_MODIFY("cpu3")
- MCFG_CPU_PROGRAM_MAP(cischeat_map3)
+ MCFG_DEVICE_MODIFY("cpu3")
+ MCFG_DEVICE_PROGRAM_MAP(cischeat_map3)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(cischeat_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(cischeat_sound_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2032,20 +2032,20 @@ MACHINE_CONFIG_START(cischeat_state::f1gpstar)
bigrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_CLOCK(12000000)
- MCFG_CPU_PROGRAM_MAP(f1gpstar_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_CLOCK(12000000)
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstar_map)
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_CLOCK(12000000)
- MCFG_CPU_PROGRAM_MAP(f1gpstar_map2)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_CLOCK(12000000)
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstar_map2)
- MCFG_CPU_MODIFY("cpu3")
- MCFG_CPU_CLOCK(12000000)
- MCFG_CPU_PROGRAM_MAP(f1gpstar_map3)
+ MCFG_DEVICE_MODIFY("cpu3")
+ MCFG_DEVICE_CLOCK(12000000)
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstar_map3)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(f1gpstar_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstar_sound_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", f1gpstar)
@@ -2070,14 +2070,14 @@ MACHINE_CONFIG_START(cischeat_state::f1gpstr2)
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(f1gpstr2_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstr2_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(f1gpstr2_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstr2_sound_map)
- MCFG_CPU_ADD("cpu5", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(f1gpstr2_io_map)
+ MCFG_DEVICE_ADD("cpu5", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(f1gpstr2_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
MACHINE_CONFIG_END
@@ -2085,8 +2085,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cischeat_state::wildplt)
f1gpstr2(config);
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(wildplt_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(wildplt_map)
MACHINE_CONFIG_END
@@ -2115,8 +2115,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::scudhamm_scanline)
MACHINE_CONFIG_START(cischeat_state::scudhamm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(scudhamm_map)
+ MCFG_DEVICE_ADD("maincpu",M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(scudhamm_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cischeat_state, scudhamm_scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2171,8 +2171,8 @@ MACHINE_CONFIG_START(cischeat_state::armchmp2)
scudhamm(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(armchmp2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(armchmp2_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(cischeat_state, armchamp2_scanline)
MACHINE_CONFIG_END
@@ -2203,8 +2203,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::captflag_scanline)
MACHINE_CONFIG_START(cischeat_state::captflag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(24'000'000) / 2) // TMP68000P-12
- MCFG_CPU_PROGRAM_MAP(captflag_map)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(24'000'000) / 2) // TMP68000P-12
+ MCFG_DEVICE_PROGRAM_MAP(captflag_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cischeat_state, captflag_scanline, "screen", 0, 1)
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(2000), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH )
diff --git a/src/mame/drivers/cit101.cpp b/src/mame/drivers/cit101.cpp
index 877d94e0907..8eaca769ea6 100644
--- a/src/mame/drivers/cit101.cpp
+++ b/src/mame/drivers/cit101.cpp
@@ -274,9 +274,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cit101_state::cit101)
- MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
//MCFG_SCREEN_RAW_PARAMS(14.976_MHz_XTAL, 960, 0, 800, 260, 0, 240)
@@ -285,62 +285,62 @@ MACHINE_CONFIG_START(cit101_state::cit101)
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", I8085_RST75_LINE))
MCFG_DEVICE_ADD("comuart", I8251, 6.144_MHz_XTAL / 2)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("comm", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("comm", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("comm", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("uartint", input_merger_device, in_w<0>))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("uartint", input_merger_device, in_w<2>))
-
- MCFG_RS232_PORT_ADD("comm", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("comuart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("comuart", i8251_device, write_dsr))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("comm", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("comm", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("comm", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("uartint", input_merger_device, in_w<0>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("uartint", input_merger_device, in_w<2>))
+
+ MCFG_DEVICE_ADD("comm", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("comuart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("comuart", i8251_device, write_dsr))
// CTS can be disabled in SET-UP Mode C
// DSR, CD, SI, RI are examined only during the modem test, not "always ignored" as the User's Manual claims
MCFG_DEVICE_ADD("auxuart", I8251, 6.144_MHz_XTAL / 2)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("printer", rs232_port_device, write_txd))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("uartint", input_merger_device, in_w<1>))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("uartint", input_merger_device, in_w<3>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("printer", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("uartint", input_merger_device, in_w<1>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("uartint", input_merger_device, in_w<3>))
- MCFG_RS232_PORT_ADD("printer", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("auxuart", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("auxuart", i8251_device, write_cts))
MCFG_INPUT_MERGER_ANY_HIGH("uartint")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", I8085_RST55_LINE))
MCFG_DEVICE_ADD("kbduart", I8251, 6.144_MHz_XTAL / 2)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", cit101_hle_keyboard_device, write_rxd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("keyboard", cit101_hle_keyboard_device, write_rxd))
MCFG_I8251_RXRDY_HANDLER(INPUTLINE("maincpu", I8085_RST65_LINE))
MCFG_DEVICE_ADD("keyboard", CIT101_HLE_KEYBOARD, 0)
- MCFG_CIT101_HLE_KEYBOARD_TXD_CALLBACK(DEVWRITELINE("kbduart", i8251_device, write_rxd))
+ MCFG_CIT101_HLE_KEYBOARD_TXD_CALLBACK(WRITELINE("kbduart", i8251_device, write_rxd))
MCFG_DEVICE_ADD("pit0", PIT8253, 0)
MCFG_PIT8253_CLK0(6.144_MHz_XTAL / 4)
MCFG_PIT8253_CLK1(6.144_MHz_XTAL / 4)
MCFG_PIT8253_CLK2(6.144_MHz_XTAL / 4)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_txc))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("auxuart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("auxuart", i8251_device, write_txc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("auxuart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("pit1", PIT8253, 0)
MCFG_PIT8253_CLK0(6.144_MHz_XTAL / 4)
MCFG_PIT8253_CLK1(6.144_MHz_XTAL / 4)
MCFG_PIT8253_CLK2(6.144_MHz_XTAL / 4)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("comuart", i8251_device, write_txc))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("comuart", i8251_device, write_rxc))
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("kbduart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("kbduart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("comuart", i8251_device, write_txc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("comuart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("kbduart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("kbduart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(cit101_state, nvr_address_w))
- MCFG_I8255_IN_PORTB_CB(READ8(cit101_state, nvr_data_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(cit101_state, nvr_data_w))
- MCFG_I8255_IN_PORTC_CB(DEVREADLINE("comm", rs232_port_device, cts_r)) MCFG_DEVCB_BIT(0)
- MCFG_DEVCB_CHAIN_INPUT(DEVREADLINE("comm", rs232_port_device, dcd_r)) MCFG_DEVCB_BIT(1) // tied to DSR for loopback test
- MCFG_DEVCB_CHAIN_INPUT(DEVREADLINE("comm", rs232_port_device, ri_r)) MCFG_DEVCB_BIT(2) // tied to CTS for loopback test
- MCFG_DEVCB_CHAIN_INPUT(DEVREADLINE("comm", rs232_port_device, si_r)) MCFG_DEVCB_BIT(3) // tied to CTS for loopback test
- MCFG_I8255_OUT_PORTC_CB(WRITE8(cit101_state, nvr_control_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, cit101_state, nvr_address_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, cit101_state, nvr_data_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, cit101_state, nvr_data_w))
+ MCFG_I8255_IN_PORTC_CB(READLINE("comm", rs232_port_device, cts_r)) MCFG_DEVCB_BIT(0)
+ MCFG_DEVCB_CHAIN_INPUT(READLINE("comm", rs232_port_device, dcd_r)) MCFG_DEVCB_BIT(1) // tied to DSR for loopback test
+ MCFG_DEVCB_CHAIN_INPUT(READLINE("comm", rs232_port_device, ri_r)) MCFG_DEVCB_BIT(2) // tied to CTS for loopback test
+ MCFG_DEVCB_CHAIN_INPUT(READLINE("comm", rs232_port_device, si_r)) MCFG_DEVCB_BIT(3) // tied to CTS for loopback test
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, cit101_state, nvr_control_w))
MCFG_DEVICE_ADD("nvr", ER2055, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cit220.cpp b/src/mame/drivers/cit220.cpp
index 4325e3494cb..fb62f80b769 100644
--- a/src/mame/drivers/cit220.cpp
+++ b/src/mame/drivers/cit220.cpp
@@ -80,10 +80,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cit220_state::cit220p)
- MCFG_CPU_ADD("maincpu", I8085A, 6000000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_I8085A_SOD(WRITELINE(cit220_state, sod_w))
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_I8085A_SOD(WRITELINE(*this, cit220_state, sod_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(24553200, 1580, 0, 1320, 259, 0, 240) // dot clock guessed
diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp
index 5db550d845c..2b6dc58858d 100644
--- a/src/mame/drivers/citycon.cpp
+++ b/src/mame/drivers/citycon.cpp
@@ -190,13 +190,13 @@ void citycon_state::machine_reset()
MACHINE_CONFIG_START(citycon_state::citycon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000)) // HD68B09P
- MCFG_CPU_PROGRAM_MAP(citycon_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", citycon_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(8'000'000)) // HD68B09P
+ MCFG_DEVICE_PROGRAM_MAP(citycon_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", citycon_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(20'000'000) / 32) // schematics allow for either a 6809 or 6809E; HD68A09EP found on one actual PCB
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", citycon_state, irq0_line_hold) //actually unused, probably it was during development
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(20'000'000) / 32) // schematics allow for either a 6809 or 6809E; HD68A09EP found on one actual PCB
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", citycon_state, irq0_line_hold) //actually unused, probably it was during development
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -217,12 +217,12 @@ MACHINE_CONFIG_START(citycon_state::citycon)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(20'000'000) / 16) // schematics consistently specify AY-3-8910, though YM2149 found on one actual PCB
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(20'000'000) / 16) // schematics consistently specify AY-3-8910, though YM2149 found on one actual PCB
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(20'000'000) / 16)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch2", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(20'000'000) / 16)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch2", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp
index f75d65bc98a..4848af9acf3 100644
--- a/src/mame/drivers/ckz80.cpp
+++ b/src/mame/drivers/ckz80.cpp
@@ -434,8 +434,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ckz80_state::master)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(master_trampoline)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(master_trampoline)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", ckz80_state, irq_on, attotime::from_hz(429)) // theoretical frequency from 555 timer (22nF, 150K, 1K5), measurement was 418Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(429) - attotime::from_nsec(22870)) // active for 22.87us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", ckz80_state, irq_off, attotime::from_hz(429))
@@ -451,7 +451,7 @@ MACHINE_CONFIG_START(ckz80_state::master)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_2BIT_BINARY_WEIGHTED_ONES_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_BINARY_WEIGHTED_ONES_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp
index 2d1b834e1ae..e49395b8fc4 100644
--- a/src/mame/drivers/clayshoo.cpp
+++ b/src/mame/drivers/clayshoo.cpp
@@ -325,10 +325,10 @@ void clayshoo_state::machine_reset()
MACHINE_CONFIG_START(clayshoo_state::clayshoo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", clayshoo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", clayshoo_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -343,8 +343,8 @@ MACHINE_CONFIG_START(clayshoo_state::clayshoo)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(clayshoo_state, input_port_select_w))
- MCFG_I8255_IN_PORTB_CB(READ8(clayshoo_state, input_port_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, clayshoo_state, input_port_select_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, clayshoo_state, input_port_r))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 50161a455bb..2a3a0df5e3b 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -741,37 +741,37 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(clcd_state::clcd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, 2000000)
- MCFG_CPU_PROGRAM_MAP(clcd_mem)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(clcd_mem)
MCFG_DEVICE_ADD("via0", VIA6522, 2000000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(clcd_state, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(clcd_state, via0_pb_w))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(clcd_state, via0_cb1_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(clcd_state, write_irq_via0))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, clcd_state, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, clcd_state, via0_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, clcd_state, via0_cb1_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, clcd_state, write_irq_via0))
MCFG_DEVICE_ADD("via1", VIA6522, 2000000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(clcd_state, via1_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(clcd_state, via1_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(clcd_state, write_irq_via1))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_XOR(1)
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, clcd_state, via1_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, clcd_state, via1_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, clcd_state, write_irq_via1))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe)) MCFG_DEVCB_XOR(1)
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_DEVICE_ADD("acia", MOS6551, 2000000)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(clcd_state, write_irq_acia))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, clcd_state, write_irq_acia))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("via1", via6522_device, write_pb4))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("acia", mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("via1", via6522_device, write_pb4))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, nullptr)
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("via1", via6522_device, write_pb6)) MCFG_DEVCB_XOR(1)
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("via1", via6522_device, write_pb6)) MCFG_DEVCB_XOR(1)
MCFG_DEVICE_ADD("bank1", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(clcd_banked_mem)
@@ -798,11 +798,11 @@ MACHINE_CONFIG_START(clcd_state::clcd)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x400)
MCFG_DEVICE_ADD("rtc", MSM58321, XTAL(32'768))
- MCFG_MSM58321_D0_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa0))
- MCFG_MSM58321_D1_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa1))
- MCFG_MSM58321_D2_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa2))
- MCFG_MSM58321_D3_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa3))
- MCFG_MSM58321_BUSY_HANDLER(DEVWRITELINE("via1", via6522_device, write_pa7))
+ MCFG_MSM58321_D0_HANDLER(WRITELINE("via1", via6522_device, write_pa0))
+ MCFG_MSM58321_D1_HANDLER(WRITELINE("via1", via6522_device, write_pa1))
+ MCFG_MSM58321_D2_HANDLER(WRITELINE("via1", via6522_device, write_pa2))
+ MCFG_MSM58321_D3_HANDLER(WRITELINE("via1", via6522_device, write_pa3))
+ MCFG_MSM58321_BUSY_HANDLER(WRITELINE("via1", via6522_device, write_pa7))
MCFG_MSM58321_YEAR0(1984)
MCFG_MSM58321_DEFAULT_24H(true)
@@ -820,7 +820,7 @@ MACHINE_CONFIG_START(clcd_state::clcd)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_RAM_ADD("ram")
diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp
index 25eefe28066..564dd70c499 100644
--- a/src/mame/drivers/cliffhgr.cpp
+++ b/src/mame/drivers/cliffhgr.cpp
@@ -681,9 +681,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cliffhgr_state::cliffhgr)
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4MHz */
- MCFG_CPU_PROGRAM_MAP(mainmem)
- MCFG_CPU_IO_MAP(mainport)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mainmem)
+ MCFG_DEVICE_IO_MAP(mainport)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -703,11 +703,11 @@ MACHINE_CONFIG_START(cliffhgr_state::cliffhgr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(cliffhgr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 9cf405b7048..6aa2a9e4956 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -316,22 +316,22 @@ GFXDECODE_END
MACHINE_CONFIG_START(cloak_state::cloak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(master_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cloak_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cloak_state, irq0_line_hold, 4*60)
- MCFG_CPU_ADD("slave", M6502, 1250000) /* 1.25 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(slave_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cloak_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("slave", M6502, 1250000) /* 1.25 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cloak_state, irq0_line_hold, 2*60)
MCFG_QUANTUM_TIME(attotime::from_hz(1000))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 10B
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cloak_state, coin_counter_r_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cloak_state, coin_counter_l_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cloak_state, cocktail_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cloak_state, coin_counter_r_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cloak_state, coin_counter_l_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cloak_state, cocktail_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ???
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // START LED 2
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // START LED 1
@@ -355,12 +355,12 @@ MACHINE_CONFIG_START(cloak_state::cloak)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* more low pass filters ==> DISCRETE processing */
- MCFG_SOUND_ADD("pokey1", POKEY, XTAL(10'000'000)/8) /* Accurate to recording */
+ MCFG_DEVICE_ADD("pokey1", POKEY, XTAL(10'000'000)/8) /* Accurate to recording */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("START"))
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(RES_K(1), CAP_U(0.047), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, XTAL(10'000'000)/8) /* Accurate to recording */
+ MCFG_DEVICE_ADD("pokey2", POKEY, XTAL(10'000'000)/8) /* Accurate to recording */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW"))
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(RES_K(1), CAP_U(0.022), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index 98d21f2bd6a..f3314cffd0d 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -407,12 +407,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(cloud9_state::cloud9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(cloud9_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(cloud9_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cloud9_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cloud9_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cloud9_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cloud9_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT
@@ -438,10 +438,10 @@ MACHINE_CONFIG_START(cloud9_state::cloud9)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp
index a56fb9eabdf..9c0f72150de 100644
--- a/src/mame/drivers/clowndwn.cpp
+++ b/src/mame/drivers/clowndwn.cpp
@@ -59,8 +59,8 @@ void clowndwn_state::machine_reset()
MACHINE_CONFIG_START(clowndwn_state::clowndwn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, 8000000) // unknown type and clock
- MCFG_CPU_PROGRAM_MAP(clowndwn_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, 8000000) // unknown type and clock
+ MCFG_DEVICE_PROGRAM_MAP(clowndwn_map)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index 88661a87389..15a8627f8f9 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -255,16 +255,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(clpoker_state::clpoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 3) // Z0840004PSC, divider not verified
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 3) // Z0840004PSC, divider not verified
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // HY6116ALP-12
MCFG_DEVICE_ADD("ppi_outputs", I8255, 0) // M5L8255AP-5
- MCFG_I8255_OUT_PORTA_CB(WRITE8(clpoker_state, output_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(clpoker_state, output_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(clpoker_state, output_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, clpoker_state, output_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, clpoker_state, output_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, clpoker_state, output_c_w))
MCFG_DEVICE_ADD("ppi_inputs", I8255, 0) // M5L8255AP-5
MCFG_I8255_IN_PORTA_CB(IOPORT("INA"))
@@ -280,7 +280,7 @@ MACHINE_CONFIG_START(clpoker_state::clpoker)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) // probably right
MCFG_SCREEN_UPDATE_DRIVER(clpoker_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(clpoker_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, clpoker_state, vblank_w))
MCFG_PALETTE_ADD("palette", 0x100)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") // HM86171
@@ -289,7 +289,7 @@ MACHINE_CONFIG_START(clpoker_state::clpoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000) / 8) // AY38910A/P, divider not verified
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(12'000'000) / 8) // AY38910A/P, divider not verified
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index fbd506daaaf..2ab64bbef04 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -275,19 +275,19 @@ INTERRUPT_GEN_MEMBER(clshroad_state::sound_timer_irq)
MACHINE_CONFIG_START(clshroad_state::firebatl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) /* ? */
- MCFG_CPU_PROGRAM_MAP(clshroad_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", clshroad_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(clshroad_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", clshroad_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, MAIN_CLOCK) /* ? */
- MCFG_CPU_PROGRAM_MAP(clshroad_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(clshroad_state, sound_timer_irq, 120) /* periodic interrupt, don't know about the frequency */
+ MCFG_DEVICE_ADD("audiocpu", Z80, MAIN_CLOCK) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(clshroad_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(clshroad_state, sound_timer_irq, 120) /* periodic interrupt, don't know about the frequency */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(clshroad_state, main_irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(clshroad_state, sound_irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(clshroad_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, clshroad_state, main_irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, clshroad_state, sound_irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, clshroad_state, flipscreen_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -308,27 +308,27 @@ MACHINE_CONFIG_START(clshroad_state::firebatl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", WIPING_CUSTOM, 96000)
+ MCFG_DEVICE_ADD("custom", WIPING_CUSTOM, 96000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(clshroad_state::clshroad)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) /* ? real speed unknown. 3MHz is too low and causes problems */
- MCFG_CPU_PROGRAM_MAP(clshroad_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", clshroad_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK) /* ? real speed unknown. 3MHz is too low and causes problems */
+ MCFG_DEVICE_PROGRAM_MAP(clshroad_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", clshroad_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, MAIN_CLOCK) /* ? */
- MCFG_CPU_PROGRAM_MAP(clshroad_sound_map)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", clshroad_state, irq0_line_hold) /* IRQ, no NMI */
- MCFG_CPU_PERIODIC_INT_DRIVER(clshroad_state, sound_timer_irq, 60) /* periodic interrupt, don't know about the frequency */
+ MCFG_DEVICE_ADD("audiocpu", Z80, MAIN_CLOCK) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(clshroad_sound_map)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", clshroad_state, irq0_line_hold) /* IRQ, no NMI */
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(clshroad_state, sound_timer_irq, 60) /* periodic interrupt, don't know about the frequency */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // never writes here?
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(clshroad_state, main_irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(clshroad_state, sound_irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(clshroad_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, clshroad_state, main_irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, clshroad_state, sound_irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, clshroad_state, flipscreen_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -348,7 +348,7 @@ MACHINE_CONFIG_START(clshroad_state::clshroad)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", WIPING_CUSTOM, 96000)
+ MCFG_DEVICE_ADD("custom", WIPING_CUSTOM, 96000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cm1800.cpp b/src/mame/drivers/cm1800.cpp
index 1c7dae6ad9a..cad5f568484 100644
--- a/src/mame/drivers/cm1800.cpp
+++ b/src/mame/drivers/cm1800.cpp
@@ -99,18 +99,18 @@ void cm1800_state::machine_reset()
MACHINE_CONFIG_START(cm1800_state::cm1800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEVICE_ADD("uart", AY51013, 0) // exact uart type is unknown
MCFG_AY51013_TX_CLOCK(153600)
MCFG_AY51013_RX_CLOCK(153600)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_AY51013_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index dbf2f14acfc..0f1ced447cb 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -2173,185 +2173,185 @@ static void cmi2x_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(cmi_state::cmi2x)
- MCFG_CPU_ADD("maincpu1", MC6809E, Q209_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(maincpu1_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cmi_state, cpu1_interrupt_callback)
+ MCFG_DEVICE_ADD("maincpu1", MC6809E, Q209_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu1_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cmi_state, cpu1_interrupt_callback)
MCFG_QUANTUM_PERFECT_CPU("maincpu1")
- MCFG_CPU_ADD("maincpu2", MC6809E, Q209_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(maincpu2_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cmi_state, cpu2_interrupt_callback)
+ MCFG_DEVICE_ADD("maincpu2", MC6809E, Q209_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu2_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cmi_state, cpu2_interrupt_callback)
MCFG_QUANTUM_PERFECT_CPU("maincpu2")
- MCFG_CPU_ADD("muskeys", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(muskeys_map)
+ MCFG_DEVICE_ADD("muskeys", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(muskeys_map)
- MCFG_CPU_ADD("alphakeys", M6802, XTAL(3'840'000))
- MCFG_CPU_PROGRAM_MAP(alphakeys_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cmi_state, irq0_line_hold, XTAL(3'840'000) / 400) // TODO: PIA controls this
+ MCFG_DEVICE_ADD("alphakeys", M6802, XTAL(3'840'000))
+ MCFG_DEVICE_PROGRAM_MAP(alphakeys_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cmi_state, irq0_line_hold, XTAL(3'840'000) / 400) // TODO: PIA controls this
- MCFG_CPU_ADD("smptemidi", M68000, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(midicpu_map)
+ MCFG_DEVICE_ADD("smptemidi", M68000, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(midicpu_map)
- MCFG_CPU_ADD("cmi07cpu", MC6809E, Q209_CPU_CLOCK) // ?
- MCFG_CPU_PROGRAM_MAP(cmi07cpu_map)
+ MCFG_DEVICE_ADD("cmi07cpu", MC6809E, Q209_CPU_CLOCK) // ?
+ MCFG_DEVICE_PROGRAM_MAP(cmi07cpu_map)
/* alpha-numeric display */
MCFG_DEVICE_ADD("dp1", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(cmi_state, cmi_iix_update_dp<0>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, cmi_state, cmi_iix_update_dp<0>))
MCFG_DEVICE_ADD("dp2", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(cmi_state, cmi_iix_update_dp<1>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, cmi_state, cmi_iix_update_dp<1>))
MCFG_DEVICE_ADD("dp3", DL1416T, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(cmi_state, cmi_iix_update_dp<2>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, cmi_state, cmi_iix_update_dp<2>))
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBLANK_END, HBLANK_START, VTOTAL, VBLANK_END, VBLANK_START)
MCFG_SCREEN_UPDATE_DRIVER(cmi_state, screen_update_cmi2x)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cmi_state, cmi_iix_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cmi_state, cmi_iix_vblank))
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_MSM5832_ADD("msm5832", XTAL(32'768))
MCFG_DEVICE_ADD("i8214_1", I8214, 1000000) // cmi_8214_intf_1
- MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_1_int_w))
+ MCFG_I8214_INT_CALLBACK(WRITELINE(*this, cmi_state, i8214_1_int_w))
MCFG_DEVICE_ADD("i8214_2", I8214, 1000000) // cmi_8214_intf_2
- MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_2_int_w))
+ MCFG_I8214_INT_CALLBACK(WRITELINE(*this, cmi_state, i8214_2_int_w))
MCFG_DEVICE_ADD("i8214_3", I8214, 1000000) // cmi_8214_intf_3
- MCFG_I8214_INT_CALLBACK(WRITELINE(cmi_state, i8214_3_int_w))
- MCFG_I8214_ENLG_CALLBACK(WRITELINE(cmi_state, i8214_3_enlg))
+ MCFG_I8214_INT_CALLBACK(WRITELINE(*this, cmi_state, i8214_3_int_w))
+ MCFG_I8214_ENLG_CALLBACK(WRITELINE(*this, cmi_state, i8214_3_enlg))
MCFG_DEVICE_ADD("q133_pia_1", PIA6821, 0) // pia_q133_1_config
- MCFG_PIA_READPA_HANDLER(READ8(cmi_state, q133_1_porta_r));
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi_state, q133_1_porta_w));
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(cmi_state, q133_1_portb_w));
+ MCFG_PIA_READPA_HANDLER(READ8(*this, cmi_state, q133_1_porta_r));
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, cmi_state, q133_1_porta_w));
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, cmi_state, q133_1_portb_w));
MCFG_DEVICE_ADD("q133_pia_2", PIA6821, 0) // pia_q133_2_config
MCFG_DEVICE_ADD("q133_ptm", PTM6840, 2000000) // ptm_q133_config
MCFG_PTM6840_EXTERNAL_CLOCKS(1024, 1, 111) // Third is todo
MCFG_DEVICE_ADD("q219_pia", PIA6821, 0) // pia_q219_config
- MCFG_PIA_READPB_HANDLER(READ8(cmi_state, pia_q219_b_r));
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi_state, vscroll_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(cmi_state, video_attr_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(cmi_state, pia_q219_irqa))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(cmi_state, pia_q219_irqb))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, cmi_state, pia_q219_b_r));
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, cmi_state, vscroll_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, cmi_state, video_attr_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, cmi_state, pia_q219_irqa))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, cmi_state, pia_q219_irqb))
MCFG_DEVICE_ADD("q219_ptm", PTM6840, 2000000) // ptm_q219_config
MCFG_PTM6840_EXTERNAL_CLOCKS(HBLANK_FREQ.dvalue(), VBLANK_FREQ.dvalue(), 1'000'000) // TODO: does the third thing come from a crystal?
- MCFG_PTM6840_IRQ_CB(WRITELINE(cmi_state, ptm_q219_irq))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, cmi_state, ptm_q219_irq))
MCFG_DEVICE_ADD("cmi02_pia_1", PIA6821, 0) // pia_cmi02_1_config
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(cmi_state, master_tune_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, cmi_state, master_tune_w))
MCFG_DEVICE_ADD("cmi02_pia_2", PIA6821, 0) // pia_cmi02_2_config
MCFG_DEVICE_ADD("cmi02_ptm", PTM6840, 2000000) // ptm_cmi02_config TODO
- MCFG_PTM6840_O2_CB(WRITELINE(cmi_state, cmi02_ptm_o2))
- MCFG_PTM6840_IRQ_CB(WRITELINE(cmi_state, cmi02_ptm_irq))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, cmi_state, cmi02_ptm_o2))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, cmi_state, cmi02_ptm_irq))
MCFG_DEVICE_ADD("mkbd_acia_clock", CLOCK, XTAL(1'843'200) / 12)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(cmi_state, mkbd_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, cmi_state, mkbd_acia_clock))
MCFG_DEVICE_ADD("q133_acia_0", MOS6551, XTAL(1'843'200))
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("q133_acia_irq", input_merger_device, in_w<0>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("q133_acia_1", MOS6551, XTAL(1'843'200))
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("q133_acia_irq", input_merger_device, in_w<1>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("q133_acia_2", MOS6551, XTAL(1'843'200))
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("q133_acia_irq", input_merger_device, in_w<2>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<2>))
MCFG_DEVICE_ADD("q133_acia_3", MOS6551, XTAL(1'843'200))
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("q133_acia_irq", input_merger_device, in_w<3>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("q133_acia_irq", input_merger_device, in_w<3>))
MCFG_INPUT_MERGER_ANY_HIGH("q133_acia_irq")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(cmi_state, q133_acia_irq))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, cmi_state, q133_acia_irq))
MCFG_DEVICE_ADD("acia_mkbd_kbd", ACIA6850, XTAL(1'843'200) / 12) // acia_mkbd_kbd
MCFG_DEVICE_ADD("acia_mkbd_cmi", ACIA6850, XTAL(1'843'200) / 12) // acia_mkbd_cmi
MCFG_DEVICE_ADD("ank_pia", PIA6821, 0) // pia_ank_config
MCFG_DEVICE_MODIFY("q133_acia_0")
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("acia_mkbd_cmi", acia6850_device, write_rxd))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("acia_mkbd_cmi", acia6850_device, write_cts))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("acia_mkbd_cmi", acia6850_device, write_rxd))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE("acia_mkbd_cmi", acia6850_device, write_cts))
MCFG_DEVICE_MODIFY("acia_mkbd_cmi")
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("q133_acia_0", mos6551_device, write_rxd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("q133_acia_0", mos6551_device, write_cts))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(cmi_state, mkbd_cmi_acia_int))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("q133_acia_0", mos6551_device, write_rxd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("q133_acia_0", mos6551_device, write_cts))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, cmi_state, mkbd_cmi_acia_int))
MCFG_DEVICE_MODIFY("acia_mkbd_kbd")
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("ank_pia", pia6821_device, cb2_w))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("ank_pia", pia6821_device, ca2_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(cmi_state, mkbd_kbd_acia_int))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("ank_pia", pia6821_device, cb2_w))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("ank_pia", pia6821_device, ca2_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, cmi_state, mkbd_kbd_acia_int))
MCFG_INPUT_MERGER_ANY_HIGH("irqs")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("alphakeys", M6802_IRQ_LINE))
MCFG_DEVICE_MODIFY("ank_pia")
- MCFG_PIA_READPA_HANDLER(READ8(cmi_state, ank_col_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(cmi_state, ank_rts_r))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("acia_mkbd_kbd", acia6850_device, write_cts))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("acia_mkbd_kbd", acia6850_device, write_rxd))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<0>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, cmi_state, ank_col_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, cmi_state, ank_rts_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("acia_mkbd_kbd", acia6850_device, write_cts))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("acia_mkbd_kbd", acia6850_device, write_rxd))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("irqs", input_merger_device, in_w<0>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("irqs", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("ank_pia_clock", CLOCK, 9600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ank_pia", pia6821_device, ca1_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ank_pia", pia6821_device, ca1_w))
MCFG_DEVICE_ADD("cmi07_ptm", PTM6840, 2000000) // ptm_cmi07_config TODO
- MCFG_PTM6840_IRQ_CB(WRITELINE(cmi_state, cmi07_irq))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, cmi_state, cmi07_irq))
MCFG_FD1791_ADD("wd1791", XTAL(16'000'000) / 8) // wd1791_interface
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cmi_state, wd1791_irq))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(cmi_state, wd1791_drq))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, cmi_state, wd1791_irq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, cmi_state, wd1791_drq))
MCFG_FLOPPY_DRIVE_ADD("wd1791:0", cmi2x_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1791:1", cmi2x_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
/* Musical keyboard */
MCFG_DEVICE_ADD("cmi10_pia_u20", PIA6821, 0)
- MCFG_PIA_READCB1_HANDLER(READLINE(cmi_state, cmi10_u20_cb1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(cmi_state, cmi10_u20_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(cmi_state, cmi10_u20_b_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(cmi_state, cmi10_u20_cb2_w))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, cmi_state, cmi10_u20_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, cmi_state, cmi10_u20_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, cmi_state, cmi10_u20_b_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, cmi_state, cmi10_u20_cb2_w))
MCFG_DEVICE_ADD("cmi10_pia_u21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(cmi_state, cmi10_u21_a_r))
- MCFG_PIA_CB2_HANDLER(WRITELINE(cmi_state, cmi10_u21_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, cmi_state, cmi10_u21_a_r))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, cmi_state, cmi10_u21_cb2_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
// Channel cards
MCFG_DEVICE_ADD("cmi01a_0", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<0>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<0>))
MCFG_DEVICE_ADD("cmi01a_1", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<1>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<1>))
MCFG_DEVICE_ADD("cmi01a_2", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<2>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<2>))
MCFG_DEVICE_ADD("cmi01a_3", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<3>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<3>))
MCFG_DEVICE_ADD("cmi01a_4", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<4>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<4>))
MCFG_DEVICE_ADD("cmi01a_5", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<5>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<5>))
MCFG_DEVICE_ADD("cmi01a_6", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<6>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<6>))
MCFG_DEVICE_ADD("cmi01a_7", CMI01A_CHANNEL_CARD, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(cmi_state, channel_irq<7>))
+ MCFG_CMI01A_IRQ_CALLBACK(WRITELINE(*this, cmi_state, channel_irq<7>))
MACHINE_CONFIG_END
ROM_START( cmi2x )
diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp
index a272317871b..60e47bbf2a4 100644
--- a/src/mame/drivers/cmmb.cpp
+++ b/src/mame/drivers/cmmb.cpp
@@ -410,9 +410,9 @@ void cmmb_state::machine_reset()
MACHINE_CONFIG_START(cmmb_state::cmmb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, MAIN_CLOCK/5) // Unknown clock, but chip rated for 14MHz
- MCFG_CPU_PROGRAM_MAP(cmmb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cmmb_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", M65SC02, MAIN_CLOCK/5) // Unknown clock, but chip rated for 14MHz
+ MCFG_DEVICE_PROGRAM_MAP(cmmb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cmmb_state, vblank_irq)
MCFG_AT29C020_ADD("at29c020")
@@ -429,7 +429,7 @@ MACHINE_CONFIG_START(cmmb_state::cmmb)
/* sound hardware */
// MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, 8000000/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index 2f0d3afc50f..ac2fd0f1b65 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -827,11 +827,11 @@ MACHINE_RESET_MEMBER(cninja_state,robocop2)
MACHINE_CONFIG_START(cninja_state::cninja)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(cninja_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cninja_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DECO_IRQ_ADD("irq", "screen")
MCFG_DECO_IRQ_RASTER1_IRQ_CB(INPUTLINE("maincpu", 3))
@@ -895,12 +895,12 @@ MACHINE_CONFIG_START(cninja_state::cninja)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
@@ -915,11 +915,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::stoneage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(cninja_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cninja_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(stoneage_s_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(stoneage_s_map)
MCFG_DECO_IRQ_ADD("irq", "screen")
MCFG_DECO_IRQ_RASTER1_IRQ_CB(INPUTLINE("maincpu", 3))
@@ -996,8 +996,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::cninjabl2)
stoneage(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(cninjabl2_s_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(cninjabl2_s_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninjabl2)
@@ -1015,11 +1015,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::cninjabl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(cninjabl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cninjabl_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(cninjabl_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(cninjabl_sound_map)
MCFG_DECO_IRQ_ADD("irq", "screen")
MCFG_DECO_IRQ_RASTER1_IRQ_CB(INPUTLINE("maincpu", 3))
@@ -1087,11 +1087,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::edrandy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(edrandy_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(edrandy_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DECO_IRQ_ADD("irq", "screen")
MCFG_DECO_IRQ_RASTER1_IRQ_CB(INPUTLINE("maincpu", 3))
@@ -1154,12 +1154,12 @@ MACHINE_CONFIG_START(cninja_state::edrandy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
@@ -1174,11 +1174,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::robocop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(robocop2_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(robocop2_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DECO_IRQ_ADD("irq", "screen")
MCFG_DECO_IRQ_RASTER1_IRQ_CB(INPUTLINE("maincpu", 3))
@@ -1247,13 +1247,13 @@ MACHINE_CONFIG_START(cninja_state::robocop2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
@@ -1270,12 +1270,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cninja_state::mutantf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mutantf_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cninja_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mutantf_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cninja_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
- MCFG_CPU_PROGRAM_MAP(sound_map_mutantf)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_mutantf)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1344,7 +1344,7 @@ MACHINE_CONFIG_START(cninja_state::mutantf)
MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000) / 9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) // IRQ2
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(cninja_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, cninja_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index 4c428204e55..7f8be3c5e4d 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -921,16 +921,16 @@ MACHINE_RESET_MEMBER(cntsteer_state,cntsteer)
MACHINE_CONFIG_START(cntsteer_state::cntsteer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) /* MC68B09E */
- MCFG_CPU_PROGRAM_MAP(cntsteer_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) /* MC68B09E */
+ MCFG_DEVICE_PROGRAM_MAP(cntsteer_cpu1_map)
- MCFG_CPU_ADD("subcpu", MC6809E, 2000000) /* MC68B09E */
- MCFG_CPU_PROGRAM_MAP(cntsteer_cpu2_map)
+ MCFG_DEVICE_ADD("subcpu", MC6809E, 2000000) /* MC68B09E */
+ MCFG_DEVICE_PROGRAM_MAP(cntsteer_cpu2_map)
// MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cntsteer_state, sound_interrupt, 480)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cntsteer_state, sound_interrupt, 480)
MCFG_MACHINE_START_OVERRIDE(cntsteer_state,cntsteer)
MCFG_MACHINE_RESET_OVERRIDE(cntsteer_state,cntsteer)
@@ -944,7 +944,7 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer)
MCFG_SCREEN_UPDATE_DRIVER(cntsteer_state, screen_update_cntsteer)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) // ?
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(cntsteer_state, subcpu_vblank_irq)) // ?
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, cntsteer_state, subcpu_vblank_irq)) // ?
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_QUANTUM_PERFECT_CPU("subcpu")
@@ -960,14 +960,14 @@ MACHINE_CONFIG_START(cntsteer_state::cntsteer)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -975,17 +975,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cntsteer_state::zerotrgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(gekitsui_cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cntsteer_state, nmi_line_pulse) /* ? */
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(gekitsui_cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cntsteer_state, nmi_line_pulse) /* ? */
- MCFG_CPU_ADD("subcpu", MC6809E, 2000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(gekitsui_cpu2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cntsteer_state, nmi_line_pulse) /* ? */
+ MCFG_DEVICE_ADD("subcpu", MC6809E, 2000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(gekitsui_cpu2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cntsteer_state, nmi_line_pulse) /* ? */
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cntsteer_state, sound_interrupt, 480)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cntsteer_state, sound_interrupt, 480)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1012,10 +1012,10 @@ MACHINE_CONFIG_START(cntsteer_state::zerotrgt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index baa6f7d3493..393332a6efa 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -3284,17 +3284,17 @@ void cobra_state::machine_reset()
MACHINE_CONFIG_START(cobra_state::cobra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC603, 100000000) /* 603EV, 100? MHz */
+ MCFG_DEVICE_ADD("maincpu", PPC603, 100000000) /* 603EV, 100? MHz */
MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
- MCFG_CPU_PROGRAM_MAP(cobra_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cobra_state, cobra_vblank)
+ MCFG_DEVICE_PROGRAM_MAP(cobra_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cobra_state, cobra_vblank)
- MCFG_CPU_ADD("subcpu", PPC403GA, 32000000) /* 403GA, 33? MHz */
- MCFG_CPU_PROGRAM_MAP(cobra_sub_map)
+ MCFG_DEVICE_ADD("subcpu", PPC403GA, 32000000) /* 403GA, 33? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cobra_sub_map)
- MCFG_CPU_ADD("gfxcpu", PPC604, 100000000) /* 604, 100? MHz */
+ MCFG_DEVICE_ADD("gfxcpu", PPC604, 100000000) /* 604, 100? MHz */
MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
- MCFG_CPU_PROGRAM_MAP(cobra_gfx_map)
+ MCFG_DEVICE_PROGRAM_MAP(cobra_gfx_map)
MCFG_QUANTUM_TIME(attotime::from_hz(15005))
@@ -3303,7 +3303,7 @@ MACHINE_CONFIG_START(cobra_state::cobra)
MCFG_PCI_BUS_LEGACY_DEVICE(0, DEVICE_SELF, cobra_state, mpc106_pci_r, mpc106_pci_w)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(cobra_state, ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, cobra_state, ide_interrupt))
/* video hardware */
@@ -3320,10 +3320,10 @@ MACHINE_CONFIG_START(cobra_state::cobra)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_M48T58_ADD("m48t58")
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 07ab3150fb1..5b08ad09267 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -361,11 +361,11 @@ void coco_cart(device_slot_interface &device)
device.option_add("rs232", COCO_RS232);
device.option_add("dcmodem", COCO_DCMODEM);
device.option_add("orch90", COCO_ORCH90);
- device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1));
+ device.option_add("ssc", COCO_SSC);
device.option_add("games_master", COCO_PAK_GMC);
device.option_add("banked_16k", COCO_PAK_BANKED);
device.option_add("pak", COCO_PAK);
- device.option_add("multi", COCO_MULTIPAK).clock(DERIVED_CLOCK(1, 1));
+ device.option_add("multi", COCO_MULTIPAK);
}
//-------------------------------------------------
@@ -385,12 +385,12 @@ MACHINE_CONFIG_START(coco_state::coco_sound)
MCFG_SPEAKER_STANDARD_MONO("speaker")
// 6-bit D/A: R10-15 = 10K, 20K, 40.2K, 80.6K, 162K, 324K (according to parts list); output also controls joysticks
- MCFG_SOUND_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125)
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
// Single-bit sound: R22 = 10K
- MCFG_SOUND_ADD("sbs", DAC_1BIT, 0)
+ MCFG_DEVICE_ADD("sbs", DAC_1BIT, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
@@ -438,31 +438,31 @@ MACHINE_CONFIG_START(coco12_state::coco)
MCFG_DEVICE_CLOCK(XTAL(14'318'181) / 16)
// basic machine hardware
- MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco_mem)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(coco_state, dasm_override)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco_mem)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(coco_state, dasm_override)
// devices
MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia0_irq_b))
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, coco_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, coco_state, pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia1_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia1_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia1_firq_b))
MCFG_SAM6883_ADD(SAM_TAG, XTAL(14'318'181), MAINCPU_TAG, AS_PROGRAM)
- MCFG_SAM6883_RES_CALLBACK(READ8(coco12_state, sam_read))
+ MCFG_SAM6883_RES_CALLBACK(READ8(*this, coco12_state, sam_read))
// Becker Port device
MCFG_DEVICE_ADD(DWSOCK_TAG, COCO_DWSOCK, 0)
@@ -471,12 +471,12 @@ MACHINE_CONFIG_START(coco12_state::coco)
MCFG_CASSETTE_FORMATS(coco_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "printer")
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(PIA1_TAG, pia6821_device, ca1_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "printer")
+ MCFG_RS232_DCD_HANDLER(WRITELINE(PIA1_TAG, pia6821_device, ca1_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("printer", printer)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "pak")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
@@ -484,9 +484,9 @@ MACHINE_CONFIG_START(coco12_state::coco)
MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, VDG_TAG)
MCFG_DEVICE_ADD(VDG_TAG, MC6847_NTSC, XTAL(14'318'181) / 4) // VClk output from MC6883
- MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync))
- MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
+ MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, coco12_state, horizontal_sync))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, coco12_state, field_sync))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(SAM_TAG, sam6883_device, display_read))
// sound hardware
coco_sound(config);
@@ -509,8 +509,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(coco12_state::cocoh)
coco(config);
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco_mem)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MACHINE_CONFIG_END
@@ -519,7 +519,7 @@ MACHINE_CONFIG_START(coco12_state::cocoe)
coco(config);
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdc")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MCFG_COCO_VHD_ADD(VHD0_TAG)
@@ -528,8 +528,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(coco12_state::cocoeh)
cocoe(config);
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco_mem)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MACHINE_CONFIG_END
@@ -538,7 +538,7 @@ MACHINE_CONFIG_START(coco12_state::coco2)
coco(config);
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdcv11")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MCFG_COCO_VHD_ADD(VHD0_TAG)
@@ -547,8 +547,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(coco12_state::coco2h)
coco2(config);
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco_mem)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MACHINE_CONFIG_END
@@ -557,15 +557,15 @@ MACHINE_CONFIG_START(coco12_state::coco2b)
coco2(config);
MCFG_DEVICE_REMOVE(VDG_TAG)
MCFG_DEVICE_ADD(VDG_TAG, MC6847T1_NTSC, XTAL(14'318'181) / 4)
- MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(coco12_state, horizontal_sync))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(coco12_state, field_sync))
- MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
+ MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, coco12_state, horizontal_sync))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, coco12_state, field_sync))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(SAM_TAG, sam6883_device, display_read))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coco12_state::coco2bh)
coco2b(config);
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco_mem)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MACHINE_CONFIG_END
@@ -574,7 +574,7 @@ MACHINE_CONFIG_START(coco12_state::cp400)
coco(config);
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cp450_fdc")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MACHINE_CONFIG_END
@@ -583,7 +583,7 @@ MACHINE_CONFIG_START(coco12_state::t4426)
coco2(config);
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, t4426_cart, "t4426")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MCFG_SLOT_FIXED(true) // This cart is fixed so no way to change it
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(coco12_state::cd6809)
coco(config);
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cd6809_fdc")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp
index 97b91870452..04691ba2a08 100644
--- a/src/mame/drivers/coco3.cpp
+++ b/src/mame/drivers/coco3.cpp
@@ -247,28 +247,28 @@ MACHINE_CONFIG_START(coco3_state::coco3)
MCFG_DEVICE_CLOCK(XTAL(28'636'363) / 32)
// basic machine hardware
- MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco3_mem)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(coco_state, dasm_override)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco3_mem)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(coco_state, dasm_override)
// devices
MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia0_irq_b))
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, coco_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, coco_state, pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia1_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia1_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia1_firq_b))
// Becker Port device
MCFG_DEVICE_ADD(DWSOCK_TAG, COCO_DWSOCK, 0)
@@ -277,12 +277,12 @@ MACHINE_CONFIG_START(coco3_state::coco3)
MCFG_CASSETTE_FORMATS(coco_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "printer")
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(PIA1_TAG, pia6821_device, ca1_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "printer")
+ MCFG_RS232_DCD_HANDLER(WRITELINE(PIA1_TAG, pia6821_device, ca1_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("printer", printer)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "fdcv11")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
@@ -296,11 +296,11 @@ MACHINE_CONFIG_START(coco3_state::coco3)
MCFG_GIME_MAINCPU(MAINCPU_TAG)
MCFG_GIME_RAM(RAM_TAG)
MCFG_GIME_EXT(CARTRIDGE_TAG)
- MCFG_GIME_HSYNC_CALLBACK(DEVWRITELINE(PIA0_TAG, pia6821_device, ca1_w))
- MCFG_GIME_FSYNC_CALLBACK(DEVWRITELINE(PIA0_TAG, pia6821_device, cb1_w))
- MCFG_GIME_IRQ_CALLBACK(WRITELINE(coco3_state, gime_irq_w))
- MCFG_GIME_FIRQ_CALLBACK(WRITELINE(coco3_state, gime_firq_w))
- MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(coco_state, floating_bus_read))
+ MCFG_GIME_HSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, ca1_w))
+ MCFG_GIME_FSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, cb1_w))
+ MCFG_GIME_IRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_irq_w))
+ MCFG_GIME_FIRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_firq_w))
+ MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(*this, coco_state, floating_bus_read))
// composite monitor
MCFG_SCREEN_ADD(COMPOSITE_SCREEN_TAG, RASTER)
@@ -347,24 +347,24 @@ MACHINE_CONFIG_START(coco3_state::coco3p)
MCFG_GIME_MAINCPU(MAINCPU_TAG)
MCFG_GIME_RAM(RAM_TAG)
MCFG_GIME_EXT(CARTRIDGE_TAG)
- MCFG_GIME_HSYNC_CALLBACK(DEVWRITELINE(PIA0_TAG, pia6821_device, ca1_w))
- MCFG_GIME_FSYNC_CALLBACK(DEVWRITELINE(PIA0_TAG, pia6821_device, cb1_w))
- MCFG_GIME_IRQ_CALLBACK(WRITELINE(coco3_state, gime_irq_w))
- MCFG_GIME_FIRQ_CALLBACK(WRITELINE(coco3_state, gime_firq_w))
- MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(coco_state, floating_bus_read))
+ MCFG_GIME_HSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, ca1_w))
+ MCFG_GIME_FSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, cb1_w))
+ MCFG_GIME_IRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_irq_w))
+ MCFG_GIME_FIRQ_CALLBACK(WRITELINE(*this, coco3_state, gime_firq_w))
+ MCFG_GIME_FLOATING_BUS_CALLBACK(READ8(*this, coco_state, floating_bus_read))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coco3_state::coco3h)
coco3(config);
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(coco3_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(coco3_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coco3_state::coco3dw1)
coco3(config);
MCFG_COCO_CARTRIDGE_REMOVE(CARTRIDGE_TAG)
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, coco_cart, "cc3hdb1")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp
index 9d897865f6c..6ab128cf548 100644
--- a/src/mame/drivers/cocoloco.cpp
+++ b/src/mame/drivers/cocoloco.cpp
@@ -525,8 +525,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cocoloco_state::cocoloco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
- MCFG_CPU_PROGRAM_MAP(cocoloco_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(cocoloco_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -539,7 +539,7 @@ MACHINE_CONFIG_START(cocoloco_state::cocoloco)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, SND_CLOCK) /* confirmed */
+ MCFG_DEVICE_ADD("ay8910", AY8910, SND_CLOCK) /* confirmed */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
@@ -549,7 +549,7 @@ MACHINE_CONFIG_START(cocoloco_state::cocoloco)
/* NETLIST configuration using internal AY8910 resistor values */
- MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
+ MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, 48000)
MCFG_NETLIST_SETUP(nl_cocoloco)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/codata.cpp b/src/mame/drivers/codata.cpp
index a6af58b8ebf..b3204c6d8da 100644
--- a/src/mame/drivers/codata.cpp
+++ b/src/mame/drivers/codata.cpp
@@ -64,32 +64,32 @@ void codata_state::machine_reset()
MACHINE_CONFIG_START(codata_state::codata)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("uart", UPD7201_NEW, XTAL(16'000'000) / 4)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs423a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs423b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs423a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs423a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs423a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs423b", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_5))
MCFG_DEVICE_ADD("timer", AM9513A, XTAL(16'000'000) / 4)
MCFG_AM9513_OUT1_CALLBACK(NOOP) // Timer 1 = "Abort/Reset" (watchdog)
MCFG_AM9513_OUT2_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_6)) // Timer 2
MCFG_AM9513_OUT3_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7)) // Refresh
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("uart", upd7201_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", upd7201_new_device, txca_w))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("uart", upd7201_new_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", upd7201_new_device, txcb_w))
-
- MCFG_RS232_PORT_ADD("rs423a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", upd7201_new_device, rxa_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", upd7201_new_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", upd7201_new_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs423b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", upd7201_new_device, rxb_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("uart", upd7201_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", upd7201_new_device, txca_w))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("uart", upd7201_new_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", upd7201_new_device, txcb_w))
+
+ MCFG_DEVICE_ADD("rs423a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", upd7201_new_device, rxa_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", upd7201_new_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", upd7201_new_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs423b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", upd7201_new_device, rxb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index 5530f107b39..b5be078e1c0 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -1255,9 +1255,9 @@ uint32_t coinmstr_state::screen_update_coinmstr(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(coinmstr_state::coinmstr)
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 7 MHz.
- MCFG_CPU_PROGRAM_MAP(coinmstr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", coinmstr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) // 7 MHz.
+ MCFG_DEVICE_PROGRAM_MAP(coinmstr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", coinmstr_state, irq0_line_hold)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("PIA0.A"))
@@ -1290,40 +1290,40 @@ MACHINE_CONFIG_START(coinmstr_state::coinmstr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, SND_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coinmstr_state::quizmstr)
coinmstr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(quizmstr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(quizmstr_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coinmstr_state::trailblz)
coinmstr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(trailblz_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(trailblz_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coinmstr_state::supnudg2)
coinmstr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(supnudg2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(supnudg2_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coinmstr_state::pokeroul)
coinmstr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(pokeroul_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(pokeroul_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coinmstr_state::jpcoin)
coinmstr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jpcoin_map)
- MCFG_CPU_IO_MAP(jpcoin_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jpcoin_map)
+ MCFG_DEVICE_IO_MAP(jpcoin_io_map)
// MCFG_NVRAM_ADD_0FILL("attr_ram3")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index 871b95a37b9..82f38ad57bc 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -638,10 +638,10 @@ void coinmvga_state::ramdac2_map(address_map &map)
MACHINE_CONFIG_START(coinmvga_state::coinmvga)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83007, CPU_CLOCK) /* xtal */
- MCFG_CPU_PROGRAM_MAP(coinmvga_map)
- MCFG_CPU_IO_MAP(coinmvga_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", coinmvga_state, vblank_irq) /* wrong, fix me */
+ MCFG_DEVICE_ADD("maincpu", H83007, CPU_CLOCK) /* xtal */
+ MCFG_DEVICE_PROGRAM_MAP(coinmvga_map)
+ MCFG_DEVICE_IO_MAP(coinmvga_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", coinmvga_state, vblank_irq) /* wrong, fix me */
// MCFG_NVRAM_ADD_0FILL("nvram")
@@ -666,7 +666,7 @@ MACHINE_CONFIG_START(coinmvga_state::coinmvga)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, SND_CLOCK)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, SND_CLOCK)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp
index 0bd34ecb228..be4dbdda98b 100644
--- a/src/mame/drivers/coleco.cpp
+++ b/src/mame/drivers/coleco.cpp
@@ -377,20 +377,20 @@ void coleco_state::machine_reset()
MACHINE_CONFIG_START(coleco_state::coleco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(7'159'090)/2) // 3.579545 MHz
- MCFG_CPU_PROGRAM_MAP(coleco_map)
- MCFG_CPU_IO_MAP(coleco_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(7'159'090)/2) // 3.579545 MHz
+ MCFG_DEVICE_PROGRAM_MAP(coleco_map)
+ MCFG_DEVICE_IO_MAP(coleco_io_map)
/* video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(coleco_state, coleco_vdp_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, coleco_state, coleco_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL(7'159'090)/2) // 3.579545 MHz
+ MCFG_DEVICE_ADD("sn76489a", SN76489A, XTAL(7'159'090)/2) // 3.579545 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// TODO: enable when Z80 has better WAIT pin emulation, this currently breaks pitfall2 for example
//MCFG_SN76496_READY_HANDLER(INPUTLINE("maincpu", Z80_INPUT_LINE_WAIT)) MCFG_DEVCB_INVERT
@@ -413,7 +413,7 @@ MACHINE_CONFIG_START(coleco_state::colecop)
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(coleco_state, coleco_vdp_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, coleco_state, coleco_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -422,8 +422,8 @@ MACHINE_CONFIG_START(coleco_state::czz50)
coleco(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") // note: cpu speed unverified, assume it's the same as ColecoVision
- MCFG_CPU_PROGRAM_MAP(czz50_map)
+ MCFG_DEVICE_MODIFY("maincpu") // note: cpu speed unverified, assume it's the same as ColecoVision
+ MCFG_DEVICE_PROGRAM_MAP(czz50_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coleco_state::dina)
@@ -435,7 +435,7 @@ MACHINE_CONFIG_START(coleco_state::dina)
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(coleco_state, coleco_vdp_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, coleco_state, coleco_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 64df611e046..00bef90de57 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -699,12 +699,12 @@ void combatsc_state::machine_reset()
MACHINE_CONFIG_START(combatsc_state::combatsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
- MCFG_CPU_PROGRAM_MAP(combatsc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", combatsc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(combatsc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", combatsc_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(combatsc_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(combatsc_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1200))
@@ -740,11 +740,11 @@ MACHINE_CONFIG_START(combatsc_state::combatsc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(combatsc_state, combatsc_portA_w))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, combatsc_state, combatsc_portA_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -753,12 +753,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(combatsc_state::combatscb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
- MCFG_CPU_PROGRAM_MAP(combatscb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", combatsc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(combatscb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", combatsc_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(combatscb_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(combatscb_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1200))
@@ -786,10 +786,10 @@ MACHINE_CONFIG_START(combatsc_state::combatscb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_MSM5205_VCK_CALLBACK(ASSERTLINE("audiocpu", 0))
diff --git a/src/mame/drivers/comebaby.cpp b/src/mame/drivers/comebaby.cpp
index 41a6eac692c..c6e6bff0abb 100644
--- a/src/mame/drivers/comebaby.cpp
+++ b/src/mame/drivers/comebaby.cpp
@@ -237,9 +237,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(comebaby_state::comebaby)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM, (66666666*19)/2) /* Actually a Celeron */
- MCFG_CPU_PROGRAM_MAP(comebaby_map)
- MCFG_CPU_IO_MAP(comebaby_io)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, (66666666*19)/2) /* Actually a Celeron */
+ MCFG_DEVICE_PROGRAM_MAP(comebaby_map)
+ MCFG_DEVICE_IO_MAP(comebaby_io)
pcat_common(config);
diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp
index e421eae97cf..51ffcd22f1c 100644
--- a/src/mame/drivers/commando.cpp
+++ b/src/mame/drivers/commando.cpp
@@ -255,13 +255,13 @@ void commando_state::machine_reset()
MACHINE_CONFIG_START(commando_state::commando)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, PHI_MAIN) // ???
- MCFG_CPU_PROGRAM_MAP(commando_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, PHI_MAIN) // ???
+ MCFG_DEVICE_PROGRAM_MAP(commando_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_ADD("audiocpu", Z80, PHI_B) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(commando_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, PHI_B) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(commando_state, irq0_line_hold, 4*60)
/* video hardware */
@@ -271,8 +271,8 @@ MACHINE_CONFIG_START(commando_state::commando)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(commando_state, screen_update_commando)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(commando_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, commando_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", commando)
@@ -285,10 +285,10 @@ MACHINE_CONFIG_START(commando_state::commando)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, PHI_B/2)
+ MCFG_DEVICE_ADD("ym1", YM2203, PHI_B/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2", YM2203, PHI_B/2)
+ MCFG_DEVICE_ADD("ym2", YM2203, PHI_B/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp
index ce514003eb9..6bc9792c19f 100644
--- a/src/mame/drivers/compc.cpp
+++ b/src/mame/drivers/compc.cpp
@@ -193,27 +193,28 @@ void compc_state::compciii_io(address_map &map)
}
MACHINE_CONFIG_START(compc_state::compc)
- MCFG_CPU_ADD("maincpu", I8088, 4772720*2)
- MCFG_CPU_PROGRAM_MAP(compc_map)
- MCFG_CPU_IO_MAP(compc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 4772720*2)
+ MCFG_DEVICE_PROGRAM_MAP(compc_map)
+ MCFG_DEVICE_IO_MAP(compc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_REMOVE("mb:pit8253")
MCFG_DEVICE_ADD("mb:pit8253", FE2010_PIT, 0)
MCFG_PIT8253_CLK0(XTAL(14'318'181)/12.0) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("mb:pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("mb:pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(14'318'181)/12.0) /* dram refresh */
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("mb", ibm5160_mb_device, pc_pit8253_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("mb", ibm5160_mb_device, pc_pit8253_out1_changed))
MCFG_PIT8253_CLK2(XTAL(14'318'181)/12.0) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("mb", ibm5160_mb_device, pc_pit8253_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("mb", ibm5160_mb_device, pc_pit8253_out2_changed))
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "fdc_xt", false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "mda", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
- MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE("mb:pic8259", pic8259_device, ir1_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -227,7 +228,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(compc_state::pc10iii)
compc(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(compciii_io)
+ MCFG_DEVICE_IO_MAP(compciii_io)
MACHINE_CONFIG_END
ROM_START(compc10)
diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp
index be41578442c..7bfb2b42d0e 100644
--- a/src/mame/drivers/compgolf.cpp
+++ b/src/mame/drivers/compgolf.cpp
@@ -225,8 +225,8 @@ void compgolf_state::machine_reset()
MACHINE_CONFIG_START(compgolf_state::compgolf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) // HD68B09EP
- MCFG_CPU_PROGRAM_MAP(compgolf_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) // HD68B09EP
+ MCFG_DEVICE_PROGRAM_MAP(compgolf_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -245,10 +245,10 @@ MACHINE_CONFIG_START(compgolf_state::compgolf)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("maincpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(compgolf_state, compgolf_scrollx_lo_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(compgolf_state, compgolf_scrolly_lo_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, compgolf_state, compgolf_scrollx_lo_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, compgolf_state, compgolf_scrolly_lo_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp
index 6fe593d274a..c84bcb2f9ae 100644
--- a/src/mame/drivers/compis.cpp
+++ b/src/mame/drivers/compis.cpp
@@ -753,48 +753,48 @@ void compis_state::machine_reset()
MACHINE_CONFIG_START(compis_state::compis)
// basic machine hardware
- MCFG_CPU_ADD(I80186_TAG, I80186, 15.36_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(compis_mem)
- MCFG_CPU_IO_MAP(compis_io)
- MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, compis_state, compis_irq_callback))
- MCFG_80186_TMROUT0_HANDLER(DEVWRITELINE(DEVICE_SELF, compis_state, tmr0_w))
- MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE(DEVICE_SELF, compis_state, tmr1_w))
+ MCFG_DEVICE_ADD(I80186_TAG, I80186, 15.36_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(compis_mem)
+ MCFG_DEVICE_IO_MAP(compis_io)
+ MCFG_80186_IRQ_SLAVE_ACK(READ8(DEVICE_SELF, compis_state, compis_irq_callback))
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE(DEVICE_SELF, compis_state, tmr0_w))
+ MCFG_80186_TMROUT1_HANDLER(WRITELINE(DEVICE_SELF, compis_state, tmr1_w))
// devices
MCFG_DEVICE_ADD(I80130_TAG, I80130, 15.36_MHz_XTAL/2)
- MCFG_I80130_IRQ_CALLBACK(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w))
- MCFG_I80130_SYSTICK_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir3_w))
- MCFG_I80130_DELAY_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir7_w))
- MCFG_I80130_BAUD_CALLBACK(WRITELINE(compis_state, tmr2_w))
+ MCFG_I80130_IRQ_CALLBACK(WRITELINE(I80186_TAG, i80186_cpu_device, int0_w))
+ MCFG_I80130_SYSTICK_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir3_w))
+ MCFG_I80130_DELAY_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir7_w))
+ MCFG_I80130_BAUD_CALLBACK(WRITELINE(*this, compis_state, tmr2_w))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(15.36_MHz_XTAL/8)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8274_TAG, i8274_device, rxtxcb_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8274_TAG, i8274_device, rxtxcb_w))
MCFG_PIT8253_CLK1(15.36_MHz_XTAL/8)
MCFG_PIT8253_CLK2(15.36_MHz_XTAL/8)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(compis_state, tmr5_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, compis_state, tmr5_w))
MCFG_DEVICE_ADD(I8255_TAG, I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTB_CB(READ8(compis_state, ppi_pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(compis_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, compis_state, ppi_pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, compis_state, ppi_pc_w))
MCFG_DEVICE_ADD(I8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(COMPIS_KEYBOARD_TAG, compis_keyboard_device, si_w))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(I80130_TAG, i80130_device, ir2_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int1_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(COMPIS_KEYBOARD_TAG, compis_keyboard_device, si_w))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(I80130_TAG, i80130_device, ir2_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(I80186_TAG, i80186_cpu_device, int1_w))
MCFG_DEVICE_ADD(COMPIS_KEYBOARD_TAG, COMPIS_KEYBOARD, 0)
- MCFG_COMPIS_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd))
+ MCFG_COMPIS_KEYBOARD_OUT_TX_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_rxd))
MCFG_DEVICE_ADD(I8274_TAG, I8274, 15.36_MHz_XTAL/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int3_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_INT_CB(WRITELINE(I80186_TAG, i80186_cpu_device, int3_w))
MCFG_DEVICE_ADD(MM58174A_TAG, MM58274C, 32.768_kHz_XTAL)
MCFG_MM58274C_MODE24(1) // 24 hour
@@ -805,31 +805,31 @@ MACHINE_CONFIG_START(compis_state::compis)
MCFG_TIMER_DRIVER_ADD_PERIODIC("tape", compis_state, tape_tick, attotime::from_hz(44100))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8274_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(I8274_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8274_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8274_TAG, z80dart_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8274_TAG, z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(I8274_TAG, z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8274_TAG, z80dart_device, ctsb_w))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(compis_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(compis_state, write_centronics_select))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, compis_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, compis_state, write_centronics_select))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_COMPIS_GRAPHICS_SLOT_ADD(GRAPHICS_TAG, 15.36_MHz_XTAL/2, compis_graphics_cards, "hrg")
MCFG_ISBX_SLOT_ADD(ISBX_0_TAG, 0, isbx_cards, "fdc")
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir0_w))
- MCFG_ISBX_SLOT_MDRQT_CALLBACK(DEVWRITELINE(I80186_TAG, i80186_cpu_device, drq0_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir1_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir0_w))
+ MCFG_ISBX_SLOT_MDRQT_CALLBACK(WRITELINE(I80186_TAG, i80186_cpu_device, drq0_w))
MCFG_ISBX_SLOT_ADD(ISBX_1_TAG, 0, isbx_cards, nullptr)
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir6_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir5_w))
- MCFG_ISBX_SLOT_MDRQT_CALLBACK(DEVWRITELINE(I80186_TAG, i80186_cpu_device, drq1_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir6_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir5_w))
+ MCFG_ISBX_SLOT_MDRQT_CALLBACK(WRITELINE(I80186_TAG, i80186_cpu_device, drq1_w))
// software lists
MCFG_SOFTWARE_LIST_ADD("flop_list", "compis")
@@ -848,8 +848,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(compis_state::compis2)
compis(config);
// basic machine hardware
- MCFG_CPU_MODIFY(I80186_TAG)
- MCFG_CPU_PROGRAM_MAP(compis2_mem)
+ MCFG_DEVICE_MODIFY(I80186_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(compis2_mem)
// TODO 8087
// internal ram
diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp
index 4ddc2f1cac2..18e6494ab7b 100644
--- a/src/mame/drivers/compucolor.cpp
+++ b/src/mame/drivers/compucolor.cpp
@@ -396,10 +396,10 @@ void compucolor2_state::machine_reset()
MACHINE_CONFIG_START(compucolor2_state::compucolor2)
// basic machine hardware
- MCFG_CPU_ADD(I8080_TAG, I8080, XTAL(17'971'200)/9)
- MCFG_CPU_PROGRAM_MAP(compucolor2_mem)
- MCFG_CPU_IO_MAP(compucolor2_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(compucolor2_state,int_ack)
+ MCFG_DEVICE_ADD(I8080_TAG, I8080, XTAL(17'971'200)/9)
+ MCFG_DEVICE_PROGRAM_MAP(compucolor2_mem)
+ MCFG_DEVICE_IO_MAP(compucolor2_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(compucolor2_state,int_ack)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -410,28 +410,28 @@ MACHINE_CONFIG_START(compucolor2_state::compucolor2)
MCFG_DEVICE_ADD(CRT5027_TAG, CRT5027, XTAL(17'971'200)/2/6)
MCFG_TMS9927_CHAR_WIDTH(6)
- MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("blink", ripple_counter_device, clock_w))
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE("blink", ripple_counter_device, clock_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD("blink", RIPPLE_COUNTER, 0) // 74LS393 at UG10
MCFG_RIPPLE_COUNTER_STAGES(8)
- MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(DEVWRITELINE(TMS5501_TAG, tms5501_device, sens_w)) MCFG_DEVCB_BIT(4)
+ MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITELINE(TMS5501_TAG, tms5501_device, sens_w)) MCFG_DEVCB_BIT(4)
// devices
MCFG_DEVICE_ADD(TMS5501_TAG, TMS5501, XTAL(17'971'200)/9)
MCFG_TMS5501_IRQ_CALLBACK(INPUTLINE(I8080_TAG, I8085_INTR_LINE))
- MCFG_TMS5501_XMT_CALLBACK(WRITELINE(compucolor2_state, xmt_w))
- MCFG_TMS5501_XI_CALLBACK(READ8(compucolor2_state, xi_r))
- MCFG_TMS5501_XO_CALLBACK(WRITE8(compucolor2_state, xo_w))
+ MCFG_TMS5501_XMT_CALLBACK(WRITELINE(*this, compucolor2_state, xmt_w))
+ MCFG_TMS5501_XI_CALLBACK(READ8(*this, compucolor2_state, xi_r))
+ MCFG_TMS5501_XO_CALLBACK(WRITE8(*this, compucolor2_state, xo_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(TMS5501_TAG, tms5501_device, rcv_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(TMS5501_TAG, tms5501_device, rcv_w))
MCFG_COMPUCOLOR_FLOPPY_PORT_ADD("cd0", compucolor_floppy_port_devices, "floppy")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(TMS5501_TAG, tms5501_device, rcv_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(TMS5501_TAG, tms5501_device, rcv_w))
MCFG_COMPUCOLOR_FLOPPY_PORT_ADD("cd1", compucolor_floppy_port_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(TMS5501_TAG, tms5501_device, rcv_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(TMS5501_TAG, tms5501_device, rcv_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp
index 57ff8434d98..2f792a2fa14 100644
--- a/src/mame/drivers/comquest.cpp
+++ b/src/mame/drivers/comquest.cpp
@@ -215,9 +215,9 @@ void comquest_state::machine_reset()
MACHINE_CONFIG_START(comquest_state::comquest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6805, 4000000) /* 4000000? */
- /*MCFG_CPU_ADD("maincpu", HD63705, 4000000) instruction set looks like m6805/m6808 */
- /*MCFG_CPU_ADD("maincpu", M68705, 4000000) instruction set looks like m6805/m6808 */
+ MCFG_DEVICE_ADD("maincpu", M6805, 4000000) /* 4000000? */
+ /*MCFG_DEVICE_ADD("maincpu", HD63705, 4000000) instruction set looks like m6805/m6808 */
+ /*MCFG_DEVICE_ADD("maincpu", M68705, 4000000) instruction set looks like m6805/m6808 */
/*
8 bit bus, integrated io, serial io?,
@@ -243,7 +243,7 @@ MACHINE_CONFIG_START(comquest_state::comquest)
not epson e0c88
*/
- MCFG_CPU_PROGRAM_MAP(comquest_mem)
+ MCFG_DEVICE_PROGRAM_MAP(comquest_mem)
/* video hardware */
diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp
index cb11fde8a9a..a0265fa3070 100644
--- a/src/mame/drivers/comx35.cpp
+++ b/src/mame/drivers/comx35.cpp
@@ -597,15 +597,15 @@ void comx35_state::machine_reset()
MACHINE_CONFIG_START(comx35_state::pal)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_PAL)
- MCFG_CPU_PROGRAM_MAP(comx35_mem)
- MCFG_CPU_IO_MAP(comx35_io)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_PAL)
+ MCFG_DEVICE_PROGRAM_MAP(comx35_mem)
+ MCFG_DEVICE_IO_MAP(comx35_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(comx35_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(comx35_state, ef2_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(comx35_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(comx35_state, q_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(comx35_state, sc_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, comx35_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, comx35_state, ef2_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, comx35_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, comx35_state, q_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, comx35_state, sc_w))
// sound and video hardware
comx35_pal_video(config);
@@ -630,7 +630,7 @@ MACHINE_CONFIG_START(comx35_state::pal)
// expansion bus
MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, comx_expansion_cards, "eb")
- MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx35_state, irq_w))
+ MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, comx35_state, irq_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -647,15 +647,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(comx35_state::ntsc)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_NTSC)
- MCFG_CPU_PROGRAM_MAP(comx35_mem)
- MCFG_CPU_IO_MAP(comx35_io)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_NTSC)
+ MCFG_DEVICE_PROGRAM_MAP(comx35_mem)
+ MCFG_DEVICE_IO_MAP(comx35_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(comx35_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(comx35_state, ef2_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(comx35_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(comx35_state, q_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(comx35_state, sc_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, comx35_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, comx35_state, ef2_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, comx35_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, comx35_state, q_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, comx35_state, sc_w))
// sound and video hardware
comx35_ntsc_video(config);
@@ -680,7 +680,7 @@ MACHINE_CONFIG_START(comx35_state::ntsc)
// expansion bus
MCFG_COMX_EXPANSION_SLOT_ADD(EXPANSION_TAG, comx_expansion_cards, "eb")
- MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx35_state, irq_w))
+ MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, comx35_state, irq_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp
index ad7b471ff3e..9f089ac633a 100644
--- a/src/mame/drivers/concept.cpp
+++ b/src/mame/drivers/concept.cpp
@@ -212,8 +212,8 @@ void concept_a2_cards(device_slot_interface &device)
MACHINE_CONFIG_START(concept_state::concept)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8182000) /* 16.364 MHz / 2 */
- MCFG_CPU_PROGRAM_MAP(concept_memmap)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8182000) /* 16.364 MHz / 2 */
+ MCFG_DEVICE_PROGRAM_MAP(concept_memmap)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -231,7 +231,7 @@ MACHINE_CONFIG_START(concept_state::concept)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* rtc */
@@ -241,21 +241,21 @@ MACHINE_CONFIG_START(concept_state::concept)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1022750)
- MCFG_VIA6522_READPA_HANDLER(READ8(concept_state, via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(concept_state, via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(concept_state, via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(concept_state, via_out_b))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(concept_state, via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(concept_state, via_irq_func))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, concept_state, via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, concept_state, via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, concept_state, via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, concept_state, via_out_b))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, concept_state, via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, concept_state, via_irq_func))
/* ACIAs */
MCFG_DEVICE_ADD(ACIA_0_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_DEVICE_ADD(ACIA_1_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
MCFG_DEVICE_ADD(KBD_ACIA_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
@@ -269,17 +269,17 @@ MACHINE_CONFIG_START(concept_state::concept)
MCFG_A2BUS_SLOT_ADD(A2BUS_TAG, "sl4", concept_a2_cards, "fdc01")
/* 2x RS232 ports */
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA_0_TAG, mos6551_device, write_cts))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA_1_TAG, mos6551_device, write_cts))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA_0_TAG, mos6551_device, write_cts))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA_1_TAG, mos6551_device, write_cts))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp
index db2579ed9f2..dc61014eb9a 100644
--- a/src/mame/drivers/contra.cpp
+++ b/src/mame/drivers/contra.cpp
@@ -209,12 +209,12 @@ void contra_state::machine_reset()
MACHINE_CONFIG_START(contra_state::contra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) /* 3000000? (HD63C09EP) */
- MCFG_CPU_PROGRAM_MAP(contra_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", contra_state, contra_interrupt)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8) /* 3000000? (HD63C09EP) */
+ MCFG_DEVICE_PROGRAM_MAP(contra_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", contra_state, contra_interrupt)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000)/8) /* 3000000? (HD68B09EP) */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(24'000'000)/8) /* 3000000? (HD68B09EP) */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/controlid.cpp b/src/mame/drivers/controlid.cpp
index e50f6172bf6..2fd0d91642c 100644
--- a/src/mame/drivers/controlid.cpp
+++ b/src/mame/drivers/controlid.cpp
@@ -113,12 +113,12 @@ PALETTE_INIT_MEMBER(controlidx628_state, controlidx628)
MACHINE_CONFIG_START(controlidx628_state::controlidx628)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I80C32, XTAL(11'059'200)) /* Actually the board has an Atmel AT89S52 mcu. */
- MCFG_CPU_PROGRAM_MAP(prog_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(controlidx628_state, p0_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(controlidx628_state, p1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(controlidx628_state, p3_w))
+ MCFG_DEVICE_ADD("maincpu", I80C32, XTAL(11'059'200)) /* Actually the board has an Atmel AT89S52 mcu. */
+ MCFG_DEVICE_PROGRAM_MAP(prog_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, controlidx628_state, p0_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, controlidx628_state, p1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, controlidx628_state, p3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp
index db4bcd1ff31..0ebaca2746b 100644
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@@ -715,8 +715,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(coolpool_state::amerdart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(amerdart_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(amerdart_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000)/12) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
@@ -724,11 +724,11 @@ MACHINE_CONFIG_START(coolpool_state::amerdart)
MCFG_TMS340X0_TO_SHIFTREG_CB(coolpool_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(coolpool_state, from_shiftreg) /* read from shiftreg function */
- MCFG_CPU_ADD("dsp", TMS32015, XTAL(40'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(amerdart_dsp_pgm_map)
+ MCFG_DEVICE_ADD("dsp", TMS32015, XTAL(40'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(amerdart_dsp_pgm_map)
/* Data Map is internal to the CPU */
- MCFG_CPU_IO_MAP(amerdart_dsp_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(coolpool_state, amerdart_dsp_bio_line_r))
+ MCFG_DEVICE_IO_MAP(amerdart_dsp_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, coolpool_state, amerdart_dsp_bio_line_r))
MCFG_TIMER_DRIVER_ADD_SCANLINE("audioint", coolpool_state, amerdart_audio_int_gen, "screen", 0, 1)
MCFG_GENERIC_LATCH_16_ADD("main2dsp")
@@ -747,7 +747,7 @@ MACHINE_CONFIG_START(coolpool_state::amerdart)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_12BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_12BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -756,8 +756,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(coolpool_state::coolpool)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(coolpool_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(coolpool_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000)/6) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -765,12 +765,12 @@ MACHINE_CONFIG_START(coolpool_state::coolpool)
MCFG_TMS340X0_TO_SHIFTREG_CB(coolpool_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(coolpool_state, from_shiftreg) /* read from shiftreg function */
- MCFG_CPU_ADD("dsp", TMS32026,XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(coolpool_dsp_pgm_map)
- MCFG_CPU_IO_MAP(coolpool_dsp_io_map)
- MCFG_TMS32025_BIO_IN_CB(READ16(coolpool_state, dsp_bio_line_r))
- MCFG_TMS32025_HOLD_IN_CB(READ16(coolpool_state, dsp_hold_line_r))
-// MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(coolpool_state, dsp_HOLDA_signal_w))
+ MCFG_DEVICE_ADD("dsp", TMS32026,XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(coolpool_dsp_pgm_map)
+ MCFG_DEVICE_IO_MAP(coolpool_dsp_io_map)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, coolpool_state, dsp_bio_line_r))
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, coolpool_state, dsp_hold_line_r))
+// MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(*this, coolpool_state, dsp_HOLDA_signal_w))
MCFG_GENERIC_LATCH_16_ADD("main2dsp")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("dsp", 0)) /* ??? I have no idea who should generate this! */
@@ -794,7 +794,7 @@ MACHINE_CONFIG_START(coolpool_state::coolpool)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_12BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_12BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -803,11 +803,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(coolpool_state::_9ballsht)
coolpool(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nballsht_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nballsht_map)
- MCFG_CPU_MODIFY("dsp")
- MCFG_CPU_IO_MAP(nballsht_dsp_io_map)
+ MCFG_DEVICE_MODIFY("dsp")
+ MCFG_DEVICE_IO_MAP(nballsht_dsp_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 66241d33c33..b6cdb736f35 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -3264,21 +3264,21 @@ WRITE_LINE_MEMBER(coolridr_state::scsp2_to_sh1_irq)
#define MAIN_CLOCK XTAL(28'636'363)
MACHINE_CONFIG_START(coolridr_state::coolridr)
- MCFG_CPU_ADD("maincpu", SH2, MAIN_CLOCK) // 28 mhz
- MCFG_CPU_PROGRAM_MAP(system_h1_map)
+ MCFG_DEVICE_ADD("maincpu", SH2, MAIN_CLOCK) // 28 mhz
+ MCFG_DEVICE_PROGRAM_MAP(system_h1_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", coolridr_state, system_h1_main, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", M68000, 11289600) //256 x 44100 Hz = 11.2896 MHz
- MCFG_CPU_PROGRAM_MAP(system_h1_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", M68000, 11289600) //256 x 44100 Hz = 11.2896 MHz
+ MCFG_DEVICE_PROGRAM_MAP(system_h1_sound_map)
- MCFG_CPU_ADD("sub", SH1, 16000000) // SH7032 HD6417032F20!! 16 mhz
- MCFG_CPU_PROGRAM_MAP(coolridr_submap)
+ MCFG_DEVICE_ADD("sub", SH1, 16000000) // SH7032 HD6417032F20!! 16 mhz
+ MCFG_DEVICE_PROGRAM_MAP(coolridr_submap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer2", coolridr_state, system_h1_sub, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("io", SEGA_315_5649, 0)
- MCFG_315_5649_OUT_PB_CB(WRITE8(coolridr_state, lamps_w))
+ MCFG_315_5649_OUT_PB_CB(WRITE8(*this, coolridr_state, lamps_w))
MCFG_315_5649_IN_PC_CB(IOPORT("IN0"))
MCFG_315_5649_IN_PD_CB(IOPORT("P1"))
MCFG_315_5649_IN_PE_CB(IOPORT("P2"))
@@ -3310,25 +3310,25 @@ MACHINE_CONFIG_START(coolridr_state::coolridr)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp1", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(coolridr_state, scsp_irq))
- MCFG_SCSP_MAIN_IRQ_CB(WRITELINE(coolridr_state, scsp1_to_sh1_irq))
+ MCFG_DEVICE_ADD("scsp1", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, coolridr_state, scsp_irq))
+ MCFG_SCSP_MAIN_IRQ_CB(WRITELINE(*this, coolridr_state, scsp1_to_sh1_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
- MCFG_SOUND_ADD("scsp2", SCSP, 0)
- MCFG_SCSP_MAIN_IRQ_CB(WRITELINE(coolridr_state, scsp2_to_sh1_irq))
+ MCFG_DEVICE_ADD("scsp2", SCSP)
+ MCFG_SCSP_MAIN_IRQ_CB(WRITELINE(*this, coolridr_state, scsp2_to_sh1_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(coolridr_state::aquastge)
coolridr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(aquastge_h1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(aquastge_h1_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(aquastge_submap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(aquastge_submap)
MCFG_DEVICE_REMOVE("io")
MCFG_DEVICE_ADD("io", SEGA_315_5649, 0)
diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp
index 7fe9c133037..b91d5306aef 100644
--- a/src/mame/drivers/cop01.cpp
+++ b/src/mame/drivers/cop01.cpp
@@ -449,14 +449,14 @@ void cop01_state::machine_reset()
MACHINE_CONFIG_START(cop01_state::cop01)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown clock / divider */
- MCFG_CPU_PROGRAM_MAP(cop01_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cop01_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown clock / divider */
+ MCFG_DEVICE_PROGRAM_MAP(cop01_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cop01_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'000'000)) /* unknown clock / divider, hand-tuned to match audio reference */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'000'000)) /* unknown clock / divider, hand-tuned to match audio reference */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(audio_io_map)
/* video hardware */
@@ -478,30 +478,30 @@ MACHINE_CONFIG_START(cop01_state::cop01)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1250000) /* unknown clock / divider, hand-tuned to match audio reference */
+ MCFG_DEVICE_ADD("ay1", AY8910, 1250000) /* unknown clock / divider, hand-tuned to match audio reference */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, 1250000) /* unknown clock / divider, hand-tuned to match audio reference */
+ MCFG_DEVICE_ADD("ay2", AY8910, 1250000) /* unknown clock / divider, hand-tuned to match audio reference */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8910, 1250000) /* unknown clock / divider, hand-tuned to match audio reference */
+ MCFG_DEVICE_ADD("ay3", AY8910, 1250000) /* unknown clock / divider, hand-tuned to match audio reference */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mightguy_state::mightguy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown divider */
- MCFG_CPU_PROGRAM_MAP(cop01_map)
- MCFG_CPU_IO_MAP(mightguy_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cop01_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown divider */
+ MCFG_DEVICE_PROGRAM_MAP(cop01_map)
+ MCFG_DEVICE_IO_MAP(mightguy_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cop01_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, AUDIOCPU_CLOCK/2) /* unknown divider */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(mightguy_audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, AUDIOCPU_CLOCK/2) /* unknown divider */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(mightguy_audio_io_map)
MCFG_DEVICE_ADD("prot_chip", NB1412M2, XTAL(8'000'000)/2) // divided by 2 maybe
- MCFG_NB1412M2_DAC_CB(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_NB1412M2_DAC_CB(WRITE8("dac", dac_byte_interface, write))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -522,10 +522,10 @@ MACHINE_CONFIG_START(mightguy_state::mightguy)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, AUDIOCPU_CLOCK/2) /* unknown divider */
+ MCFG_DEVICE_ADD("ymsnd", YM3526, AUDIOCPU_CLOCK/2) /* unknown divider */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) // unknown DAC
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index e1622961463..6ad614944d7 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -921,8 +921,8 @@ DRIVER_INIT_MEMBER(cops_state,cops)
MACHINE_CONFIG_START(cops_state::cops)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(cops_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(cops_map)
/* video hardware */
MCFG_LASERDISC_LDP1450_ADD("laserdisc",9600)
@@ -930,17 +930,17 @@ MACHINE_CONFIG_START(cops_state::cops)
/* via */
MCFG_DEVICE_ADD("via6522_1", VIA6522, MAIN_CLOCK/2)
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(cops_state, via1_irq))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(cops_state, via1_b_w))
- MCFG_VIA6522_CB1_HANDLER(WRITE8(cops_state, via1_cb1_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, cops_state, via1_irq))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, cops_state, via1_b_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITE8(*this, cops_state, via1_cb1_w))
MCFG_DEVICE_ADD("via6522_2", VIA6522, MAIN_CLOCK/2)
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(cops_state, via2_irq))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, cops_state, via2_irq))
MCFG_DEVICE_ADD("via6522_3", VIA6522, MAIN_CLOCK/2)
- MCFG_VIA6522_READPA_HANDLER(READ8(cops_state, cdrom_data_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(cops_state, cdrom_data_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(cops_state, cdrom_ctrl_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, cops_state, cdrom_data_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, cops_state, cdrom_data_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, cops_state, cdrom_ctrl_w))
/* acia (really a 65C52)*/
@@ -948,7 +948,7 @@ MACHINE_CONFIG_START(cops_state::cops)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* TODO: Verify clock */
- MCFG_SOUND_ADD("snsnd", SN76489, MAIN_CLOCK/2)
+ MCFG_DEVICE_ADD("snsnd", SN76489, MAIN_CLOCK/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -957,8 +957,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cops_state::revlatns)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(revlatns_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(revlatns_map)
/* video hardware */
MCFG_LASERDISC_LDP1450_ADD("laserdisc",9600)
@@ -966,9 +966,9 @@ MACHINE_CONFIG_START(cops_state::revlatns)
/* via */
MCFG_DEVICE_ADD("via6522_1", VIA6522, MAIN_CLOCK/2)
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(cops_state, via1_irq))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(cops_state, via1_b_w))
- MCFG_VIA6522_CB1_HANDLER(WRITE8(cops_state, via1_cb1_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, cops_state, via1_irq))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, cops_state, via1_b_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITE8(*this, cops_state, via1_cb1_w))
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
@@ -978,7 +978,7 @@ MACHINE_CONFIG_START(cops_state::revlatns)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* TODO: Verify clock */
- MCFG_SOUND_ADD("snsnd", SN76489, MAIN_CLOCK/2)
+ MCFG_DEVICE_ADD("snsnd", SN76489, MAIN_CLOCK/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index bbe34afdcc4..ed651484b37 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -251,8 +251,8 @@ void copsnrob_state::machine_reset()
MACHINE_CONFIG_START(copsnrob_state::copsnrob)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp
index 19646dd7722..c1ad249ecc6 100644
--- a/src/mame/drivers/corona.cpp
+++ b/src/mame/drivers/corona.cpp
@@ -1382,14 +1382,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(corona_state::winner81)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, WC81_MAIN_XTAL/8) /* measured */
- MCFG_CPU_PROGRAM_MAP(winner81_map)
- MCFG_CPU_IO_MAP(winner81_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, WC81_MAIN_XTAL/8) /* measured */
+ MCFG_DEVICE_PROGRAM_MAP(winner81_map)
+ MCFG_DEVICE_IO_MAP(winner81_cpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, WC81_MAIN_XTAL/10) /* measured */
- MCFG_CPU_PROGRAM_MAP(winner81_sound_map)
- MCFG_CPU_IO_MAP(winner81_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(corona_state, nmi_line_pulse, 244) /* 244 Hz (1MHz/16/16/16) */
+ MCFG_DEVICE_ADD("soundcpu", Z80, WC81_MAIN_XTAL/10) /* measured */
+ MCFG_DEVICE_PROGRAM_MAP(winner81_sound_map)
+ MCFG_DEVICE_IO_MAP(winner81_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(corona_state, nmi_line_pulse, 244) /* 244 Hz (1MHz/16/16/16) */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1410,20 +1410,20 @@ MACHINE_CONFIG_START(corona_state::winner81)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, AY_CLK1) /* measured */
+ MCFG_DEVICE_ADD("aysnd", AY8912, AY_CLK1) /* measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(corona_state::winner82)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, WC82_MAIN_XTAL/8) /* measured */
- MCFG_CPU_PROGRAM_MAP(winner82_map)
- MCFG_CPU_IO_MAP(winner82_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, WC82_MAIN_XTAL/8) /* measured */
+ MCFG_DEVICE_PROGRAM_MAP(winner82_map)
+ MCFG_DEVICE_IO_MAP(winner82_cpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, WC82_MAIN_XTAL/8) /* measured */
- MCFG_CPU_PROGRAM_MAP(winner82_sound_map) /* IM1 instead of NMI */
- MCFG_CPU_IO_MAP(winner82_sound_cpu_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, WC82_MAIN_XTAL/8) /* measured */
+ MCFG_DEVICE_PROGRAM_MAP(winner82_sound_map) /* IM1 instead of NMI */
+ MCFG_DEVICE_IO_MAP(winner82_sound_cpu_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1444,21 +1444,21 @@ MACHINE_CONFIG_START(corona_state::winner82)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLK2) /* measured */
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLK2) /* measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(corona_state::re800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
- MCFG_CPU_PROGRAM_MAP(re800_map)
- MCFG_CPU_IO_MAP(re800_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(re800_map)
+ MCFG_DEVICE_IO_MAP(re800_cpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
- MCFG_CPU_PROGRAM_MAP(re800_sound_map)
- MCFG_CPU_IO_MAP(re800_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(corona_state, nmi_line_pulse, 244) /* 244 Hz (1MHz/16/16/16) */
+ MCFG_DEVICE_ADD("soundcpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(re800_sound_map)
+ MCFG_DEVICE_IO_MAP(re800_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(corona_state, nmi_line_pulse, 244) /* 244 Hz (1MHz/16/16/16) */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1479,20 +1479,20 @@ MACHINE_CONFIG_START(corona_state::re800)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, AY_CLK2)
+ MCFG_DEVICE_ADD("aysnd", AY8912, AY_CLK2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(corona_state::rcirulet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
- MCFG_CPU_PROGRAM_MAP(re800_map)
- MCFG_CPU_IO_MAP(re800_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(re800_map)
+ MCFG_DEVICE_IO_MAP(re800_cpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
- MCFG_CPU_PROGRAM_MAP(winner82_sound_map) /* IM1 instead of NMI */
- MCFG_CPU_IO_MAP(winner82_sound_cpu_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(winner82_sound_map) /* IM1 instead of NMI */
+ MCFG_DEVICE_IO_MAP(winner82_sound_cpu_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1513,21 +1513,21 @@ MACHINE_CONFIG_START(corona_state::rcirulet)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, AY_CLK2)
+ MCFG_DEVICE_ADD("aysnd", AY8912, AY_CLK2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(corona_state::luckyrlt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
- MCFG_CPU_PROGRAM_MAP(luckyrlt_map)
- MCFG_CPU_IO_MAP(luckyrlt_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(luckyrlt_map)
+ MCFG_DEVICE_IO_MAP(luckyrlt_cpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
- MCFG_CPU_PROGRAM_MAP(luckyrlt_sound_map)
- MCFG_CPU_IO_MAP(luckyrlt_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(corona_state, nmi_line_pulse, 244) /* 244 Hz (1MHz/16/16/16) */
+ MCFG_DEVICE_ADD("soundcpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(luckyrlt_sound_map)
+ MCFG_DEVICE_IO_MAP(luckyrlt_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(corona_state, nmi_line_pulse, 244) /* 244 Hz (1MHz/16/16/16) */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1548,7 +1548,7 @@ MACHINE_CONFIG_START(corona_state::luckyrlt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, AY_CLK1)
+ MCFG_DEVICE_ADD("aysnd", AY8912, AY_CLK1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp
index a2711de60f6..f630e9eff91 100644
--- a/src/mame/drivers/cortex.cpp
+++ b/src/mame/drivers/cortex.cpp
@@ -187,18 +187,18 @@ MACHINE_CONFIG_START(cortex_state::cortex)
MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL(12'000'000), mem_map, io_map)
MCFG_DEVICE_ADD("control", LS259, 0) // IC64
- //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(cortex_state, basic_led_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(cortex_state, keyboard_ack_w))
- //MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(cortex_state, ebus_int_ack_w))
- //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(cortex_state, ebus_to_en_w))
- //MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(cortex_state, disk_size_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(cortex_state, romsw_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("beeper", beep_device, set_state))
+ //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, cortex_state, basic_led_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cortex_state, keyboard_ack_w))
+ //MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cortex_state, ebus_int_ack_w))
+ //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cortex_state, ebus_to_en_w))
+ //MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cortex_state, disk_size_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, cortex_state, romsw_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("beeper", beep_device, set_state))
/* video hardware */
MCFG_DEVICE_ADD( "crtc", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_OUT_INT_LINE_CB(INPUTLINE("maincpu", INT_9995_INT1))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(cortex_state, vdp_int_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, cortex_state, vdp_int_w))
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "crtc", tms9928a_device, screen_update )
@@ -211,7 +211,7 @@ MACHINE_CONFIG_START(cortex_state::cortex)
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) // guess
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp
index 65401277dd5..a3c52504b15 100644
--- a/src/mame/drivers/cosmic.cpp
+++ b/src/mame/drivers/cosmic.cpp
@@ -1008,7 +1008,7 @@ MACHINE_RESET_MEMBER(cosmic_state,cosmicg)
MACHINE_CONFIG_START(cosmic_state::cosmic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz */
+ MCFG_DEVICE_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz */
MCFG_MACHINE_START_OVERRIDE(cosmic_state,cosmic)
MCFG_MACHINE_RESET_OVERRIDE(cosmic_state,cosmic)
@@ -1037,8 +1037,8 @@ MACHINE_CONFIG_START(cosmic_state::panic)
cosmic(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(panic_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(panic_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cosmic_state, panic_scanline, "screen", 0, 1)
/* video hardware */
@@ -1053,12 +1053,12 @@ MACHINE_CONFIG_START(cosmic_state::panic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(9)
MCFG_SAMPLES_NAMES(panic_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1068,8 +1068,8 @@ MACHINE_CONFIG_START(cosmic_state::cosmica)
cosmic(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cosmica_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cosmica_map)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cosmica)
@@ -1083,7 +1083,7 @@ MACHINE_CONFIG_START(cosmic_state::cosmica)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(13)
MCFG_SAMPLES_NAMES(cosmica_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
@@ -1115,12 +1115,12 @@ MACHINE_CONFIG_START(cosmic_state::cosmicg)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(9)
MCFG_SAMPLES_NAMES(cosmicg_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // NE556
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // NE556
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
// Other DACs include 3-bit binary-weighted (100K/50K/25K) DAC combined with another NE556 for attack march
@@ -1131,8 +1131,8 @@ MACHINE_CONFIG_START(cosmic_state::magspot)
cosmic(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", Z80, Z80_MASTER_CLOCK/4) /* 2.704 MHz, verified via schematics */
- MCFG_CPU_PROGRAM_MAP(magspot_map)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, Z80_MASTER_CLOCK/4) /* 2.704 MHz, verified via schematics */
+ MCFG_DEVICE_PROGRAM_MAP(magspot_map)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", panic)
@@ -1146,7 +1146,7 @@ MACHINE_CONFIG_START(cosmic_state::magspot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1167,8 +1167,8 @@ MACHINE_CONFIG_START(cosmic_state::nomnlnd)
cosmic(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(magspot_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(magspot_map)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", panic)
@@ -1182,7 +1182,7 @@ MACHINE_CONFIG_START(cosmic_state::nomnlnd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index 4f4b86ee500..3dfb82e1aba 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -508,18 +508,18 @@ QUICKLOAD_LOAD_MEMBER( cosmicos_state, cosmicos )
MACHINE_CONFIG_START(cosmicos_state::cosmicos)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(cosmicos_mem)
- MCFG_CPU_IO_MAP(cosmicos_io)
- MCFG_COSMAC_WAIT_CALLBACK(READLINE(cosmicos_state, wait_r))
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(cosmicos_state, clear_r))
- MCFG_COSMAC_EF1_CALLBACK(READLINE(cosmicos_state, ef1_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(cosmicos_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(cosmicos_state, ef3_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(cosmicos_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(cosmicos_state, q_w))
- MCFG_COSMAC_DMAR_CALLBACK(READ8(cosmicos_state, dma_r))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(cosmicos_state, sc_w))
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(cosmicos_mem)
+ MCFG_DEVICE_IO_MAP(cosmicos_io)
+ MCFG_COSMAC_WAIT_CALLBACK(READLINE(*this, cosmicos_state, wait_r))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cosmicos_state, clear_r))
+ MCFG_COSMAC_EF1_CALLBACK(READLINE(*this, cosmicos_state, ef1_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, cosmicos_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, cosmicos_state, ef3_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, cosmicos_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cosmicos_state, q_w))
+ MCFG_COSMAC_DMAR_CALLBACK(READ8(*this, cosmicos_state, dma_r))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, cosmicos_state, sc_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_cosmicos )
@@ -533,10 +533,10 @@ MACHINE_CONFIG_START(cosmicos_state::cosmicos)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), WRITELINE(cosmicos_state, dmaout_w), WRITELINE(cosmicos_state, efx_w), NOOP, VCC, VCC, VCC)
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), WRITELINE(*this, cosmicos_state, dmaout_w), WRITELINE(*this, cosmicos_state, efx_w), NOOP, VCC, VCC, VCC)
MCFG_CDP1864_CHROMINANCE(RES_K(2), 0, 0, 0) // R2
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp
index b7d4d361257..bc0b36d1508 100644
--- a/src/mame/drivers/cp1.cpp
+++ b/src/mame/drivers/cp1.cpp
@@ -266,22 +266,22 @@ QUICKLOAD_LOAD_MEMBER( cp1_state, quickload )
MACHINE_CONFIG_START(cp1_state::cp1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8049, XTAL(6'000'000))
- MCFG_CPU_IO_MAP(cp1_io)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(cp1_state, port1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(cp1_state, port1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(cp1_state, port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(cp1_state, port2_w))
+ MCFG_DEVICE_ADD("maincpu", I8049, XTAL(6'000'000))
+ MCFG_DEVICE_IO_MAP(cp1_io)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, cp1_state, port1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, cp1_state, port1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, cp1_state, port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, cp1_state, port2_w))
MCFG_MCS48_PORT_BUS_IN_CB(LOGGER("getbus"))
MCFG_MCS48_PORT_BUS_OUT_CB(LOGGER("putbus"))
MCFG_MCS48_PORT_T0_IN_CB(LOGGER("t0_r"))
MCFG_MCS48_PORT_T1_IN_CB(LOGGER("t1_r"))
MCFG_DEVICE_ADD("i8155", I8155, 0)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(cp1_state, i8155_porta_w))
- MCFG_I8155_IN_PORTB_CB(READ8(cp1_state, i8155_portb_r))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(cp1_state, i8155_portb_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(cp1_state, i8155_portc_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, cp1_state, i8155_porta_w))
+ MCFG_I8155_IN_PORTB_CB(READ8(*this, cp1_state, i8155_portb_r))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, cp1_state, i8155_portb_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, cp1_state, i8155_portc_w))
MCFG_DEVICE_ADD("i8155_cp3", I8155, 0)
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 8c8a1870f43..9bce5eb8c5d 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3356,13 +3356,13 @@ MACHINE_START_MEMBER(cps_state,qsound)
MACHINE_CONFIG_START(cps_state::cps1_10MHz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000) ) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000) ) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,cps1)
@@ -3370,7 +3370,7 @@ MACHINE_CONFIG_START(cps_state::cps1_10MHz)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(CPS_PIXEL_CLOCK, CPS_HTOTAL, CPS_HBEND, CPS_HBSTART, CPS_VTOTAL, CPS_VBEND, CPS_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_cps1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -3396,8 +3396,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::forgottn)
cps1_10MHz(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(forgottn_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(forgottn_map)
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0)
MCFG_UPD4701_PORTX("DIAL0")
@@ -3408,8 +3408,8 @@ MACHINE_CONFIG_START(cps_state::cps1_12MHz)
cps1_10MHz(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(12'000'000) ) /* verified on pcb */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(12'000'000) ) /* verified on pcb */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::pang3)
@@ -3423,7 +3423,7 @@ MACHINE_CONFIG_START(cps_state::ganbare)
cps1_10MHz(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cps_state, ganbare_interrupt, "screen", 0, 1) // need to investigate more
MCFG_M48T35_ADD("m48t35")
@@ -3433,15 +3433,15 @@ MACHINE_CONFIG_START(cps_state::qsound)
cps1_12MHz(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(12'000'000) ) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(qsound_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(12'000'000) ) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(qsound_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_REPLACE("audiocpu", Z80, XTAL(8'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(qsound_sub_map)
- MCFG_CPU_OPCODES_MAP(qsound_decrypted_opcodes_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured (cps2.c)
+ MCFG_DEVICE_REPLACE("audiocpu", Z80, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(qsound_sub_map)
+ MCFG_DEVICE_OPCODES_MAP(qsound_decrypted_opcodes_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured (cps2.c)
MCFG_MACHINE_START_OVERRIDE(cps_state, qsound)
@@ -3470,14 +3470,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::sf2m3)
cps1_12MHz(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sf2m3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sf2m3_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::sf2m10)
cps1_12MHz(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sf2m10_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sf2m10_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index 313511ab040..aabc7145c40 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -1307,14 +1307,14 @@ MACHINE_START_MEMBER(cps_state,cps2)
MACHINE_CONFIG_START(cps_state::cps2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(cps2_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(cps2_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cps_state, cps2_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(qsound_sub_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(qsound_sub_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cps_state, irq0_line_hold, 250) // measured
MCFG_MACHINE_START_OVERRIDE(cps_state, cps2)
@@ -1325,7 +1325,7 @@ MACHINE_CONFIG_START(cps_state::cps2)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(CPS_PIXEL_CLOCK, CPS_HTOTAL, CPS_HBEND, CPS_HBSTART, CPS_VTOTAL, CPS_VBEND, CPS_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_cps1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -1345,8 +1345,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::dead_cps2)
cps2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dead_cps2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dead_cps2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::gigaman2)
@@ -1356,7 +1356,7 @@ MACHINE_CONFIG_START(cps_state::gigaman2)
// gigaman2 has an AT89C4051 (8051) MCU as an audio cpu, no qsound.
MCFG_DEVICE_REMOVE("qsound")
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index 5e2eb44038b..471f641e47e 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -2523,11 +2523,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps3_state::cps3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the internal multiplier to 4x (this should probably be handled in the core..)
- MCFG_CPU_PROGRAM_MAP(cps3_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps3_state, cps3_vbl_interrupt)
- MCFG_CPU_PERIODIC_INT_DRIVER(cps3_state, cps3_other_interrupt, 80) /* ?source? */
+ MCFG_DEVICE_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the internal multiplier to 4x (this should probably be handled in the core..)
+ MCFG_DEVICE_PROGRAM_MAP(cps3_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps3_state, cps3_vbl_interrupt)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cps3_state, cps3_other_interrupt, 80) /* ?source? */
MCFG_SH2_DMA_KLUDGE_CB(cps3_state, dma_callback)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
@@ -2559,7 +2559,7 @@ MACHINE_CONFIG_START(cps3_state::cps3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("cps3sound", CPS3, MASTER_CLOCK / 3)
+ MCFG_DEVICE_ADD("cps3sound", CPS3, MASTER_CLOCK / 3)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp
index 7027718c20c..330922f5ab7 100644
--- a/src/mame/drivers/craft.cpp
+++ b/src/mame/drivers/craft.cpp
@@ -247,10 +247,10 @@ void craft_state::machine_reset()
MACHINE_CONFIG_START(craft_state::craft)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ATMEGA88, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(craft_prg_map)
- MCFG_CPU_DATA_MAP(craft_data_map)
- MCFG_CPU_IO_MAP(craft_io_map)
+ MCFG_DEVICE_ADD("maincpu", ATMEGA88, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(craft_prg_map)
+ MCFG_DEVICE_DATA_MAP(craft_data_map)
+ MCFG_DEVICE_IO_MAP(craft_io_map)
MCFG_CPU_AVR8_EEPROM("eeprom")
/* video hardware */
@@ -264,7 +264,7 @@ MACHINE_CONFIG_START(craft_state::craft)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("avr8")
- MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "avr8", 0.25) // pd1/pd2/pd4/pd5/pd6/pd7 + 2k(x7) + 1k(x5)
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "avr8", 0.25) // pd1/pd2/pd4/pd5/pd6/pd7 + 2k(x7) + 1k(x5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp
index 085fbcdcd8f..02b34c105b6 100644
--- a/src/mame/drivers/crbaloon.cpp
+++ b/src/mame/drivers/crbaloon.cpp
@@ -364,10 +364,10 @@ INTERRUPT_GEN_MEMBER(crbaloon_state::vblank_irq)
MACHINE_CONFIG_START(crbaloon_state::crbaloon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crbaloon_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crbaloon_state, vblank_irq)
/* video hardware */
diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp
index 80bebd6e4de..6d647984ceb 100644
--- a/src/mame/drivers/crgolf.cpp
+++ b/src/mame/drivers/crgolf.cpp
@@ -468,22 +468,22 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(crgolf_state::crgolf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/3/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,MASTER_CLOCK/3/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80,MASTER_CLOCK/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 1H
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(crgolf_state, color_select_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(crgolf_state, screen_flip_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(crgolf_state, screen_select_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(crgolf_state, screenb_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(crgolf_state, screena_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, crgolf_state, color_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, crgolf_state, screen_flip_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, crgolf_state, screen_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, crgolf_state, screenb_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, crgolf_state, screena_enable_w))
MCFG_GENERIC_LATCH_8_ADD("soundlatch1")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -512,7 +512,7 @@ MACHINE_CONFIG_START(crgolf_state::crgolf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/3/2/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -520,8 +520,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(crgolf_state::crgolfhi)
crgolf(config);
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(crgolf_state, vck_callback))
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, crgolf_state, vck_callback))
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -531,15 +531,15 @@ MACHINE_CONFIG_START(crgolf_state::mastrglf)
crgolfhi(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mastrglf_map)
- MCFG_CPU_IO_MAP(mastrglf_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
-
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(mastrglf_submap)
- MCFG_CPU_IO_MAP(mastrglf_subio)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mastrglf_map)
+ MCFG_DEVICE_IO_MAP(mastrglf_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
+
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(mastrglf_submap)
+ MCFG_DEVICE_IO_MAP(mastrglf_subio)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crgolf_state, irq0_line_hold)
MCFG_DEVICE_REMOVE("palette")
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index 82fd14b8dd8..1e8f6fbde97 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -303,13 +303,13 @@ CUSTOM_INPUT_MEMBER( crimfght_state::system_r )
MACHINE_CONFIG_START(crimfght_state::crimfght)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(crimfght_map)
- MCFG_KONAMICPU_LINE_CB(WRITE8(crimfght_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(crimfght_map)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, crimfght_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(crimfght_sound_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, crimfght_state, audiocpu_irq_ack)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(crimfght_sound_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, crimfght_state, audiocpu_irq_ack)
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
@@ -348,12 +348,12 @@ MACHINE_CONFIG_START(crimfght_state::crimfght)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(crimfght_state, ym2151_ct_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, crimfght_state, ym2151_ct_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(crimfght_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, crimfght_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index 84ed038d40f..9284a3c56fc 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -344,13 +344,13 @@ void crospang_state::machine_reset()
MACHINE_CONFIG_START(crospang_state::crospang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(14'318'181)/2) /* 68000P10 @ 7.15909MHz */
- MCFG_CPU_PROGRAM_MAP(crospang_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crospang_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(14'318'181)/2) /* 68000P10 @ 7.15909MHz */
+ MCFG_DEVICE_PROGRAM_MAP(crospang_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crospang_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(crospang_sound_map)
- MCFG_CPU_IO_MAP(crospang_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(crospang_sound_map)
+ MCFG_DEVICE_IO_MAP(crospang_sound_io_map)
/* video hardware */
@@ -379,7 +379,7 @@ MACHINE_CONFIG_START(crospang_state::crospang)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545MHz */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -391,8 +391,8 @@ MACHINE_CONFIG_START(crospang_state::bestri)
crospang(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bestri_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bestri_map)
MACHINE_CONFIG_END
@@ -400,8 +400,8 @@ MACHINE_CONFIG_START(crospang_state::bestria)
crospang(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bestria_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bestria_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp
index 4fed9fa4c1a..ade43071932 100644
--- a/src/mame/drivers/crshrace.cpp
+++ b/src/mame/drivers/crshrace.cpp
@@ -405,13 +405,13 @@ void crshrace_state::machine_reset()
MACHINE_CONFIG_START(crshrace_state::crshrace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(crshrace_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crshrace_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(crshrace_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crshrace_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* video hardware */
@@ -420,8 +420,8 @@ MACHINE_CONFIG_START(crshrace_state::crshrace)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(crshrace_state, screen_update_crshrace)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("spriteram2", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("spriteram2", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", crshrace)
@@ -447,7 +447,7 @@ MACHINE_CONFIG_START(crshrace_state::crshrace)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index 400e5a0cbed..2c196bd5e15 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -739,33 +739,33 @@ static void crvision_cart(device_slot_interface &device)
MACHINE_CONFIG_START(crvision_state::creativision)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(crvision_map)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(crvision_map)
// devices
MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(crvision_state, pia_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(crvision_state, pia_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(crvision_state, pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(SN76489_TAG, sn76496_base_device, write))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, crvision_state, pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, crvision_state, pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, crvision_state, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(SN76489_TAG, sn76496_base_device, write))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD("cent_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT4_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_OUTPUT_LATCH_BIT4_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL(2'000'000))
- MCFG_SN76496_READY_HANDLER(DEVWRITELINE(PIA6821_TAG, pia6821_device, cb1_w))
+ MCFG_DEVICE_ADD(SN76489_TAG, SN76489A, XTAL(2'000'000))
+ MCFG_SN76496_READY_HANDLER(WRITELINE(PIA6821_TAG, pia6821_device, cb1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
@@ -817,24 +817,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(laser2001_state::lasr2001)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(17'734'470)/9)
- MCFG_CPU_PROGRAM_MAP(lasr2001_map)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(17'734'470)/9)
+ MCFG_DEVICE_PROGRAM_MAP(lasr2001_map)
// devices
MCFG_DEVICE_ADD(PIA6821_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(laser2001_state, pia_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(laser2001_state, pia_pb_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(laser2001_state, pia_ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(laser2001_state, pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(laser2001_state, pia_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(laser2001_state, pia_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(laser2001_state, pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, laser2001_state, pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, laser2001_state, pia_pb_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, laser2001_state, pia_ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, laser2001_state, pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, laser2001_state, pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, laser2001_state, pia_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, laser2001_state, pia_cb2_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(laser2001_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, laser2001_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -847,8 +847,8 @@ MACHINE_CONFIG_START(laser2001_state::lasr2001)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489_TAG, SN76489A, XTAL(17'734'470)/9)
- MCFG_SN76496_READY_HANDLER(WRITELINE(laser2001_state, write_psg_ready))
+ MCFG_DEVICE_ADD(SN76489_TAG, SN76489A, XTAL(17'734'470)/9)
+ MCFG_SN76496_READY_HANDLER(WRITELINE(*this, laser2001_state, write_psg_ready))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp
index eca562f6d6f..2aa0e1a617a 100644
--- a/src/mame/drivers/crystal.cpp
+++ b/src/mame/drivers/crystal.cpp
@@ -1487,10 +1487,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(crystal_state::crystal)
- MCFG_CPU_ADD("maincpu", SE3208, 43000000)
- MCFG_CPU_PROGRAM_MAP(crystal_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", crystal_state, crystal_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(crystal_state, icallback)
+ MCFG_DEVICE_ADD("maincpu", SE3208, 43000000)
+ MCFG_DEVICE_PROGRAM_MAP(crystal_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", crystal_state, crystal_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(crystal_state, icallback)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1500,7 +1500,7 @@ MACHINE_CONFIG_START(crystal_state::crystal)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
MCFG_SCREEN_UPDATE_DRIVER(crystal_state, screen_update_crystal)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(crystal_state, screen_vblank_crystal))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, crystal_state, screen_vblank_crystal))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("vr0", VIDEO_VRENDER0, 0)
@@ -1521,20 +1521,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(crystal_state::trivrus)
crystal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(trivrus_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(trivrus_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(crystal_state::crospuzl)
crystal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(crospuzl_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(crospuzl_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(crystal_state::crzyddz2)
crystal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(crzyddz2_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(crzyddz2_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index 23e019ff280..47a9a6839a1 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -363,30 +363,30 @@ WRITE16_MEMBER(csplayh5_state::tmp68301_parallel_port_w)
MACHINE_CONFIG_START(csplayh5_state::csplayh5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
- MCFG_CPU_PROGRAM_MAP(csplayh5_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301", tmp68301_device, irq_callback)
+ MCFG_DEVICE_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
+ MCFG_DEVICE_PROGRAM_MAP(csplayh5_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301", tmp68301_device, irq_callback)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", csplayh5_state, csplayh5_irq, "screen", 0, 1)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(csplayh5_state, tmp68301_parallel_port_w))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, csplayh5_state, tmp68301_parallel_port_w))
#if USE_H8
- MCFG_CPU_ADD("subcpu", H83002, DVD_CLOCK/2) /* unknown divider */
- MCFG_CPU_PROGRAM_MAP(csplayh5_sub_map)
- MCFG_CPU_IO_MAP(csplayh5_sub_io_map)
+ MCFG_DEVICE_ADD("subcpu", H83002, DVD_CLOCK/2) /* unknown divider */
+ MCFG_DEVICE_PROGRAM_MAP(csplayh5_sub_map)
+ MCFG_DEVICE_IO_MAP(csplayh5_sub_io_map)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true) // dvd
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(csplayh5_state, ide_irq))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, csplayh5_state, ide_irq))
#endif
MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272)) // typical 9958 clock, not verified
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(csplayh5_state, csplayh5_vdp0_interrupt))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, csplayh5_state, csplayh5_vdp0_interrupt))
MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272))
/* sound hardware */
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index 4abc14e1fff..0c88705313a 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -259,10 +259,10 @@ void cswat_state::machine_start()
MACHINE_CONFIG_START(cswat_state::cswat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/3/4) // HD68A09EP, 1.5MHz?
- MCFG_CPU_PROGRAM_MAP(cswat_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cswat_state, irq0_line_assert)
- MCFG_CPU_PERIODIC_INT_DRIVER(cswat_state, nmi_handler, 300) // ?
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(18'432'000)/3/4) // HD68A09EP, 1.5MHz?
+ MCFG_DEVICE_PROGRAM_MAP(cswat_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cswat_state, irq0_line_assert)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cswat_state, nmi_handler, 300) // ?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp
index a09ec617100..9f891f78c05 100644
--- a/src/mame/drivers/ct486.cpp
+++ b/src/mame/drivers/ct486.cpp
@@ -110,74 +110,74 @@ void ct486_state::ct486_io(address_map &map)
//**************************************************************************
MACHINE_CONFIG_START(ct486_state::ct486)
- MCFG_CPU_ADD("maincpu", I486, XTAL(25'000'000))
- MCFG_CPU_PROGRAM_MAP(ct486_map)
- MCFG_CPU_IO_MAP(ct486_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("cs4031", cs4031_device, int_ack_r)
+ MCFG_DEVICE_ADD("maincpu", I486, XTAL(25'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ct486_map)
+ MCFG_DEVICE_IO_MAP(ct486_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("cs4031", cs4031_device, int_ack_r)
MCFG_CS4031_ADD("cs4031", XTAL(25'000'000), "maincpu", "isa", "bios", "keybc")
// cpu connections
- MCFG_CS4031_HOLD(WRITELINE(ct486_state, cs4031_hold));
+ MCFG_CS4031_HOLD(WRITELINE(*this, ct486_state, cs4031_hold));
MCFG_CS4031_NMI(INPUTLINE("maincpu", INPUT_LINE_NMI));
MCFG_CS4031_INTR(INPUTLINE("maincpu", INPUT_LINE_IRQ0));
MCFG_CS4031_CPURESET(INPUTLINE("maincpu", INPUT_LINE_RESET));
MCFG_CS4031_A20M(INPUTLINE("maincpu", INPUT_LINE_A20));
// isa dma
- MCFG_CS4031_IOR(READ16(ct486_state, cs4031_ior))
- MCFG_CS4031_IOW(WRITE16(ct486_state, cs4031_iow))
- MCFG_CS4031_TC(WRITE8(ct486_state, cs4031_tc))
+ MCFG_CS4031_IOR(READ16(*this, ct486_state, cs4031_ior))
+ MCFG_CS4031_IOW(WRITE16(*this, ct486_state, cs4031_iow))
+ MCFG_CS4031_TC(WRITE8(*this, ct486_state, cs4031_tc))
// speaker
- MCFG_CS4031_SPKR(WRITELINE(ct486_state, cs4031_spkr))
+ MCFG_CS4031_SPKR(WRITELINE(*this, ct486_state, cs4031_spkr))
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("1M,2M,8M,16M,32M,64M")
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
- MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(DEVWRITELINE("cs4031", cs4031_device, kbrst_w))
- MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(DEVWRITELINE("cs4031", cs4031_device, gatea20_w))
- MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("cs4031", cs4031_device, irq01_w))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(WRITELINE("cs4031", cs4031_device, kbrst_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(WRITELINE("cs4031", cs4031_device, gatea20_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("cs4031", cs4031_device, irq01_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(WRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(WRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
MCFG_DEVICE_ADD("isabus", ISA16, 0)
MCFG_ISA16_CPU("maincpu")
- MCFG_ISA_BUS_IOCHCK(DEVWRITELINE("cs4031", cs4031_device, iochck_w))
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("cs4031", cs4031_device, irq09_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("cs4031", cs4031_device, irq03_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("cs4031", cs4031_device, irq04_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("cs4031", cs4031_device, irq05_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("cs4031", cs4031_device, irq06_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("cs4031", cs4031_device, irq07_w))
- MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE("cs4031", cs4031_device, irq10_w))
- MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE("cs4031", cs4031_device, irq11_w))
- MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE("cs4031", cs4031_device, irq12_w))
- MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE("cs4031", cs4031_device, irq14_w))
- MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE("cs4031", cs4031_device, irq15_w))
- MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE("cs4031", cs4031_device, dreq0_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("cs4031", cs4031_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("cs4031", cs4031_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("cs4031", cs4031_device, dreq3_w))
- MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE("cs4031", cs4031_device, dreq5_w))
- MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE("cs4031", cs4031_device, dreq6_w))
- MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE("cs4031", cs4031_device, dreq7_w))
- MCFG_ISA16_SLOT_ADD("isabus", "board1", pc_isa16_cards, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("isabus", "board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("isabus", "board3", pc_isa16_cards, "ide", true)
- MCFG_ISA16_SLOT_ADD("isabus", "board4", pc_isa16_cards, "lpt", true)
- MCFG_ISA16_SLOT_ADD("isabus", "isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD("isabus", "isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("isabus", "isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("isabus", "isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("isabus", "isa5", pc_isa16_cards, nullptr, false)
+ MCFG_ISA_BUS_IOCHCK(WRITELINE("cs4031", cs4031_device, iochck_w))
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("cs4031", cs4031_device, irq09_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("cs4031", cs4031_device, irq03_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("cs4031", cs4031_device, irq04_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("cs4031", cs4031_device, irq05_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("cs4031", cs4031_device, irq06_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("cs4031", cs4031_device, irq07_w))
+ MCFG_ISA_OUT_IRQ10_CB(WRITELINE("cs4031", cs4031_device, irq10_w))
+ MCFG_ISA_OUT_IRQ11_CB(WRITELINE("cs4031", cs4031_device, irq11_w))
+ MCFG_ISA_OUT_IRQ12_CB(WRITELINE("cs4031", cs4031_device, irq12_w))
+ MCFG_ISA_OUT_IRQ14_CB(WRITELINE("cs4031", cs4031_device, irq14_w))
+ MCFG_ISA_OUT_IRQ15_CB(WRITELINE("cs4031", cs4031_device, irq15_w))
+ MCFG_ISA_OUT_DRQ0_CB(WRITELINE("cs4031", cs4031_device, dreq0_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("cs4031", cs4031_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("cs4031", cs4031_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("cs4031", cs4031_device, dreq3_w))
+ MCFG_ISA_OUT_DRQ5_CB(WRITELINE("cs4031", cs4031_device, dreq5_w))
+ MCFG_ISA_OUT_DRQ6_CB(WRITELINE("cs4031", cs4031_device, dreq6_w))
+ MCFG_ISA_OUT_DRQ7_CB(WRITELINE("cs4031", cs4031_device, dreq7_w))
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "fdcsmc", true)
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "ide", true)
+ MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "lpt", true)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "isabus", pc_isa16_cards, nullptr, false)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// video hardware
diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp
index f16603fff24..4fb6719375b 100644
--- a/src/mame/drivers/cubeqst.cpp
+++ b/src/mame/drivers/cubeqst.cpp
@@ -525,20 +525,20 @@ WRITE16_MEMBER( cubeqst_state::sound_dac_w )
*************************************/
MACHINE_CONFIG_START(cubeqst_state::cubeqst)
- MCFG_CPU_ADD("main_cpu", M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(m68k_program_map)
+ MCFG_DEVICE_ADD("main_cpu", M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(m68k_program_map)
- MCFG_CPU_ADD("rotate_cpu", CQUESTROT, XTAL(10'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(rotate_map)
- MCFG_CQUESTROT_CONFIG( DEVWRITE16( "line_cpu", cquestlin_cpu_device, linedata_w ) )
+ MCFG_DEVICE_ADD("rotate_cpu", CQUESTROT, XTAL(10'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(rotate_map)
+ MCFG_CQUESTROT_CONFIG( WRITE16( "line_cpu", cquestlin_cpu_device, linedata_w ) )
- MCFG_CPU_ADD("line_cpu", CQUESTLIN, XTAL(10'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(line_sound_map)
- MCFG_CQUESTLIN_CONFIG( DEVREAD16( "rotate_cpu", cquestrot_cpu_device, linedata_r ) )
+ MCFG_DEVICE_ADD("line_cpu", CQUESTLIN, XTAL(10'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(line_sound_map)
+ MCFG_CQUESTLIN_CONFIG( READ16( "rotate_cpu", cquestrot_cpu_device, linedata_r ) )
- MCFG_CPU_ADD("sound_cpu", CQUESTSND, XTAL(10'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(line_sound_map)
- MCFG_CQUESTSND_CONFIG( WRITE16( cubeqst_state, sound_dac_w ), "soundproms" )
+ MCFG_DEVICE_ADD("sound_cpu", CQUESTSND, XTAL(10'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(line_sound_map)
+ MCFG_CQUESTSND_CONFIG( WRITE16( *this, cubeqst_state, sound_dac_w ), "soundproms" )
MCFG_QUANTUM_TIME(attotime::from_hz(48000))
@@ -551,30 +551,30 @@ MACHINE_CONFIG_START(cubeqst_state::cubeqst)
MCFG_LASERDISC_OVERLAY_SCALE(1.0f, 1.030f)
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cubeqst_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cubeqst_state, vblank_irq))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("rdac0", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c22 (34) + tl074cn.1b (53) + r10k.rn1 (30)
- MCFG_SOUND_ADD("ldac0", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c13 (34) + tl074cn.3b (53) + r10k.rn3 (30)
- MCFG_SOUND_ADD("rdac1", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c21 (34) + tl074cn.1c (53) + r10k.rn2 (30)
- MCFG_SOUND_ADD("ldac1", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c12 (34) + tl074cn.3c (53) + r10k.rn4 (30)
- MCFG_SOUND_ADD("rdac2", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c20 (34) + tl074cn.1c (53) + r10k.rn2 (30)
- MCFG_SOUND_ADD("ldac2", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c11 (34) + tl074cn.3c (53) + r10k.rn4 (30)
- MCFG_SOUND_ADD("rdac3", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c19 (34) + tl074cn.1b (53) + r10k.rn1 (30)
- MCFG_SOUND_ADD("ldac3", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c10 (34) + tl074cn.3b (53) + r10k.rn3 (30)
- MCFG_SOUND_ADD("rdac4", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c18 (34) + tl074cn.1c (53) + r10k.rn2 (30)
- MCFG_SOUND_ADD("ldac4", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c9 (34) + tl074cn.3c (53) + r10k.rn4 (30)
- MCFG_SOUND_ADD("rdac5", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c17 (34) + tl074cn.1b (53) + r10k.rn1 (30)
- MCFG_SOUND_ADD("ldac5", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c8 (34) + tl074cn.3b (53) + r10k.rn3 (30)
- MCFG_SOUND_ADD("rdac6", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c16 (34) + tl074cn.1c (53) + r10k.rn2 (30)
- MCFG_SOUND_ADD("ldac6", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c7 (34) + tl074cn.3c (53) + r10k.rn4 (30)
- MCFG_SOUND_ADD("rdac7", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c15 (34) + tl074cn.1b (53) + r10k.rn1 (30)
- MCFG_SOUND_ADD("ldac7", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c6 (34) + tl074cn.3b (53) + r10k.rn3 (30)
+ MCFG_DEVICE_ADD("rdac0", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c22 (34) + tl074cn.1b (53) + r10k.rn1 (30)
+ MCFG_DEVICE_ADD("ldac0", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c13 (34) + tl074cn.3b (53) + r10k.rn3 (30)
+ MCFG_DEVICE_ADD("rdac1", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c21 (34) + tl074cn.1c (53) + r10k.rn2 (30)
+ MCFG_DEVICE_ADD("ldac1", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c12 (34) + tl074cn.3c (53) + r10k.rn4 (30)
+ MCFG_DEVICE_ADD("rdac2", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c20 (34) + tl074cn.1c (53) + r10k.rn2 (30)
+ MCFG_DEVICE_ADD("ldac2", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c11 (34) + tl074cn.3c (53) + r10k.rn4 (30)
+ MCFG_DEVICE_ADD("rdac3", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c19 (34) + tl074cn.1b (53) + r10k.rn1 (30)
+ MCFG_DEVICE_ADD("ldac3", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c10 (34) + tl074cn.3b (53) + r10k.rn3 (30)
+ MCFG_DEVICE_ADD("rdac4", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c18 (34) + tl074cn.1c (53) + r10k.rn2 (30)
+ MCFG_DEVICE_ADD("ldac4", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c9 (34) + tl074cn.3c (53) + r10k.rn4 (30)
+ MCFG_DEVICE_ADD("rdac5", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c17 (34) + tl074cn.1b (53) + r10k.rn1 (30)
+ MCFG_DEVICE_ADD("ldac5", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c8 (34) + tl074cn.3b (53) + r10k.rn3 (30)
+ MCFG_DEVICE_ADD("rdac6", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c16 (34) + tl074cn.1c (53) + r10k.rn2 (30)
+ MCFG_DEVICE_ADD("ldac6", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c7 (34) + tl074cn.3c (53) + r10k.rn4 (30)
+ MCFG_DEVICE_ADD("rdac7", AD7521, 0) MCFG_SOUND_ROUTE(0, "rspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.1d (24) + 1500pf.c15 (34) + tl074cn.1b (53) + r10k.rn1 (30)
+ MCFG_DEVICE_ADD("ldac7", AD7521, 0) MCFG_SOUND_ROUTE(0, "lspeaker", 0.125) // ad7521jn.2d (59) + cd4051be.3d (24) + 1500pf.c6 (34) + tl074cn.3b (53) + r10k.rn3 (30)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "rdac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "ldac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac0", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index 50bdf263c8f..436730b9009 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -1033,8 +1033,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cubo_state::cubo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
- MCFG_CPU_PROGRAM_MAP(cubo_mem)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cubo_mem)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_2mb_map32)
@@ -1048,12 +1048,12 @@ MACHINE_CONFIG_START(cubo_state::cubo)
MCFG_I2CMEM_DATA_SIZE(1024)
MCFG_AKIKO_ADD("akiko")
- MCFG_AKIKO_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_AKIKO_MEM_WRITE_CB(WRITE16(amiga_state, chip_ram_w))
- MCFG_AKIKO_INT_CB(WRITELINE(cubo_state, akiko_int_w))
- MCFG_AKIKO_SCL_HANDLER(DEVWRITELINE("i2cmem", i2cmem_device, write_scl))
- MCFG_AKIKO_SDA_READ_HANDLER(DEVREADLINE("i2cmem", i2cmem_device, read_sda))
- MCFG_AKIKO_SDA_WRITE_HANDLER(DEVWRITELINE("i2cmem", i2cmem_device, write_sda))
+ MCFG_AKIKO_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AKIKO_MEM_WRITE_CB(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AKIKO_INT_CB(WRITELINE(*this, cubo_state, akiko_int_w))
+ MCFG_AKIKO_SCL_HANDLER(WRITELINE("i2cmem", i2cmem_device, write_scl))
+ MCFG_AKIKO_SDA_READ_HANDLER(READLINE("i2cmem", i2cmem_device, read_sda))
+ MCFG_AKIKO_SDA_WRITE_HANDLER(WRITELINE("i2cmem", i2cmem_device, write_sda))
// video hardware
pal_video(config);
@@ -1066,39 +1066,39 @@ MACHINE_CONFIG_START(cubo_state::cubo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_PAL)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_PAL)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.25)
- MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w))
+ MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w))
- MCFG_SOUND_ADD("cdda", CDDA, 0)
+ MCFG_DEVICE_ADD("cdda", CDDA)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* cia */
// these are setup differently on other amiga drivers (needed for floppy to work) which is correct / why?
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_PAL)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA"))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(cubo_state, akiko_cia_0_port_a_write))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, cubo_state, akiko_cia_0_port_a_write))
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_PAL)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
- MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE(cubo_state, rs232_rx_w))
+ MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE(*this, cubo_state, rs232_rx_w))
MCFG_CDROM_ADD("cd32_cdrom")
MCFG_CDROM_INTERFACE("cd32_cdrom")
/* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_PAL)
- MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w))
- MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r))
- MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w))
- MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w))
- MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w))
+ MCFG_AMIGA_FDC_INDEX_CALLBACK(WRITELINE("cia_1", mos8520_device, flag_w))
+ MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w))
+ MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index de3209d1989..a094371cce9 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -406,10 +406,10 @@ void cultures_state::machine_reset()
MACHINE_CONFIG_START(cultures_state::cultures)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
- MCFG_CPU_PROGRAM_MAP(cultures_map)
- MCFG_CPU_IO_MAP(cultures_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cultures_state, cultures_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cultures_map)
+ MCFG_DEVICE_IO_MAP(cultures_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cultures_state, cultures_interrupt)
MCFG_DEVICE_ADD("vrambank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(vrambank_map)
diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp
index 1e53524984d..f245c0e8217 100644
--- a/src/mame/drivers/cupidon.cpp
+++ b/src/mame/drivers/cupidon.cpp
@@ -103,8 +103,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cupidon_state::cupidon)
- MCFG_CPU_ADD("maincpu", M68340, 16000000) // The access to 3FF00 at the start would suggest this is a 68340 so probably 16 or 25 mhz?
- MCFG_CPU_PROGRAM_MAP(cupidon_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000) // The access to 3FF00 at the start would suggest this is a 68340 so probably 16 or 25 mhz?
+ MCFG_DEVICE_PROGRAM_MAP(cupidon_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 55b9200d6ca..ec2d8d3d5da 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -459,7 +459,7 @@ void cv1k_state::machine_reset()
MACHINE_CONFIG_START(cv1k_state::cv1k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH3BE, 12.8_MHz_XTAL*8) // 102.4MHz
+ MCFG_DEVICE_ADD("maincpu", SH3BE, 12.8_MHz_XTAL*8) // 102.4MHz
MCFG_SH4_MD0(0) // none of this is verified
MCFG_SH4_MD1(0) // (the sh3 is different to the sh4 anyway, should be changed)
MCFG_SH4_MD2(0)
@@ -470,9 +470,9 @@ MACHINE_CONFIG_START(cv1k_state::cv1k)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(12.8_MHz_XTAL*8) // 102.4MHz
- MCFG_CPU_PROGRAM_MAP(cv1k_map)
- MCFG_CPU_IO_MAP(cv1k_port)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(cv1k_map)
+ MCFG_DEVICE_IO_MAP(cv1k_port)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold)
MCFG_RTC9701_ADD("eeprom")
MCFG_SERFLASH_ADD("game")
@@ -501,7 +501,7 @@ MACHINE_CONFIG_START(cv1k_state::cv1k_d)
/* basic machine hardware */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", SH3BE, 12.8_MHz_XTAL*8) // 102.4MHz
+ MCFG_DEVICE_ADD("maincpu", SH3BE, 12.8_MHz_XTAL*8) // 102.4MHz
MCFG_SH4_MD0(0) // none of this is verified
MCFG_SH4_MD1(0) // (the sh3 is different to the sh4 anyway, should be changed)
MCFG_SH4_MD2(0)
@@ -512,9 +512,9 @@ MACHINE_CONFIG_START(cv1k_state::cv1k_d)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(12.8_MHz_XTAL*8) // 102.4MHz
- MCFG_CPU_PROGRAM_MAP(cv1k_d_map)
- MCFG_CPU_IO_MAP(cv1k_port)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(cv1k_d_map)
+ MCFG_DEVICE_IO_MAP(cv1k_port)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold)
MCFG_DEVICE_MODIFY("blitter")
MCFG_EPIC12_SET_MAINRAMSIZE(0x1000000)
diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp
index 6cfb22b0d95..0c5f7dd89f3 100644
--- a/src/mame/drivers/cvicny.cpp
+++ b/src/mame/drivers/cvicny.cpp
@@ -137,8 +137,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cvicny_state::cvicny)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(cvicny_mem)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(cvicny_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_cvicny)
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index eb8f3dfaa0b..1e2fffd43e1 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -965,24 +965,24 @@ MACHINE_RESET_MEMBER(cvs_state,cvs)
MACHINE_CONFIG_START(cvs_state::cvs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/16)
- MCFG_CPU_PROGRAM_MAP(cvs_main_cpu_map)
- MCFG_CPU_IO_MAP(cvs_main_cpu_io_map)
- MCFG_CPU_DATA_MAP(cvs_main_cpu_data_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cvs_state, cvs_main_cpu_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(cvs_state, write_s2650_flag))
-
- MCFG_CPU_ADD("audiocpu", S2650, XTAL(14'318'181)/16)
- MCFG_CPU_PROGRAM_MAP(cvs_dac_cpu_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, XTAL(14'318'181)/16)
+ MCFG_DEVICE_PROGRAM_MAP(cvs_main_cpu_map)
+ MCFG_DEVICE_IO_MAP(cvs_main_cpu_io_map)
+ MCFG_DEVICE_DATA_MAP(cvs_main_cpu_data_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cvs_state, cvs_main_cpu_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, cvs_state, write_s2650_flag))
+
+ MCFG_DEVICE_ADD("audiocpu", S2650, XTAL(14'318'181)/16)
+ MCFG_DEVICE_PROGRAM_MAP(cvs_dac_cpu_map)
/* doesn't look like it is used at all */
- //MCFG_S2650_SENSE_INPUT(READLINE(cvs_state, cvs_393hz_clock_r))
+ //MCFG_S2650_SENSE_INPUT(READLINE(*this, cvs_state, cvs_393hz_clock_r))
- MCFG_CPU_ADD("speechcpu", S2650, XTAL(14'318'181)/16)
- MCFG_CPU_PROGRAM_MAP(cvs_speech_cpu_map)
+ MCFG_DEVICE_ADD("speechcpu", S2650, XTAL(14'318'181)/16)
+ MCFG_DEVICE_PROGRAM_MAP(cvs_speech_cpu_map)
/* romclk is much more probable, 393 Hz results in timing issues */
- //MCFG_S2650_SENSE_INPUT(READLINE(cvs_state, cvs_393hz_clock_r))
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("tms", tms5110_device, romclk_hack_r))
+ //MCFG_S2650_SENSE_INPUT(READLINE(*this, cvs_state, cvs_393hz_clock_r))
+ MCFG_S2650_SENSE_INPUT(READLINE("tms", tms5110_device, romclk_hack_r))
MCFG_MACHINE_START_OVERRIDE(cvs_state,cvs)
MCFG_MACHINE_RESET_OVERRIDE(cvs_state,cvs)
@@ -1019,16 +1019,16 @@ MACHINE_CONFIG_START(cvs_state::cvs)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("tms", TMS5100, XTAL(640'000))
- MCFG_TMS5110_DATA_CB(READLINE(cvs_state, speech_rom_read_bit))
+ MCFG_DEVICE_ADD("tms", TMS5100, XTAL(640'000))
+ MCFG_TMS5110_DATA_CB(READLINE(*this, cvs_state, speech_rom_read_bit))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp
index c4865d8b3c8..9c587a1f3a7 100644
--- a/src/mame/drivers/cxgz80.cpp
+++ b/src/mame/drivers/cxgz80.cpp
@@ -398,8 +398,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cxgz80_state::ch2001)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(ch2001_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(ch2001_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", cxgz80_state, irq_on, attotime::from_hz(484)) // theoretical frequency from 555 timer (22nF, 100K+33K, 1K2), measurement was 568Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(484) - attotime::from_nsec(18300)) // active for 18.3us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", cxgz80_state, irq_off, attotime::from_hz(484))
@@ -411,7 +411,7 @@ MACHINE_CONFIG_START(cxgz80_state::ch2001)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index e4b75c11aab..d20031a3767 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -1055,8 +1055,8 @@ void cxhumax_state::machine_reset()
}
MACHINE_CONFIG_START(cxhumax_state::cxhumax)
- MCFG_CPU_ADD("maincpu", ARM920T, 180000000) // CX24175 (RevC up?)
- MCFG_CPU_PROGRAM_MAP(cxhumax_map)
+ MCFG_DEVICE_ADD("maincpu", ARM920T, 180000000) // CX24175 (RevC up?)
+ MCFG_DEVICE_PROGRAM_MAP(cxhumax_map)
MCFG_INTEL_28F320J3D_ADD("flash")
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 612dfa83e17..0d8985d20ff 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -395,19 +395,19 @@ GFXDECODE_END
MACHINE_CONFIG_START(cyberbal_state::cyberbal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_PERIODIC_INT_DEVICE("soundcomm", atari_sound_comm_device, sound_irq_gen, ATARI_CLOCK_14MHz/4/4/16/16/14)
- MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(extra_map)
+ MCFG_DEVICE_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(extra_map)
- MCFG_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(sound_68k_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(cyberbal_state, sound_68k_irq_gen, 10000)
+ MCFG_DEVICE_ADD("dac", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_68k_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cyberbal_state, sound_68k_irq_gen, 10000)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(cyberbal_state, screen_update_cyberbal_left)
MCFG_SCREEN_PALETTE("lpalette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cyberbal_state, video_int_write_line)) /* or is it "right?" */
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cyberbal_state, video_int_write_line)) /* or is it "right?" */
MCFG_SCREEN_ADD("rscreen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -456,12 +456,12 @@ MACHINE_CONFIG_START(cyberbal_state::cyberbal)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ymsnd", ATARI_CLOCK_14MHz/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundcomm", atari_sound_comm_device, ym2151_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_SOUND_ADD("rdac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // AM6012.6j
- MCFG_SOUND_ADD("ldac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // AM6012.6j
+ MCFG_DEVICE_ADD("rdac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // AM6012.6j
+ MCFG_DEVICE_ADD("ldac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // AM6012.6j
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
@@ -481,8 +481,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cyberbal2p_state::cyberbal2p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(cyberbal2p_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(cyberbal2p_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -506,7 +506,7 @@ MACHINE_CONFIG_START(cyberbal2p_state::cyberbal2p)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(cyberbal2p_state, screen_update_cyberbal2p)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cyberbal2p_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cyberbal2p_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index 3bdaafb5019..2be8fef78b9 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -839,16 +839,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(cybertnk_state::cybertnk)
- MCFG_CPU_ADD("maincpu", M68000,XTAL(20'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(master_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(20'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(master_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq1_line_assert)
- MCFG_CPU_ADD("slave", M68000,XTAL(20'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(slave_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("slave", M68000,XTAL(20'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(slave_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq3_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))//arbitrary value,needed to get the communication to work
@@ -880,11 +880,11 @@ MACHINE_CONFIG_START(cybertnk_state::cybertnk)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", Y8950, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym1", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ym2", Y8950, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym2", Y8950, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index 499a302cf62..0695dbc0d96 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -392,13 +392,13 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(cybiko_state::cybikov1)
// cpu
- MCFG_CPU_ADD( "maincpu", H8S2241, XTAL(11'059'200) )
- MCFG_CPU_PROGRAM_MAP( cybikov1_mem )
- MCFG_CPU_IO_MAP( cybikov1_io )
+ MCFG_DEVICE_ADD( "maincpu", H8S2241, XTAL(11'059'200) )
+ MCFG_DEVICE_PROGRAM_MAP( cybikov1_mem )
+ MCFG_DEVICE_IO_MAP( cybikov1_io )
MCFG_DEVICE_MODIFY("maincpu:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE("flash1", at45db041_device, si_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE("flash1", at45db041_device, sck_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("flash1", at45db041_device, si_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("flash1", at45db041_device, sck_w))
// screen
MCFG_SCREEN_ADD("screen", RASTER)
@@ -412,13 +412,13 @@ MACHINE_CONFIG_START(cybiko_state::cybikov1)
MCFG_DEFAULT_LAYOUT(layout_lcd)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// machine
/* rtc */
MCFG_PCF8593_ADD("rtc")
MCFG_AT45DB041_ADD("flash1")
- MCFG_AT45DBXXX_SO_CALLBACK(DEVWRITELINE("maincpu:sci1", h8_sci_device, rx_w))
+ MCFG_AT45DBXXX_SO_CALLBACK(WRITELINE("maincpu:sci1", h8_sci_device, rx_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -428,15 +428,15 @@ MACHINE_CONFIG_START(cybiko_state::cybikov1)
MCFG_RAM_EXTRA_OPTIONS("1M")
/* serial debug port */
- MCFG_RS232_PORT_ADD ("debug_serial", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD ("debug_serial", RS232_PORT, default_rs232_devices, nullptr)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("null_modem", debug_serial)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", debug_serial)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("pty", debug_serial)
MCFG_DEVICE_MODIFY("debug_serial")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu:sci2", h8_sci_device, rx_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu:sci2", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("maincpu:sci2")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE("debug_serial", rs232_port_device, write_txd))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("debug_serial", rs232_port_device, write_txd))
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", cybiko_state, cybiko, "bin,nv", 0)
@@ -445,13 +445,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cybiko_state::cybikov2)
cybikov1(config);
// cpu
- MCFG_CPU_REPLACE("maincpu", H8S2246, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(cybikov2_mem)
- MCFG_CPU_IO_MAP(cybikov2_io)
+ MCFG_DEVICE_REPLACE("maincpu", H8S2246, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(cybikov2_mem)
+ MCFG_DEVICE_IO_MAP(cybikov2_io)
MCFG_DEVICE_MODIFY("maincpu:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE("flash1", at45db041_device, si_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE("flash1", at45db041_device, sck_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("flash1", at45db041_device, si_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("flash1", at45db041_device, sck_w))
// machine
MCFG_SST_39VF020_ADD("flash2")
@@ -463,17 +463,17 @@ MACHINE_CONFIG_START(cybiko_state::cybikov2)
/* serial debug port */
MCFG_DEVICE_MODIFY("debug_serial")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu:sci2", h8_sci_device, rx_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu:sci2", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("maincpu:sci2")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE("debug_serial", rs232_port_device, write_txd))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("debug_serial", rs232_port_device, write_txd))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cybiko_state::cybikoxt)
cybikov1(config);
// cpu
- MCFG_CPU_REPLACE("maincpu", H8S2323, XTAL(18'432'000))
- MCFG_CPU_PROGRAM_MAP(cybikoxt_mem )
- MCFG_CPU_IO_MAP(cybikoxt_io )
+ MCFG_DEVICE_REPLACE("maincpu", H8S2323, XTAL(18'432'000))
+ MCFG_DEVICE_PROGRAM_MAP(cybikoxt_mem )
+ MCFG_DEVICE_IO_MAP(cybikoxt_io )
// machine
MCFG_DEVICE_REMOVE("flash1")
@@ -485,9 +485,9 @@ MACHINE_CONFIG_START(cybiko_state::cybikoxt)
/* serial debug port */
MCFG_DEVICE_MODIFY("debug_serial")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu:sci2", h8_sci_device, rx_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu:sci2", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("maincpu:sci2")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE("debug_serial", rs232_port_device, write_txd))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("debug_serial", rs232_port_device, write_txd))
/* quickload */
MCFG_DEVICE_REMOVE("quickload")
diff --git a/src/mame/drivers/cybstorm.cpp b/src/mame/drivers/cybstorm.cpp
index a66b73c1050..16eceeb4669 100644
--- a/src/mame/drivers/cybstorm.cpp
+++ b/src/mame/drivers/cybstorm.cpp
@@ -224,8 +224,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(cybstorm_state::round2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp
index 3e22905af85..6512517741f 100644
--- a/src/mame/drivers/cyclemb.cpp
+++ b/src/mame/drivers/cyclemb.cpp
@@ -966,15 +966,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(cyclemb_state::cyclemb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/3) // Z8400BPS
- MCFG_CPU_PROGRAM_MAP(cyclemb_map)
- MCFG_CPU_IO_MAP(cyclemb_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cyclemb_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'000'000)/3) // Z8400BPS
+ MCFG_DEVICE_PROGRAM_MAP(cyclemb_map)
+ MCFG_DEVICE_IO_MAP(cyclemb_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cyclemb_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(cyclemb_sound_map)
- MCFG_CPU_IO_MAP(cyclemb_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(cyclemb_state, irq0_line_hold, 60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(cyclemb_sound_map)
+ MCFG_DEVICE_IO_MAP(cyclemb_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(cyclemb_state, irq0_line_hold, 60)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -996,16 +996,16 @@ MACHINE_CONFIG_START(cyclemb_state::cyclemb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(18'000'000)/12)
-// MCFG_YM2203_IRQ_HANDLER(WRITELINE(cyclemb_state, ym_irq))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(18'000'000)/12)
+// MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, cyclemb_state, ym_irq))
// MCFG_AY8910_PORT_B_READ_CB(IOPORT("UNK")) /* port B read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cyclemb_state::skydest)
cyclemb(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(skydest_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(skydest_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(64*8, 32*8)
diff --git a/src/mame/drivers/cz101.cpp b/src/mame/drivers/cz101.cpp
index 3672b761334..dc8afaccb72 100644
--- a/src/mame/drivers/cz101.cpp
+++ b/src/mame/drivers/cz101.cpp
@@ -379,15 +379,15 @@ void cz101_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START( cz101_state::cz101 )
- MCFG_CPU_ADD("maincpu", UPD7810, 10_MHz_XTAL) // actually 7811, but internal ROM disabled
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_UPD7810_PORTA_READ_CB(READ8(cz101_state, port_a_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(cz101_state, port_a_w))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(cz101_state, port_b_w))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(cz101_state, port_c_w))
+ MCFG_DEVICE_ADD("maincpu", UPD7810, 10_MHz_XTAL) // actually 7811, but internal ROM disabled
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, cz101_state, port_a_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, cz101_state, port_a_w))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, cz101_state, port_b_w))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, cz101_state, port_c_w))
MCFG_CLOCK_ADD("midi_clock", 2_MHz_XTAL)
-// MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("maincpu", upd7810_device, sck_w)) not supported yet
+// MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("maincpu", upd7810_device, sck_w)) not supported yet
// video hardware
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp
index 033550005e8..1ac59dac49b 100644
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@@ -195,9 +195,9 @@ void czk80_state::kbd_put(u8 data)
MACHINE_CONFIG_START(czk80_state::czk80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(czk80_mem)
- MCFG_CPU_IO_MAP(czk80_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(czk80_mem)
+ MCFG_DEVICE_IO_MAP(czk80_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(czk80_state, czk80)
@@ -208,14 +208,14 @@ MACHINE_CONFIG_START(czk80_state::czk80)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(czk80_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(czk80_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(czk80_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, czk80_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, czk80_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, czk80_state, ctc_z2_w))
MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
- //MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- //MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ //MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ //MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000)/4)
diff --git a/src/mame/drivers/d400.cpp b/src/mame/drivers/d400.cpp
index 48b75976a26..d68fcff5dc6 100644
--- a/src/mame/drivers/d400.cpp
+++ b/src/mame/drivers/d400.cpp
@@ -51,8 +51,8 @@ static INPUT_PORTS_START( d461 )
INPUT_PORTS_END
MACHINE_CONFIG_START(d400_state::d461)
- MCFG_CPU_ADD("maincpu", MC6809E, 4'000'000) // HD68B09EP
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 4'000'000) // HD68B09EP
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(59'292'000) / 3, 1080, 0, 810, 305, 0, 300) // yes, 81 columns
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index 8a8053e09aa..0168d152092 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -386,8 +386,8 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 )
MACHINE_CONFIG_START(d6800_state::d6800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(d6800_map)
+ MCFG_DEVICE_ADD("maincpu",M6800, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(d6800_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -404,16 +404,16 @@ MACHINE_CONFIG_START(d6800_state::d6800)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("beeper", BEEP, 1200)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(d6800_state, d6800_keyboard_r))
- MCFG_PIA_READPB_HANDLER(READ8(d6800_state, d6800_cassette_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(d6800_state, d6800_keyboard_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(d6800_state, d6800_cassette_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(d6800_state, d6800_screen_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, d6800_state, d6800_keyboard_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, d6800_state, d6800_cassette_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, d6800_state, d6800_keyboard_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, d6800_state, d6800_cassette_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, d6800_state, d6800_screen_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp
index 212be5a3796..9639ce58e5b 100644
--- a/src/mame/drivers/d6809.cpp
+++ b/src/mame/drivers/d6809.cpp
@@ -152,8 +152,8 @@ void d6809_state::machine_reset()
MACHINE_CONFIG_START(d6809_state::d6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(14'745'600) / 8) // MC68B09EP
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(14'745'600) / 8) // MC68B09EP
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("acia1", MOS6551, XTAL(14'745'600) / 8) // uses Q clock
MCFG_DEVICE_ADD("acia2", MOS6551, XTAL(14'745'600) / 8) // uses Q clock
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index 797cbe9f2b6..594947f73c1 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -300,10 +300,10 @@ void d9final_state::machine_start()
MACHINE_CONFIG_START(d9final_state::d9final)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 24000000/4)/* ? MHz */
- MCFG_CPU_PROGRAM_MAP(d9final_map)
- MCFG_CPU_IO_MAP(d9final_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", d9final_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 24000000/4)/* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(d9final_map)
+ MCFG_DEVICE_IO_MAP(d9final_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", d9final_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram") // Sharp LH5116D-10 + battery
@@ -322,7 +322,7 @@ MACHINE_CONFIG_START(d9final_state::d9final)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
//MCFG_DEVICE_ADD("essnd", ES8712, 24000000/3) // clock unknown
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index c6b4cb45c6f..07fdec907cb 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -660,15 +660,15 @@ PALETTE_INIT_MEMBER(dacholer_state, dacholer)
MACHINE_CONFIG_START(dacholer_state::dacholer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/4) /* ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dacholer_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dacholer_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(19'968'000)/8) /* ? */
- MCFG_CPU_PROGRAM_MAP(snd_map)
- MCFG_CPU_IO_MAP(snd_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dacholer_state, sound_irq)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(19'968'000)/8) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(snd_map)
+ MCFG_DEVICE_IO_MAP(snd_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dacholer_state, sound_irq)
/* video hardware */
@@ -691,30 +691,30 @@ MACHINE_CONFIG_START(dacholer_state::dacholer)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(19'968'000)/16)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(19'968'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(19'968'000)/16)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(19'968'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL(19'968'000)/16)
+ MCFG_DEVICE_ADD("ay3", AY8910, XTAL(19'968'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(dacholer_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dacholer_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 = 3906.25Hz playback - guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dacholer_state::itaten)
dacholer(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(itaten_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(itaten_main_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(itaten_snd_map)
- MCFG_CPU_IO_MAP(itaten_snd_io_map)
- MCFG_CPU_VBLANK_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(itaten_snd_map)
+ MCFG_DEVICE_IO_MAP(itaten_snd_io_map)
+ MCFG_DEVICE_VBLANK_INT_REMOVE()
MCFG_GFXDECODE_MODIFY("gfxdecode", itaten)
diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp
index 9501de50f9e..bf19dc5d4f6 100644
--- a/src/mame/drivers/dai.cpp
+++ b/src/mame/drivers/dai.cpp
@@ -189,19 +189,19 @@ GFXDECODE_END
/* machine definition */
MACHINE_CONFIG_START(dai_state::dai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(dai_mem)
- MCFG_CPU_IO_MAP(dai_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(dai_state,int_ack)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(dai_mem)
+ MCFG_DEVICE_IO_MAP(dai_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(dai_state,int_ack)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(2000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("custom", dai_sound_device, set_input_ch0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("custom", dai_sound_device, set_input_ch0))
MCFG_PIT8253_CLK1(2000000)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("custom", dai_sound_device, set_input_ch1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("custom", dai_sound_device, set_input_ch1))
MCFG_PIT8253_CLK2(2000000)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("custom", dai_sound_device, set_input_ch2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("custom", dai_sound_device, set_input_ch2))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
@@ -224,7 +224,7 @@ MACHINE_CONFIG_START(dai_state::dai)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", DAI_SOUND, 0)
+ MCFG_DEVICE_ADD("custom", DAI_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -236,8 +236,8 @@ MACHINE_CONFIG_START(dai_state::dai)
/* tms5501 */
MCFG_DEVICE_ADD("tms5501", TMS5501, 2000000)
MCFG_TMS5501_IRQ_CALLBACK(INPUTLINE("maincpu", I8085_INTR_LINE))
- MCFG_TMS5501_XI_CALLBACK(READ8(dai_state, dai_keyboard_r))
- MCFG_TMS5501_XO_CALLBACK(WRITE8(dai_state, dai_keyboard_w))
+ MCFG_TMS5501_XI_CALLBACK(READ8(*this, dai_state, dai_keyboard_r))
+ MCFG_TMS5501_XO_CALLBACK(WRITE8(*this, dai_state, dai_keyboard_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp
index 9a2b95e307d..f00b836ccbd 100644
--- a/src/mame/drivers/dai3wksi.cpp
+++ b/src/mame/drivers/dai3wksi.cpp
@@ -406,9 +406,9 @@ void dai3wksi_state::machine_reset()
MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dai3wksi_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dai3wksi_state, irq0_line_hold)
/* video hardware */
@@ -423,13 +423,13 @@ MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
MCFG_SPEAKER_STANDARD_MONO("mono")
#if (USE_SAMPLES)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(dai3wksi_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
#else
// Invader Hit
- MCFG_SOUND_ADD("ic76", SN76477, 0)
+ MCFG_DEVICE_ADD("ic76", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(RES_K(4.7)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.1), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
// Ship Movement
- MCFG_SOUND_ADD("ic77", SN76477, 0)
+ MCFG_DEVICE_ADD("ic77", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(RES_K(4.7)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.1), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -463,7 +463,7 @@ MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
// Danger
- MCFG_SOUND_ADD("ic78", SN76477, 0)
+ MCFG_DEVICE_ADD("ic78", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), 0, 0) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(200)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.1), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -480,7 +480,7 @@ MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
// Invader Marching Noise
- MCFG_SOUND_ADD("ic79", SN76477, 0)
+ MCFG_DEVICE_ADD("ic79", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(RES_K(56)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.1), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
// Big Planet Explosion
- MCFG_SOUND_ADD("ic80", SN76477, 0)
+ MCFG_DEVICE_ADD("ic80", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(330), CAP_P(470)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_M(2)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(1.0), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -514,7 +514,7 @@ MACHINE_CONFIG_START(dai3wksi_state::dai3wksi)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
// Plane Shoot noise
- MCFG_SOUND_ADD("ic81", SN76477, 0)
+ MCFG_DEVICE_ADD("ic81", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(RES_K(200)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(10), RES_K(4.7)) // attack_decay_cap + attack_res
diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp
index 5500409bc75..d780f21717d 100644
--- a/src/mame/drivers/dambustr.cpp
+++ b/src/mame/drivers/dambustr.cpp
@@ -256,16 +256,16 @@ DRIVER_INIT_MEMBER(dambustr_state,dambustr)
MACHINE_CONFIG_START(dambustr_state::dambustr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(dambustr_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dambustr_map)
MCFG_MACHINE_RESET_OVERRIDE(dambustr_state,galaxold)
MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(dambustr_state,galaxold_7474_9m_1_callback))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, dambustr_state,galaxold_7474_9m_1_callback))
MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(dambustr_state,galaxold_7474_9m_2_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, dambustr_state,galaxold_7474_9m_2_q_callback))
MCFG_TIMER_DRIVER_ADD("int_timer", dambustr_state, galaxold_interrupt_timer)
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp
index 95955651ad1..6b333915b7b 100644
--- a/src/mame/drivers/darius.cpp
+++ b/src/mame/drivers/darius.cpp
@@ -707,20 +707,20 @@ void darius_state::machine_reset()
MACHINE_CONFIG_START(darius_state::darius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(darius_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(darius_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(darius_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(darius_sound_map)
- MCFG_CPU_ADD("cpub", M68000, XTAL(16'000'000)/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(darius_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("cpub", M68000, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(darius_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", darius_state, irq4_line_hold)
- MCFG_CPU_ADD("adpcm", Z80, XTAL(8'000'000)/2) /* 4 MHz */ /* ADPCM player using MSM5205 */
- MCFG_CPU_PROGRAM_MAP(darius_sound2_map)
- MCFG_CPU_IO_MAP(darius_sound2_io_map)
+ MCFG_DEVICE_ADD("adpcm", Z80, XTAL(8'000'000)/2) /* 4 MHz */ /* ADPCM player using MSM5205 */
+ MCFG_DEVICE_PROGRAM_MAP(darius_sound2_map)
+ MCFG_DEVICE_IO_MAP(darius_sound2_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame ? */
@@ -766,10 +766,10 @@ MACHINE_CONFIG_START(darius_state::darius)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(8'000'000)/2) /* 4 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) /* assumes Z80 sandwiched between 68Ks */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(darius_state, darius_write_portA0)) /* portA write */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(darius_state, darius_write_portB0)) /* portB write */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, darius_state, darius_write_portA0)) /* portA write */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, darius_state, darius_write_portB0)) /* portB write */
MCFG_SOUND_ROUTE(0, "filter0.0l", 0.08)
MCFG_SOUND_ROUTE(0, "filter0.0r", 0.08)
MCFG_SOUND_ROUTE(1, "filter0.1l", 0.08)
@@ -779,9 +779,9 @@ MACHINE_CONFIG_START(darius_state::darius)
MCFG_SOUND_ROUTE(3, "filter0.3l", 0.60)
MCFG_SOUND_ROUTE(3, "filter0.3r", 0.60)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(8'000'000)/2) /* 4 MHz */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(darius_state, darius_write_portA1)) /* portA write */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(darius_state, darius_write_portB1)) /* portB write */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, darius_state, darius_write_portA1)) /* portA write */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, darius_state, darius_write_portB1)) /* portB write */
MCFG_SOUND_ROUTE(0, "filter1.0l", 0.08)
MCFG_SOUND_ROUTE(0, "filter1.0r", 0.08)
MCFG_SOUND_ROUTE(1, "filter1.1l", 0.08)
@@ -791,8 +791,8 @@ MACHINE_CONFIG_START(darius_state::darius)
MCFG_SOUND_ROUTE(3, "filter1.3l", 0.60)
MCFG_SOUND_ROUTE(3, "filter1.3r", 0.60)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(darius_state, darius_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, darius_state, darius_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0)
diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp
index 44c571fe480..b9dc841147a 100644
--- a/src/mame/drivers/darkmist.cpp
+++ b/src/mame/drivers/darkmist.cpp
@@ -241,9 +241,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(darkmist_state::scanline)
MACHINE_CONFIG_START(darkmist_state::darkmist)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(memmap)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", darkmist_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("t5182", T5182, 0)
@@ -267,7 +267,7 @@ MACHINE_CONFIG_START(darkmist_state::darkmist)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4) /* 3.579545 MHz */
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("t5182", t5182_device, ym2151_irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp
index a94468ff048..0696db39cf3 100644
--- a/src/mame/drivers/darkseal.cpp
+++ b/src/mame/drivers/darkseal.cpp
@@ -210,12 +210,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(darkseal_state::darkseal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 */
- MCFG_CPU_PROGRAM_MAP(darkseal_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", darkseal_state, irq6_line_assert)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* Custom chip 59 */
+ MCFG_DEVICE_PROGRAM_MAP(darkseal_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", darkseal_state, irq6_line_assert)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -270,7 +270,7 @@ MACHINE_CONFIG_START(darkseal_state::darkseal)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9)
diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp
index 74ef4071a69..3c418873545 100644
--- a/src/mame/drivers/daruma.cpp
+++ b/src/mame/drivers/daruma.cpp
@@ -118,14 +118,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(daruma_state::daruma)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32,11059200) //verified on pcb
- MCFG_CPU_PROGRAM_MAP(mem_prg)
- MCFG_CPU_IO_MAP(mem_io)
+ MCFG_DEVICE_ADD("maincpu", I80C32,11059200) //verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(mem_prg)
+ MCFG_DEVICE_IO_MAP(mem_io)
// TODO: ports
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(0, "mono", 1.00)
/* TODO:
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index 68c57f14fb5..287a533abd9 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -529,16 +529,16 @@ void dassault_state::machine_reset()
MACHINE_CONFIG_START(dassault_state::dassault)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* 14MHz - Accurate */
- MCFG_CPU_PROGRAM_MAP(dassault_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dassault_state, irq4_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* 14MHz - Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(dassault_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dassault_state, irq4_line_assert)
- MCFG_CPU_ADD("sub", M68000, XTAL(28'000'000)/2) /* 14MHz - Accurate */
- MCFG_CPU_PROGRAM_MAP(dassault_sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dassault_state, irq5_line_assert)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(28'000'000)/2) /* 14MHz - Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(dassault_sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dassault_state, irq5_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/8) /* Accurate */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/8) /* Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
// MCFG_QUANTUM_TIME(attotime::from_hz(8400)) /* 140 CPU slices per frame */
MCFG_QUANTUM_PERFECT_CPU("maincpu") // I was seeing random lockups.. let's see if this helps
@@ -608,13 +608,13 @@ MACHINE_CONFIG_START(dassault_state::dassault)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) // IRQ1
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(dassault_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dassault_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp
index d7ecd255bbc..fbd84070834 100644
--- a/src/mame/drivers/datum.cpp
+++ b/src/mame/drivers/datum.cpp
@@ -184,17 +184,17 @@ WRITE8_MEMBER( datum_state::pb_w )
MACHINE_CONFIG_START(datum_state::datum)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6802, XTAL(4'000'000)) // internally divided to 1 MHz
- MCFG_CPU_PROGRAM_MAP(datum_mem)
+ MCFG_DEVICE_ADD("maincpu",M6802, XTAL(4'000'000)) // internally divided to 1 MHz
+ MCFG_DEVICE_PROGRAM_MAP(datum_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_datum)
/* Devices */
MCFG_DEVICE_ADD("pia1", PIA6821, 0) // keyboard & display
- MCFG_PIA_READPA_HANDLER(READ8(datum_state, pa_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(datum_state, pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(datum_state, pb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, datum_state, pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, datum_state, pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, datum_state, pb_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index a0485a79928..9d7764ca46c 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -602,9 +602,9 @@ It needs at least 64 instances because 0xa05b will be eventually nuked by the vb
MACHINE_CONFIG_START(dblcrown_state::dblcrown)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dblcrown_map)
- MCFG_CPU_IO_MAP(dblcrown_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dblcrown_map)
+ MCFG_DEVICE_IO_MAP(dblcrown_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dblcrown_state, dblcrown_irq_scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -627,13 +627,13 @@ MACHINE_CONFIG_START(dblcrown_state::dblcrown)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(dblcrown_state, lamps_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(dblcrown_state, bank_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(dblcrown_state, mux_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, dblcrown_state, lamps_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, dblcrown_state, bank_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, dblcrown_state, mux_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ284, SND_CLOCK)
+ MCFG_DEVICE_ADD("ymz", YMZ284, SND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp
index 050ac8f0693..d845b41cb60 100644
--- a/src/mame/drivers/dblewing.cpp
+++ b/src/mame/drivers/dblewing.cpp
@@ -352,14 +352,14 @@ DECOSPR_PRIORITY_CB_MEMBER(dblewing_state::pri_callback)
MACHINE_CONFIG_START(dblewing_state::dblewing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* DE102 */
- MCFG_CPU_PROGRAM_MAP(dblewing_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dblewing_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* DE102 */
+ MCFG_DEVICE_PROGRAM_MAP(dblewing_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dblewing_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'220'000)/9)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'220'000)/9)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io)
MCFG_INPUT_MERGER_ANY_HIGH("soundirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", 0))
@@ -407,14 +407,14 @@ MACHINE_CONFIG_START(dblewing_state::dblewing)
MCFG_DECO146_IN_PORTC_CB(IOPORT("DSW"))
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR
- MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(dblewing_state, soundlatch_irq_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("soundirq", input_merger_device, in_w<0>))
+ MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(*this, dblewing_state, soundlatch_irq_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("soundirq", input_merger_device, in_w<0>))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_OKIM6295_ADD("oki", XTAL(28'000'000)/28, PIN7_HIGH)
diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp
index 1c55440d4c1..48d1a179a47 100644
--- a/src/mame/drivers/dbox.cpp
+++ b/src/mame/drivers/dbox.cpp
@@ -600,25 +600,23 @@ static INPUT_PORTS_START( dbox )
INPUT_PORTS_END
MACHINE_CONFIG_START(dbox_state::dbox)
- MCFG_CPU_ADD("maincpu", M68340, 0) // The 68340 has an internal VCO as clock source, hence need no CPU clock
+ MCFG_DEVICE_ADD("maincpu", M68340, 0) // The 68340 has an internal VCO as clock source, hence need no CPU clock
MCFG_MC68340_ADD_CRYSTAL(XTAL(32'768)) // The dbox uses the VCO and has a crystal as VCO reference and to synthesize internal clocks from
- MCFG_CPU_PROGRAM_MAP(dbox_map)
- MCFG_MC68340_PA_OUTPUT_CB(WRITE8(dbox_state, write_pa))
+ MCFG_DEVICE_PROGRAM_MAP(dbox_map)
+ MCFG_MC68340_PA_OUTPUT_CB(WRITE8(*this, dbox_state, write_pa))
/* Timer 2 is used to communicate with the descrambler module TODO: Write the descrambler module */
- //MCFG_MC68340_TOUT2_OUTPUT_CB(DEVWRITELINE("dcs", descrambler_device, txd_receiver))
- //MCFG_MC68340_TGATE2_INPUT_CB(DEVREADLINE("dsc", descrambler_device, rxd_receiver))
+ //MCFG_MC68340_TOUT2_OUTPUT_CB(WRITELINE("dcs", descrambler_device, txd_receiver))
+ //MCFG_MC68340_TGATE2_INPUT_CB(READLINE("dsc", descrambler_device, rxd_receiver))
/* Configure the serial ports */
-#define CHA ":rs232"
-#define CHB ":modem"
MCFG_DEVICE_MODIFY("maincpu:serial")
- MCFG_MC68340SER_A_TX_CALLBACK(DEVWRITELINE(CHA, rs232_port_device, write_txd))
- MCFG_MC68340SER_B_TX_CALLBACK(DEVWRITELINE(CHB, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD (CHA, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE (":maincpu:serial", mc68340_serial_module_device, rx_a_w))
- MCFG_RS232_PORT_ADD (CHB, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE (":maincpu:serial", mc68340_serial_module_device, rx_b_w))
+ MCFG_MC68340SER_A_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68340SER_B_TX_CALLBACK(WRITELINE("modem", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD ("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("maincpu:serial", mc68340_serial_module_device, rx_a_w))
+ MCFG_DEVICE_ADD ("modem", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("maincpu:serial", mc68340_serial_module_device, rx_b_w))
/* Add the boot flash */
MCFG_AMD_29F800B_16BIT_ADD("flash")
@@ -628,7 +626,7 @@ MACHINE_CONFIG_START(dbox_state::dbox)
MCFG_DEFAULT_LAYOUT(layout_sda5708)
/* IP16 74256 8 bit latch */
MCFG_LATCH8_ADD("hct259.ip16")
- MCFG_LATCH8_WRITE_4(DEVWRITELINE("display", sda5708_device, reset_w))
+ MCFG_LATCH8_WRITE_4(WRITELINE("display", sda5708_device, reset_w))
MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(dbox_state, dbox)
diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp
index 306d905281d..6ca18756523 100644
--- a/src/mame/drivers/dbz.cpp
+++ b/src/mame/drivers/dbz.cpp
@@ -331,13 +331,13 @@ void dbz_state::machine_reset()
MACHINE_CONFIG_START(dbz_state::dbz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(dbz_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(dbz_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dbz_state, dbz_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(dbz_sound_map)
- MCFG_CPU_IO_MAP(dbz_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(dbz_sound_map)
+ MCFG_DEVICE_IO_MAP(dbz_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(dbz_state::dbz)
MCFG_K053936_OFFSETS(-46, -16)
MCFG_DEVICE_ADD("k053252", K053252, 16000000/2)
- MCFG_K053252_INT1_ACK_CB(WRITELINE(dbz_state, dbz_irq2_ack_w))
+ MCFG_K053252_INT1_ACK_CB(WRITELINE(*this, dbz_state, dbz_irq2_ack_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index ae34421a707..0ce3f4f98e0 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -582,7 +582,7 @@ void dc_cons_state::gdrom_config(device_t *device)
MACHINE_CONFIG_START(dc_cons_state::dc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", SH4LE, CPU_CLOCK)
MCFG_SH4_MD0(1)
MCFG_SH4_MD1(0)
MCFG_SH4_MD2(1)
@@ -593,13 +593,13 @@ MACHINE_CONFIG_START(dc_cons_state::dc)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dc_map)
- MCFG_CPU_IO_MAP(dc_port)
+ MCFG_DEVICE_PROGRAM_MAP(dc_map)
+ MCFG_DEVICE_IO_MAP(dc_port)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dc_state, dc_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
- MCFG_CPU_PROGRAM_MAP(dc_audio_map)
+ MCFG_DEVICE_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
+ MCFG_DEVICE_PROGRAM_MAP(dc_audio_map)
MCFG_MACHINE_RESET_OVERRIDE(dc_cons_state,dc_console )
@@ -616,20 +616,20 @@ MACHINE_CONFIG_START(dc_cons_state::dc)
MCFG_SCREEN_RAW_PARAMS(13458568*2, 857, 0, 640, 524, 0, 480) /* TODO: where pclk actually comes? */
MCFG_SCREEN_UPDATE_DEVICE("powervr2", powervr2_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x1000)
- MCFG_POWERVR2_ADD("powervr2", WRITE8(dc_state, pvr_irq))
+ MCFG_POWERVR2_ADD("powervr2", WRITE8(*this, dc_state, pvr_irq))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aica", AICA, 0)
+ MCFG_DEVICE_ADD("aica", AICA, 0)
MCFG_AICA_MASTER
- MCFG_AICA_IRQ_CB(WRITELINE(dc_state, aica_irq))
- MCFG_AICA_MAIN_IRQ_CB(WRITELINE(dc_state, sh4_aica_irq))
+ MCFG_AICA_IRQ_CB(WRITELINE(*this, dc_state, aica_irq))
+ MCFG_AICA_MAIN_IRQ_CB(WRITELINE(*this, dc_state, sh4_aica_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MCFG_AICARTC_ADD("aicartc", XTAL(32'768))
MCFG_DEVICE_ADD("ata", ATA_INTERFACE, 0)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(dc_cons_state, ata_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, dc_cons_state, ata_interrupt))
MCFG_DEVICE_MODIFY("ata:0")
MCFG_SLOT_OPTION_ADD("gdrom", GDROM)
diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp
index a3ee2a73afc..647a8f3b448 100644
--- a/src/mame/drivers/dcheese.cpp
+++ b/src/mame/drivers/dcheese.cpp
@@ -375,14 +375,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(dcheese_state::dcheese)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MAIN_OSC)
- MCFG_CPU_PROGRAM_MAP(main_cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dcheese_state, dcheese_vblank)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(dcheese_state,irq_callback)
-
- MCFG_CPU_ADD("audiocpu", M6809, SOUND_OSC/16)
- MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(dcheese_state, irq1_line_hold, 480) /* accurate for fredmem */
+ MCFG_DEVICE_ADD("maincpu", M68000, MAIN_OSC)
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dcheese_state, dcheese_vblank)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(dcheese_state,irq_callback)
+
+ MCFG_DEVICE_ADD("audiocpu", M6809, SOUND_OSC/16)
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dcheese_state, irq1_line_hold, 480) /* accurate for fredmem */
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp
index 8ec949416b1..589e6b0b818 100644
--- a/src/mame/drivers/dcon.cpp
+++ b/src/mame/drivers/dcon.cpp
@@ -278,12 +278,12 @@ WRITE16_MEMBER( dcon_state::layer_scroll_w )
MACHINE_CONFIG_START(dcon_state::dcon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(dcon_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dcon_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(dcon_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dcon_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* Perhaps 14318180/4? */
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* Perhaps 14318180/4? */
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -295,8 +295,8 @@ MACHINE_CONFIG_START(dcon_state::dcon)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(dcon_state, layer_en_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(dcon_state, layer_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, dcon_state, layer_en_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, dcon_state, layer_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dcon)
MCFG_PALETTE_ADD("palette", 2048)
@@ -305,8 +305,8 @@ MACHINE_CONFIG_START(dcon_state::dcon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -315,19 +315,19 @@ MACHINE_CONFIG_START(dcon_state::dcon)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(sdgndmps_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dcon_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(sdgndmps_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dcon_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -339,8 +339,8 @@ MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(dcon_state, layer_en_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(dcon_state, layer_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, dcon_state, layer_en_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, dcon_state, layer_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dcon)
MCFG_PALETTE_ADD("palette", 2048)
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -360,8 +360,8 @@ MACHINE_CONFIG_START(dcon_state::sdgndmps) /* PCB number is PB91008 */
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp
index a19e68639eb..fca107c9bfa 100644
--- a/src/mame/drivers/dct11em.cpp
+++ b/src/mame/drivers/dct11em.cpp
@@ -56,9 +56,9 @@ uint32_t dct11em_state::screen_update_dct11em(screen_device &screen, bitmap_ind1
MACHINE_CONFIG_START(dct11em_state::dct11em)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, 7500000) // 7.5MHz XTAL
+ MCFG_DEVICE_ADD("maincpu",T11, 7500000) // 7.5MHz XTAL
MCFG_T11_INITIAL_MODE(0x1403) /* according to specs */
- MCFG_CPU_PROGRAM_MAP(dct11em_mem)
+ MCFG_DEVICE_PROGRAM_MAP(dct11em_mem)
/* video hardware */
diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp
index 9fa0fb511fc..0083518b992 100644
--- a/src/mame/drivers/dday.cpp
+++ b/src/mame/drivers/dday.cpp
@@ -257,8 +257,8 @@ void dday_state::machine_reset()
MACHINE_CONFIG_START(dday_state::dday)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
- MCFG_CPU_PROGRAM_MAP(dday_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(dday_map)
/* video hardware */
@@ -279,10 +279,10 @@ MACHINE_CONFIG_START(dday_state::dday)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 1000000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp
index bcc4ba05262..54cd08bd8fd 100644
--- a/src/mame/drivers/ddayjlc.cpp
+++ b/src/mame/drivers/ddayjlc.cpp
@@ -599,11 +599,11 @@ PALETTE_INIT_MEMBER(ddayjlc_state, ddayjlc)
MACHINE_CONFIG_START(ddayjlc_state::ddayjlc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/3)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/3)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, 12000000/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -615,7 +615,7 @@ MACHINE_CONFIG_START(ddayjlc_state::ddayjlc)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(ddayjlc_state, screen_update_ddayjlc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddayjlc_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddayjlc_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddayjlc)
MCFG_PALETTE_ADD("palette", 0x200+4)
@@ -625,11 +625,11 @@ MACHINE_CONFIG_START(ddayjlc_state::ddayjlc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 12000000/6)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay1", AY8910, 12000000/6)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ay2", AY8910, 12000000/6)
+ MCFG_DEVICE_ADD("ay2", AY8910, 12000000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 084a8dec283..f67b1d165c5 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -621,10 +621,10 @@ INTERRUPT_GEN_MEMBER(ddealer_state::interrupt)
MACHINE_CONFIG_START(ddealer_state::ddealer)
- MCFG_CPU_ADD("maincpu" , M68000, XTAL(16'000'000)/2) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(ddealer)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ddealer_state, interrupt)
- MCFG_CPU_PERIODIC_INT_DRIVER(ddealer_state, irq1_line_hold, 90)//guess, controls music tempo, 112 is way too fast
+ MCFG_DEVICE_ADD("maincpu" , M68000, XTAL(16'000'000)/2) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ddealer)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ddealer_state, interrupt)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ddealer_state, irq1_line_hold, 90)//guess, controls music tempo, 112 is way too fast
// M50747 or NMK-110 8131 MCU
@@ -645,7 +645,7 @@ MACHINE_CONFIG_START(ddealer_state::ddealer)
MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", ddealer_state, mcu_sim, attotime::from_hz(10000))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(6'000'000) / 8) /* 7.5KHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(6'000'000) / 8) /* 7.5KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index b36445ed080..c1e6cf9717c 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -4350,10 +4350,10 @@ void dynax_state::htengoku_banked_map(address_map &map)
MACHINE_CONFIG_START(ddenlovr_state::htengoku)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,20000000 / 4)
- MCFG_CPU_PROGRAM_MAP(htengoku_mem_map)
- MCFG_CPU_IO_MAP(htengoku_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu",Z80,20000000 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(htengoku_mem_map)
+ MCFG_DEVICE_IO_MAP(htengoku_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(htengoku_banked_map)
@@ -4370,10 +4370,10 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, layer_half_w)) // half of the interleaved layer to write to
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, layer_half2_w)) //
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(dynax_state, blitter_ack_w)) // Blitter IRQ Ack
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w)) // half of the interleaved layer to write to
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, layer_half2_w)) //
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w)) // Blitter IRQ Ack
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4384,7 +4384,7 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_htengoku)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, sprtmtch_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 16*256)
@@ -4393,17 +4393,17 @@ MACHINE_CONFIG_START(ddenlovr_state::htengoku)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 20000000 / 16)
- MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, htengoku_dsw_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, htengoku_dsw_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 20000000 / 16)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, htengoku_dsw_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, htengoku_dsw_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2413", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
MACHINE_CONFIG_END
@@ -9705,13 +9705,13 @@ WRITE_LINE_MEMBER(ddenlovr_state::ddenlovr_irq)
MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(ddenlovr_map)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(ddenlovr_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(ddenlovr_state, ddenlovr_blitter_irq_ack_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(ddenlovr_state, ddenlovr_coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ddenlovr_state, ddenlovr_coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_blitter_irq_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_coincounter_1_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,ddenlovr)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -9725,7 +9725,7 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, ddenlovr_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, ddenlovr_irq))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -9736,10 +9736,10 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YMZ284, XTAL(28'636'363) / 16) // or /8 ?
+ MCFG_DEVICE_ADD("aysnd", YMZ284, XTAL(28'636'363) / 16) // or /8 ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
@@ -9753,48 +9753,48 @@ MACHINE_CONFIG_START(ddenlovr_state::ddenlovj)
ddenlovr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ddenlovj_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ddenlovj_map)
MCFG_DEVICE_REPLACE("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ddenlovr_state, ddenlovr_blitter_irq_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ddenlovr_state, ddenlovr_blitter_irq_ack_w))
MCFG_DEVICE_REPLACE("rtc", RTC62421, XTAL(32'768)) // internal oscillator
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::ddenlovrk)
ddenlovr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ddenlovrk_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ddenlovrk_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::akamaru)
ddenlovr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(akamaru_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(akamaru_map)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(ddenlovr_state, akamaru_dsw2_sel_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(ddenlovr_state, akamaru_dsw1_sel_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, ddenlovr_state, akamaru_dsw2_sel_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, ddenlovr_state, akamaru_dsw1_sel_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::quiz365)
ddenlovj(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(quiz365_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(quiz365_map)
MCFG_DEVICE_MODIFY("mainlatch") // 7D has wire mod connecting to sample ROM at 1F
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(ddenlovr_state, quiz365_oki_bank1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ddenlovr_state, quiz365_oki_bank2_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, ddenlovr_state, quiz365_oki_bank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ddenlovr_state, quiz365_oki_bank2_w))
- MCFG_SOUND_REPLACE("aysnd", YM2149, XTAL(28'636'363) / 16) // or /8 ?
+ MCFG_DEVICE_REPLACE("aysnd", YM2149, XTAL(28'636'363) / 16) // or /8 ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, quiz365_input_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, quiz365_input_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_DEVICE_REPLACE("rtc", MSM6242, XTAL(32'768))
MACHINE_CONFIG_END
@@ -9803,16 +9803,16 @@ MACHINE_CONFIG_START(ddenlovr_state::nettoqc)
ddenlovj(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nettoqc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nettoqc_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::ultrchmp)
ddenlovr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ultrchmp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ultrchmp_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -9834,11 +9834,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::quizchq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2) /* Verified */
- MCFG_CPU_PROGRAM_MAP(quizchq_map)
- MCFG_CPU_IO_MAP(quizchq_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(READ8(ddenlovr_state, rongrong_input_r))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, rongrong_select_w))
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2) /* Verified */
+ MCFG_DEVICE_PROGRAM_MAP(quizchq_map)
+ MCFG_DEVICE_IO_MAP(quizchq_portmap)
+ MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, ddenlovr_state, rongrong_input_r))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, rongrong_select_w))
// bit 5 of 0x1b (SIO CTSB?) = blitter busy
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,rongrong)
@@ -9853,7 +9853,7 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, strobe_a)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, strobe_a)) MCFG_DEVCB_INVERT
MCFG_PALETTE_ADD("palette", 0x100)
@@ -9864,7 +9864,7 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363)/8) // 3.579545Mhz, verified
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363)/8) // 3.579545Mhz, verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363)/28, PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
@@ -9872,16 +9872,16 @@ MACHINE_CONFIG_START(ddenlovr_state::quizchq)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg2)) MCFG_DEVCB_INVERT
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg2)) MCFG_DEVCB_INVERT
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::rongrong)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rongrong_map)
- MCFG_CPU_IO_MAP(rongrong_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rongrong_map)
+ MCFG_DEVICE_IO_MAP(rongrong_portmap)
MACHINE_CONFIG_END
/***************************************************************************
@@ -9922,13 +9922,13 @@ WRITE_LINE_MEMBER(ddenlovr_state::mmpanic_rtc_irq)
MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(mmpanic_map)
- MCFG_CPU_IO_MAP(mmpanic_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(mmpanic_map)
+ MCFG_DEVICE_IO_MAP(mmpanic_portmap)
- MCFG_CPU_ADD("soundcpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(mmpanic_sound_map)
- MCFG_CPU_IO_MAP(mmpanic_sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(mmpanic_sound_map)
+ MCFG_DEVICE_IO_MAP(mmpanic_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mmpanic)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -9942,7 +9942,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, mmpanic_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, mmpanic_irq))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -9956,10 +9956,10 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym2413", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2413", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", 1022720, PIN7_HIGH) // clock frequency & pin 7 not verified
@@ -9967,7 +9967,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mmpanic)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mmpanic_rtc_irq))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, ddenlovr_state, mmpanic_rtc_irq))
MACHINE_CONFIG_END
@@ -10014,9 +10014,9 @@ WRITE_LINE_MEMBER(ddenlovr_state::hanakanz_rtc_irq)
MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,8000000) // KL5C80A12
- MCFG_CPU_PROGRAM_MAP(hanakanz_map)
- MCFG_CPU_IO_MAP(hanakanz_portmap)
+ MCFG_DEVICE_ADD("maincpu",Z80,8000000) // KL5C80A12
+ MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
+ MCFG_DEVICE_IO_MAP(hanakanz_portmap)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10030,7 +10030,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, hanakanz_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, hanakanz_irq))
MCFG_PALETTE_ADD("palette", 0x200)
@@ -10039,7 +10039,7 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2413", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_OKIM6295_ADD("oki", 1022720, PIN7_HIGH) // clock frequency & pin 7 not verified
@@ -10047,23 +10047,23 @@ MACHINE_CONFIG_START(ddenlovr_state::hanakanz)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::hkagerou)
hanakanz(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(hkagerou_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(hkagerou_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(20'000'000) / 2) // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
- MCFG_CPU_PROGRAM_MAP(hanakanz_map)
- MCFG_CPU_IO_MAP(kotbinyo_portmap)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(20'000'000) / 2) // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
+ MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
+ MCFG_DEVICE_IO_MAP(kotbinyo_portmap)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10077,7 +10077,7 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, hanakanz_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, hanakanz_irq))
MCFG_PALETTE_ADD("palette", 0x200)
@@ -10086,7 +10086,7 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'375'160) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'375'160) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_OKIM6295_ADD("oki", XTAL(28'375'160) / 28, PIN7_HIGH)
@@ -10094,15 +10094,15 @@ MACHINE_CONFIG_START(ddenlovr_state::kotbinyo)
/* devices */
// MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
-// MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
+// MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::kotbinsp)
kotbinyo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(kotbinsp_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(kotbinsp_portmap)
MACHINE_CONFIG_END
@@ -10110,8 +10110,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mjreach1)
hanakanz(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjreach1_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjreach1_portmap)
MACHINE_CONFIG_END
@@ -10128,19 +10128,19 @@ MACHINE_CONFIG_START(ddenlovr_state::mjchuuka)
hanakanz(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", TMPZ84C015, 8000000)
- MCFG_CPU_PROGRAM_MAP(hanakanz_map)
- MCFG_CPU_IO_MAP(mjchuuka_portmap)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, hanakanz_rombank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mjchuuka_oki_bank_w))
+ MCFG_DEVICE_REPLACE("maincpu", TMPZ84C015, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
+ MCFG_DEVICE_IO_MAP(mjchuuka_portmap)
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, hanakanz_rombank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjchuuka_oki_bank_w))
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_DEVICE_MODIFY("rtc")
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg1))
- MCFG_SOUND_ADD("aysnd", AY8910, 1789772)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1789772)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -10153,25 +10153,25 @@ WRITE_LINE_MEMBER(ddenlovr_state::funkyfig_sound_irq)
MACHINE_CONFIG_START(ddenlovr_state::funkyfig)
mmpanic(config);
- MCFG_CPU_REPLACE("maincpu", TMPZ84C015, 8000000)
- MCFG_CPU_PROGRAM_MAP(funkyfig_map)
- MCFG_CPU_IO_MAP(funkyfig_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(READ8(ddenlovr_state, funkyfig_dsw_r))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, funkyfig_rombank_w))
+ MCFG_DEVICE_REPLACE("maincpu", TMPZ84C015, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(funkyfig_map)
+ MCFG_DEVICE_IO_MAP(funkyfig_portmap)
+ MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, ddenlovr_state, funkyfig_dsw_r))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, funkyfig_rombank_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,funkyfig)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(ddenlovr_state, funkyfig_sound_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, ddenlovr_state, funkyfig_sound_irq))
MCFG_DEVICE_MODIFY("rtc")
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1)) MCFG_DEVCB_INVERT
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg1)) MCFG_DEVCB_INVERT
MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, funkyfig_blitter_irq)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(funkyfig_sound_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(funkyfig_sound_portmap)
MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,ddenlovr) // no extra layers?
MACHINE_CONFIG_END
@@ -10184,11 +10184,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(mjmyster_map)
- MCFG_CPU_IO_MAP(mjschuka_portmap)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, sryudens_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mjflove_rombank_w))
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(mjmyster_map)
+ MCFG_DEVICE_IO_MAP(mjschuka_portmap)
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10202,7 +10202,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_PALETTE_ADD("palette", 0x200)
@@ -10213,10 +10213,10 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
@@ -10224,7 +10224,7 @@ MACHINE_CONFIG_START(ddenlovr_state::mjschuka)
/* devices */
MCFG_DEVICE_ADD("rtc", RTC62421, XTAL(32'768)) // internal oscillator
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, pa7_w)) MCFG_DEVCB_INVERT
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, pa7_w)) MCFG_DEVCB_INVERT
MACHINE_CONFIG_END
@@ -10243,15 +10243,15 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyster)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjmyster_map)
- MCFG_CPU_IO_MAP(mjmyster_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjmyster_map)
+ MCFG_DEVICE_IO_MAP(mjmyster_portmap)
MCFG_TMPZ84C015_IN_PA_CB(NOOP)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, mjmyster_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mmpanic_rombank_w))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mmpanic_rombank_w))
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
MCFG_DEVICE_MODIFY("rtc")
MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
@@ -10260,8 +10260,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyster)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
- MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -10281,26 +10281,26 @@ MACHINE_CONFIG_START(ddenlovr_state::hginga)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hginga_map)
- MCFG_CPU_IO_MAP(hginga_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hginga_map)
+ MCFG_DEVICE_IO_MAP(hginga_portmap)
MCFG_TMPZ84C015_IN_PA_CB(NOOP)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, mjmyster_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, hginga_rombank_w))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hginga_rombank_w))
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_DEVICE_MODIFY("rtc")
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, pa7_w)) MCFG_DEVCB_INVERT
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, pa7_w)) MCFG_DEVCB_INVERT
MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
- MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
- MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, hginga_dsw_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, hginga_dsw_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -10308,26 +10308,26 @@ MACHINE_CONFIG_START(ddenlovr_state::hgokou)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hgokou_map)
- MCFG_CPU_IO_MAP(hgokou_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hgokou_map)
+ MCFG_DEVICE_IO_MAP(hgokou_portmap)
MCFG_TMPZ84C015_IN_PA_CB(NOOP)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, mjmyster_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, hginga_rombank_w))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hginga_rombank_w))
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_DEVICE_MODIFY("rtc")
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, pa7_w)) MCFG_DEVCB_INVERT
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, pa7_w)) MCFG_DEVCB_INVERT
MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
- MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
- MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, hginga_dsw_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 3579545)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, hginga_dsw_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -10335,34 +10335,34 @@ MACHINE_CONFIG_START(ddenlovr_state::hgokbang)
hgokou(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(hgokbang_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(hgokbang_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::mjmywrld)
mjmyster(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hginga_map)
- MCFG_CPU_IO_MAP(mjmywrld_portmap)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, mjmyster_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, hginga_rombank_w))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hginga_map)
+ MCFG_DEVICE_IO_MAP(mjmywrld_portmap)
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hginga_rombank_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::mjmyuniv)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjmyster_map)
- MCFG_CPU_IO_MAP(mjmyster_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjmyster_map)
+ MCFG_DEVICE_IO_MAP(mjmyster_portmap)
MCFG_TMPZ84C015_IN_PA_CB(NOOP)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, mjmyster_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mmpanic_rombank_w))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mmpanic_rombank_w))
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjmyster)
@@ -10371,8 +10371,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyuniv)
MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
- MCFG_SOUND_ADD("aysnd", AY8910, 1789772)
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1789772)
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -10380,15 +10380,15 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyornt)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(quizchq_map)
- MCFG_CPU_IO_MAP(mjmyster_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(quizchq_map)
+ MCFG_DEVICE_IO_MAP(mjmyster_portmap)
MCFG_TMPZ84C015_IN_PA_CB(NOOP)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, mjmyster_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mmpanic_rombank_w))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, mjmyster_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mmpanic_rombank_w))
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 336-1, 4, 256-16+4-1)
@@ -10400,8 +10400,8 @@ MACHINE_CONFIG_START(ddenlovr_state::mjmyornt)
MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjmyster_blitter_irq)
- MCFG_SOUND_ADD("aysnd", AY8910, 1789772)
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1789772)
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -10435,26 +10435,26 @@ MACHINE_CONFIG_START(ddenlovr_state::mjflove)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rongrong_map)
- MCFG_CPU_IO_MAP(mjflove_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rongrong_map)
+ MCFG_DEVICE_IO_MAP(mjflove_portmap)
MCFG_TMPZ84C015_IN_PA_CB(IOPORT("DSW2"))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, hanakanz_keyb_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hanakanz_keyb_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, mjflove_irq))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) // frame counter?
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, mjflove_irq))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("maincpu", tmpz84c015_device, trg0)) // frame counter?
MCFG_DEVICE_REPLACE("rtc", RTC72421, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, mjflove_rtc_irq))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, ddenlovr_state, mjflove_rtc_irq))
MCFG_DDENLOVR_BLITTER_IRQ(ddenlovr_state, mjflove_blitter_irq)
MCFG_VIDEO_START_OVERRIDE(ddenlovr_state,mjflove) // blitter commands in the roms are shuffled around
- MCFG_SOUND_ADD("aysnd", AY8910, 28636363/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 28636363/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -10462,11 +10462,11 @@ MACHINE_CONFIG_START(ddenlovr_state::hparadis)
quizchq(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hparadis_map)
- MCFG_CPU_IO_MAP(hparadis_portmap)
- MCFG_TMPZ84C015_IN_PA_CB(READ8(ddenlovr_state, hparadis_dsw_r))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, hparadis_select_w))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hparadis_map)
+ MCFG_DEVICE_IO_MAP(hparadis_portmap)
+ MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, ddenlovr_state, hparadis_dsw_r))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, hparadis_select_w))
// the RTC seems unused
MCFG_DEVICE_REMOVE("rtc")
@@ -10479,9 +10479,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::jongtei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(20'000'000) / 2) // KL5C80A12
- MCFG_CPU_PROGRAM_MAP(hanakanz_map)
- MCFG_CPU_IO_MAP(jongtei_portmap)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(20'000'000) / 2) // KL5C80A12
+ MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
+ MCFG_DEVICE_IO_MAP(jongtei_portmap)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10495,7 +10495,7 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, hanakanz_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, hanakanz_irq))
MCFG_PALETTE_ADD("palette", 0x200)
@@ -10506,7 +10506,7 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
@@ -10514,13 +10514,13 @@ MACHINE_CONFIG_START(ddenlovr_state::jongtei)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::mjgnight)
jongtei(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjgnight_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjgnight_portmap)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(336, 256)
@@ -10534,11 +10534,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::sryudens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000) / 2) // ?
- MCFG_CPU_PROGRAM_MAP(sryudens_map)
- MCFG_CPU_IO_MAP(sryudens_portmap)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, sryudens_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mjflove_rombank_w))
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, XTAL(16'000'000) / 2) // ?
+ MCFG_DEVICE_PROGRAM_MAP(sryudens_map)
+ MCFG_DEVICE_IO_MAP(sryudens_portmap)
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,sryudens)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10552,7 +10552,7 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -10563,10 +10563,10 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YMZ284, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("aysnd", YMZ284, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH) // ?
@@ -10574,7 +10574,7 @@ MACHINE_CONFIG_START(ddenlovr_state::sryudens)
/* devices */
MCFG_DEVICE_ADD("rtc", RTC62421, XTAL(32'768)) // internal oscillator
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg1))
MACHINE_CONFIG_END
/***************************************************************************
@@ -10585,11 +10585,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::janshinp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(janshinp_map)
- MCFG_CPU_IO_MAP(janshinp_portmap)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, sryudens_rambank_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, mjflove_rombank_w))
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(janshinp_map)
+ MCFG_DEVICE_IO_MAP(janshinp_portmap)
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, sryudens_rambank_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, mjflove_rombank_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,hanakanz)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10603,7 +10603,7 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -10614,10 +10614,10 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YMZ284, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("aysnd", YMZ284, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH) // ?
@@ -10625,7 +10625,7 @@ MACHINE_CONFIG_START(ddenlovr_state::janshinp)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg1))
MACHINE_CONFIG_END
// Same PCB as janshinp
@@ -10657,11 +10657,11 @@ MACHINE_START_MEMBER(ddenlovr_state,seljan2)
MACHINE_CONFIG_START(ddenlovr_state::seljan2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(seljan2_map)
- MCFG_CPU_IO_MAP(seljan2_portmap)
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(ddenlovr_state, hanakanz_keyb_w))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(ddenlovr_state, sryudens_coincounter_w))
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(seljan2_map)
+ MCFG_DEVICE_IO_MAP(seljan2_portmap)
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, ddenlovr_state, hanakanz_keyb_w))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, ddenlovr_state, sryudens_coincounter_w))
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,seljan2)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10675,7 +10675,7 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0))
MCFG_PALETTE_ADD("palette", 0x100)
@@ -10686,12 +10686,12 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(28'636'363) / 8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(ddenlovr_state, seljan2_dsw_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(28'636'363) / 8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ddenlovr_state, seljan2_dsw_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH) // ?
@@ -10699,7 +10699,7 @@ MACHINE_CONFIG_START(ddenlovr_state::seljan2)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg1))
MACHINE_CONFIG_END
@@ -10711,9 +10711,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(hanakanz_map)
- MCFG_CPU_IO_MAP(daimyojn_portmap)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(hanakanz_map)
+ MCFG_DEVICE_IO_MAP(daimyojn_portmap)
MCFG_MACHINE_START_OVERRIDE(ddenlovr_state,mjflove)
MCFG_MACHINE_RESET_OVERRIDE(ddenlovr_state,ddenlovr)
@@ -10727,7 +10727,7 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
MCFG_SCREEN_UPDATE_DRIVER(ddenlovr_state, screen_update_ddenlovr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddenlovr_state, hanakanz_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddenlovr_state, hanakanz_irq))
MCFG_PALETTE_ADD("palette", 0x200)
@@ -10736,7 +10736,7 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(28'636'363) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_OKIM6295_ADD("oki", XTAL(28'636'363) / 28, PIN7_HIGH)
@@ -10744,7 +10744,7 @@ MACHINE_CONFIG_START(ddenlovr_state::daimyojn)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(ddenlovr_state, hanakanz_rtc_irq))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(*this, ddenlovr_state, hanakanz_rtc_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index eb9c51e1bd9..c466107c800 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -947,15 +947,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(ddragon_state::ddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, MAIN_CLOCK / 4) /* HD63C09EP, 3 MHz */
- MCFG_CPU_PROGRAM_MAP(ddragon_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, MAIN_CLOCK / 4) /* HD63C09EP, 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ddragon_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon_state, ddragon_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", HD63701, MAIN_CLOCK / 2) /* HD63701YOP, 6 MHz / 4 internally */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", HD63701, MAIN_CLOCK / 2) /* HD63701YOP, 6 MHz / 4 internally */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", MC6809, MAIN_CLOCK / 2) /* HD68A09P, 6 MHz / 4 internally */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809, MAIN_CLOCK / 2) /* HD68A09P, 6 MHz / 4 internally */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */
@@ -981,17 +981,17 @@ MACHINE_CONFIG_START(ddragon_state::ddragon)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", M6809_IRQ_LINE))
MCFG_YM2151_ADD("fmsnd", SOUND_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(ddragon_state, irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, ddragon_state, irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK / 32)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_1)) /* interrupt function */
+ MCFG_DEVICE_ADD("adpcm1", MSM5205, MAIN_CLOCK / 32)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ddragon_state, dd_adpcm_int_1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK / 32)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_2)) /* interrupt function */
+ MCFG_DEVICE_ADD("adpcm2", MSM5205, MAIN_CLOCK / 32)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ddragon_state, dd_adpcm_int_2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1001,8 +1001,8 @@ MACHINE_CONFIG_START(ddragon_state::ddragonb)
ddragon(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("sub", M6809, MAIN_CLOCK / 8) /* 1.5MHz */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_REPLACE("sub", M6809, MAIN_CLOCK / 8) /* 1.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MACHINE_CONFIG_END
@@ -1010,24 +1010,24 @@ MACHINE_CONFIG_START(ddragon_state::ddragonba)
ddragon(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6MHz / 4 internally */
- MCFG_CPU_PROGRAM_MAP(ddragonba_sub_map)
- MCFG_CPU_IO_MAP(ddragonba_sub_portmap)
+ MCFG_DEVICE_REPLACE("sub", M6803, MAIN_CLOCK / 2) /* 6MHz / 4 internally */
+ MCFG_DEVICE_PROGRAM_MAP(ddragonba_sub_map)
+ MCFG_DEVICE_IO_MAP(ddragonba_sub_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddragon_state::ddragon6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz */
- MCFG_CPU_PROGRAM_MAP(ddragon_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ddragon_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon_state, ddragon_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 1.5 Mhz */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, MAIN_CLOCK / 8) /* 1.5 Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809E, MAIN_CLOCK / 8) /* 1.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */
@@ -1053,17 +1053,17 @@ MACHINE_CONFIG_START(ddragon_state::ddragon6809)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", M6809_IRQ_LINE))
MCFG_YM2151_ADD("fmsnd", SOUND_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(ddragon_state,irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, ddragon_state,irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_1)) /* interrupt function */
+ MCFG_DEVICE_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ddragon_state, dd_adpcm_int_1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_2)) /* interrupt function */
+ MCFG_DEVICE_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ddragon_state, dd_adpcm_int_2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1072,15 +1072,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddragon_state::ddragon2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, MAIN_CLOCK / 4) /* HD63C09EP, 3 MHz */
- MCFG_CPU_PROGRAM_MAP(dd2_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, MAIN_CLOCK / 4) /* HD63C09EP, 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dd2_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon_state, ddragon_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(dd2_sub_map)
+ MCFG_DEVICE_ADD("sub", Z80, MAIN_CLOCK / 3) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dd2_sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(dd2_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(dd2_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000)) /* heavy interleaving to sync up sprite<->main CPUs */
@@ -1106,7 +1106,7 @@ MACHINE_CONFIG_START(ddragon_state::ddragon2)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
MCFG_YM2151_ADD("fmsnd", SOUND_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(ddragon_state,irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, ddragon_state,irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
@@ -1119,8 +1119,8 @@ MACHINE_CONFIG_START(darktowr_state::darktowr)
ddragon(config);
/* basic machine hardware */
- MCFG_CPU_ADD("mcu", M68705P3, XTAL(4'000'000))
- MCFG_M68705_PORTA_W_CB(WRITE8(darktowr_state, mcu_port_a_w))
+ MCFG_DEVICE_ADD("mcu", M68705P3, XTAL(4'000'000))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, darktowr_state, mcu_port_a_w))
/* video hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp
index 2f5749b6593..96a1605ba9c 100644
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@@ -823,18 +823,18 @@ void ddragon3_state::machine_reset()
MACHINE_CONFIG_START(ddragon3_state::ddragon3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(ddragon3_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(ddragon3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(28_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
MCFG_SCREEN_UPDATE_DRIVER(ddragon3_state, screen_update_ddragon3)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddragon3)
@@ -862,8 +862,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddragon3_state::ddragon3b)
ddragon3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dd3b_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dd3b_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VBLANK_CALLBACK(NOOP)
@@ -872,11 +872,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ddragon3_state::ctribe)
ddragon3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ctribe_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ctribe_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(ctribe_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(ctribe_sound_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
@@ -885,12 +885,12 @@ MACHINE_CONFIG_START(ddragon3_state::ctribe)
MCFG_SCREEN_UPDATE_DRIVER(ddragon3_state, screen_update_ctribe)
MCFG_SCREEN_VBLANK_CALLBACK(NOOP)
- MCFG_SOUND_MODIFY("ym2151")
+ MCFG_DEVICE_MODIFY("ym2151")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(0, "lspeaker", 1.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.20)
- MCFG_SOUND_MODIFY("oki")
+ MCFG_DEVICE_MODIFY("oki")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
@@ -900,12 +900,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wwfwfest_state::wwfwfest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 24 crystal, 12 rated chip */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) /* 24 crystal, 12 rated chip */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -913,7 +913,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(28_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
MCFG_SCREEN_UPDATE_DRIVER(wwfwfest_state, screen_update_wwfwfest)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", wwfwfest)
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index b6afd10c74b..7234583e817 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -260,14 +260,14 @@ void ddribble_state::machine_reset()
MACHINE_CONFIG_START(ddribble_state::ddribble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu0_map)
+ MCFG_DEVICE_ADD(m_maincpu, MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu0_map)
- MCFG_CPU_ADD("cpu1", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_ADD(m_cpu1, MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_ADD("cpu2", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_ADD("cpu2", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
@@ -283,9 +283,9 @@ MACHINE_CONFIG_START(ddribble_state::ddribble)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1) */
MCFG_SCREEN_UPDATE_DRIVER(ddribble_state, screen_update_ddribble)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ddribble_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ddribble_state, vblank_irq))
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", ddribble)
+ MCFG_GFXDECODE_ADD(m_gfxdecode, "palette", ddribble)
MCFG_PALETTE_ADD("palette", 64 + 256)
MCFG_PALETTE_INDIRECT_ENTRIES(64)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
@@ -294,23 +294,23 @@ MACHINE_CONFIG_START(ddribble_state::ddribble)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(3'579'545)) /* verified on pcb */
- MCFG_AY8910_PORT_B_READ_CB(READ8(ddribble_state, ddribble_vlm5030_busy_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ddribble_state, ddribble_vlm5030_ctrl_w))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, ddribble_state, ddribble_vlm5030_busy_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ddribble_state, ddribble_vlm5030_ctrl_w))
MCFG_SOUND_ROUTE(0, "filter1", 0.25)
MCFG_SOUND_ROUTE(1, "filter2", 0.25)
MCFG_SOUND_ROUTE(2, "filter3", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.25)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD(m_vlm, VLM5030, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD(m_filter1, FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD(m_filter2, FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD(m_filter3, FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp
index c58ca6f62f0..e1f61791da7 100644
--- a/src/mame/drivers/de_2.cpp
+++ b/src/mame/drivers/de_2.cpp
@@ -531,17 +531,17 @@ WRITE8_MEMBER(de_2_state::lamps_w)
MACHINE_CONFIG_START(de_2_state::de_bg_audio)
/* sound CPU */
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
- MCFG_CPU_PROGRAM_MAP(de_2_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
+ MCFG_DEVICE_PROGRAM_MAP(de_2_audio_map)
MCFG_SPEAKER_STANDARD_MONO("bg")
MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(de_2_state, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, de_2_state, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
- MCFG_SOUND_ADD("msm5205", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(de_2_state, msm5205_irq_w))
+ MCFG_DEVICE_ADD("msm5205", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, de_2_state, msm5205_irq_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MACHINE_CONFIG_END
@@ -549,10 +549,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type1)
/* basic machine hardware */
MCFG_DECOCPU_TYPE1_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
- MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w))
- MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
- MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
- MCFG_DECOCPU_LAMP(WRITE8(de_2_state,lamps_w))
+ MCFG_DECOCPU_DISPLAY(READ8(*this, de_2_state,display_r),WRITE8(*this, de_2_state,display_w))
+ MCFG_DECOCPU_SOUNDLATCH(WRITE8(*this, de_2_state,sound_w))
+ MCFG_DECOCPU_SWITCH(READ8(*this, de_2_state,switch_r),WRITE8(*this, de_2_state,switch_w))
+ MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w))
/* Video */
MCFG_DEFAULT_LAYOUT(layout_de2)
@@ -564,10 +564,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type2)
/* basic machine hardware */
MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
- MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w))
- MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
- MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
- MCFG_DECOCPU_LAMP(WRITE8(de_2_state,lamps_w))
+ MCFG_DECOCPU_DISPLAY(READ8(*this, de_2_state,display_r),WRITE8(*this, de_2_state,display_w))
+ MCFG_DECOCPU_SOUNDLATCH(WRITE8(*this, de_2_state,sound_w))
+ MCFG_DECOCPU_SWITCH(READ8(*this, de_2_state,switch_r),WRITE8(*this, de_2_state,switch_w))
+ MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w))
/* Video */
MCFG_DEFAULT_LAYOUT(layout_de2)
@@ -579,10 +579,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type2_alpha3)
/* basic machine hardware */
MCFG_DECOCPU_TYPE2_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
- MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,type2alpha3_display_w))
- MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
- MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
- MCFG_DECOCPU_LAMP(WRITE8(de_2_state,lamps_w))
+ MCFG_DECOCPU_DISPLAY(READ8(*this, de_2_state,display_r),WRITE8(*this, de_2_state,type2alpha3_display_w))
+ MCFG_DECOCPU_SOUNDLATCH(WRITE8(*this, de_2_state,sound_w))
+ MCFG_DECOCPU_SWITCH(READ8(*this, de_2_state,switch_r),WRITE8(*this, de_2_state,switch_w))
+ MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w))
/* Video */
MCFG_DEFAULT_LAYOUT(layout_de2a3)
@@ -594,10 +594,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(de_2_state::de_type3)
/* basic machine hardware */
MCFG_DECOCPU_TYPE3_ADD("decocpu", XTAL(8'000'000) / 2, ":maincpu")
- MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,type3_display_w))
- MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_2_state,sound_w))
- MCFG_DECOCPU_SWITCH(READ8(de_2_state,switch_r),WRITE8(de_2_state,switch_w))
- MCFG_DECOCPU_LAMP(WRITE8(de_2_state,lamps_w))
+ MCFG_DECOCPU_DISPLAY(READ8(*this, de_2_state,display_r),WRITE8(*this, de_2_state,type3_display_w))
+ MCFG_DECOCPU_SOUNDLATCH(WRITE8(*this, de_2_state,sound_w))
+ MCFG_DECOCPU_SWITCH(READ8(*this, de_2_state,switch_r),WRITE8(*this, de_2_state,switch_w))
+ MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w))
/* Video */
MCFG_DEFAULT_LAYOUT(layout_de2a3)
diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp
index c77bee766f7..f6e4cc9c81f 100644
--- a/src/mame/drivers/de_3.cpp
+++ b/src/mame/drivers/de_3.cpp
@@ -399,11 +399,11 @@ void de_3_state::machine_reset()
MACHINE_CONFIG_START(de_3_state::de_3)
/* basic machine hardware */
MCFG_DECOCPU_TYPE3_ADD("decocpu",XTAL(8'000'000) / 2, ":maincpu")
- MCFG_DECOCPU_DISPLAY(READ8(de_3_state,display_r),WRITE8(de_3_state,display_w))
- MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_3_state,sound_w))
- MCFG_DECOCPU_SWITCH(READ8(de_3_state,switch_r),WRITE8(de_3_state,switch_w))
- MCFG_DECOCPU_LAMP(WRITE8(de_3_state,lamps_w))
- MCFG_DECOCPU_DMDSTATUS(READ8(de_3_state,dmd_status_r))
+ MCFG_DECOCPU_DISPLAY(READ8(*this, de_3_state,display_r),WRITE8(*this, de_3_state,display_w))
+ MCFG_DECOCPU_SOUNDLATCH(WRITE8(*this, de_3_state,sound_w))
+ MCFG_DECOCPU_SWITCH(READ8(*this, de_3_state,switch_r),WRITE8(*this, de_3_state,switch_w))
+ MCFG_DECOCPU_LAMP(WRITE8(*this, de_3_state,lamps_w))
+ MCFG_DECOCPU_DMDSTATUS(READ8(*this, de_3_state,dmd_status_r))
genpin_audio(config);
diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp
index 1ee84484284..7f8e5241531 100644
--- a/src/mame/drivers/de_3b.cpp
+++ b/src/mame/drivers/de_3b.cpp
@@ -244,11 +244,11 @@ DRIVER_INIT_MEMBER(de_3b_state,de_3b)
MACHINE_CONFIG_START(de_3b_state::de_3b)
/* basic machine hardware */
MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL(8'000'000) / 2, ":maincpu")
- MCFG_DECOCPU_DISPLAY(READ8(de_3b_state,display_r),WRITE8(de_3b_state,display_w))
- MCFG_DECOCPU_SOUNDLATCH(WRITE8(de_3b_state,sound_w))
- MCFG_DECOCPU_SWITCH(READ8(de_3b_state,switch_r),WRITE8(de_3b_state,switch_w))
- MCFG_DECOCPU_LAMP(WRITE8(de_3b_state,lamps_w))
- MCFG_DECOCPU_DMDSTATUS(READ8(de_3b_state,dmd_status_r))
+ MCFG_DECOCPU_DISPLAY(READ8(*this, de_3b_state,display_r),WRITE8(*this, de_3b_state,display_w))
+ MCFG_DECOCPU_SOUNDLATCH(WRITE8(*this, de_3b_state,sound_w))
+ MCFG_DECOCPU_SWITCH(READ8(*this, de_3b_state,switch_r),WRITE8(*this, de_3b_state,switch_w))
+ MCFG_DECOCPU_LAMP(WRITE8(*this, de_3b_state,lamps_w))
+ MCFG_DECOCPU_DMDSTATUS(READ8(*this, de_3b_state,dmd_status_r))
genpin_audio(config);
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index 539bd98f37a..7baa88a86c3 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -272,17 +272,17 @@ TIMER_DEVICE_CALLBACK_MEMBER(deadang_state::sub_scanline)
MACHINE_CONFIG_START(deadang_state::deadang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL(16'000'000)/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", V30,XTAL(16'000'000)/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer1", deadang_state, main_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", V30,XTAL(16'000'000)/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", V30,XTAL(16'000'000)/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer2", deadang_state, sub_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_OPCODES_MAP(sound_decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_OPCODES_MAP(sound_decrypted_opcodes_map)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_ROM("audiocpu")
@@ -310,20 +310,20 @@ MACHINE_CONFIG_START(deadang_state::deadang)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ym1", ym2203_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ym1", ym2203_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ym1", ym2203_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ym1", ym2203_device, write))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(14'318'181)/4)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(14'318'181)/4)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(14'318'181)/4)
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000)
+ MCFG_DEVICE_ADD("adpcm1", SEIBU_ADPCM, 8000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000)
+ MCFG_DEVICE_ADD("adpcm2", SEIBU_ADPCM, 8000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index 2f3e3252d64..5f97b6877d5 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -1643,12 +1643,12 @@ MACHINE_CONFIG_START(dec0_state::dec0)
dec0_base(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(dec0_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_assert) /* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(dec0_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_assert) /* VBL */
- MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, XTAL(12'000'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(dec0_s_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0)
@@ -1659,13 +1659,13 @@ MACHINE_CONFIG_START(dec0_state::dec0)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000) / 8)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000) / 4)
+ MCFG_DEVICE_ADD("ym2", YM3812, XTAL(12'000'000) / 4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -1688,13 +1688,13 @@ MACHINE_CONFIG_START(dec0_state::dec1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM3812, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -1734,12 +1734,12 @@ WRITE_LINE_MEMBER(dec0_automat_state::msm2_vclk_cb)
MACHINE_CONFIG_START(dec0_automat_state::automat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(automat_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(automat_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 3000000)// ?
- MCFG_CPU_PROGRAM_MAP(automat_s_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)// ?
+ MCFG_DEVICE_PROGRAM_MAP(automat_s_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma)
@@ -1776,31 +1776,31 @@ MACHINE_CONFIG_START(dec0_automat_state::automat)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("2203a", YM2203, 1250000)
+ MCFG_DEVICE_ADD("2203a", YM2203, 1250000)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MCFG_SOUND_ADD("2203b", YM2203, 1250000)
+ MCFG_DEVICE_ADD("2203b", YM2203, 1250000)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
MCFG_DEVICE_ADD("adpcm_select1", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm1", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm1", msm5205_device, data_w))
MCFG_DEVICE_ADD("adpcm_select2", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm2", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm2", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm1_vclk_cb))
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm1_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm2_vclk_cb))
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm2_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1809,12 +1809,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_automat_state::secretab)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MCFG_CPU_PROGRAM_MAP(secretab_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(secretab_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 3000000)// ?
- MCFG_CPU_PROGRAM_MAP(secretab_s_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)// ?
+ MCFG_DEVICE_PROGRAM_MAP(secretab_s_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(dec0_state,dec0_nodma)
@@ -1851,28 +1851,28 @@ MACHINE_CONFIG_START(dec0_automat_state::secretab)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("2203a", YM2203, 1250000)
+ MCFG_DEVICE_ADD("2203a", YM2203, 1250000)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MCFG_SOUND_ROUTE(1, "mono", 0.90)
MCFG_SOUND_ROUTE(2, "mono", 0.90)
MCFG_SOUND_ROUTE(3, "mono", 0.35)
- MCFG_SOUND_ADD("ym3812", YM3812, 2500000)
+ MCFG_DEVICE_ADD("ym3812", YM3812, 2500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_DEVICE_ADD("adpcm_select1", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm1", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm1", msm5205_device, data_w))
MCFG_DEVICE_ADD("adpcm_select2", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm2", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm2", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm1_vclk_cb))
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm1_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm2_vclk_cb))
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec0_automat_state, msm2_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1881,12 +1881,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::hbarrel)
dec0(config);
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec0_state, dec0_mcu_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec0_state, dec0_mcu_port0_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec0_state, dec0_mcu_port1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec0_state, dec0_mcu_port2_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(dec0_state, dec0_mcu_port3_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec0_state, dec0_mcu_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port0_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port2_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port3_w))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1896,12 +1896,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::baddudes)
dec0(config);
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec0_state, dec0_mcu_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec0_state, dec0_mcu_port0_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec0_state, dec0_mcu_port1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec0_state, dec0_mcu_port2_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(dec0_state, dec0_mcu_port3_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec0_state, dec0_mcu_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port0_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port2_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, dec0_state, dec0_mcu_port3_w))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1927,8 +1927,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::robocop)
dec0(config);
- MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16)
- MCFG_CPU_PROGRAM_MAP(robocop_sub_map)
+ MCFG_DEVICE_ADD("sub", H6280, XTAL(21'477'272) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(robocop_sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(3000)) /* Interleave between HuC6280 & 68000 */
@@ -1948,8 +1948,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::hippodrm)
dec0(config);
- MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16)
- MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map)
+ MCFG_DEVICE_ADD("sub", H6280, XTAL(21'477'272) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(hippodrm_sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */
@@ -1961,8 +1961,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::ffantasybl)
dec0(config);
-// MCFG_CPU_ADD("sub", H6280, XTAL(21'477'272) / 16)
-// MCFG_CPU_PROGRAM_MAP(hippodrm_sub_map)
+// MCFG_DEVICE_ADD("sub", H6280, XTAL(21'477'272) / 16)
+// MCFG_DEVICE_PROGRAM_MAP(hippodrm_sub_map)
// MCFG_QUANTUM_TIME(attotime::from_hz(300)) /* Interleave between H6280 & 68000 */
@@ -1984,13 +1984,13 @@ MACHINE_CONFIG_START(dec0_state::slyspy)
dec1(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MCFG_CPU_PROGRAM_MAP(slyspy_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold) /* VBL, apparently it auto-acks */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(slyspy_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold) /* VBL, apparently it auto-acks */
// TODO: both games doesn't like /3 here, MT #06740
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(12'000'000)/2/2) /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */
- MCFG_CPU_PROGRAM_MAP(slyspy_s_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(12'000'000)/2/2) /* verified on pcb (6Mhz is XIN on pin 10 of H6280) */
+ MCFG_DEVICE_PROGRAM_MAP(slyspy_s_map)
MCFG_DEVICE_ADD("pfprotect", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(slyspy_protection_map)
@@ -2018,12 +2018,12 @@ MACHINE_CONFIG_START(dec0_state::midres)
dec1(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
- MCFG_CPU_PROGRAM_MAP(midres_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(midres_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dec0_state, irq6_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(midres_s_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(24'000'000)/4/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(midres_s_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2034,15 +2034,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec0_state::midresb)
midres(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(midresb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(midresb_map)
- MCFG_CPU_REPLACE("audiocpu", M6502, 1500000 )
- MCFG_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_DEVICE_REPLACE("audiocpu", M6502, 1500000 )
+ MCFG_DEVICE_PROGRAM_MAP(dec0_s_map)
- MCFG_CPU_ADD("mcu", M68705R3, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("mcu", M68705R3, XTAL(3'579'545))
- MCFG_SOUND_MODIFY("ym2")
+ MCFG_DEVICE_MODIFY("ym2")
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index 6cd1c1dca0a..9f6800fff72 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -1950,14 +1950,14 @@ void dec8_state::machine_reset()
MACHINE_CONFIG_START(dec8_state::lastmisn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(lastmisn_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(lastmisn_map)
- MCFG_CPU_ADD("sub", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(lastmisn_sub_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(lastmisn_sub_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000)
- MCFG_CPU_PROGRAM_MAP(ym3526_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(ym3526_s_map)
/* NMIs are caused by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -1989,13 +1989,13 @@ MACHINE_CONFIG_START(dec8_state::lastmisn)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2003,29 +2003,29 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::shackled)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(shackled_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(shackled_map)
- MCFG_CPU_ADD("sub", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(shackled_sub_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(shackled_sub_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000)
- MCFG_CPU_PROGRAM_MAP(ym3526_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(ym3526_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec8_state, i8751_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec8_state, i8751_port0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(dec8_state, i8751_port1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec8_state, i8751_port1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec8_state, shackled_mcu_to_main_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec8_state, i8751_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec8_state, i8751_port0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, dec8_state, i8751_port1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec8_state, i8751_port1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec8_state, shackled_mcu_to_main_w))
MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751"))
// MCFG_QUANTUM_TIME(attotime::from_hz(100000))
MCFG_QUANTUM_PERFECT_CPU("maincpu") // needs heavy sync, otherwise one of the two CPUs will miss an irq and makes the game to hang
MCFG_INPUT_MERGER_ANY_LOW("coin")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(dec8_state, shackled_coin_irq))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, dec8_state, shackled_coin_irq))
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
@@ -2054,13 +2054,13 @@ MACHINE_CONFIG_START(dec8_state::shackled)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2068,19 +2068,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::gondo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E,3000000) /* HD63C09EP */
- MCFG_CPU_PROGRAM_MAP(gondo_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E,3000000) /* HD63C09EP */
+ MCFG_DEVICE_PROGRAM_MAP(gondo_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000)
- MCFG_CPU_PROGRAM_MAP(oscar_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec8_state, i8751_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec8_state, i8751_port0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(dec8_state, i8751_port1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec8_state, i8751_port1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec8_state, gondo_mcu_to_main_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec8_state, i8751_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec8_state, i8751_port0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, dec8_state, i8751_port1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec8_state, i8751_port1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec8_state, gondo_mcu_to_main_w))
MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751"))
/* video hardware */
@@ -2097,8 +2097,8 @@ MACHINE_CONFIG_START(dec8_state::gondo)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_RAW_PARAMS_DATA_EAST
MCFG_SCREEN_UPDATE_DRIVER(dec8_state, screen_update_gondo)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dec8_state, screen_vblank_dec8))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("nmigate", input_merger_device, in_w<1>))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dec8_state, screen_vblank_dec8))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("nmigate", input_merger_device, in_w<1>))
MCFG_SCREEN_PALETTE("palette")
MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
@@ -2115,13 +2115,13 @@ MACHINE_CONFIG_START(dec8_state::gondo)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2129,19 +2129,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::garyoret)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E,3000000) /* HD63C09EP */
- MCFG_CPU_PROGRAM_MAP(garyoret_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E,3000000) /* HD63C09EP */
+ MCFG_DEVICE_PROGRAM_MAP(garyoret_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000)
- MCFG_CPU_PROGRAM_MAP(oscar_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec8_state, i8751_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec8_state, i8751_port0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(dec8_state, i8751_port1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec8_state, i8751_port1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec8_state, gondo_mcu_to_main_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec8_state, i8751_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec8_state, i8751_port0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, dec8_state, i8751_port1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec8_state, i8751_port1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec8_state, gondo_mcu_to_main_w))
MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751"))
/* video hardware */
@@ -2158,8 +2158,8 @@ MACHINE_CONFIG_START(dec8_state::garyoret)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_RAW_PARAMS_DATA_EAST
MCFG_SCREEN_UPDATE_DRIVER(dec8_state, screen_update_garyoret)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dec8_state, screen_vblank_dec8))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("nmigate", input_merger_device, in_w<1>))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dec8_state, screen_vblank_dec8))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("nmigate", input_merger_device, in_w<1>))
MCFG_SCREEN_PALETTE("palette")
MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
@@ -2176,13 +2176,13 @@ MACHINE_CONFIG_START(dec8_state::garyoret)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2190,19 +2190,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::ghostb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, 3000000) /* HD63C09EP */
- MCFG_CPU_PROGRAM_MAP(meikyuh_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, 3000000) /* HD63C09EP */
+ MCFG_DEVICE_PROGRAM_MAP(meikyuh_map)
- MCFG_CPU_ADD("audiocpu", DECO_222, 1500000)
- MCFG_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_DEVICE_ADD("audiocpu", DECO_222, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, 3000000*4)
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec8_state, i8751_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec8_state, i8751_port0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(dec8_state, i8751_port1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(dec8_state, i8751_port1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec8_state, gondo_mcu_to_main_w))
+ MCFG_DEVICE_ADD("mcu", I8751, 3000000*4)
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec8_state, i8751_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec8_state, i8751_port0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, dec8_state, i8751_port1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, dec8_state, i8751_port1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec8_state, gondo_mcu_to_main_w))
MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751"))
/* video hardware */
@@ -2223,8 +2223,8 @@ MACHINE_CONFIG_START(dec8_state::ghostb)
// MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_RAW_PARAMS_DATA_EAST
MCFG_SCREEN_UPDATE_DRIVER(dec8_state, screen_update_ghostb)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dec8_state, screen_vblank_dec8))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(dec8_state, ghostb_nmi_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dec8_state, screen_vblank_dec8))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, dec8_state, ghostb_nmi_w))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ghostb)
@@ -2236,34 +2236,34 @@ MACHINE_CONFIG_START(dec8_state::ghostb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3812, 3000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::meikyuh)
ghostb(config);
- MCFG_CPU_REPLACE("audiocpu", M6502, 1500000)
- MCFG_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_DEVICE_REPLACE("audiocpu", M6502, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(dec8_s_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::csilver)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(csilver_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(csilver_map)
- MCFG_CPU_ADD("sub", MC6809E, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(csilver_sub_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(csilver_sub_map)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(csilver_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(csilver_s_map)
/* NMIs are caused by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -2296,18 +2296,18 @@ MACHINE_CONFIG_START(dec8_state::csilver)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM3526, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
- MCFG_MSM5205_VCLK_CB(WRITELINE(dec8_state, csilver_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dec8_state, csilver_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88)
MACHINE_CONFIG_END
@@ -2315,19 +2315,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::oscar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL(12'000'000)/2) /* PCB seen both HD6309 or MC6809, clock verified on pcb */
- MCFG_CPU_PROGRAM_MAP(oscar_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309, XTAL(12'000'000)/2) /* PCB seen both HD6309 or MC6809, clock verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(oscar_map)
- MCFG_CPU_ADD("sub", HD6309, XTAL(12'000'000)/2) /* PCB seen both HD6309 or MC6809, clock verified on pcb */
- MCFG_CPU_PROGRAM_MAP(oscar_sub_map)
+ MCFG_DEVICE_ADD("sub", HD6309, XTAL(12'000'000)/2) /* PCB seen both HD6309 or MC6809, clock verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(oscar_sub_map)
- MCFG_CPU_ADD("audiocpu", DECO_222, XTAL(12'000'000)/8) // IC labeled "C10707-1"
- MCFG_CPU_PROGRAM_MAP(oscar_s_map)
+ MCFG_DEVICE_ADD("audiocpu", DECO_222, XTAL(12'000'000)/8) // IC labeled "C10707-1"
+ MCFG_DEVICE_PROGRAM_MAP(oscar_s_map)
/* NMIs are caused by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(2400)) /* 40 CPU slices per frame */
MCFG_INPUT_MERGER_ANY_LOW("coin") // 1S1588 x3 (D1-D3) + RCDM-I5
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(dec8_state, oscar_coin_irq))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, dec8_state, oscar_coin_irq))
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
@@ -2361,13 +2361,13 @@ MACHINE_CONFIG_START(dec8_state::oscar)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", m6502_device::NMI_LINE))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM3526, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2375,17 +2375,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::srdarwin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) /* MC68A09EP */
- MCFG_CPU_PROGRAM_MAP(srdarwin_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) /* MC68A09EP */
+ MCFG_DEVICE_PROGRAM_MAP(srdarwin_map)
- MCFG_CPU_ADD("audiocpu", DECO_222, 1500000)
- MCFG_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_DEVICE_ADD("audiocpu", DECO_222, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000)) /* unknown frequency */
- MCFG_MCS51_PORT_P0_IN_CB(READ8(dec8_state, i8751_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(dec8_state, i8751_port0_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(dec8_state, srdarwin_mcu_to_main_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000)) /* unknown frequency */
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, dec8_state, i8751_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, dec8_state, i8751_port0_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, dec8_state, srdarwin_mcu_to_main_w))
MCFG_MCS51_PORT_P3_IN_CB(IOPORT("I8751"))
MCFG_QUANTUM_PERFECT_CPU("maincpu") /* needed for stability with emulated MCU or sometimes commands get missed and game crashes at bosses */
@@ -2414,13 +2414,13 @@ MACHINE_CONFIG_START(dec8_state::srdarwin)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.23)
MCFG_SOUND_ROUTE(1, "mono", 0.23)
MCFG_SOUND_ROUTE(2, "mono", 0.23)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3812, 3000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -2428,11 +2428,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dec8_state::cobracom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) /* MC68B09EP */
- MCFG_CPU_PROGRAM_MAP(cobra_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) /* MC68B09EP */
+ MCFG_DEVICE_PROGRAM_MAP(cobra_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000)
- MCFG_CPU_PROGRAM_MAP(dec8_s_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(dec8_s_map)
/* NMIs are caused by the main CPU */
/* video hardware */
@@ -2471,13 +2471,13 @@ MACHINE_CONFIG_START(dec8_state::cobracom)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.53)
MCFG_SOUND_ROUTE(1, "mono", 0.53)
MCFG_SOUND_ROUTE(2, "mono", 0.53)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3812, 3000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp
index ebc2dea55bb..f4713b594a2 100644
--- a/src/mame/drivers/deco156.cpp
+++ b/src/mame/drivers/deco156.cpp
@@ -330,9 +330,9 @@ DECOSPR_PRIORITY_CB_MEMBER(deco156_state::pri_callback)
MACHINE_CONFIG_START(deco156_state::hvysmsh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
- MCFG_CPU_PROGRAM_MAP(hvysmsh_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deco156_state, deco32_vbl_interrupt)
+ MCFG_DEVICE_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
+ MCFG_DEVICE_PROGRAM_MAP(hvysmsh_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco156_state, deco32_vbl_interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -383,9 +383,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(deco156_state::wcvol95)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
- MCFG_CPU_PROGRAM_MAP(wcvol95_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deco156_state, deco32_vbl_interrupt)
+ MCFG_DEVICE_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
+ MCFG_DEVICE_PROGRAM_MAP(wcvol95_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco156_state, deco32_vbl_interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -424,7 +424,7 @@ MACHINE_CONFIG_START(deco156_state::wcvol95)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 28000000 / 2)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 28000000 / 2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp
index 38a6ff5bd0b..0c7d41a92da 100644
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@@ -1879,18 +1879,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(captaven_state::captaven)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000)/4) /* verified on pcb (Data East 101 custom)*/
- MCFG_CPU_PROGRAM_MAP(captaven_map)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000)/4) /* verified on pcb (Data East 101 custom)*/
+ MCFG_DEVICE_PROGRAM_MAP(captaven_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(h6280_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* pin 10 is 32mhz/4, pin 14 is High so internal divisor is 3 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map)
MCFG_INPUT_MERGER_ANY_HIGH("irq_merger")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", ARM_IRQ_LINE))
MCFG_DECO_IRQ_ADD("irq", "screen")
- MCFG_DECO_IRQ_RASTER2_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<0>))
- MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
+ MCFG_DECO_IRQ_RASTER2_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<0>))
+ MCFG_DECO_IRQ_VBLANK_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
@@ -1949,7 +1949,7 @@ MACHINE_CONFIG_START(captaven_state::captaven)
MCFG_YM2151_ADD("ymsnd", XTAL(32'220'000)/9) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
@@ -1964,12 +1964,12 @@ MACHINE_CONFIG_END
// DE-0380-2
MACHINE_CONFIG_START(fghthist_state::fghthist)
- MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(fghthist_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(fghthist_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
- MCFG_CPU_PROGRAM_MAP(h6280_sound_custom_latch_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(h6280_sound_custom_latch_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2018,7 +2018,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist)
MCFG_DECO146_ADD("ioprot")
MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_DECO146_IN_PORTB_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0)
+ MCFG_DECO146_IN_PORTB_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0)
MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1"))
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
MCFG_DECO146_SET_USE_MAGIC_ADDRESS_XOR
@@ -2033,7 +2033,7 @@ MACHINE_CONFIG_START(fghthist_state::fghthist)
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
@@ -2049,11 +2049,11 @@ MACHINE_CONFIG_END
// DE-0395-1
MACHINE_CONFIG_START(fghthist_state::fghthsta)
fghthist(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fghthsta_memmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fghthsta_memmap)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(h6280_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map)
MCFG_DEVICE_REMOVE("soundlatch")
@@ -2066,18 +2066,18 @@ MACHINE_CONFIG_START(fghthist_state::fghthistu)
fghthsta(config);
MCFG_DEVICE_REMOVE("audiocpu")
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'220'000) / 9)
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_IO_MAP(z80_sound_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'220'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_IO_MAP(z80_sound_io)
MCFG_INPUT_MERGER_ANY_HIGH("sound_irq_merger")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_MODIFY("ioprot")
- MCFG_DECO146_SOUNDLATCH_IRQ_CB(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>))
+ MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>))
- MCFG_SOUND_MODIFY("ymsnd")
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>))
+ MCFG_DEVICE_MODIFY("ymsnd")
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
@@ -2087,18 +2087,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dragngun_state::dragngun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(dragngun_map)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(dragngun_map)
- MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
- MCFG_CPU_PROGRAM_MAP(h6280_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, 32220000/8)
+ MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map)
MCFG_INPUT_MERGER_ANY_HIGH("irq_merger")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", ARM_IRQ_LINE))
MCFG_DECO_IRQ_ADD("irq", "screen")
- MCFG_DECO_IRQ_RASTER2_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<0>))
- MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
+ MCFG_DECO_IRQ_RASTER2_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<0>))
+ MCFG_DECO_IRQ_VBLANK_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2162,7 +2162,7 @@ MACHINE_CONFIG_START(dragngun_state::dragngun)
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
@@ -2190,36 +2190,36 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dragngun_state::lockloadu)
dragngun(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lockloadu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lockloadu_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(lockloadu_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(lockloadu_sound_map)
MCFG_DEVICE_MODIFY("irq")
- MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<2>))
+ MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<2>))
MCFG_DEVICE_MODIFY("tilegen2")
MCFG_DECO16IC_PF1_SIZE(DECO_32x32)
MCFG_DECO16IC_PF2_SIZE(DECO_32x32) // lockload definitely wants pf34 half width..
- MCFG_SOUND_MODIFY("ymsnd")
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(dragngun_state, lockload_okibank_lo_w))
+ MCFG_DEVICE_MODIFY("ymsnd")
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dragngun_state, lockload_okibank_lo_w))
MACHINE_CONFIG_END
// DE-0420-1 + Bottom board DE-0421-0
MACHINE_CONFIG_START(dragngun_state::lockload)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(lockload_map)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(lockload_map)
MCFG_INPUT_MERGER_ANY_HIGH("irq_merger")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", ARM_IRQ_LINE))
- MCFG_CPU_ADD("audiocpu", Z80, 32220000/8)
- MCFG_CPU_PROGRAM_MAP(lockload_sound_map)
- MCFG_CPU_IO_MAP(z80_sound_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 32220000/8)
+ MCFG_DEVICE_PROGRAM_MAP(lockload_sound_map)
+ MCFG_DEVICE_IO_MAP(z80_sound_io)
MCFG_INPUT_MERGER_ANY_HIGH("sound_irq_merger")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
@@ -2227,9 +2227,9 @@ MACHINE_CONFIG_START(dragngun_state::lockload)
MCFG_DECO_IRQ_ADD("irq", "screen")
MCFG_DECO_IRQ_LIGHTGUN1_CB(IOPORT("LIGHT0_Y"))
MCFG_DECO_IRQ_LIGHTGUN2_CB(IOPORT("LIGHT1_Y"))
- MCFG_DECO_IRQ_RASTER2_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<0>))
- MCFG_DECO_IRQ_VBLANK_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
- MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(DEVWRITELINE("irq_merger", input_merger_any_high_device, in_w<2>))
+ MCFG_DECO_IRQ_RASTER2_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<0>))
+ MCFG_DECO_IRQ_VBLANK_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<1>))
+ MCFG_DECO_IRQ_LIGHTGUN_IRQ_CB(WRITELINE("irq_merger", input_merger_any_high_device, in_w<2>))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* to improve main<->audio comms */
@@ -2286,15 +2286,15 @@ MACHINE_CONFIG_START(dragngun_state::lockload)
MCFG_DECO146_IN_PORTA_CB(IOPORT("INPUTS"))
MCFG_DECO146_IN_PORTB_CB(IOPORT("SYSTEM"))
MCFG_DECO146_IN_PORTC_CB(IOPORT("DSW"))
- MCFG_DECO146_SOUNDLATCH_IRQ_CB(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>))
+ MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>))
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_REVERSE
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ymsnd", 32220000/9)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(dragngun_state, lockload_okibank_lo_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, dragngun_state, lockload_okibank_lo_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
@@ -2314,9 +2314,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nslasher_state::tattass)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, 28000000/4) // unconfirmed
- MCFG_CPU_PROGRAM_MAP(tattass_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", ARM, 28000000/4) // unconfirmed
+ MCFG_DEVICE_PROGRAM_MAP(tattass_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom")
@@ -2372,9 +2372,9 @@ MACHINE_CONFIG_START(nslasher_state::tattass)
MCFG_DECO104_ADD("ioprot")
MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_DECO146_IN_PORTB_CB(READ16(nslasher_state, port_b_tattass))
+ MCFG_DECO146_IN_PORTB_CB(READ16(*this, nslasher_state, port_b_tattass))
MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1"))
- MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(nslasher_state, tattass_sound_irq_w))
+ MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE(*this, nslasher_state, tattass_sound_irq_w))
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
MCFG_VIDEO_START_OVERRIDE(nslasher_state,nslasher)
@@ -2386,13 +2386,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nslasher_state::nslasher)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, XTAL(28'322'000) / 4)
- MCFG_CPU_PROGRAM_MAP(nslasher_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'322'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(nslasher_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco32_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 32220000/9)
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_IO_MAP(z80_sound_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 32220000/9)
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_IO_MAP(z80_sound_io)
MCFG_INPUT_MERGER_ANY_HIGH("sound_irq_merger")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
@@ -2455,17 +2455,17 @@ MACHINE_CONFIG_START(nslasher_state::nslasher)
MCFG_DECO104_ADD("ioprot")
MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_DECO146_IN_PORTB_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0)
+ MCFG_DECO146_IN_PORTB_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0)
MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1"))
- MCFG_DECO146_SOUNDLATCH_IRQ_CB(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>))
+ MCFG_DECO146_SOUNDLATCH_IRQ_CB(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<0>))
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ymsnd", 32220000/9)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(deco32_state, sound_bankswitch_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("sound_irq_merger", input_merger_any_high_device, in_w<1>))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, deco32_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
@@ -2481,16 +2481,16 @@ MACHINE_CONFIG_END
// the US release uses a H6280 instead of a Z80, much like Lock 'n' Loaded
MACHINE_CONFIG_START(nslasher_state::nslasheru)
nslasher(config);
- MCFG_CPU_REPLACE("audiocpu", H6280, 32220000/8)
- MCFG_CPU_PROGRAM_MAP(h6280_sound_map)
+ MCFG_DEVICE_REPLACE("audiocpu", H6280, 32220000/8)
+ MCFG_DEVICE_PROGRAM_MAP(h6280_sound_map)
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
MCFG_DEVICE_REMOVE("ioprot")
MCFG_DECO104_ADD("ioprot")
MCFG_DECO146_IN_PORTA_CB(IOPORT("IN0"))
- MCFG_DECO146_IN_PORTB_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0)
+ MCFG_DECO146_IN_PORTB_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(0)
MCFG_DECO146_IN_PORTC_CB(IOPORT("IN1"))
MCFG_DECO146_SOUNDLATCH_IRQ_CB(INPUTLINE("audiocpu", 0))
MCFG_DECO146_SET_INTERFACE_SCRAMBLE_INTERLEAVE
diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp
index 8f2a2b1cf5b..2a11657f3f0 100644
--- a/src/mame/drivers/deco_ld.cpp
+++ b/src/mame/drivers/deco_ld.cpp
@@ -463,13 +463,13 @@ void deco_ld_state::machine_start()
MACHINE_CONFIG_START(deco_ld_state::rblaster)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502,8000000/2)
- MCFG_CPU_PROGRAM_MAP(rblaster_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deco_ld_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M6502,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(rblaster_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deco_ld_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu",M6502,8000000/2)
- MCFG_CPU_PROGRAM_MAP(rblaster_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(deco_ld_state, sound_interrupt, 640)
+ MCFG_DEVICE_ADD("audiocpu",M6502,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(rblaster_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(deco_ld_state, sound_interrupt, 640)
// MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -485,8 +485,8 @@ MACHINE_CONFIG_START(deco_ld_state::rblaster)
MCFG_PALETTE_FORMAT(BBGGGRRR_inverted)
//MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- //MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("laserdisc", sony_ldp1000_device, write))
- //MCFG_ACIA6850_RXD_HANDLER(DEVREADLINE("laserdisc", sony_ldp1000_device, read))
+ //MCFG_ACIA6850_TXD_HANDLER(WRITELINE("laserdisc", sony_ldp1000_device, write))
+ //MCFG_ACIA6850_RXD_HANDLER(READLINE("laserdisc", sony_ldp1000_device, read))
/* sound hardware */
/* TODO: mixing */
@@ -495,15 +495,15 @@ MACHINE_CONFIG_START(deco_ld_state::rblaster)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp
index 35e6a8d004d..16647c2c66c 100644
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@@ -512,8 +512,8 @@ MACHINE_RESET_MEMBER(deco_mlc_state,mlc)
MACHINE_CONFIG_START(deco_mlc_state::avengrgs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
- MCFG_CPU_PROGRAM_MAP(avengrgs_map)
+ MCFG_DEVICE_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
+ MCFG_DEVICE_PROGRAM_MAP(avengrgs_map)
MCFG_MACHINE_RESET_OVERRIDE(deco_mlc_state,mlc)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually 93c45 */
@@ -526,7 +526,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(deco_mlc_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(deco_mlc_state, screen_vblank_mlc))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, deco_mlc_state, screen_vblank_mlc))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", deco_mlc)
@@ -539,7 +539,7 @@ MACHINE_CONFIG_START(deco_mlc_state::avengrgs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 42000000 / 3)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -547,8 +547,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(deco_mlc_state::mlc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
- MCFG_CPU_PROGRAM_MAP(decomlc_map)
+ MCFG_DEVICE_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
+ MCFG_DEVICE_PROGRAM_MAP(decomlc_map)
MCFG_MACHINE_RESET_OVERRIDE(deco_mlc_state,mlc)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") /* Actually 93c45 */
@@ -561,7 +561,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(deco_mlc_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(deco_mlc_state, screen_vblank_mlc))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, deco_mlc_state, screen_vblank_mlc))
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", deco_mlc)
@@ -577,7 +577,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 42000000 / 3)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 42000000 / 3)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -592,7 +592,7 @@ MACHINE_CONFIG_START(deco_mlc_state::mlc_5bpp)
MCFG_GFXDECODE_MODIFY("gfxdecode", 5bpp)
// TODO: mono? ch.0 doesn't output any sound in-game
- MCFG_SOUND_MODIFY("ymz")
+ MCFG_DEVICE_MODIFY("ymz")
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index a9d3229cfd2..8f727ce1ba9 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -955,18 +955,18 @@ PALETTE_INIT_MEMBER(decocass_state, decocass)
MACHINE_CONFIG_START(decocass_state::decocass)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO_222, HCLK4) /* the earlier revision board doesn't have the 222 but must have the same thing implemented in logic for the M6502 */
- MCFG_CPU_PROGRAM_MAP(decocass_map)
+ MCFG_DEVICE_ADD("maincpu", DECO_222, HCLK4) /* the earlier revision board doesn't have the 222 but must have the same thing implemented in logic for the M6502 */
+ MCFG_DEVICE_PROGRAM_MAP(decocass_map)
- MCFG_CPU_ADD("audiocpu", M6502, HCLK1/3/2)
- MCFG_CPU_PROGRAM_MAP(decocass_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, HCLK1/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(decocass_sound_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("audionmi", decocass_state, decocass_audio_nmi_gen, "screen", 0, 8)
- MCFG_CPU_ADD("mcu", I8041, HCLK)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(decocass_state, i8041_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(decocass_state, i8041_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(decocass_state, i8041_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(decocass_state, i8041_p2_w))
+ MCFG_DEVICE_ADD("mcu", I8041, HCLK)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, decocass_state, i8041_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, decocass_state, i8041_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, decocass_state, i8041_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, decocass_state, i8041_p2_w))
MCFG_QUANTUM_TIME(attotime::from_hz(4200)) /* interleave CPUs */
@@ -991,10 +991,10 @@ MACHINE_CONFIG_START(decocass_state::decocass)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, HCLK2)
+ MCFG_DEVICE_ADD("ay1", AY8910, HCLK2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay2", AY8910, HCLK2)
+ MCFG_DEVICE_ADD("ay2", AY8910, HCLK2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index dcc5fcfb179..a0dd4d88229 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -877,19 +877,19 @@ TIMER_CALLBACK_MEMBER(dectalk_state::outfifo_read_cb)
MACHINE_CONFIG_START(dectalk_state::dectalk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* E74 20MHz OSC (/2) */
- MCFG_CPU_PROGRAM_MAP(m68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* E74 20MHz OSC (/2) */
+ MCFG_DEVICE_PROGRAM_MAP(m68k_mem)
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) // MC2681 DUART ; Y3 3.6864MHz xtal */
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(dectalk_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(dectalk_state, duart_txa))
- MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MC68681_INPORT_CALLBACK(READ8(dectalk_state, duart_input))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(dectalk_state, duart_output))
-
- MCFG_CPU_ADD("dsp", TMS32010, XTAL(20'000'000)) /* Y1 20MHz xtal */
- MCFG_CPU_PROGRAM_MAP(tms32010_mem)
- MCFG_CPU_IO_MAP(tms32010_io)
- MCFG_TMS32010_BIO_IN_CB(READLINE(dectalk_state, spc_semaphore_r)) //read infifo-has-data-in-it fifo readable status
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, dectalk_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, dectalk_state, duart_txa))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68681_INPORT_CALLBACK(READ8(*this, dectalk_state, duart_input))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, dectalk_state, duart_output))
+
+ MCFG_DEVICE_ADD("dsp", TMS32010, XTAL(20'000'000)) /* Y1 20MHz xtal */
+ MCFG_DEVICE_PROGRAM_MAP(tms32010_mem)
+ MCFG_DEVICE_IO_MAP(tms32010_io)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, dectalk_state, spc_semaphore_r)) //read infifo-has-data-in-it fifo readable status
#ifdef USE_LOOSE_TIMING
MCFG_QUANTUM_TIME(attotime::from_hz(100))
#else
@@ -902,14 +902,14 @@ MACHINE_CONFIG_START(dectalk_state::dectalk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", AD7541, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9) // ad7541.e107 (E88 10KHz OSC, handled by timer)
+ MCFG_DEVICE_ADD("dac", AD7541, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9) // ad7541.e107 (E88 10KHz OSC, handled by timer)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
/* Y2 is a 3.579545 MHz xtal for the dtmf decoder chip */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_b_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_b_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index 1dc8b4e2051..7926b051f1a 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -415,9 +415,9 @@ void decwriter_state::machine_reset()
MACHINE_CONFIG_START(decwriter_state::la120)
- MCFG_CPU_ADD("maincpu",I8080, XTAL(18'000'000) / 9) // 18Mhz xtal on schematics, using an i8224 clock divider/reset sanitizer IC
- MCFG_CPU_PROGRAM_MAP(la120_mem)
- MCFG_CPU_IO_MAP(la120_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(18'000'000) / 9) // 18Mhz xtal on schematics, using an i8224 clock divider/reset sanitizer IC
+ MCFG_DEVICE_PROGRAM_MAP(la120_mem)
+ MCFG_DEVICE_IO_MAP(la120_io)
/* video hardware */
//TODO: no actual screen! has 8 leds above the keyboard (similar to vt100/vk100) and has 4 7segment leds for showing an error code.
@@ -431,23 +431,23 @@ MACHINE_CONFIG_START(decwriter_state::la120)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 786) // TODO: LA120 speaker is controlled by asic; VT100 has: 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
+ MCFG_DEVICE_ADD("beeper", BEEP, 786) // TODO: LA120 speaker is controlled by asic; VT100 has: 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* i8251 */
MCFG_DEVICE_ADD("i8251", I8251, 0)
/*
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_dsr))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251", i8251_device, write_dsr))
MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("i8251", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("i8251", i8251_device, write_txc))
*/
MCFG_DEVICE_ADD("nvm", ER1400, 0)
diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp
index 1179d5ac987..0f2c879237a 100644
--- a/src/mame/drivers/deniam.cpp
+++ b/src/mame/drivers/deniam.cpp
@@ -253,13 +253,13 @@ void deniam_state::machine_reset()
MACHINE_CONFIG_START(deniam_state::deniam16b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(25'000'000)/2) /* 12.5Mhz verified */
- MCFG_CPU_PROGRAM_MAP(deniam16b_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deniam_state, irq4_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(25'000'000)/2) /* 12.5Mhz verified */
+ MCFG_DEVICE_PROGRAM_MAP(deniam16b_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deniam_state, irq4_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(25'000'000)/4) /* 6.25Mhz verified */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(25'000'000)/4) /* 6.25Mhz verified */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* video hardware */
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(deniam_state::deniam16b)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(25'000'000)/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(25'000'000)/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
@@ -293,9 +293,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(deniam_state::deniam16c)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(25'000'000)/2) /* 12.5Mhz verified */
- MCFG_CPU_PROGRAM_MAP(deniam16c_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", deniam_state, irq4_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(25'000'000)/2) /* 12.5Mhz verified */
+ MCFG_DEVICE_PROGRAM_MAP(deniam16c_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", deniam_state, irq4_line_assert)
/* video hardware */
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(deniam_state::deniam16c)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(25'000'000)/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(25'000'000)/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_OKIM6295_ADD("oki", XTAL(25'000'000)/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp
index d1f41acdb92..81cc442b48d 100644
--- a/src/mame/drivers/deshoros.cpp
+++ b/src/mame/drivers/deshoros.cpp
@@ -267,9 +267,9 @@ void destiny_state::machine_reset()
MACHINE_CONFIG_START(destiny_state::destiny)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, XTAL(4'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(destiny_state, irq0_line_hold, 50) // timer irq controls update speed, frequency needs to be determined yet (2MHz through three 74LS390)
+ MCFG_DEVICE_ADD("maincpu", M6809, XTAL(4'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(destiny_state, irq0_line_hold, 50) // timer irq controls update speed, frequency needs to be determined yet (2MHz through three 74LS390)
/* video hardware (dummy) */
MCFG_SCREEN_ADD("screen", LCD)
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(destiny_state::destiny)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 800) // TODO: determine exact frequency thru schematics
+ MCFG_DEVICE_ADD("beeper", BEEP, 800) // TODO: determine exact frequency thru schematics
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index 549f7cc3c5c..1bd2168ab49 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -467,9 +467,9 @@ void destroyr_state::machine_start()
MACHINE_CONFIG_START(destroyr_state::destroyr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(12'096'000) / 16)
- MCFG_CPU_PROGRAM_MAP(destroyr_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(destroyr_state, irq0_line_assert, 4*60)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(12'096'000) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(destroyr_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(destroyr_state, irq0_line_assert, 4*60)
MCFG_DEVICE_ADD("outlatch", F9334, 0) // F8
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // LED 1
diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp
index 4c557c18291..707b425d5ca 100644
--- a/src/mame/drivers/dfruit.cpp
+++ b/src/mame/drivers/dfruit.cpp
@@ -373,8 +373,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(dfruit_state::dfruit_irq_scanline)
MACHINE_CONFIG_START(dfruit_state::dfruit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/2) //!!! TC0091LVC !!!
- MCFG_CPU_PROGRAM_MAP(dfruit_map)
+ MCFG_DEVICE_ADD("maincpu",Z80,MASTER_CLOCK/2) //!!! TC0091LVC !!!
+ MCFG_DEVICE_PROGRAM_MAP(dfruit_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dfruit_state, dfruit_irq_scanline, "screen", 0, 1)
//MCFG_MACHINE_START_OVERRIDE(dfruit_state,4enraya)
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(dfruit_state::dfruit)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(dfruit_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dfruit_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dfruit_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dfruit )
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(dfruit_state::dfruit)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("opn", YM2203, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("opn", YM2203, MASTER_CLOCK/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index e07012ac648..b2cfd307108 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -321,13 +321,13 @@ static void dgnbeta_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(dgnbeta_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(dgn_beta_state, dgnbeta_dasm_override)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dgnbeta_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(dgn_beta_state, dgnbeta_dasm_override)
/* both cpus in the beta share the same address/data buses */
- MCFG_CPU_ADD(DMACPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(dgnbeta_map)
+ MCFG_DEVICE_ADD(DMACPU_TAG, MC6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dgnbeta_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -344,37 +344,37 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
/* PIA 0 at $FC20-$FC23 I46 */
MCFG_DEVICE_ADD(PIA_0_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(dgn_beta_state, d_pia0_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(dgn_beta_state, d_pia0_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(dgn_beta_state, d_pia0_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(dgn_beta_state, d_pia0_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(dgn_beta_state, d_pia0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state, d_pia0_irq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state, d_pia0_irq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, dgn_beta_state, d_pia0_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, dgn_beta_state, d_pia0_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, dgn_beta_state, d_pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, dgn_beta_state, d_pia0_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia0_irq_b))
/* PIA 1 at $FC24-$FC27 I63 */
MCFG_DEVICE_ADD(PIA_1_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(dgn_beta_state, d_pia1_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(dgn_beta_state, d_pia1_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(dgn_beta_state, d_pia1_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(dgn_beta_state, d_pia1_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state, d_pia1_irq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state, d_pia1_irq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, dgn_beta_state, d_pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, dgn_beta_state, d_pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, dgn_beta_state, d_pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, dgn_beta_state, d_pia1_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia1_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia1_irq_b))
/* PIA 2 at FCC0-FCC3 I28 */
/* This seems to control the RAM paging system, and have the DRQ */
/* from the WD2797 */
MCFG_DEVICE_ADD(PIA_2_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(dgn_beta_state, d_pia2_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(dgn_beta_state, d_pia2_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(dgn_beta_state, d_pia2_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(dgn_beta_state, d_pia2_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state, d_pia2_irq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state, d_pia2_irq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, dgn_beta_state, d_pia2_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, dgn_beta_state, d_pia2_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, dgn_beta_state, d_pia2_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, dgn_beta_state, d_pia2_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia2_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, dgn_beta_state, d_pia2_irq_b))
MCFG_WD2797_ADD(FDC_TAG, XTAL(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dgn_beta_state, dgnbeta_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dgn_beta_state, dgnbeta_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, dgn_beta_state, dgnbeta_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dgn_beta_state, dgnbeta_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", dgnbeta_floppies, "dd", dgn_beta_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -389,7 +389,7 @@ MACHINE_CONFIG_START(dgn_beta_state::dgnbeta)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16) /*?*/
MCFG_MC6845_UPDATE_ROW_CB(dgn_beta_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(dgn_beta_state, dgnbeta_vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, dgn_beta_state, dgnbeta_vsync_changed))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp
index 790684a7441..42ead57bf81 100644
--- a/src/mame/drivers/dgpix.cpp
+++ b/src/mame/drivers/dgpix.cpp
@@ -428,9 +428,9 @@ void dgpix_state::machine_reset()
MACHINE_CONFIG_START(dgpix_state::dgpix)
- MCFG_CPU_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/*
unknown 16bit sound cpu, embedded inside the KS0164 sound chip
diff --git a/src/mame/drivers/diablo1300.cpp b/src/mame/drivers/diablo1300.cpp
index 7f0551c6f0b..40f995608b3 100644
--- a/src/mame/drivers/diablo1300.cpp
+++ b/src/mame/drivers/diablo1300.cpp
@@ -177,9 +177,9 @@ void diablo1300_state::machine_reset()
MACHINE_CONFIG_START( diablo1300_state::diablo1300 )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DIABLO1300, XTAL(1'689'600))
- MCFG_CPU_PROGRAM_MAP(diablo1300_map)
- MCFG_CPU_DATA_MAP(diablo1300_data_map)
+ MCFG_DEVICE_ADD("maincpu", DIABLO1300, XTAL(1'689'600))
+ MCFG_DEVICE_PROGRAM_MAP(diablo1300_map)
+ MCFG_DEVICE_DATA_MAP(diablo1300_data_map)
MACHINE_CONFIG_END
ROM_START( diablo )
diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp
index 1af37b93dc1..1ab136a588f 100644
--- a/src/mame/drivers/didact.cpp
+++ b/src/mame/drivers/didact.cpp
@@ -574,8 +574,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(didact_state::scan_artwork)
}
MACHINE_CONFIG_START(md6802_state::md6802)
- MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(md6802_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(md6802_map)
MCFG_DEFAULT_LAYOUT(layout_md6802)
/* Devices */
@@ -596,21 +596,21 @@ MACHINE_CONFIG_START(md6802_state::md6802)
/* 0xE068 0xC000 (Port A) = 0x60 */
/* 0xE08A 0xC002 (Port B) = 0xEE - updating display */
/* 0xE090 0xC000 (Port A) = 0x00 - looping in 0x10,0x20,0x30,0x40,0x50 */
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(md6802_state, pia2_kbA_w))
- MCFG_PIA_READPA_HANDLER(READ8(md6802_state, pia2_kbA_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(md6802_state, pia2_kbB_w))
- MCFG_PIA_READPB_HANDLER(READ8(md6802_state, pia2_kbB_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(md6802_state, pia2_ca2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, md6802_state, pia2_kbA_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, md6802_state, pia2_kbA_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, md6802_state, pia2_kbB_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, md6802_state, pia2_kbB_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, md6802_state, pia2_ca2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("artwork_timer", md6802_state, scan_artwork, attotime::from_hz(10))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mp68a_state::mp68a)
// Clock source is based on a N9602N Dual Retriggerable Resettable Monostable Multivibrator oscillator at aprox 505KHz.
// Trimpot seems broken/stuck at 5K Ohm thu. ROM code 1Ms delay loops suggest 1MHz+
- MCFG_CPU_ADD("maincpu", M6800, 505000)
- MCFG_CPU_PROGRAM_MAP(mp68a_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 505000)
+ MCFG_DEVICE_PROGRAM_MAP(mp68a_map)
MCFG_DEFAULT_LAYOUT(layout_mp68a)
/* Devices */
@@ -630,11 +630,11 @@ MACHINE_CONFIG_START(mp68a_state::mp68a)
/* --execution-wait for key loop-- */
/* 0x086B Update display sequnc, see below */
/* 0x0826 CB1 read = 0x603 (Control B) - is a key pressed? */
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mp68a_state, pia2_kbA_w))
- MCFG_PIA_READPA_HANDLER(READ8(mp68a_state, pia2_kbA_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mp68a_state, pia2_kbB_w))
- MCFG_PIA_READPB_HANDLER(READ8(mp68a_state, pia2_kbB_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(mp68a_state, pia2_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mp68a_state, pia2_kbA_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mp68a_state, pia2_kbA_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mp68a_state, pia2_kbB_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mp68a_state, pia2_kbB_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, mp68a_state, pia2_cb1_r))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE)) /* Not used by ROM. Combined trace to CPU IRQ with IRQB */
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE)) /* Not used by ROM. Combined trace to CPU IRQ with IRQA */
@@ -652,17 +652,17 @@ MACHINE_CONFIG_START(mp68a_state::mp68a)
/* 0x086B 0x600 (Port A) = 0x50 */
/* 0x086B 0x600 (Port A) = 0x70 */
MCFG_DEVICE_ADD("digit0", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(mp68a_state, digit_w<0>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, mp68a_state, digit_w<0>))
MCFG_DEVICE_ADD("digit1", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(mp68a_state, digit_w<1>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, mp68a_state, digit_w<1>))
MCFG_DEVICE_ADD("digit2", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(mp68a_state, digit_w<2>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, mp68a_state, digit_w<2>))
MCFG_DEVICE_ADD("digit3", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(mp68a_state, digit_w<3>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, mp68a_state, digit_w<3>))
MCFG_DEVICE_ADD("digit4", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(mp68a_state, digit_w<4>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, mp68a_state, digit_w<4>))
MCFG_DEVICE_ADD("digit5", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(mp68a_state, digit_w<5>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, mp68a_state, digit_w<5>))
MCFG_TIMER_DRIVER_ADD_PERIODIC("artwork_timer", mp68a_state, scan_artwork, attotime::from_hz(10))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp
index 80d4c6143a2..57418b8de34 100644
--- a/src/mame/drivers/dietgo.cpp
+++ b/src/mame/drivers/dietgo.cpp
@@ -214,13 +214,13 @@ void dietgo_state::machine_start()
MACHINE_CONFIG_START(dietgo_state::dietgo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* DE102 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(dietgo_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dietgo_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* DE102 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(dietgo_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dietgo_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp
index b60b53d156e..0c3a884d6c4 100644
--- a/src/mame/drivers/digel804.cpp
+++ b/src/mame/drivers/digel804.cpp
@@ -632,9 +632,9 @@ WRITE_LINE_MEMBER( ep804_state::ep804_acia_irq_w )
MACHINE_CONFIG_START(digel804_state::digel804)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3.6864_MHz_XTAL/2) /* Z80A, X1(aka E0 on schematics): 3.6864Mhz */
- MCFG_CPU_PROGRAM_MAP(z80_mem_804_1_4)
- MCFG_CPU_IO_MAP(z80_io_1_4)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3.6864_MHz_XTAL/2) /* Z80A, X1(aka E0 on schematics): 3.6864Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem_804_1_4)
+ MCFG_DEVICE_IO_MAP(z80_io_1_4)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_ROC10937_ADD("vfd",0) // RIGHT_TO_LEFT
@@ -643,7 +643,7 @@ MACHINE_CONFIG_START(digel804_state::digel804)
MCFG_DEFAULT_LAYOUT(layout_digel804)
MCFG_DEVICE_ADD("74c923", MM74C923, 0)
- MCFG_MM74C922_DA_CALLBACK(WRITELINE(digel804_state, da_w))
+ MCFG_MM74C922_DA_CALLBACK(WRITELINE(*this, digel804_state, da_w))
MCFG_MM74C922_X1_CALLBACK(IOPORT("LINE0"))
MCFG_MM74C922_X2_CALLBACK(IOPORT("LINE1"))
MCFG_MM74C922_X3_CALLBACK(IOPORT("LINE2"))
@@ -652,15 +652,15 @@ MACHINE_CONFIG_START(digel804_state::digel804)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
MCFG_MOS6551_XTAL(3.6864_MHz_XTAL/2)
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(digel804_state, acia_irq_w))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", mos6551_device, write_cts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, digel804_state, acia_irq_w))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", mos6551_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("null_modem", digel804_rs232_defaults)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", digel804_rs232_defaults)
@@ -670,7 +670,7 @@ MACHINE_CONFIG_START(digel804_state::digel804)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -678,12 +678,12 @@ MACHINE_CONFIG_START(ep804_state::ep804)
digel804(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") /* Z80, X1(aka E0 on schematics): 3.6864Mhz */
- MCFG_CPU_PROGRAM_MAP(z80_mem_804_1_2)
- MCFG_CPU_IO_MAP(z80_io_1_2)
+ MCFG_DEVICE_MODIFY("maincpu") /* Z80, X1(aka E0 on schematics): 3.6864Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem_804_1_2)
+ MCFG_DEVICE_IO_MAP(z80_io_1_2)
MCFG_DEVICE_MODIFY("acia")
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(ep804_state, ep804_acia_irq_w))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, ep804_state, ep804_acia_irq_w))
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("32K")
diff --git a/src/mame/drivers/digijet.cpp b/src/mame/drivers/digijet.cpp
index adcb112da5b..f67fb80f89c 100644
--- a/src/mame/drivers/digijet.cpp
+++ b/src/mame/drivers/digijet.cpp
@@ -50,8 +50,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(digijet_state::digijet)
/* basic machine hardware */
- MCFG_CPU_ADD(I8049_TAG, I8049, XTAL(11'000'000))
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD(I8049_TAG, I8049, XTAL(11'000'000))
+ MCFG_DEVICE_IO_MAP(io_map)
MACHINE_CONFIG_END
ROM_START( digijet )
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index 36b99503358..1cba4ad9a47 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -309,8 +309,8 @@ void dim68k_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dim68k_state::dim68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(dim68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(dim68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -324,7 +324,7 @@ MACHINE_CONFIG_START(dim68k_state::dim68k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp
index b657643cf15..b94164cd0b6 100644
--- a/src/mame/drivers/discoboy.cpp
+++ b/src/mame/drivers/discoboy.cpp
@@ -455,13 +455,13 @@ WRITE_LINE_MEMBER(discoboy_state::yunsung8_adpcm_int)
MACHINE_CONFIG_START(discoboy_state::discoboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
- MCFG_CPU_PROGRAM_MAP(discoboy_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", discoboy_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(discoboy_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", discoboy_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(10'000'000)/2) /* 5 MHz? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(10'000'000)/2) /* 5 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("rambank1", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(rambank1_map)
@@ -489,15 +489,15 @@ MACHINE_CONFIG_START(discoboy_state::discoboy)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(10'000'000)/4) /* 2.5 MHz? */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(10'000'000)/4) /* 2.5 MHz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(discoboy_state, yunsung8_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, discoboy_state, yunsung8_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp
index 2e8a8d77064..e8910799695 100644
--- a/src/mame/drivers/divebomb.cpp
+++ b/src/mame/drivers/divebomb.cpp
@@ -388,17 +388,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(divebomb_state::divebomb)
- MCFG_CPU_ADD("fgcpu", Z80,XTAL1/4) // ?
- MCFG_CPU_PROGRAM_MAP(divebomb_fgcpu_map)
- MCFG_CPU_IO_MAP(divebomb_fgcpu_iomap)
+ MCFG_DEVICE_ADD("fgcpu", Z80,XTAL1/4) // ?
+ MCFG_DEVICE_PROGRAM_MAP(divebomb_fgcpu_map)
+ MCFG_DEVICE_IO_MAP(divebomb_fgcpu_iomap)
- MCFG_CPU_ADD("spritecpu", Z80,XTAL1/4) // ?
- MCFG_CPU_PROGRAM_MAP(divebomb_spritecpu_map)
- MCFG_CPU_IO_MAP(divebomb_spritecpu_iomap)
+ MCFG_DEVICE_ADD("spritecpu", Z80,XTAL1/4) // ?
+ MCFG_DEVICE_PROGRAM_MAP(divebomb_spritecpu_map)
+ MCFG_DEVICE_IO_MAP(divebomb_spritecpu_iomap)
- MCFG_CPU_ADD("rozcpu", Z80,XTAL1/4) // ?
- MCFG_CPU_PROGRAM_MAP(divebomb_rozcpu_map)
- MCFG_CPU_IO_MAP(divebomb_rozcpu_iomap)
+ MCFG_DEVICE_ADD("rozcpu", Z80,XTAL1/4) // ?
+ MCFG_DEVICE_PROGRAM_MAP(divebomb_rozcpu_map)
+ MCFG_DEVICE_IO_MAP(divebomb_rozcpu_iomap)
MCFG_QUANTUM_PERFECT_CPU("fgcpu")
@@ -412,10 +412,10 @@ MACHINE_CONFIG_START(divebomb_state::divebomb)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("rozcpu", INPUT_LINE_IRQ0))
MCFG_GENERIC_LATCH_8_ADD("spr2fg")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("fgcpu_irq", input_merger_any_high_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("fgcpu_irq", input_merger_any_high_device, in_w<0>))
MCFG_GENERIC_LATCH_8_ADD("roz2fg")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("fgcpu_irq", input_merger_any_high_device, in_w<1>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("fgcpu_irq", input_merger_any_high_device, in_w<1>))
MCFG_DEVICE_ADD("k051316_1", K051316, 0)
MCFG_GFX_PALETTE("palette")
@@ -457,17 +457,17 @@ MACHINE_CONFIG_START(divebomb_state::divebomb)
MCFG_SPEAKER_STANDARD_MONO("mono")
// All frequencies unverified
- MCFG_SOUND_ADD("sn0", SN76489, XTAL1/8)
+ MCFG_DEVICE_ADD("sn0", SN76489, XTAL1/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("sn1", SN76489, XTAL1/8)
+ MCFG_DEVICE_ADD("sn1", SN76489, XTAL1/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("sn2", SN76489, XTAL1/8)
+ MCFG_DEVICE_ADD("sn2", SN76489, XTAL1/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("sn3", SN76489, XTAL1/8)
+ MCFG_DEVICE_ADD("sn3", SN76489, XTAL1/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("sn4", SN76489, XTAL1/8)
+ MCFG_DEVICE_ADD("sn4", SN76489, XTAL1/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("sn5", SN76489, XTAL1/8)
+ MCFG_DEVICE_ADD("sn5", SN76489, XTAL1/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp
index b64ce3fda16..63ff0ecd7b1 100644
--- a/src/mame/drivers/diverboy.cpp
+++ b/src/mame/drivers/diverboy.cpp
@@ -272,12 +272,12 @@ void diverboy_state::machine_start()
MACHINE_CONFIG_START(diverboy_state::diverboy)
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* guess */
- MCFG_CPU_PROGRAM_MAP(diverboy_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", diverboy_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(diverboy_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", diverboy_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(snd_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(snd_map)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", diverboy)
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index fa061217d6e..c4be26e9f22 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -481,30 +481,30 @@ void djboy_state::machine_reset()
MACHINE_CONFIG_START(djboy_state::djboy)
- MCFG_CPU_ADD("mastercpu", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(mastercpu_am)
- MCFG_CPU_IO_MAP(mastercpu_port_am)
+ MCFG_DEVICE_ADD("mastercpu", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(mastercpu_am)
+ MCFG_DEVICE_IO_MAP(mastercpu_port_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", djboy_state, djboy_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slavecpu", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(slavecpu_am)
- MCFG_CPU_IO_MAP(slavecpu_port_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold)
-
- MCFG_CPU_ADD("soundcpu", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(soundcpu_am)
- MCFG_CPU_IO_MAP(soundcpu_port_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold)
-
- MCFG_CPU_ADD("beast", I80C51, 6000000)
- MCFG_MCS51_PORT_P0_IN_CB(READ8(djboy_state, beast_p0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(djboy_state, beast_p0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(djboy_state, beast_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(djboy_state, beast_p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(djboy_state, beast_p2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(djboy_state, beast_p2_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(djboy_state, beast_p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(djboy_state, beast_p3_w))
+ MCFG_DEVICE_ADD("slavecpu", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(slavecpu_am)
+ MCFG_DEVICE_IO_MAP(slavecpu_port_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(soundcpu_am)
+ MCFG_DEVICE_IO_MAP(soundcpu_port_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", djboy_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("beast", I80C51, 6000000)
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, djboy_state, beast_p0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, djboy_state, beast_p0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, djboy_state, beast_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, djboy_state, beast_p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, djboy_state, beast_p2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, djboy_state, beast_p2_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, djboy_state, beast_p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, djboy_state, beast_p3_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -520,7 +520,7 @@ MACHINE_CONFIG_START(djboy_state::djboy)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(djboy_state, screen_update_djboy)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(djboy_state, screen_vblank_djboy))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, djboy_state, screen_vblank_djboy))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", djboy)
@@ -534,7 +534,7 @@ MACHINE_CONFIG_START(djboy_state::djboy)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index 77ee6806aba..299418157b3 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -1381,13 +1381,13 @@ MACHINE_CONFIG_START(djmain_state::djmainj)
/* basic machine hardware */
// popn3 works 9.6 MHz or slower in some songs */
- //MCFG_CPU_ADD("maincpu", M68EC020, 18432000/2) /* 9.216 MHz!? */
- MCFG_CPU_ADD("maincpu", M68EC020, 32000000/4) /* 8.000 MHz!? */
- MCFG_CPU_PROGRAM_MAP(maincpu_djmainj)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", djmain_state, vb_interrupt)
+ //MCFG_DEVICE_ADD("maincpu", M68EC020, 18432000/2) /* 9.216 MHz!? */
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 32000000/4) /* 8.000 MHz!? */
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_djmainj)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", djmain_state, vb_interrupt)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(djmain_state, ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, djmain_state, ide_interrupt))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1424,14 +1424,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(djmain_state::djmainu)
djmainj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(maincpu_djmainu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_djmainu)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(djmain_state::djmaina)
djmainj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(maincpu_djmaina)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_djmaina)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index b5d8ddb2392..4d6bb2a2fb7 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -1695,18 +1695,18 @@ WRITE_LINE_MEMBER(dkong_state::busreq_w )
MACHINE_CONFIG_START(dkong_state::dkong_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CLOCK_1H)
- MCFG_CPU_PROGRAM_MAP(dkong_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CLOCK_1H)
+ MCFG_DEVICE_PROGRAM_MAP(dkong_map)
MCFG_MACHINE_START_OVERRIDE(dkong_state,dkong2b)
MCFG_MACHINE_RESET_OVERRIDE(dkong_state,dkong)
MCFG_DEVICE_ADD("dma8257", I8257, CLOCK_1H)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(dkong_state, busreq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(dkong_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(dkong_state, memory_write_byte))
- MCFG_I8257_IN_IOR_1_CB(READ8(dkong_state, p8257_ctl_r))
- MCFG_I8257_OUT_IOW_0_CB(WRITE8(dkong_state, p8257_ctl_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, dkong_state, busreq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, dkong_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, dkong_state, memory_write_byte))
+ MCFG_I8257_IN_IOR_1_CB(READ8(*this, dkong_state, p8257_ctl_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, dkong_state, p8257_ctl_w))
MCFG_I8257_REVERSE_RW_MODE(1) // why?
/* video hardware */
@@ -1714,7 +1714,7 @@ MACHINE_CONFIG_START(dkong_state::dkong_base)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_dkong)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dkong_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dkong_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dkong)
MCFG_PALETTE_ADD("palette", DK2B_PALETTE_LENGTH)
@@ -1791,23 +1791,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::dkong3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2) /* verified in schematics */
- MCFG_CPU_PROGRAM_MAP(dkong3_map)
- MCFG_CPU_IO_MAP(dkong3_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2) /* verified in schematics */
+ MCFG_DEVICE_PROGRAM_MAP(dkong3_map)
+ MCFG_DEVICE_IO_MAP(dkong3_io_map)
MCFG_MACHINE_START_OVERRIDE(dkong_state, dkong3)
MCFG_DEVICE_ADD("z80dma", Z80DMA, CLOCK_1H)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(dkong_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(dkong_state, memory_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, dkong_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, dkong_state, memory_write_byte))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_dkong)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dkong_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dkong_state, vblank_irq))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("n2a03a", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("n2a03b", INPUT_LINE_NMI))
@@ -1824,8 +1824,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::dkongjr)
dkong_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dkongjr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dkongjr_map)
/* sound hardware */
dkongjr_audio(config);
@@ -1861,27 +1861,27 @@ MACHINE_CONFIG_START(dkong_state::s2650)
dkong2b(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(s2650_map)
- MCFG_CPU_IO_MAP(s2650_io_map)
- MCFG_CPU_DATA_MAP(s2650_data_map)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(dkong_state, s2650_fo_w))
+ MCFG_DEVICE_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(s2650_map)
+ MCFG_DEVICE_IO_MAP(s2650_io_map)
+ MCFG_DEVICE_DATA_MAP(s2650_data_map)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, dkong_state, s2650_fo_w))
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dkong_state, s2650_interrupt))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dkong_state, s2650_interrupt))
MCFG_DEVICE_MODIFY("dma8257")
- MCFG_I8257_IN_MEMR_CB(READ8(dkong_state, hb_dma_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(dkong_state, hb_dma_write_byte))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, dkong_state, hb_dma_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, dkong_state, hb_dma_write_byte))
MCFG_MACHINE_START_OVERRIDE(dkong_state,s2650)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::herbiedk)
s2650(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ???
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ???
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dkong_state::spclforc)
@@ -1905,8 +1905,8 @@ MACHINE_CONFIG_START(dkong_state::strtheat)
dkong2b(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(epos_readport)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(epos_readport)
MCFG_MACHINE_RESET_OVERRIDE(dkong_state,strtheat)
MACHINE_CONFIG_END
@@ -1915,8 +1915,8 @@ MACHINE_CONFIG_START(dkong_state::drakton)
dkong2b(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(epos_readport)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(epos_readport)
MCFG_MACHINE_RESET_OVERRIDE(dkong_state,drakton)
MACHINE_CONFIG_END
@@ -1925,8 +1925,8 @@ MACHINE_CONFIG_START(dkong_state::drktnjr)
dkongjr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(epos_readport)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(epos_readport)
MCFG_MACHINE_RESET_OVERRIDE(dkong_state,drakton)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index 604ab327ca8..76b2d0d4cf9 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -732,14 +732,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(dlair_state::dlair_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_US/4)
- MCFG_CPU_PROGRAM_MAP(dlus_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(dlair_state, irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_US/4)
+ MCFG_DEVICE_PROGRAM_MAP(dlus_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dlair_state, irq0_line_hold, (double)MASTER_CLOCK_US/8/16/16/16/16)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK_US/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK_US/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
@@ -767,14 +767,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dlair_state::dleuro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4)
MCFG_Z80_DAISY_CHAIN(dleuro_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(dleuro_map)
- MCFG_CPU_IO_MAP(dleuro_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(dleuro_map)
+ MCFG_DEVICE_IO_MAP(dleuro_io_map)
MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK_EURO/4 /* same as "maincpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(dlair_state, write_speaker))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, dlair_state, write_speaker))
MCFG_DEVICE_ADD("sio", Z80SIO, MASTER_CLOCK_EURO/4 /* same as "maincpu" */)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -798,11 +798,11 @@ MACHINE_CONFIG_START(dlair_state::dleuro)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- MCFG_SOUND_MODIFY("ld_22vp932")
+ MCFG_DEVICE_MODIFY("ld_22vp932")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp
index eac4abc99b8..2aa6b82d312 100644
--- a/src/mame/drivers/dlair2.cpp
+++ b/src/mame/drivers/dlair2.cpp
@@ -183,10 +183,10 @@ INTERRUPT_GEN_MEMBER(dlair2_state::dlair2_timer_irq)
MACHINE_CONFIG_START(dlair2_state::dlair2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088 , MAIN_CLOCK/3) /* Schematics show I8088 "max" CPU */
- MCFG_CPU_PROGRAM_MAP(dlair2_map)
- MCFG_CPU_IO_MAP(dlair2_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(dlair2_state, dlair2_timer_irq, 60) // timer irq, TODO: timing
+ MCFG_DEVICE_ADD("maincpu", I8088 , MAIN_CLOCK/3) /* Schematics show I8088 "max" CPU */
+ MCFG_DEVICE_PROGRAM_MAP(dlair2_map)
+ MCFG_DEVICE_IO_MAP(dlair2_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dlair2_state, dlair2_timer_irq, 60) // timer irq, TODO: timing
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index 40a689c2166..f6a7142a089 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -303,10 +303,10 @@ void dm7000_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dm7000_state::dm7000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",PPC405GP, 252000000 / 10) // Should be PPC405D4?
+ MCFG_DEVICE_ADD("maincpu",PPC405GP, 252000000 / 10) // Should be PPC405D4?
// Slowed down 10 times in order to get normal response for now
MCFG_PPC_BUS_FREQUENCY(252000000)
- MCFG_CPU_PROGRAM_MAP(dm7000_mem)
+ MCFG_DEVICE_PROGRAM_MAP(dm7000_mem)
/* video hardware */
diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp
index bd9fc5bd8b1..20302c3ab2f 100644
--- a/src/mame/drivers/dmax8000.cpp
+++ b/src/mame/drivers/dmax8000.cpp
@@ -151,46 +151,46 @@ static void floppies(device_slot_interface &device)
MACHINE_CONFIG_START(dmax8000_state::dmax8000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000) ) // no idea what crystal is used, but 4MHz clock is confirmed
- MCFG_CPU_PROGRAM_MAP(dmax8000_mem)
- MCFG_CPU_IO_MAP(dmax8000_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000) ) // no idea what crystal is used, but 4MHz clock is confirmed
+ MCFG_DEVICE_PROGRAM_MAP(dmax8000_mem)
+ MCFG_DEVICE_IO_MAP(dmax8000_io)
MCFG_MACHINE_RESET_OVERRIDE(dmax8000_state, dmax8000)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'000'000) / 2) // 2MHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("dart1", z80dart_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart1", z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart2", z80dart_device, txca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("dart2", z80dart_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("dart1", z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("dart1", z80dart_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart1", z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart2", z80dart_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart2", z80dart_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("dart2", z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("dart1", z80dart_device, rxtxcb_w))
MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(4'000'000)) // A = terminal; B = aux
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart1", z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("dart1", z80dart_device, dcda_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("dart1", z80dart_device, ria_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart1", z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("dart1", z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("dart1", z80dart_device, dcda_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("dart1", z80dart_device, ria_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("dart1", z80dart_device, ctsa_w))
MCFG_DEVICE_ADD("dart2", Z80DART, XTAL(4'000'000)) // RS232 ports
MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(dmax8000_state, port0c_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(dmax8000_state, port0d_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, dmax8000_state, port0c_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, dmax8000_state, port0d_w))
MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000))
MCFG_FD1793_ADD("fdc", XTAL(2'000'000)) // no idea
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dmax8000_state, fdc_drq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dmax8000_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp
index b0289b3c597..651a6f5ed72 100644
--- a/src/mame/drivers/dmndrby.cpp
+++ b/src/mame/drivers/dmndrby.cpp
@@ -530,13 +530,13 @@ INTERRUPT_GEN_MEMBER(dmndrby_state::dderby_timer_irq)
MACHINE_CONFIG_START(dmndrby_state::dderby)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(memmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dmndrby_state, dderby_irq)
- MCFG_CPU_PERIODIC_INT_DRIVER(dmndrby_state, dderby_timer_irq, 244/2)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dmndrby_state, dderby_irq)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dmndrby_state, dderby_timer_irq, 244/2)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
- MCFG_CPU_PROGRAM_MAP(dderby_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
+ MCFG_DEVICE_PROGRAM_MAP(dderby_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -559,7 +559,7 @@ MACHINE_CONFIG_START(dmndrby_state::dderby)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1789750) // frequency guessed
+ MCFG_DEVICE_ADD("ay1", AY8910, 1789750) // frequency guessed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp
index c76711cb6e8..201f4bcaaf6 100644
--- a/src/mame/drivers/dms5000.cpp
+++ b/src/mame/drivers/dms5000.cpp
@@ -62,9 +62,9 @@ uint32_t dms5000_state::screen_update_dms5000(screen_device &screen, bitmap_ind1
MACHINE_CONFIG_START(dms5000_state::dms5000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8086, XTAL(9'830'400))
- MCFG_CPU_PROGRAM_MAP(dms5000_mem)
- MCFG_CPU_IO_MAP(dms5000_io)
+ MCFG_DEVICE_ADD("maincpu",I8086, XTAL(9'830'400))
+ MCFG_DEVICE_PROGRAM_MAP(dms5000_mem)
+ MCFG_DEVICE_IO_MAP(dms5000_io)
/* video hardware */
diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp
index 742b8ee8245..22e46f3fcfb 100644
--- a/src/mame/drivers/dms86.cpp
+++ b/src/mame/drivers/dms86.cpp
@@ -117,36 +117,36 @@ void dms86_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dms86_state::dms86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600) / 3) // according to the manual... hmm
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(14'745'600) / 3) // according to the manual... hmm
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
// According to the manual the clock is 14,765,600 / 4 but that couldn't possibly work.
// By maths, clock should be 9600*32*4*16 = 19,660,800 but not working either
// So, commented out because it makes the whole thing crawl, only get 18% on my machine
//MCFG_DEVICE_ADD("ctc_clock", CLOCK, 19660800) //XTAL(14'745'600) / 4)
- //MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc" ,z80ctc_device, trg0))
- //MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg1))
- //MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc" ,z80ctc_device, trg2))
+ //MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc" ,z80ctc_device, trg0))
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc" ,z80ctc_device, trg1))
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc" ,z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(14'745'600) / 3)
//MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // frame rate interrupt to maincpu
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w)) // SIO1 Ch B
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80sio_device, txca_w)) // SIO1 Ch A
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1" ,z80sio_device, rxca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w)) // SIO2
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2" ,z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2" ,z80sio_device, rxca_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio1", z80sio_device, rxtxcb_w)) // SIO1 Ch B
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio1", z80sio_device, txca_w)) // SIO1 Ch A
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1" ,z80sio_device, rxca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("sio2", z80sio_device, rxtxcb_w)) // SIO2
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2" ,z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2" ,z80sio_device, rxca_w))
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(14'745'600) / 3)
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(14'745'600) / 3)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 332cf37346e..6ff7402f00b 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -768,14 +768,14 @@ static void dmv_slot7a(device_slot_interface &device)
MACHINE_CONFIG_START(dmv_state::dmv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(24'000'000) / 6)
- MCFG_CPU_PROGRAM_MAP(dmv_mem)
- MCFG_CPU_IO_MAP(dmv_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(24'000'000) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(dmv_mem)
+ MCFG_DEVICE_IO_MAP(dmv_io)
- MCFG_CPU_ADD("kb_ctrl_mcu", I8741, XTAL(6'000'000))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_state, kb_mcu_port1_r)) // bit 0 data from kb
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dmv_state, kb_mcu_port1_w)) // bit 1 data to kb
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_state, kb_mcu_port2_w))
+ MCFG_DEVICE_ADD("kb_ctrl_mcu", I8741, XTAL(6'000'000))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, dmv_state, kb_mcu_port1_r)) // bit 0 data from kb
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dmv_state, kb_mcu_port1_w)) // bit 1 data to kb
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, dmv_state, kb_mcu_port2_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -799,76 +799,76 @@ MACHINE_CONFIG_START(dmv_state::dmv)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(dmv_state, hgdc_draw_text)
MCFG_DEVICE_ADD( "dma8237", AM9517A, XTAL(4'000'000) )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(dmv_state, dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(dmv_state, dmac_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(dmv_state, program_r))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(dmv_state, program_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, dmv_state, dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, dmv_state, dmac_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, dmv_state, program_r))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, dmv_state, program_w))
MCFG_I8237_IN_IOR_0_CB(LOGGER("Read DMA CH1"))
MCFG_I8237_OUT_IOW_0_CB(LOGGER("Write DMA CH1"))
MCFG_I8237_IN_IOR_1_CB(LOGGER("Read DMA CH2"))
MCFG_I8237_OUT_IOW_1_CB(LOGGER("Write DMA CH2"))
- MCFG_I8237_IN_IOR_2_CB(DEVREAD8("upd7220", upd7220_device, dack_r))
- MCFG_I8237_OUT_IOW_2_CB(DEVWRITE8("upd7220", upd7220_device, dack_w))
- MCFG_I8237_IN_IOR_3_CB(DEVREAD8("i8272", i8272a_device, mdma_r))
- MCFG_I8237_OUT_IOW_3_CB(DEVWRITE8("i8272", i8272a_device, mdma_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(dmv_state, dmac_dack3))
+ MCFG_I8237_IN_IOR_2_CB(READ8("upd7220", upd7220_device, dack_r))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8("upd7220", upd7220_device, dack_w))
+ MCFG_I8237_IN_IOR_3_CB(READ8("i8272", i8272a_device, mdma_r))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8("i8272", i8272a_device, mdma_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, dmv_state, dmac_dack3))
MCFG_I8272A_ADD( "i8272", true )
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(dmv_state, fdc_irq))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8237", am9517a_device, dreq3_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, dmv_state, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma8237", am9517a_device, dreq3_w))
MCFG_FLOPPY_DRIVE_ADD("i8272:0", dmv_floppies, "525dd", dmv_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272:1", dmv_floppies, "525dd", dmv_state::floppy_formats)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(50)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(dmv_state, pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, dmv_state, pit_out0))
MCFG_PIT8253_CLK2(XTAL(24'000'000) / 3 / 16)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(dmv_state, timint_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, dmv_state, timint_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("slot1", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot1, nullptr, false)
MCFG_DEVICE_ADD("slot2", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot2_6, nullptr, false)
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint2_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq2_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint2_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq2_w))
MCFG_DEVICE_ADD("slot2a", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot2a, nullptr, false)
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint2a_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq2a_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint2a_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq2a_w))
MCFG_DEVICE_ADD("slot3", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot2_6, nullptr, false)
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint3_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq3_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint3_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq3_w))
MCFG_DEVICE_ADD("slot4", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot2_6, nullptr, false)
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint4_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq4_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint4_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq4_w))
MCFG_DEVICE_ADD("slot5", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot2_6, nullptr, false)
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint5_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq5_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint5_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq5_w))
MCFG_DEVICE_ADD("slot6", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot2_6, nullptr, false)
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint6_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq6_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint6_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq6_w))
MCFG_DEVICE_ADD("slot7", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot7, nullptr, false)
- MCFG_DMVCART_SLOT_PROGRAM_READWRITE_CB(READ8(dmv_state, exp_program_r), WRITE8(dmv_state, exp_program_w))
- MCFG_DMVCART_SLOT_OUT_THOLD_CB(WRITELINE(dmv_state, thold7_w))
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint7_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq7_w))
+ MCFG_DMVCART_SLOT_PROGRAM_READWRITE_CB(READ8(*this, dmv_state, exp_program_r), WRITE8(*this, dmv_state, exp_program_w))
+ MCFG_DMVCART_SLOT_OUT_THOLD_CB(WRITELINE(*this, dmv_state, thold7_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint7_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq7_w))
MCFG_DEVICE_ADD("slot7a", DMVCART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(dmv_slot7a, "k230", false)
- MCFG_DMVCART_SLOT_PROGRAM_READWRITE_CB(READ8(dmv_state, exp_program_r), WRITE8(dmv_state, exp_program_w))
- MCFG_DMVCART_SLOT_OUT_THOLD_CB(WRITELINE(dmv_state, thold7_w))
- MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(dmv_state, busint7a_w))
- MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(dmv_state, irq7a_w))
+ MCFG_DMVCART_SLOT_PROGRAM_READWRITE_CB(READ8(*this, dmv_state, exp_program_r), WRITE8(*this, dmv_state, exp_program_w))
+ MCFG_DMVCART_SLOT_OUT_THOLD_CB(WRITELINE(*this, dmv_state, thold7_w))
+ MCFG_DMVCART_SLOT_OUT_INT_CB(WRITELINE(*this, dmv_state, busint7a_w))
+ MCFG_DMVCART_SLOT_OUT_IRQ_CB(WRITELINE(*this, dmv_state, irq7a_w))
MCFG_SOFTWARE_LIST_ADD("flop_list", "dmv")
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index 927eaa7fbe2..a8a90e1f12d 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -599,15 +599,15 @@ void docastle_state::machine_start()
MACHINE_CONFIG_START(docastle_state::docastle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(docastle_map)
- MCFG_CPU_IO_MAP(docastle_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(docastle_map)
+ MCFG_DEVICE_IO_MAP(docastle_io_map)
- MCFG_CPU_ADD("slave", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(docastle_map2)
+ MCFG_DEVICE_ADD("slave", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(docastle_map2)
- MCFG_CPU_ADD("cpu3", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(docastle_map3)
+ MCFG_DEVICE_ADD("cpu3", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(docastle_map3)
MCFG_DEVICE_ADD("inp1", TMS1025, 0)
MCFG_TMS1025_READ_PORT_CB(PORT1, IOPORT("DSW2"))
@@ -636,9 +636,9 @@ MACHINE_CONFIG_START(docastle_state::docastle)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_VISAREA_ADJUST(8,-8,0,0)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(docastle_state, docastle_tint))
- MCFG_MC6845_OUT_CUR_CB(WRITELINE(docastle_state, stx_on_w))
- MCFG_MC6845_OUT_DE_CB(WRITELINE(docastle_state, stx_off_w))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, docastle_state, docastle_tint))
+ MCFG_MC6845_OUT_CUR_CB(WRITELINE(*this, docastle_state, stx_on_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, docastle_state, stx_off_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(9'828'000)/2, 0x138, 8, 0x100-8, 0x108, 0, 0xc0) // from crtc
@@ -652,16 +652,16 @@ MACHINE_CONFIG_START(docastle_state::docastle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("sn1", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("sn2", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn3", SN76489A, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("sn3", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn4", SN76489A, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("sn4", SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -669,11 +669,11 @@ MACHINE_CONFIG_START(docastle_state::dorunrun)
docastle(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dorunrun_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dorunrun_map)
- MCFG_CPU_MODIFY("slave")
- MCFG_CPU_PROGRAM_MAP(dorunrun_map2)
+ MCFG_DEVICE_MODIFY("slave")
+ MCFG_DEVICE_PROGRAM_MAP(dorunrun_map2)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun)
@@ -683,8 +683,8 @@ MACHINE_CONFIG_START(docastle_state::idsoccer)
docastle(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(idsoccer_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(idsoccer_map)
MCFG_DEVICE_MODIFY("inp1")
MCFG_TMS1025_READ_PORT_CB(PORT4, IOPORT("JOYS_RIGHT"))
@@ -696,8 +696,8 @@ MACHINE_CONFIG_START(docastle_state::idsoccer)
MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun)
/* sound hardware */
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* Crystal verified on American Soccer board. */
- MCFG_MSM5205_VCLK_CB(WRITELINE(docastle_state, idsoccer_adpcm_int)) // interrupt function
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) /* Crystal verified on American Soccer board. */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, docastle_state, idsoccer_adpcm_int)) // interrupt function
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) // 6 kHz ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp
index d5351e3489e..3257533d934 100644
--- a/src/mame/drivers/dogfgt.cpp
+++ b/src/mame/drivers/dogfgt.cpp
@@ -242,12 +242,12 @@ void dogfgt_state::machine_reset()
MACHINE_CONFIG_START(dogfgt_state::dogfgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(dogfgt_state, irq0_line_hold, 16*60) /* ? controls music tempo */
+ MCFG_DEVICE_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dogfgt_state, irq0_line_hold, 16*60) /* ? controls music tempo */
- MCFG_CPU_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -268,10 +268,10 @@ MACHINE_CONFIG_START(dogfgt_state::dogfgt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index 9223e06c766..62084e1f86e 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -233,18 +233,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(dauphin_state::dauphin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(dauphin_mem)
- MCFG_CPU_IO_MAP(dauphin_io)
- MCFG_S2650_SENSE_INPUT(READLINE(dauphin_state, cass_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(dauphin_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu",S2650, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(dauphin_mem)
+ MCFG_DEVICE_IO_MAP(dauphin_io)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, dauphin_state, cass_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, dauphin_state, cass_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_dolphunk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* cassette */
diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp
index c18d889d30f..f92d2f4e7a2 100644
--- a/src/mame/drivers/dominob.cpp
+++ b/src/mame/drivers/dominob.cpp
@@ -297,10 +297,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(dominob_state::dominob)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(memmap)
- MCFG_CPU_IO_MAP(portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dominob_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(12'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_IO_MAP(portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dominob_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -318,7 +318,7 @@ MACHINE_CONFIG_START(dominob_state::dominob)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(12'000'000)/4)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index cbd1792218d..a6de06fcd87 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -1469,14 +1469,14 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::sound_2203)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1))
- MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_1))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, 1500000)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2))
- MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
+ MCFG_DEVICE_ADD("ym2", YM2203, 1500000)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_2))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -1511,12 +1511,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz verified for Last Day / D-day */
- MCFG_CPU_PROGRAM_MAP(lastday_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz verified for Last Day / D-day */
+ MCFG_DEVICE_PROGRAM_MAP(lastday_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */
- MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */
+ MCFG_DEVICE_PROGRAM_MAP(lastday_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80)
MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203)
@@ -1531,7 +1531,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_lastday)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday)
@@ -1549,14 +1549,14 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1))
- MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
+ MCFG_DEVICE_ADD("ym1", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_1))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2))
- MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r))
+ MCFG_DEVICE_ADD("ym2", YM2203, 16_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, dooyong_z80_ym2203_state, irqhandler_2203_2))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dooyong_z80_ym2203_state, unk_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -1564,12 +1564,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MCFG_CPU_PROGRAM_MAP(gulfstrm_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(gulfstrm_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ??? */
- MCFG_CPU_PROGRAM_MAP(lastday_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(lastday_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80)
MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203)
@@ -1583,7 +1583,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::gulfstrm)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_gulfstrm)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday)
@@ -1603,12 +1603,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8Mhz */
- MCFG_CPU_PROGRAM_MAP(pollux_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(pollux_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */
- MCFG_CPU_PROGRAM_MAP(pollux_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(pollux_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_ym2203_state, cpu_z80)
MCFG_MACHINE_RESET_OVERRIDE(dooyong_z80_ym2203_state, sound_ym2203)
@@ -1622,7 +1622,7 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_ym2203_state, screen_update_pollux)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastday)
@@ -1642,12 +1642,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_state::bluehawk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
- MCFG_CPU_PROGRAM_MAP(bluehawk_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(bluehawk_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1660,7 +1660,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::bluehawk)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_bluehawk)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bluehawk)
@@ -1682,12 +1682,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_state::flytiger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(flytiger_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(flytiger_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */
- MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1700,7 +1700,7 @@ MACHINE_CONFIG_START(dooyong_z80_state::flytiger)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(dooyong_z80_state, screen_update_flytiger)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", flytiger)
@@ -1721,12 +1721,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dooyong_z80_state::primella)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(primella_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL/2) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(primella_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz */
- MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) /* 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80)
@@ -1771,11 +1771,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline)
MACHINE_CONFIG_START(rshark_state::dooyong_68k)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 8_MHz_XTAL) // 8MHz measured on Super-X
+ MCFG_DEVICE_ADD("maincpu", M68000, 8_MHz_XTAL) // 8MHz measured on Super-X
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", rshark_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 8_MHz_XTAL/2) // 4MHz measured on Super-X
- MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8_MHz_XTAL/2) // 4MHz measured on Super-X
+ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
// video hardware
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -1786,7 +1786,7 @@ MACHINE_CONFIG_START(rshark_state::dooyong_68k)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(rshark_state, screen_update_rshark)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rshark)
@@ -1808,26 +1808,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rshark_state::rshark)
dooyong_68k(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rshark_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rshark_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(rshark_state::superx)
dooyong_68k(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(superx_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(superx_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(popbingo_state::popbingo)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL/2) // 10MHz measured
- MCFG_CPU_PROGRAM_MAP(popbingo_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20_MHz_XTAL/2) // 10MHz measured
+ MCFG_DEVICE_PROGRAM_MAP(popbingo_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", popbingo_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/4) // 4MHz measured
- MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/4) // 4MHz measured
+ MCFG_DEVICE_PROGRAM_MAP(bluehawk_sound_map)
// video hardware
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(popbingo_state::popbingo)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(popbingo_state, screen_update_popbingo)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", popbingo)
diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp
index dca16872560..5f5efea3d2b 100644
--- a/src/mame/drivers/dorachan.cpp
+++ b/src/mame/drivers/dorachan.cpp
@@ -227,10 +227,10 @@ void dorachan_state::machine_reset()
MACHINE_CONFIG_START(dorachan_state::dorachan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2000000)
- MCFG_CPU_PROGRAM_MAP(dorachan_map)
- MCFG_CPU_IO_MAP(dorachan_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(dorachan_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(dorachan_map)
+ MCFG_DEVICE_IO_MAP(dorachan_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dorachan_state, irq0_line_hold, 2*60)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp
index bdc7fae441e..42c7aa350e0 100644
--- a/src/mame/drivers/dotrikun.cpp
+++ b/src/mame/drivers/dotrikun.cpp
@@ -196,9 +196,9 @@ void dotrikun_state::machine_reset()
MACHINE_CONFIG_START(dotrikun_state::dotrikun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dotrikun_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dotrikun_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scanline_on", dotrikun_state, scanline_on, "screen", 0, 1)
MCFG_TIMER_DRIVER_ADD("scanline_off", dotrikun_state, scanline_off)
MCFG_TIMER_DRIVER_ADD("interrupt", dotrikun_state, interrupt)
diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp
index d276eed34bb..10ee49adb5b 100644
--- a/src/mame/drivers/dps1.cpp
+++ b/src/mame/drivers/dps1.cpp
@@ -195,21 +195,21 @@ static void floppies(device_slot_interface &device)
MACHINE_CONFIG_START(dps1_state::dps1)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_MACHINE_RESET_OVERRIDE(dps1_state, dps1)
/* video hardware */
MCFG_DEVICE_ADD("uart", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart",mc2661_device,rx_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart",mc2661_device,cts_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart",mc2661_device,rx_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart",mc2661_device,cts_w))
MCFG_DEVICE_ADD("am9519a", AM9519, 0)
@@ -217,8 +217,8 @@ MACHINE_CONFIG_START(dps1_state::dps1)
// floppy
MCFG_UPD765A_ADD("fdc", false, true)
- //MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(dps1_state, fdc_int_w)) // doesn't appear to be used
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(dps1_state, fdc_drq_w))
+ //MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, dps1_state, fdc_int_w)) // doesn't appear to be used
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, dps1_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", floppies, "floppy0", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
//MCFG_FLOPPY_DRIVE_ADD("fdc:1", floppies, "floppy1", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index f4339a8fb82..6eb3e130b03 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -169,8 +169,8 @@ void dragon_cart(device_slot_interface &device)
device.option_add("dragon_fdc", DRAGON_FDC);
device.option_add("premier_fdc", PREMIER_FDC);
device.option_add("sdtandy_fdc", SDTANDY_FDC);
- device.option_add("jcbsnd", DRAGON_JCBSND).clock(DERIVED_CLOCK(1, 1));
- device.option_add("ssc", COCO_SSC).clock(DERIVED_CLOCK(1, 1));
+ device.option_add("jcbsnd", DRAGON_JCBSND);
+ device.option_add("ssc", COCO_SSC);
device.option_add("orch90", COCO_ORCH90);
device.option_add("gmc", COCO_PAK_GMC);
device.option_add("pak", COCO_PAK);
@@ -192,30 +192,30 @@ MACHINE_CONFIG_START(dragon_state::dragon_base)
MCFG_DEVICE_CLOCK(XTAL(14'218'000) / 16)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(dragon_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(dragon_mem)
// devices
MCFG_DEVICE_ADD(PIA0_TAG, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia0_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia0_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia0_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia0_irq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia0_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia0_irq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia0_irq_b))
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(coco_state, pia1_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(coco_state, pia1_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(coco_state, pia1_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(coco_state, pia1_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(coco_state, pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(coco_state, pia1_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(coco_state, pia1_firq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(coco_state, pia1_firq_b))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, coco_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, coco_state, pia1_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, coco_state, pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, coco_state, pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, coco_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, coco_state, pia1_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, coco_state, pia1_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, coco_state, pia1_firq_b))
MCFG_SAM6883_ADD(SAM_TAG, XTAL(14'218'000), MAINCPU_TAG, AS_PROGRAM)
- MCFG_SAM6883_RES_CALLBACK(READ8(dragon_state, sam_read))
+ MCFG_SAM6883_RES_CALLBACK(READ8(*this, dragon_state, sam_read))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_FORMATS(coco_cassette_formats)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
@@ -227,9 +227,9 @@ MACHINE_CONFIG_START(dragon_state::dragon_base)
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, VDG_TAG)
MCFG_DEVICE_ADD(VDG_TAG, MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(dragon_state, horizontal_sync))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(dragon_state, field_sync))
- MCFG_MC6847_INPUT_CALLBACK(DEVREAD8(SAM_TAG, sam6883_device, display_read))
+ MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, dragon_state, horizontal_sync))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, dragon_state, field_sync))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(SAM_TAG, sam6883_device, display_read))
// sound hardware
coco_sound(config);
@@ -253,7 +253,7 @@ MACHINE_CONFIG_START(dragon_state::dragon32)
// cartridge
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_cart, "dragon_fdc")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MACHINE_CONFIG_END
@@ -266,7 +266,7 @@ MACHINE_CONFIG_START(dragon64_state::dragon64)
// cartridge
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_cart, "dragon_fdc")
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
@@ -282,8 +282,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dragon64_state::dragon64h)
dragon64(config);
// Replace M6809 with HD6309
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(dragon_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(dragon_mem)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MACHINE_CONFIG_END
@@ -321,7 +321,7 @@ MACHINE_CONFIG_START(dragon_alpha_state::dgnalpha)
// cartridge
MCFG_COCO_CARTRIDGE_ADD(CARTRIDGE_TAG, dragon_cart, nullptr)
- MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(coco_state, cart_w))
+ MCFG_COCO_CARTRIDGE_CART_CB(WRITELINE(*this, coco_state, cart_w))
MCFG_COCO_CARTRIDGE_NMI_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_NMI))
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
@@ -331,8 +331,8 @@ MACHINE_CONFIG_START(dragon_alpha_state::dgnalpha)
// floppy
MCFG_WD2797_ADD(WD2797_TAG, XTAL(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, dragon_alpha_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, dragon_alpha_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", dragon_alpha_floppies, "dd", dragon_alpha_state::dragon_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -344,16 +344,16 @@ MACHINE_CONFIG_START(dragon_alpha_state::dgnalpha)
MCFG_FLOPPY_DRIVE_SOUND(true)
// sound hardware
- MCFG_SOUND_ADD(AY8912_TAG, AY8912, 1000000)
- MCFG_AY8910_PORT_A_READ_CB(READ8(dragon_alpha_state, psg_porta_read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(dragon_alpha_state, psg_porta_write))
+ MCFG_DEVICE_ADD(AY8912_TAG, AY8912, 1000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dragon_alpha_state, psg_porta_read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, dragon_alpha_state, psg_porta_write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
// pia 2
MCFG_DEVICE_ADD( PIA2_TAG, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(dragon_alpha_state, pia2_pa_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(dragon_alpha_state, pia2_firq_a))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(dragon_alpha_state, pia2_firq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, dragon_alpha_state, pia2_pa_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, dragon_alpha_state, pia2_firq_a))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, dragon_alpha_state, pia2_firq_b))
// software lists
MCFG_SOFTWARE_LIST_ADD("dgnalpha_flop_list", "dgnalpha_flop")
@@ -378,8 +378,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dragon64_state::tanodr64h)
tanodr64(config);
// Replace M6809 CPU with HD6309 CPU
- MCFG_CPU_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(dragon_mem)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, HD6309E, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(dragon_mem)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index 8a1a4e5c21e..71c501f07de 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -274,9 +274,9 @@ void dragrace_state::machine_reset()
MACHINE_CONFIG_START(dragrace_state::dragrace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(12'096'000) / 12)
- MCFG_CPU_PROGRAM_MAP(dragrace_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(dragrace_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(12'096'000) / 12)
+ MCFG_DEVICE_PROGRAM_MAP(dragrace_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(dragrace_state, irq0_line_hold, 4*60)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -298,32 +298,32 @@ MACHINE_CONFIG_START(dragrace_state::dragrace)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(dragrace)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("latch_f5", F9334, 0) // F5
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(dragrace_state, speed1_w)) MCFG_DEVCB_MASK(0x1f) // set 3SPEED1-7SPEED1
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_EXPLODE1_EN>)) // Explosion1 enable
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_SCREECH1_EN>)) // Screech1 enable
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, dragrace_state, speed1_w)) MCFG_DEVCB_MASK(0x1f) // set 3SPEED1-7SPEED1
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_EXPLODE1_EN>)) // Explosion1 enable
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_SCREECH1_EN>)) // Screech1 enable
MCFG_DEVICE_ADD("latch_a5", F9334, 0) // A5
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_KLEXPL1_EN>)) // KLEXPL1 enable
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_MOTOR1_EN>)) // Motor1 enable
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_ATTRACT_EN>)) // Attract enable
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_LOTONE_EN>)) // LoTone enable
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_KLEXPL1_EN>)) // KLEXPL1 enable
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_MOTOR1_EN>)) // Motor1 enable
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_ATTRACT_EN>)) // Attract enable
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_LOTONE_EN>)) // LoTone enable
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(OUTPUT("led0")) // Player 1 Start Lamp
MCFG_DEVICE_ADD("latch_h5", F9334, 0) // H5
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(dragrace_state, speed2_w)) MCFG_DEVCB_MASK(0x1f) // set 3SPEED2-7SPEED2
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_EXPLODE2_EN>)) // Explosion2 enable
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_SCREECH2_EN>)) // Screech2 enable
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, dragrace_state, speed2_w)) MCFG_DEVCB_MASK(0x1f) // set 3SPEED2-7SPEED2
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_EXPLODE2_EN>)) // Explosion2 enable
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_SCREECH2_EN>)) // Screech2 enable
MCFG_DEVICE_ADD("latch_e5", F9334, 0) // E5
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_KLEXPL2_EN>)) // KLEXPL2 enable
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_MOTOR2_EN>)) // Motor2 enable
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<DRAGRACE_HITONE_EN>)) // HiTone enable
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_KLEXPL2_EN>)) // KLEXPL2 enable
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_MOTOR2_EN>)) // Motor2 enable
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<DRAGRACE_HITONE_EN>)) // HiTone enable
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(OUTPUT("led1")) // Player 2 Start Lamp
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp
index 84555de8551..07d80bc06e5 100644
--- a/src/mame/drivers/dreambal.cpp
+++ b/src/mame/drivers/dreambal.cpp
@@ -310,9 +310,9 @@ void dreambal_state::machine_reset()
MACHINE_CONFIG_START(dreambal_state::dreambal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
- MCFG_CPU_PROGRAM_MAP(dreambal_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dreambal_state, irq6_line_hold) // 5 valid too?
+ MCFG_DEVICE_ADD("maincpu", M68000, 28000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(dreambal_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dreambal_state, irq6_line_hold) // 5 valid too?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index 0d4d7a2ecad..855314cef37 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -749,9 +749,9 @@ void dreamwld_state::machine_reset()
MACHINE_CONFIG_START(dreamwld_state::baryon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz verified */
- MCFG_CPU_PROGRAM_MAP(baryon_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(baryon_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -760,7 +760,7 @@ MACHINE_CONFIG_START(dreamwld_state::baryon)
MCFG_SCREEN_SIZE(512,256)
MCFG_SCREEN_VISIBLE_AREA(0, 308-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(dreamwld_state, screen_update_dreamwld)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dreamwld_state, screen_vblank_dreamwld))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dreamwld_state, screen_vblank_dreamwld))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 0x1000)
@@ -781,9 +781,9 @@ MACHINE_CONFIG_START(dreamwld_state::dreamwld)
baryon(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dreamwld_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dreamwld_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
MCFG_OKIM6295_ADD("oki2", XTAL(32'000'000)/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp
index fa5cb9c3de2..65be27b0ac4 100644
--- a/src/mame/drivers/drgnmst.cpp
+++ b/src/mame/drivers/drgnmst.cpp
@@ -376,17 +376,17 @@ void drgnmst_state::machine_reset()
MACHINE_CONFIG_START(drgnmst_state::drgnmst)
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Confirmed */
- MCFG_CPU_PROGRAM_MAP(drgnmst_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", drgnmst_state, irq2_line_hold)
-
- MCFG_CPU_ADD("audiocpu", PIC16C55, 32000000/8) /* Confirmed */
- MCFG_PIC16C5x_READ_A_CB(READ8(drgnmst_state, pic16c5x_port0_r))
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(drgnmst_state, drgnmst_pcm_banksel_w))
- MCFG_PIC16C5x_READ_B_CB(READ8(drgnmst_state, drgnmst_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(drgnmst_state, drgnmst_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(drgnmst_state, drgnmst_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(drgnmst_state, drgnmst_snd_control_w))
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(drgnmst_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", drgnmst_state, irq2_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", PIC16C55, 32000000/8) /* Confirmed */
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, drgnmst_state, pic16c5x_port0_r))
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, drgnmst_state, drgnmst_pcm_banksel_w))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, drgnmst_state, drgnmst_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, drgnmst_state, drgnmst_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, drgnmst_state, drgnmst_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, drgnmst_state, drgnmst_snd_control_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", drgnmst)
diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp
index 9b120bc05c8..6819b022c47 100644
--- a/src/mame/drivers/dribling.cpp
+++ b/src/mame/drivers/dribling.cpp
@@ -271,21 +271,21 @@ void dribling_state::machine_reset()
MACHINE_CONFIG_START(dribling_state::dribling)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000)
- MCFG_CPU_PROGRAM_MAP(dribling_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dribling_state, dribling_irq_gen)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(dribling_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dribling_state, dribling_irq_gen)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(dribling_state, dsr_r))
- MCFG_I8255_IN_PORTB_CB(READ8(dribling_state, input_mux0_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(dribling_state, misc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, dribling_state, dsr_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, dribling_state, input_mux0_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, dribling_state, misc_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(dribling_state, sound_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(dribling_state, pb_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, dribling_state, sound_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, dribling_state, pb_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(dribling_state, shr_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, dribling_state, shr_w))
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp
index e14f69d90af..924083c2ebc 100644
--- a/src/mame/drivers/drmicro.cpp
+++ b/src/mame/drivers/drmicro.cpp
@@ -243,10 +243,10 @@ void drmicro_state::machine_reset()
MACHINE_CONFIG_START(drmicro_state::drmicro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */
- MCFG_CPU_PROGRAM_MAP(drmicro_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", drmicro_state, drmicro_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(drmicro_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", drmicro_state, drmicro_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -268,17 +268,17 @@ MACHINE_CONFIG_START(drmicro_state::drmicro)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, MCLK/4)
+ MCFG_DEVICE_ADD("sn1", SN76496, MCLK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76496, MCLK/4)
+ MCFG_DEVICE_ADD("sn2", SN76496, MCLK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76496, MCLK/4)
+ MCFG_DEVICE_ADD("sn3", SN76496, MCLK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(drmicro_state, pcm_w)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, drmicro_state, pcm_w)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp
index 8cbc3972b40..f4a84149a19 100644
--- a/src/mame/drivers/drtomy.cpp
+++ b/src/mame/drivers/drtomy.cpp
@@ -305,9 +305,9 @@ void drtomy_state::machine_reset()
MACHINE_CONFIG_START(drtomy_state::drtomy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(drtomy_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", drtomy_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,24000000/2) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(drtomy_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", drtomy_state, irq6_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index f52d308229a..ef817f269bf 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -445,19 +445,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(drw80pkr_state::drw80pkr)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(drw80pkr_map)
- MCFG_CPU_IO_MAP(drw80pkr_io_map)
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(drw80pkr_state, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(drw80pkr_state, t1_r))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(drw80pkr_state, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(drw80pkr_state, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(drw80pkr_state, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(drw80pkr_state, p2_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(drw80pkr_state, prog_w))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(drw80pkr_state, bus_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(drw80pkr_state, bus_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", drw80pkr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", I8039, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(drw80pkr_map)
+ MCFG_DEVICE_IO_MAP(drw80pkr_io_map)
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, drw80pkr_state, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, drw80pkr_state, t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, drw80pkr_state, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, drw80pkr_state, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, drw80pkr_state, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, drw80pkr_state, p2_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(*this, drw80pkr_state, prog_w))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, drw80pkr_state, bus_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, drw80pkr_state, bus_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", drw80pkr_state, irq0_line_hold)
// video hardware
@@ -479,7 +479,7 @@ MACHINE_CONFIG_START(drw80pkr_state::drw80pkr)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 20000000/12)
+ MCFG_DEVICE_ADD("aysnd", AY8912, 20000000/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp
index 8ef6c2fc634..7979bba9d37 100644
--- a/src/mame/drivers/dsb46.cpp
+++ b/src/mame/drivers/dsb46.cpp
@@ -109,35 +109,35 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(dsb46_state::dsb46)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
- MCFG_CPU_PROGRAM_MAP(dsb46_mem)
- MCFG_CPU_IO_MAP(dsb46_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(dsb46_mem)
+ MCFG_DEVICE_IO_MAP(dsb46_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(dsb46_state, dsb46)
/* video hardware */
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(1'843'200))
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc1", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg2))
/* Devices */
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(24'000'000) / 6)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(24'000'000) / 6)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio", z80sio_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("sio", z80sio_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txcb_w))
MACHINE_CONFIG_END
ROM_START( dsb46 )
diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp
index 78c6b0235ce..892614a34ef 100644
--- a/src/mame/drivers/dual68.cpp
+++ b/src/mame/drivers/dual68.cpp
@@ -98,12 +98,12 @@ void dual68_state::kbd_put(u8 data)
MACHINE_CONFIG_START(dual68_state::dual68)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(dual68_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(dual68_mem)
- MCFG_CPU_ADD("siocpu", I8085A, XTAL(16'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(sio4_mem)
- MCFG_CPU_IO_MAP(sio4_io)
+ MCFG_DEVICE_ADD("siocpu", I8085A, XTAL(16'000'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sio4_mem)
+ MCFG_DEVICE_IO_MAP(sio4_io)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/duet16.cpp b/src/mame/drivers/duet16.cpp
index cce906a933c..0e815b26bf5 100644
--- a/src/mame/drivers/duet16.cpp
+++ b/src/mame/drivers/duet16.cpp
@@ -352,63 +352,63 @@ static DEVICE_INPUT_DEFAULTS_START(keyboard)
DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(duet16_state::duet16)
- MCFG_CPU_ADD("maincpu", I8086, 24_MHz_XTAL / 3)
- MCFG_CPU_PROGRAM_MAP(duet16_mem)
- MCFG_CPU_IO_MAP(duet16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 24_MHz_XTAL / 3)
+ MCFG_DEVICE_PROGRAM_MAP(duet16_mem)
+ MCFG_DEVICE_IO_MAP(duet16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
- MCFG_CPU_ADD("i8741", I8741, 20_MHz_XTAL / 4)
+ MCFG_DEVICE_ADD("i8741", I8741, 20_MHz_XTAL / 4)
MCFG_DEVICE_ADD("pic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("dmac", AM9517A, 20_MHz_XTAL / 4)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(duet16_state, hrq_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(duet16_state, dma_mem_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(duet16_state, dma_mem_w))
- MCFG_AM9517A_IN_IOR_0_CB(DEVREAD8("fdc", upd765a_device, mdma_r))
- MCFG_AM9517A_OUT_IOW_0_CB(DEVWRITE8("fdc", upd765a_device, mdma_w))
- MCFG_AM9517A_OUT_EOP_CB(DEVWRITELINE("fdc", upd765a_device, tc_line_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, duet16_state, hrq_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, duet16_state, dma_mem_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, duet16_state, dma_mem_w))
+ MCFG_AM9517A_IN_IOR_0_CB(READ8("fdc", upd765a_device, mdma_r))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8("fdc", upd765a_device, mdma_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE("fdc", upd765a_device, tc_line_w))
MCFG_DEVICE_ADD("bgpit", PIT8253, 0)
MCFG_PIT8253_CLK0(8_MHz_XTAL / 13)
MCFG_PIT8253_CLK1(8_MHz_XTAL / 13)
MCFG_PIT8253_CLK2(8_MHz_XTAL / 13)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("sio", upd7201_new_device, txca_w)) // TODO: selected through LS153
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", upd7201_new_device, rxca_w))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("sio", upd7201_new_device, txcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", upd7201_new_device, rxcb_w))
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("kbusart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("kbusart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("sio", upd7201_new_device, txca_w)) // TODO: selected through LS153
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", upd7201_new_device, rxca_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("sio", upd7201_new_device, txcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", upd7201_new_device, rxcb_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("kbusart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("kbusart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("itm", PTM6840, 0)
MCFG_PTM6840_EXTERNAL_CLOCKS(0.0, 0.0, (8_MHz_XTAL / 8).dvalue()) // C3 = 1MHz
- MCFG_PTM6840_O3_CB(DEVWRITELINE("itm", ptm6840_device, set_c1)) // C1 = C2 = O3
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("itm", ptm6840_device, set_c2))
- MCFG_PTM6840_IRQ_CB(DEVWRITELINE("tmint", input_merger_device, in_w<0>))
+ MCFG_PTM6840_O3_CB(WRITELINE("itm", ptm6840_device, set_c1)) // C1 = C2 = O3
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("itm", ptm6840_device, set_c2))
+ MCFG_PTM6840_IRQ_CB(WRITELINE("tmint", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("sio", UPD7201_NEW, 8_MHz_XTAL / 2)
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic", pic8259_device, ir1_w)) // INT5
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("pic", pic8259_device, ir1_w)) // INT5
MCFG_DEVICE_ADD("kbusart", I8251, 8_MHz_XTAL / 4)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("kbd", rs232_port_device, write_txd))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("kbusart", i8251_device, write_cts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("kbint", input_merger_device, in_w<0>))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("kbint", input_merger_device, in_w<1>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("kbd", rs232_port_device, write_txd))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("kbusart", i8251_device, write_cts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("kbint", input_merger_device, in_w<0>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("kbint", input_merger_device, in_w<1>))
- MCFG_RS232_PORT_ADD("kbd", duet16_keyboard_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("kbusart", i8251_device, write_rxd))
+ MCFG_DEVICE_ADD("kbd", RS232_PORT, duet16_keyboard_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("kbusart", i8251_device, write_rxd))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", keyboard)
MCFG_INPUT_MERGER_ANY_HIGH("kbint")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(DEVWRITELINE("pic", pic8259_device, ir5_w)) // INT2
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("pic", pic8259_device, ir5_w)) // INT2
MCFG_INPUT_MERGER_ANY_HIGH("tmint")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(DEVWRITELINE("pic", pic8259_device, ir0_w)) // INT6
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("pic", pic8259_device, ir0_w)) // INT6
MCFG_UPD765A_ADD("fdc", true, false)
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dmac", am9517a_device, dreq0_w))
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir3_w)) // INT4
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dmac", am9517a_device, dreq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir3_w)) // INT4
MCFG_FLOPPY_DRIVE_ADD("fdc:0", duet16_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_SLOT_FIXED(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", duet16_floppies, "525qd", floppy_image_device::default_floppy_formats)
@@ -430,11 +430,11 @@ MACHINE_CONFIG_START(duet16_state::duet16)
MCFG_SCREEN_UPDATE_DEVICE("crtc", h46505_device, screen_update)
MCFG_DEVICE_ADD("rtc", MSM58321, 32768_Hz_XTAL)
- MCFG_MSM58321_D0_HANDLER(WRITELINE(duet16_state, rtc_d0_w))
- MCFG_MSM58321_D1_HANDLER(WRITELINE(duet16_state, rtc_d1_w))
- MCFG_MSM58321_D2_HANDLER(WRITELINE(duet16_state, rtc_d2_w))
- MCFG_MSM58321_D3_HANDLER(WRITELINE(duet16_state, rtc_d3_w))
- MCFG_MSM58321_BUSY_HANDLER(WRITELINE(duet16_state, rtc_busy_w))
+ MCFG_MSM58321_D0_HANDLER(WRITELINE(*this, duet16_state, rtc_d0_w))
+ MCFG_MSM58321_D1_HANDLER(WRITELINE(*this, duet16_state, rtc_d1_w))
+ MCFG_MSM58321_D2_HANDLER(WRITELINE(*this, duet16_state, rtc_d2_w))
+ MCFG_MSM58321_D3_HANDLER(WRITELINE(*this, duet16_state, rtc_d3_w))
+ MCFG_MSM58321_BUSY_HANDLER(WRITELINE(*this, duet16_state, rtc_busy_w))
MCFG_MSM58321_YEAR0(1980)
MCFG_MSM58321_DEFAULT_24H(true)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index 1067aadf398..2a7a4baf858 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -806,10 +806,10 @@ void dunhuang_state::machine_reset()
MACHINE_CONFIG_START(dunhuang_state::dunhuang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2)
- MCFG_CPU_PROGRAM_MAP(dunhuang_map)
- MCFG_CPU_IO_MAP(dunhuang_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", dunhuang_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(dunhuang_map)
+ MCFG_DEVICE_IO_MAP(dunhuang_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", dunhuang_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(5))
@@ -831,12 +831,12 @@ MACHINE_CONFIG_START(dunhuang_state::dunhuang)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ay8910", AY8910, 12000000/8)
- MCFG_AY8910_PORT_B_READ_CB(READ8(dunhuang_state, dsw_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(dunhuang_state, input_w))
+ MCFG_DEVICE_ADD("ay8910", AY8910, 12000000/8)
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, dunhuang_state, dsw_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, dunhuang_state, input_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", 12000000/8, PIN7_HIGH)
diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp
index 0c1d76d925d..deb32a3f1dc 100644
--- a/src/mame/drivers/dvk_kcgd.cpp
+++ b/src/mame/drivers/dvk_kcgd.cpp
@@ -347,8 +347,8 @@ static GFXDECODE_START( kcgd )
GFXDECODE_END
MACHINE_CONFIG_START(kcgd_state::kcgd)
- MCFG_CPU_ADD("maincpu", K1801VM2, XTAL(30'800'000)/4)
- MCFG_CPU_PROGRAM_MAP(kcgd_mem)
+ MCFG_DEVICE_ADD("maincpu", K1801VM2, XTAL(30'800'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(kcgd_mem)
MCFG_T11_INITIAL_MODE(0100000)
MCFG_TIMER_DRIVER_ADD_PERIODIC("scantimer", kcgd_state, scanline_callback, attotime::from_hz(50*28*11)) // XXX verify
@@ -367,10 +367,10 @@ MACHINE_CONFIG_START(kcgd_state::kcgd)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kcgd)
#if 0
MCFG_DEVICE_ADD("ms7004", MS7004, 0)
- MCFG_MS7004_TX_HANDLER(DEVWRITELINE("i8251kbd", i8251_device, write_rxd))
+ MCFG_MS7004_TX_HANDLER(WRITELINE("i8251kbd", i8251_device, write_rxd))
MCFG_DEVICE_ADD("keyboard_clock", CLOCK, 4800*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(kcgd_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, kcgd_state, write_keyboard_clock))
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index fbceeecbda4..9a984fef6c6 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -416,10 +416,10 @@ static GFXDECODE_START( ksm )
GFXDECODE_END
MACHINE_CONFIG_START(ksm_state::ksm)
- MCFG_CPU_ADD("maincpu", I8080, XTAL(15'400'000)/10)
- MCFG_CPU_PROGRAM_MAP(ksm_mem)
- MCFG_CPU_IO_MAP(ksm_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(15'400'000)/10)
+ MCFG_DEVICE_PROGRAM_MAP(ksm_mem)
+ MCFG_DEVICE_IO_MAP(ksm_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ksm_state, scanline_callback, "screen", 0, 1)
@@ -439,33 +439,33 @@ MACHINE_CONFIG_START(ksm_state::ksm)
// D30
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ksm_state, ksm_ppi_porta_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ksm_state, ksm_ppi_porta_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SA1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("SA2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ksm_state, ksm_ppi_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ksm_state, ksm_ppi_portc_w))
// D42 - serial connection to host
MCFG_DEVICE_ADD( "i8251line", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251line", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("i8251line", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251line", i8251_device, write_dsr))
// D41 - serial connection to MS7004 keyboard
MCFG_DEVICE_ADD( "i8251kbd", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_I8251_RTS_HANDLER(WRITELINE(ksm_state, write_brga))
- MCFG_I8251_DTR_HANDLER(WRITELINE(ksm_state, write_brgb))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(*this, ksm_state, write_brga))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(*this, ksm_state, write_brgb))
MCFG_DEVICE_ADD("ms7004", MS7004, 0)
- MCFG_MS7004_TX_HANDLER(DEVWRITELINE("i8251kbd", i8251_device, write_rxd))
+ MCFG_MS7004_TX_HANDLER(WRITELINE("i8251kbd", i8251_device, write_rxd))
// baud rate is supposed to be 4800 but keyboard is slightly faster
MCFG_DEVICE_ADD("keyboard_clock", CLOCK, 4960*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ksm_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ksm_state, write_keyboard_clock))
MACHINE_CONFIG_END
ROM_START( dvk_ksm )
diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp
index b264c03a710..f689bca9902 100644
--- a/src/mame/drivers/dwarfd.cpp
+++ b/src/mame/drivers/dwarfd.cpp
@@ -733,10 +733,10 @@ MACHINE_CONFIG_START(dwarfd_state::dwarfd)
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MCFG_CPU_ADD("maincpu", I8085A, 10595000/3*2) /* ? MHz */
- MCFG_I8085A_SOD(WRITELINE(dwarfd_state,dwarfd_sod_callback))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 10595000/3*2) /* ? MHz */
+ MCFG_I8085A_SOD(WRITELINE(*this, dwarfd_state,dwarfd_sod_callback))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -749,14 +749,14 @@ MACHINE_CONFIG_START(dwarfd_state::dwarfd)
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(dwarfd_state, display_pixels)
MCFG_I8275_IRQ_CALLBACK(INPUTLINE("maincpu", I8085_RST55_LINE))
- MCFG_I8275_DRQ_CALLBACK(WRITELINE(dwarfd_state, drq_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(*this, dwarfd_state, drq_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dwarfd)
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(dwarfd_state, dwarfd)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -764,9 +764,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dwarfd_state::pokeresp)
dwarfd(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pokeresp_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pokeresp_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_MODIFY("i8275")
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(dwarfd_state, pesp_display_pixels)
@@ -775,9 +775,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dwarfd_state::qc)
dwarfd(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qc_map)
- MCFG_CPU_IO_MAP(qc_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qc_map)
+ MCFG_DEVICE_IO_MAP(qc_io_map)
MCFG_DEVICE_MODIFY("i8275")
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(dwarfd_state, qc_display_pixels)
diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp
index b99214dcbf9..aaf6b38589b 100644
--- a/src/mame/drivers/dynadice.cpp
+++ b/src/mame/drivers/dynadice.cpp
@@ -250,13 +250,13 @@ void dynadice_state::machine_reset()
MACHINE_CONFIG_START(dynadice_state::dynadice)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080,18432000/8)
- MCFG_CPU_PROGRAM_MAP(dynadice_map)
- MCFG_CPU_IO_MAP(dynadice_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080,18432000/8)
+ MCFG_DEVICE_PROGRAM_MAP(dynadice_map)
+ MCFG_DEVICE_IO_MAP(dynadice_io_map)
- MCFG_CPU_ADD("audiocpu", Z80,18432000/6)
- MCFG_CPU_PROGRAM_MAP(dynadice_sound_map)
- MCFG_CPU_IO_MAP(dynadice_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,18432000/6)
+ MCFG_DEVICE_PROGRAM_MAP(dynadice_sound_map)
+ MCFG_DEVICE_IO_MAP(dynadice_sound_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -277,7 +277,7 @@ MACHINE_CONFIG_START(dynadice_state::dynadice)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dynamoah.cpp b/src/mame/drivers/dynamoah.cpp
index 2855a25f799..0b6cf1d5a04 100644
--- a/src/mame/drivers/dynamoah.cpp
+++ b/src/mame/drivers/dynamoah.cpp
@@ -74,17 +74,17 @@ void dynamoah_state::i8031_ext_mem(address_map &map)
}
MACHINE_CONFIG_START(dynamoah_state::dynamoah)
- MCFG_CPU_ADD("maincpu", I80C31, 6'144'000) // SC80C31BCCN40
+ MCFG_DEVICE_ADD("maincpu", I80C31, 6'144'000) // SC80C31BCCN40
// clock needs verification, being the XTAL value from a different board
- MCFG_CPU_PROGRAM_MAP(i8031_mem)
- MCFG_CPU_IO_MAP(i8031_ext_mem)
- MCFG_MCS51_PORT_P1_IN_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVICE_PROGRAM_MAP(i8031_mem)
+ MCFG_DEVICE_IO_MAP(i8031_ext_mem)
+ MCFG_MCS51_PORT_P1_IN_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
MCFG_DEVCB_CHAIN_INPUT(CONSTANT(0x7f))
- MCFG_MCS51_PORT_P1_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(dynamoah_state, p1_w)) MCFG_DEVCB_MASK(0x1f)
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(dynamoah_state, p3_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(*this, dynamoah_state, p1_w)) MCFG_DEVCB_MASK(0x1f)
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, dynamoah_state, p3_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index bd2223e2913..10bb4815cf8 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -4200,10 +4200,10 @@ MACHINE_START_MEMBER(dynax_state,hanamai)
MACHINE_CONFIG_START(dynax_state::cdracula)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/4) /* 5.3693175MHz measured */
- MCFG_CPU_PROGRAM_MAP(cdracula_mem_map)
- MCFG_CPU_IO_MAP(cdracula_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/4) /* 5.3693175MHz measured */
+ MCFG_DEVICE_PROGRAM_MAP(cdracula_mem_map)
+ MCFG_DEVICE_IO_MAP(cdracula_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4214,9 +4214,9 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, flipscreen_w)) // Flip Screen
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, blitter_ack_w)) // Blitter IRQ Ack
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(dynax_state, blit_palbank_w)) // Layers Palettes (High Bit)
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w)) // Flip Screen
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w)) // Blitter IRQ Ack
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w)) // Layers Palettes (High Bit)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4226,7 +4226,7 @@ MACHINE_CONFIG_START(dynax_state::cdracula)
MCFG_SCREEN_VISIBLE_AREA(16, 512-16-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_cdracula)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@@ -4248,10 +4248,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::hanamai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
- MCFG_CPU_IO_MAP(hanamai_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sprtmtch_mem_map)
+ MCFG_DEVICE_IO_MAP(hanamai_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4262,14 +4262,14 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("msm", msm5205_device, reset_w)) MCFG_DEVCB_INVERT // MSM5205 reset
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(dynax_state, adpcm_reset_kludge_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, flipscreen_w)) // Flip Screen
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, coincounter_0_w)) // Coin Counters
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, coincounter_1_w)) //
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, blitter_ack_w)) // Blitter IRQ Ack
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(dynax_state, blit_palbank_w)) // Layers Palettes (High Bit)
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, layer_half_w)) // half of the interleaved layer to write to
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("msm", msm5205_device, reset_w)) MCFG_DEVCB_INVERT // MSM5205 reset
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, dynax_state, adpcm_reset_kludge_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w)) // Flip Screen
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w)) // Coin Counters
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w)) //
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w)) // Blitter IRQ Ack
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w)) // Layers Palettes (High Bit)
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w)) // half of the interleaved layer to write to
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4279,7 +4279,7 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16+8, 255-8)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_hanamai)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@@ -4289,11 +4289,11 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 22000000 / 8)
+ MCFG_DEVICE_ADD("aysnd", AY8912, 22000000 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2203", YM2203, 22000000 / 8)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
+ MCFG_DEVICE_ADD("ym2203", YM2203, 22000000 / 8)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW0"))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
@@ -4301,8 +4301,8 @@ MACHINE_CONFIG_START(dynax_state::hanamai)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dynax_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4316,10 +4316,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::hnoridur)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL(22'000'000) / 4) /* 5.5MHz */
- MCFG_CPU_PROGRAM_MAP(hnoridur_mem_map)
- MCFG_CPU_IO_MAP(hnoridur_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(22'000'000) / 4) /* 5.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hnoridur_mem_map)
+ MCFG_DEVICE_IO_MAP(hnoridur_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,dynax)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4336,14 +4336,14 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC25
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, layer_half_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, layer_half2_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, blitter_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, layer_half2_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w))
MCFG_DEVICE_ADD("outlatch", LS259, 0) // IC61
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4353,7 +4353,7 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_hnoridur)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 16*256)
@@ -4362,15 +4362,15 @@ MACHINE_CONFIG_START(dynax_state::hnoridur)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL(22'000'000) / 16)
+ MCFG_DEVICE_ADD("aysnd", AY8912, XTAL(22'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dynax_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4383,10 +4383,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::hjingi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(22'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(hjingi_mem_map)
- MCFG_CPU_IO_MAP(hjingi_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(22'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(hjingi_mem_map)
+ MCFG_DEVICE_IO_MAP(hjingi_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,hjingi)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4403,16 +4403,16 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, layer_half_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, layer_half2_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, blitter_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, layer_half2_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w))
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, coincounter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, hjingi_hopper_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, hjingi_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, hjingi_hopper_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, hjingi_lockout_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4422,7 +4422,7 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1-4, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_hnoridur)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 16*256)
@@ -4431,15 +4431,15 @@ MACHINE_CONFIG_START(dynax_state::hjingi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL(22'000'000) / 16)
+ MCFG_DEVICE_ADD("aysnd", AY8912, XTAL(22'000'000) / 16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(3'579'545) )
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(3'579'545) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000) )
- MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000) )
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dynax_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4452,10 +4452,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::sprtmtch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
- MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
- MCFG_CPU_IO_MAP(sprtmtch_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sprtmtch_mem_map)
+ MCFG_DEVICE_IO_MAP(sprtmtch_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4466,11 +4466,11 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // UF12 on Intergirl
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, coincounter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, blitter_ack_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(dynax_state, blit_palbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, blitter_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4480,7 +4480,7 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_sprtmtch)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, sprtmtch_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, sprtmtch_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@@ -4490,8 +4490,8 @@ MACHINE_CONFIG_START(dynax_state::sprtmtch)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2203", YM2203, 22000000 / 8)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
+ MCFG_DEVICE_ADD("ym2203", YM2203, 22000000 / 8)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
@@ -4514,9 +4514,9 @@ WRITE_LINE_MEMBER(dynax_state::mjfriday_vblank_w)
MACHINE_CONFIG_START(dynax_state::mjfriday)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
- MCFG_CPU_PROGRAM_MAP(sprtmtch_mem_map)
- MCFG_CPU_IO_MAP(mjfriday_io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(sprtmtch_mem_map)
+ MCFG_DEVICE_IO_MAP(mjfriday_io_map)
MCFG_MACHINE_START_OVERRIDE(dynax_state,hanamai)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4524,14 +4524,14 @@ MACHINE_CONFIG_START(dynax_state::mjfriday)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC15
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, mjdialq2_blit_dest1_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, mjdialq2_blit_dest0_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, blit_palbank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(dynax_state, coincounter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(dynax_state, mjdialq2_layer1_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, mjdialq2_layer0_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_blit_dest1_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_blit_dest0_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_layer1_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_layer0_enable_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4541,7 +4541,7 @@ MACHINE_CONFIG_START(dynax_state::mjfriday)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_mjdialq2)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, mjfriday_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, mjfriday_vblank_w))
MCFG_PALETTE_ADD("palette", 512)
@@ -4551,7 +4551,7 @@ MACHINE_CONFIG_START(dynax_state::mjfriday)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, 24000000/6)
+ MCFG_DEVICE_ADD("ym2413", YM2413, 24000000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4564,8 +4564,8 @@ MACHINE_CONFIG_START(dynax_state::mjdialq2)
mjfriday(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjdialq2_mem_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjdialq2_mem_map)
MACHINE_CONFIG_END
@@ -4577,9 +4577,9 @@ MACHINE_CONFIG_START(dynax_state::yarunara)
hnoridur(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(yarunara_mem_map)
- MCFG_CPU_IO_MAP(yarunara_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(yarunara_mem_map)
+ MCFG_DEVICE_IO_MAP(yarunara_io_map)
MCFG_DEVICE_MODIFY("bankdev")
MCFG_DEVICE_PROGRAM_MAP(yarunara_banked_map)
@@ -4593,7 +4593,7 @@ MACHINE_CONFIG_START(dynax_state::yarunara)
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("mainirq", rst_pos_buffer_device, rst1_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::mjangels)
@@ -4607,8 +4607,8 @@ MACHINE_CONFIG_START(dynax_state::quiztvqq)
mjangels(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(quiztvqq_mem_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(quiztvqq_mem_map)
MACHINE_CONFIG_END
@@ -4618,9 +4618,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::mcnpshnt)
hnoridur(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mcnpshnt_mem_map)
- MCFG_CPU_IO_MAP(mcnpshnt_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mcnpshnt_mem_map)
+ MCFG_DEVICE_IO_MAP(mcnpshnt_io_map)
MCFG_VIDEO_START_OVERRIDE(dynax_state,mcnpshnt) // different priorities
MACHINE_CONFIG_END
@@ -4632,9 +4632,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::nanajign)
hnoridur(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nanajign_mem_map)
- MCFG_CPU_IO_MAP(nanajign_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nanajign_mem_map)
+ MCFG_DEVICE_IO_MAP(nanajign_io_map)
MCFG_DEVICE_MODIFY("bankdev")
MCFG_DEVICE_PROGRAM_MAP(nanajign_banked_map)
@@ -4662,15 +4662,15 @@ MACHINE_START_MEMBER(dynax_state,jantouki)
MACHINE_CONFIG_START(dynax_state::jantouki)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
- MCFG_CPU_PROGRAM_MAP(jantouki_mem_map)
- MCFG_CPU_IO_MAP(jantouki_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(jantouki_mem_map)
+ MCFG_DEVICE_IO_MAP(jantouki_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
- MCFG_CPU_ADD("soundcpu",Z80,22000000 / 4) /* 5.5MHz */
- MCFG_CPU_PROGRAM_MAP(jantouki_sound_mem_map)
- MCFG_CPU_IO_MAP(jantouki_sound_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
+ MCFG_DEVICE_ADD("soundcpu",Z80,22000000 / 4) /* 5.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(jantouki_sound_mem_map)
+ MCFG_DEVICE_IO_MAP(jantouki_sound_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_pos_buffer_device, inta_cb) // IM 0 needs an opcode on the data bus
MCFG_MACHINE_START_OVERRIDE(dynax_state,jantouki)
MCFG_MACHINE_RESET_OVERRIDE(dynax_state,dynax)
@@ -4684,14 +4684,14 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, coincounter_0_w)) // Coin Counter
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, blit2_palbank_w)) // Layers Palettes (High Bit)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(dynax_state, blit_palbank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(dynax_state, jantouki_blitter_ack_w)) // Blitter IRQ Ack
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, jantouki_blitter2_ack_w)) // Blitter 2 IRQ Ack
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w)) // Coin Counter
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, blit2_palbank_w)) // Layers Palettes (High Bit)
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, dynax_state, jantouki_blitter_ack_w)) // Blitter IRQ Ack
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, jantouki_blitter2_ack_w)) // Blitter 2 IRQ Ack
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_pos_buffer_device, rst2_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_pos_buffer_device, rst2_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
/* video hardware */
@@ -4706,7 +4706,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(dynax_state, screen_update_jantouki_top)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(dynax_state, jantouki_vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dynax_state, jantouki_vblank_w))
MCFG_SCREEN_ADD("bottom", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -4721,18 +4721,18 @@ MACHINE_CONFIG_START(dynax_state::jantouki)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 22000000 / 8)
+ MCFG_DEVICE_ADD("aysnd", AY8912, 22000000 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2203", YM2203, 22000000 / 8)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_pos_buffer_device, rst1_w))
+ MCFG_DEVICE_ADD("ym2203", YM2203, 22000000 / 8)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("soundirq", rst_pos_buffer_device, rst1_w))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int_cpu1)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, dynax_state, adpcm_int_cpu1)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -4766,37 +4766,37 @@ void dynax_state::mjelctrn_update_irq()
MACHINE_CONFIG_START(dynax_state::mjelctrn)
hnoridur(config);
- MCFG_CPU_REPLACE("maincpu", TMPZ84C015, XTAL(22'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(nanajign_mem_map)
- MCFG_CPU_IO_MAP(mjelctrn_io_map)
+ MCFG_DEVICE_REPLACE("maincpu", TMPZ84C015, XTAL(22'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(nanajign_mem_map)
+ MCFG_DEVICE_IO_MAP(mjelctrn_io_map)
MCFG_DEVICE_MODIFY("bankdev")
MCFG_DEVICE_PROGRAM_MAP(mjelctrn_banked_map)
MCFG_DEVICE_REPLACE("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, layer_half_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, layer_half2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, layer_half2_w))
// Q3, Q4 seem to be related to wrap around enable
MCFG_DEVICE_REMOVE("mainirq")
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
MCFG_VIDEO_START_OVERRIDE(dynax_state,mjelctrn)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::mjembase)
mjelctrn(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjembase_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjembase_io_map)
MCFG_TMPZ84C015_IN_PA_CB(IOPORT("DSW1"))
MCFG_TMPZ84C015_IN_PB_CB(IOPORT("DSW2"))
MCFG_DEVICE_MODIFY("mainlatch") // 13C
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
MCFG_DEVICE_REMOVE("outlatch")
@@ -4846,16 +4846,16 @@ WRITE_LINE_MEMBER(dynax_state::tenkai_blitter_ack_w)
MACHINE_CONFIG_START(dynax_state::tenkai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",TMP91640, 21472700 / 2)
- MCFG_CPU_PROGRAM_MAP(tenkai_map)
- MCFG_TLCS90_PORT_P3_READ_CB(READ8(dynax_state, tenkai_p3_r))
- MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(dynax_state, tenkai_p3_w))
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(dynax_state, tenkai_p4_w))
- MCFG_TLCS90_PORT_P5_READ_CB(READ8(dynax_state, tenkai_p5_r))
- MCFG_TLCS90_PORT_P6_WRITE_CB(WRITE8(dynax_state, tenkai_p6_w))
- MCFG_TLCS90_PORT_P7_WRITE_CB(WRITE8(dynax_state, tenkai_p7_w))
- MCFG_TLCS90_PORT_P8_READ_CB(READ8(dynax_state, tenkai_p8_r))
- MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(dynax_state, tenkai_p8_w))
+ MCFG_DEVICE_ADD("maincpu",TMP91640, 21472700 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tenkai_map)
+ MCFG_TLCS90_PORT_P3_READ_CB(READ8(*this, dynax_state, tenkai_p3_r))
+ MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(*this, dynax_state, tenkai_p3_w))
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, dynax_state, tenkai_p4_w))
+ MCFG_TLCS90_PORT_P5_READ_CB(READ8(*this, dynax_state, tenkai_p5_r))
+ MCFG_TLCS90_PORT_P6_WRITE_CB(WRITE8(*this, dynax_state, tenkai_p6_w))
+ MCFG_TLCS90_PORT_P7_WRITE_CB(WRITE8(*this, dynax_state, tenkai_p7_w))
+ MCFG_TLCS90_PORT_P8_READ_CB(READ8(*this, dynax_state, tenkai_p8_r))
+ MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(*this, dynax_state, tenkai_p8_w))
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(tenkai_banked_map)
@@ -4869,12 +4869,12 @@ MACHINE_CONFIG_START(dynax_state::tenkai)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 10C on Ougon no Hai
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, layer_half_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, layer_half2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, tenkai_6c_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, tenkai_70_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, tenkai_blitter_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, layer_half_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, layer_half2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, tenkai_6c_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, tenkai_70_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, tenkai_blitter_ack_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4893,12 +4893,12 @@ MACHINE_CONFIG_START(dynax_state::tenkai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 22000000 / 16)
- MCFG_AY8910_PORT_A_READ_CB(READ8(dynax_state, tenkai_dsw_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(dynax_state, tenkai_dswsel_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 22000000 / 16)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dynax_state, tenkai_dsw_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, dynax_state, tenkai_dswsel_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2413", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
@@ -4916,7 +4916,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::mjreach)
tenkai(config);
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, flipscreen_w)) // not inverted
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w)) // not inverted
MACHINE_CONFIG_END
/***************************************************************************
@@ -4926,9 +4926,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynax_state::gekisha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",TMP90841, XTAL(10'000'000) ) // ?
- MCFG_CPU_PROGRAM_MAP(gekisha_map)
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(dynax_state, gekisha_p4_w))
+ MCFG_DEVICE_ADD("maincpu",TMP90841, XTAL(10'000'000) ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(gekisha_map)
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, dynax_state, gekisha_p4_w))
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(gekisha_banked_map)
@@ -4942,14 +4942,14 @@ MACHINE_CONFIG_START(dynax_state::gekisha)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(dynax_state, mjdialq2_blit_dest1_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(dynax_state, mjdialq2_blit_dest0_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(dynax_state, blit_palbank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(dynax_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(dynax_state, coincounter_0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(dynax_state, coincounter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(dynax_state, mjdialq2_layer1_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(dynax_state, mjdialq2_layer0_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_blit_dest1_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_blit_dest0_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, dynax_state, blit_palbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, dynax_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, dynax_state, coincounter_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, dynax_state, coincounter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_layer1_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, dynax_state, mjdialq2_layer0_enable_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4968,12 +4968,12 @@ MACHINE_CONFIG_START(dynax_state::gekisha)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000) / 16) // ?
- MCFG_AY8910_PORT_A_READ_CB(READ8(dynax_state, tenkai_dsw_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(dynax_state, tenkai_dswsel_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(24'000'000) / 16) // ?
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, dynax_state, tenkai_dsw_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, dynax_state, tenkai_dswsel_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(24'000'000) / 8) // ?
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(24'000'000) / 8) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp
index a35b6ea9ab7..e477571578e 100644
--- a/src/mame/drivers/dynduke.cpp
+++ b/src/mame/drivers/dynduke.cpp
@@ -316,15 +316,15 @@ WRITE_LINE_MEMBER(dynduke_state::vblank_irq)
MACHINE_CONFIG_START(dynduke_state::dynduke)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU
- MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
- MCFG_CPU_ADD("slave", V30, 16000000/2) // NEC V30-8 CPU
- MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_ADD("slave", V30, 16000000/2) // NEC V30-8 CPU
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_OPCODES_MAP(sound_decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_OPCODES_MAP(sound_decrypted_opcodes_map)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_PROGRAM_MAP(sei80bu_encrypted_full_map)
@@ -340,8 +340,8 @@ MACHINE_CONFIG_START(dynduke_state::dynduke)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(dynduke_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(dynduke_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, dynduke_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dynduke)
@@ -352,8 +352,8 @@ MACHINE_CONFIG_START(dynduke_state::dynduke)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -362,15 +362,15 @@ MACHINE_CONFIG_START(dynduke_state::dynduke)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dynduke_state::dbldyn)
dynduke(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(masterj_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(masterj_map)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/e100.cpp b/src/mame/drivers/e100.cpp
index d3938662e85..8b4bf01890f 100644
--- a/src/mame/drivers/e100.cpp
+++ b/src/mame/drivers/e100.cpp
@@ -543,8 +543,8 @@ static INPUT_PORTS_START( e100 )
INPUT_PORTS_END
MACHINE_CONFIG_START(e100_state::e100)
- MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(e100_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(e100_map)
/* Devices */
MCFG_DEVICE_ADD("kbd_74145", TTL74145, 0)
@@ -565,21 +565,21 @@ MACHINE_CONFIG_START(e100_state::e100)
/* 0xF896 0xC818 (PIA1 Control B) = 0x34 - CB2 is low and lock DDRB */
/* 0xF896 0xC818 (PIA2 Control B) = 0x34 - CB2 is low and lock DDRB */
MCFG_DEVICE_ADD(PIA1_TAG, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(e100_state, pia1_kbA_w))
- MCFG_PIA_READPA_HANDLER(READ8(e100_state, pia1_kbA_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(e100_state, pia1_kbB_w))
- MCFG_PIA_READPB_HANDLER(READ8(e100_state, pia1_kbB_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(e100_state, pia1_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(e100_state, pia1_cb1_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(e100_state, pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(e100_state, pia1_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, e100_state, pia1_kbA_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, e100_state, pia1_kbA_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, e100_state, pia1_kbB_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, e100_state, pia1_kbB_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, e100_state, pia1_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, e100_state, pia1_cb1_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, e100_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, e100_state, pia1_cb2_w))
/* The optional second PIA enables the expansion port on CA1 and a software RTC with 50Hz resolution */
MCFG_DEVICE_ADD(PIA2_TAG, PIA6821, 0)
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
/* Serial port support */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
/* Cassette support - E100 uses 300 baud Kansas City Standard with 1200/2400 Hz modulation */
/* NOTE on usage: mame e100 -window -cass <wav file> -ui_active
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index 712a52b355a..e5d8ffc97d8 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -246,19 +246,19 @@ WRITE8_MEMBER( eacc_state::eacc_digit_w )
MACHINE_CONFIG_START(eacc_state::eacc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(3'579'545)) /* Divided by 4 inside the m6802*/
- MCFG_CPU_PROGRAM_MAP(eacc_mem)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(3'579'545)) /* Divided by 4 inside the m6802*/
+ MCFG_DEVICE_PROGRAM_MAP(eacc_mem)
MCFG_DEFAULT_LAYOUT(layout_eacc)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(eacc_state, eacc_keyboard_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(eacc_state, eacc_distance_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(eacc_state, eacc_cb1_r))
- MCFG_PIA_READCA2_HANDLER(READLINE(eacc_state, eacc_fuel_sensor_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(eacc_state, eacc_segment_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(eacc_state, eacc_digit_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(eacc_state, eacc_cb2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, eacc_state, eacc_keyboard_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, eacc_state, eacc_distance_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, eacc_state, eacc_cb1_r))
+ MCFG_PIA_READCA2_HANDLER(READLINE(*this, eacc_state, eacc_fuel_sensor_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, eacc_state, eacc_segment_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, eacc_state, eacc_digit_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, eacc_state, eacc_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp
index cd2722a8bf3..4cb2d06cb1c 100644
--- a/src/mame/drivers/ec184x.cpp
+++ b/src/mame/drivers/ec184x.cpp
@@ -224,19 +224,20 @@ void ec184x_state::ec1847_io(address_map &map)
// XXX verify everything
MACHINE_CONFIG_START(ec184x_state::ec1840)
- MCFG_CPU_ADD("maincpu", I8088, 4096000)
- MCFG_CPU_PROGRAM_MAP(ec1840_map)
- MCFG_CPU_IO_MAP(ec1840_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 4096000)
+ MCFG_DEVICE_PROGRAM_MAP(ec1840_map)
+ MCFG_DEVICE_IO_MAP(ec1840_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_IBM5150_MOTHERBOARD_ADD("mb","maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1840.0002", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // actually ec1840.0003 -- w/o mouse port
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ec184x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ec184x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ec184x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", ec184x_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, "ec1840.0002", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, "ec1841.0003", false) // actually ec1840.0003 -- w/o mouse port
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
MCFG_SOFTWARE_LIST_ADD("flop_list","ec1841")
@@ -247,21 +248,22 @@ MACHINE_CONFIG_START(ec184x_state::ec1840)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ec184x_state::ec1841)
- MCFG_CPU_ADD("maincpu", I8086, 4096000)
- MCFG_CPU_PROGRAM_MAP(ec1841_map)
- MCFG_CPU_IO_MAP(ec1841_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 4096000)
+ MCFG_DEVICE_PROGRAM_MAP(ec1841_map)
+ MCFG_DEVICE_IO_MAP(ec1841_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_MACHINE_RESET_OVERRIDE(ec184x_state, ec1841)
MCFG_EC1841_MOTHERBOARD_ADD("mb", "maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", ec184x_isa8_cards, "ec1841.0002", false) // cga
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", ec184x_isa8_cards, "ec1841.0003", false) // fdc + mouse port
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", ec184x_isa8_cards, "hdc", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", ec184x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", ec184x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", ec184x_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, "ec1841.0002", false) // cga
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, "ec1841.0003", false) // fdc + mouse port
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, "hdc", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", ec184x_isa8_cards, nullptr, false)
MCFG_SOFTWARE_LIST_ADD("flop_list","ec1841")
@@ -274,19 +276,20 @@ MACHINE_CONFIG_END
// XXX verify everything
MACHINE_CONFIG_START(ec184x_state::ec1847)
- MCFG_CPU_ADD("maincpu", I8088, 4772720)
- MCFG_CPU_PROGRAM_MAP(ec1847_map)
- MCFG_CPU_IO_MAP(ec1847_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 4772720)
+ MCFG_DEVICE_PROGRAM_MAP(ec1847_map)
+ MCFG_DEVICE_IO_MAP(ec1847_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "hercules", false) // cga, ega and vga(?) are options too
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, nullptr, false) // native variant (wd1010 + z80) not emulated
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false) // native serial (2x8251) not emulated
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "hercules", false) // cga, ega and vga(?) are options too
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // native variant (wd1010 + z80) not emulated
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // native serial (2x8251) not emulated
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270)
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index d847633a447..e7bc3df459e 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -173,8 +173,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(ec65_state::ec65)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502, XTAL(4'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ec65_mem)
+ MCFG_DEVICE_ADD("maincpu",M6502, XTAL(4'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ec65_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -211,8 +211,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ec65k_state::ec65k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",G65816, XTAL(4'000'000)) // can use 4,2 or 1 MHz
- MCFG_CPU_PROGRAM_MAP(ec65k_mem)
+ MCFG_DEVICE_ADD("maincpu",G65816, XTAL(4'000'000)) // can use 4,2 or 1 MHz
+ MCFG_DEVICE_PROGRAM_MAP(ec65k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ecoinf1.cpp b/src/mame/drivers/ecoinf1.cpp
index d66b8e7d84a..c413949981a 100644
--- a/src/mame/drivers/ecoinf1.cpp
+++ b/src/mame/drivers/ecoinf1.cpp
@@ -256,9 +256,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ecoinf1_state::ecoinf1_older)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(older_memmap)
- MCFG_CPU_IO_MAP(older_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(older_memmap)
+ MCFG_DEVICE_IO_MAP(older_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp
index b3c1f82ff16..4ed286e4c93 100644
--- a/src/mame/drivers/ecoinf2.cpp
+++ b/src/mame/drivers/ecoinf2.cpp
@@ -500,46 +500,46 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ecoinf2_state::ecoinf2_oxo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180,4000000) // some of these hit invalid opcodes with a plain z80, some don't?
- MCFG_CPU_PROGRAM_MAP(oxo_memmap)
- MCFG_CPU_IO_MAP(oxo_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z180,4000000) // some of these hit invalid opcodes with a plain z80, some don't?
+ MCFG_DEVICE_PROGRAM_MAP(oxo_memmap)
+ MCFG_DEVICE_IO_MAP(oxo_portmap)
MCFG_DEFAULT_LAYOUT(layout_ecoinf2)
MCFG_DEVICE_ADD("ic10_lamp", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf2_state, ppi8255_ic10_write_a_strobedat0))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf2_state, ppi8255_ic10_write_b_strobedat1))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf2_state, ppi8255_ic10_write_c_strobe))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic10_write_a_strobedat0))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic10_write_b_strobedat1))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic10_write_c_strobe))
// IC24 is the workhorse of the Phoenix, it seems to handle meters, payslides, coin lamps, inhibits and the watchdog! */
MCFG_DEVICE_ADD("ic24_coin", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf2_state, ppi8255_ic24_write_a_meters))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf2_state, ppi8255_ic24_write_b_payouts))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf2_state, ppi8255_ic24_write_c_inhibits))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic24_write_a_meters))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic24_write_b_payouts))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic24_write_c_inhibits))
MCFG_DEVICE_ADD("ic22_inpt", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf2_state, ppi8255_ic22_read_a_levels)) // manual says level switches
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf2_state, ppi8255_ic22_read_b_coins))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic22_read_c_misc)) // 0x20 appears to be meter power
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf2_state, ppi8255_ic22_read_a_levels)) // manual says level switches
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf2_state, ppi8255_ic22_read_b_coins))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf2_state, ppi8255_ic22_read_c_misc)) // 0x20 appears to be meter power
MCFG_DEVICE_ADD("ic23_reel", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf2_state, ppi8255_ic23_write_a_reel01))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf2_state, ppi8255_ic23_write_b_reel23))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic23_read_c_key)) // optos and keys
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic23_write_a_reel01))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic23_write_b_reel23))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf2_state, ppi8255_ic23_read_c_key)) // optos and keys
MCFG_DEVICE_ADD("ic13_leds", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf2_state, ppi8255_ic13_write_a_strobedat0))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf2_state, ppi8255_ic13_write_b_strobedat1))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf2_state, ppi8255_ic13_read_c_panel))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic13_write_a_strobedat0))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic13_write_b_strobedat1))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf2_state, ppi8255_ic13_read_c_panel))
MCFG_ECOIN_200STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf2_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf2_state, reel_optic_cb<0>))
MCFG_ECOIN_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf2_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf2_state, reel_optic_cb<1>))
MCFG_ECOIN_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf2_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf2_state, reel_optic_cb<2>))
MCFG_ECOIN_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf2_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf2_state, reel_optic_cb<3>))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp
index e77a3912d21..2b900d60e9c 100644
--- a/src/mame/drivers/ecoinf3.cpp
+++ b/src/mame/drivers/ecoinf3.cpp
@@ -663,91 +663,91 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ecoinf3_state::ecoinf3_pyramid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180,8000000) // certainly not a plain z80 at least, invalid opcodes for that
+ MCFG_DEVICE_ADD("maincpu", Z180,8000000) // certainly not a plain z80 at least, invalid opcodes for that
- MCFG_CPU_PROGRAM_MAP(pyramid_memmap)
- MCFG_CPU_IO_MAP(pyramid_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(pyramid_memmap)
+ MCFG_DEVICE_IO_MAP(pyramid_portmap)
MCFG_DEFAULT_LAYOUT(layout_ecoinf3)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 4000000) // no idea what the sound chip is, this sounds terrible
+ MCFG_DEVICE_ADD("sn1", SN76489, 4000000) // no idea what the sound chip is, this sounds terrible
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADD("ppi8255_a", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_a_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_a_strobedat0))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_a_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_b_strobedat1))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_a_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_a_write_c_strobe))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_a_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_a_write_a_strobedat0))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_a_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_a_write_b_strobedat1))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_a_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_a_write_c_strobe))
MCFG_DEVICE_ADD("ppi8255_b", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_b_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_b_write_a))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_b_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_b_write_b))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_b_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_b_write_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_b_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_b_write_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_b_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_b_write_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_b_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_b_write_c))
MCFG_DEVICE_ADD("ppi8255_c", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_c_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_c_write_a))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_c_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_c_write_b))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_c_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_c_write_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_c_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_c_write_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_c_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_c_write_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_c_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_c_write_c))
MCFG_DEVICE_ADD("ppi8255_d", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_d_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_d_write_a_reel01))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_d_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_d_write_b_reel23))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_d_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_d_write_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_d_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_d_write_a_reel01))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_d_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_d_write_b_reel23))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_d_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_d_write_c))
MCFG_DEVICE_ADD("ppi8255_e", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_e_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_a_alpha_display)) // alpha display characters
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_e_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_b)) // not written at an appropriate time for it to be a 'send' address for the text
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_e_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_e_write_c)) // not written at an appropriate time for it to be a 'send' address for the text
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_e_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_e_write_a_alpha_display)) // alpha display characters
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_e_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_e_write_b)) // not written at an appropriate time for it to be a 'send' address for the text
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_e_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_e_write_c)) // not written at an appropriate time for it to be a 'send' address for the text
MCFG_DEVICE_ADD("ppi8255_f", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_f_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_f_write_a))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_f_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_f_write_b))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_f_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_f_write_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_f_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_f_write_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_f_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_f_write_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_f_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_f_write_c))
MCFG_DEVICE_ADD("ppi8255_g", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_g_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_g_write_a))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_g_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_g_write_b))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_g_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_g_write_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_g_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_g_write_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_g_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_g_write_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_g_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_g_write_c))
MCFG_DEVICE_ADD("ppi8255_h", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ecoinf3_state, ppi8255_intf_h_read_a))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ecoinf3_state, ppi8255_intf_h_write_a))
- MCFG_I8255_IN_PORTB_CB(READ8(ecoinf3_state, ppi8255_intf_h_read_b))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ecoinf3_state, ppi8255_intf_h_write_b))
- MCFG_I8255_IN_PORTC_CB(READ8(ecoinf3_state, ppi8255_intf_h_read_c))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ecoinf3_state, ppi8255_intf_h_write_c))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ecoinf3_state, ppi8255_intf_h_read_a))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_h_write_a))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ecoinf3_state, ppi8255_intf_h_read_b))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_h_write_b))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ecoinf3_state, ppi8255_intf_h_read_c))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ecoinf3_state, ppi8255_intf_h_write_c))
MCFG_ECOIN_200STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf3_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf3_state, reel_optic_cb<0>))
MCFG_ECOIN_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf3_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf3_state, reel_optic_cb<1>))
MCFG_ECOIN_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf3_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf3_state, reel_optic_cb<2>))
MCFG_ECOIN_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinf3_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinf3_state, reel_optic_cb<3>))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp
index 1b0ac2815a8..1961b734230 100644
--- a/src/mame/drivers/ecoinfr.cpp
+++ b/src/mame/drivers/ecoinfr.cpp
@@ -780,9 +780,9 @@ void ecoinfr_state::machine_reset()
MACHINE_CONFIG_START(ecoinfr_state::ecoinfr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(memmap)
- MCFG_CPU_IO_MAP(portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_IO_MAP(portmap)
MCFG_TIMER_DRIVER_ADD_PERIODIC("ectimer", ecoinfr_state, ecoinfr_irq_timer, attotime::from_hz(250))
MCFG_DEFAULT_LAYOUT(layout_ecoinfr)
@@ -791,13 +791,13 @@ MACHINE_CONFIG_START(ecoinfr_state::ecoinfr)
MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0)
MCFG_ECOIN_200STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinfr_state, reel0_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinfr_state, reel0_optic_cb))
MCFG_ECOIN_200STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinfr_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinfr_state, reel1_optic_cb))
MCFG_ECOIN_200STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinfr_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinfr_state, reel2_optic_cb))
MCFG_ECOIN_200STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(ecoinfr_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, ecoinfr_state, reel3_optic_cb))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp
index 8ac8ca9ccfa..951e1226cb4 100644
--- a/src/mame/drivers/egghunt.cpp
+++ b/src/mame/drivers/egghunt.cpp
@@ -427,13 +427,13 @@ void egghunt_state::machine_reset()
MACHINE_CONFIG_START(egghunt_state::egghunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/
- MCFG_CPU_PROGRAM_MAP(egghunt_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", egghunt_state, irq0_line_hold) // or 2 like mitchell.c?
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/
+ MCFG_DEVICE_PROGRAM_MAP(egghunt_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", egghunt_state, irq0_line_hold) // or 2 like mitchell.c?
- MCFG_CPU_ADD("audiocpu", Z80,12000000/2) /* 6 MHz ?*/
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,12000000/2) /* 6 MHz ?*/
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index 72a6ad4af53..0d6d33d0035 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -577,9 +577,9 @@ static void einstein_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(einstein_state::einstein)
/* basic machine hardware */
- MCFG_CPU_ADD(IC_I001, Z80, XTAL_X002 / 2)
- MCFG_CPU_PROGRAM_MAP(einstein_mem)
- MCFG_CPU_IO_MAP(einstein_io)
+ MCFG_DEVICE_ADD(IC_I001, Z80, XTAL_X002 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(einstein_mem)
+ MCFG_DEVICE_IO_MAP(einstein_io)
MCFG_Z80_DAISY_CHAIN(einstein_daisy_chain)
/* this is actually clocked at the system clock 4 MHz, but this would be too fast for our
@@ -587,31 +587,31 @@ MACHINE_CONFIG_START(einstein_state::einstein)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", einstein_state, keyboard_timer_callback, attotime::from_hz(50))
MCFG_DEVICE_ADD(IC_I063, Z80PIO, XTAL_X002 / 2)
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(einstein_state, int_w<0>))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(einstein_state, ardy_w))
- MCFG_Z80PIO_IN_PB_CB(DEVREAD8("user", einstein_userport_device, read))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("user", einstein_userport_device, write))
- MCFG_Z80PIO_OUT_BRDY_CB(DEVWRITELINE("user", einstein_userport_device, brdy_w))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, einstein_state, int_w<0>))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, einstein_state, ardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8("user", einstein_userport_device, read))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("user", einstein_userport_device, write))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE("user", einstein_userport_device, brdy_w))
MCFG_DEVICE_ADD(IC_I058, Z80CTC, XTAL_X002 / 2)
- MCFG_Z80CTC_INTR_CB(WRITELINE(einstein_state, int_w<1>))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(IC_I060, i8251_device, write_txc))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(IC_I060, i8251_device, write_rxc))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(IC_I058, z80ctc_device, trg3))
+ MCFG_Z80CTC_INTR_CB(WRITELINE(*this, einstein_state, int_w<1>))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(IC_I060, i8251_device, write_txc))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(IC_I060, i8251_device, write_rxc))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(IC_I058, z80ctc_device, trg3))
MCFG_CLOCK_ADD("ctc_trigger", XTAL_X002 / 4)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE(IC_I058, z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(IC_I058, z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(IC_I058, z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(IC_I058, z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(IC_I058, z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(IC_I058, z80ctc_device, trg2))
/* Einstein daisy chain support for non-Z80 devices */
MCFG_Z80DAISY_GENERIC_ADD("keyboard_daisy", 0xf7)
- MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(einstein_state, int_w<2>))
+ MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(*this, einstein_state, int_w<2>))
MCFG_Z80DAISY_GENERIC_ADD("adc_daisy", 0xfb)
- MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(einstein_state, int_w<3>))
+ MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(*this, einstein_state, int_w<3>))
MCFG_Z80DAISY_GENERIC_ADD("fire_daisy", 0xfd)
- MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(einstein_state, int_w<4>))
+ MCFG_Z80DAISY_GENERIC_INT_CB(WRITELINE(*this, einstein_state, int_w<4>))
/* video hardware */
MCFG_DEVICE_ADD("vdp", TMS9129, XTAL(10'738'635) / 2)
@@ -622,13 +622,13 @@ MACHINE_CONFIG_START(einstein_state::einstein)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(IC_I030, AY8910, XTAL_X002 / 4)
- MCFG_AY8910_PORT_B_READ_CB(READ8(einstein_state, keyboard_data_read))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(einstein_state, keyboard_line_write))
+ MCFG_DEVICE_ADD(IC_I030, AY8910, XTAL_X002 / 4)
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, einstein_state, keyboard_data_read))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, einstein_state, keyboard_line_write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_ADC0844_ADD("adc")
- MCFG_ADC0844_INTR_CB(DEVWRITELINE("adc_daisy", z80daisy_generic_device, int_w))
+ MCFG_ADC0844_INTR_CB(WRITELINE("adc_daisy", z80daisy_generic_device, int_w))
MCFG_ADC0844_CH1_CB(IOPORT("analogue_1_x"))
MCFG_ADC0844_CH2_CB(IOPORT("analogue_1_y"))
MCFG_ADC0844_CH3_CB(IOPORT("analogue_2_x"))
@@ -636,10 +636,10 @@ MACHINE_CONFIG_START(einstein_state::einstein)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(IC_I063, z80pio_device, strobe_a))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(einstein_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(einstein_state, write_centronics_perror))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(einstein_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(IC_I063, z80pio_device, strobe_a))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, einstein_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, einstein_state, write_centronics_perror))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, einstein_state, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -647,15 +647,15 @@ MACHINE_CONFIG_START(einstein_state::einstein)
// uart
MCFG_DEVICE_ADD(IC_I060, I8251, XTAL_X002 / 4)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
// rs232 port
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IC_I060, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(IC_I060, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(IC_I060, i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(IC_I060, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(IC_I060, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(IC_I060, i8251_device, write_cts))
// floppy
MCFG_WD1770_ADD(IC_I042, XTAL_X002)
@@ -679,7 +679,7 @@ MACHINE_CONFIG_START(einstein_state::einstein)
// user port
MCFG_EINSTEIN_USERPORT_ADD("user")
- MCFG_EINSTEIN_USERPORT_BSTB_HANDLER(DEVWRITELINE(IC_I063, z80pio_device, strobe_b))
+ MCFG_EINSTEIN_USERPORT_BSTB_HANDLER(WRITELINE(IC_I063, z80pio_device, strobe_b))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index dd7dc8ed1f8..dc3161d2cf4 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -213,8 +213,8 @@ static INPUT_PORTS_START( electron64 )
INPUT_PORTS_END
MACHINE_CONFIG_START(electron_state::electron)
- MCFG_CPU_ADD( "maincpu", M6502, 16_MHz_XTAL/8 )
- MCFG_CPU_PROGRAM_MAP( electron_mem )
+ MCFG_DEVICE_ADD( "maincpu", M6502, 16_MHz_XTAL/8 )
+ MCFG_DEVICE_PROGRAM_MAP( electron_mem )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(16_MHz_XTAL, 1024, 0, 640, 312, 0, 256)
@@ -227,7 +227,7 @@ MACHINE_CONFIG_START(electron_state::electron)
MCFG_PALETTE_INIT_OWNER(electron_state, electron)
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 300 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 300 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_RAM_ADD(RAM_TAG)
@@ -268,9 +268,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(electron_state::electron64)
electron(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(electron_mem)
- MCFG_CPU_OPCODES_MAP(electron64_opcodes)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(electron_mem)
+ MCFG_DEVICE_OPCODES_MAP(electron64_opcodes)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp
index e9d2e376be7..b9039c2e4ec 100644
--- a/src/mame/drivers/elekscmp.cpp
+++ b/src/mame/drivers/elekscmp.cpp
@@ -147,8 +147,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(elekscmp_state::elekscmp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",INS8060, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu",INS8060, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_elekscmp)
diff --git a/src/mame/drivers/elektronmono.cpp b/src/mame/drivers/elektronmono.cpp
index a8dc80ae335..63b3ea3f0a2 100644
--- a/src/mame/drivers/elektronmono.cpp
+++ b/src/mame/drivers/elektronmono.cpp
@@ -156,8 +156,8 @@ void elekmono_state::elektron_map(address_map &map)
}
MACHINE_CONFIG_START(elekmono_state::elektron)
- MCFG_CPU_ADD("maincpu", MCF5206E, XTAL(25'447'000))
- MCFG_CPU_PROGRAM_MAP(elektron_map)
+ MCFG_DEVICE_ADD("maincpu", MCF5206E, XTAL(25'447'000))
+ MCFG_DEVICE_PROGRAM_MAP(elektron_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index dee2c473c66..0ee0657748c 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -235,16 +235,16 @@ QUICKLOAD_LOAD_MEMBER( elf2_state, elf )
MACHINE_CONFIG_START(elf2_state::elf2)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
- MCFG_CPU_PROGRAM_MAP(elf2_mem)
- MCFG_CPU_IO_MAP(elf2_io)
- MCFG_COSMAC_WAIT_CALLBACK(READLINE(elf2_state, wait_r))
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(elf2_state, clear_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(elf2_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(elf2_state, q_w))
- MCFG_COSMAC_DMAR_CALLBACK(READ8(elf2_state, dma_r))
- MCFG_COSMAC_DMAW_CALLBACK(DEVWRITE8(CDP1861_TAG, cdp1861_device, dma_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(elf2_state, sc_w))
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
+ MCFG_DEVICE_PROGRAM_MAP(elf2_mem)
+ MCFG_DEVICE_IO_MAP(elf2_io)
+ MCFG_COSMAC_WAIT_CALLBACK(READLINE(*this, elf2_state, wait_r))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, elf2_state, clear_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, elf2_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, elf2_state, q_w))
+ MCFG_COSMAC_DMAR_CALLBACK(READ8(*this, elf2_state, dma_r))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(CDP1861_TAG, cdp1861_device, dma_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, elf2_state, sc_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_elf2)
@@ -259,16 +259,16 @@ MACHINE_CONFIG_START(elf2_state::elf2)
MCFG_DEVICE_ADD(MM74C923_TAG, MM74C923, 0)
MCFG_MM74C922_OSC(CAP_U(0.15))
MCFG_MM74C922_DEBOUNCE(CAP_U(1))
- MCFG_MM74C922_DA_CALLBACK(WRITELINE(elf2_state, da_w))
+ MCFG_MM74C922_DA_CALLBACK(WRITELINE(*this, elf2_state, da_w))
MCFG_MM74C922_X1_CALLBACK(IOPORT("X1"))
MCFG_MM74C922_X2_CALLBACK(IOPORT("X2"))
MCFG_MM74C922_X3_CALLBACK(IOPORT("X3"))
MCFG_MM74C922_X4_CALLBACK(IOPORT("X4"))
MCFG_DEVICE_ADD(DM9368_H_TAG, DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(elf2_state, digit_w<0>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, elf2_state, digit_w<0>))
MCFG_DEVICE_ADD(DM9368_L_TAG, DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(elf2_state, digit_w<1>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, elf2_state, digit_w<1>))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index 7e7a27017d1..c47aecfb8b7 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -569,11 +569,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(elwro800_state::elwro800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, 3500000) /* 3.5 MHz */
- MCFG_CPU_PROGRAM_MAP(elwro800_mem)
- MCFG_CPU_IO_MAP(elwro800_io)
- MCFG_CPU_OPCODES_MAP(elwro800_m1)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", elwro800_state, elwro800jr_interrupt)
+ MCFG_DEVICE_ADD("maincpu",Z80, 3500000) /* 3.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(elwro800_mem)
+ MCFG_DEVICE_IO_MAP(elwro800_io)
+ MCFG_DEVICE_OPCODES_MAP(elwro800_m1)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", elwro800_state, elwro800jr_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(elwro800_state,elwro800)
@@ -584,7 +584,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800)
MCFG_SCREEN_SIZE(SPEC_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, SPEC_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(elwro800_state, screen_update_spectrum )
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(elwro800_state, screen_vblank_spectrum))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, elwro800_state, screen_vblank_spectrum))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 16)
@@ -597,15 +597,15 @@ MACHINE_CONFIG_START(elwro800_state::elwro800)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("JOY"))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
- MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTC_CB(READ8(elwro800_state, i8255_port_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(elwro800_state, i8255_port_c_w))
+ MCFG_I8255_IN_PORTB_CB(READ8("cent_data_in", input_buffer_device, read))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, elwro800_state, i8255_port_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, elwro800_state, i8255_port_c_w))
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(elwro800_state, write_centronics_ack))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, elwro800_state, write_centronics_ack))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -616,7 +616,7 @@ MACHINE_CONFIG_START(elwro800_state::elwro800)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp
index 34d80938dae..afb6e88366c 100644
--- a/src/mame/drivers/embargo.cpp
+++ b/src/mame/drivers/embargo.cpp
@@ -267,10 +267,10 @@ void embargo_state::machine_reset()
MACHINE_CONFIG_START(embargo_state::embargo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 625000)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_DATA_MAP(main_data_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, 625000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_DATA_MAP(main_data_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp
index fdfc07f5596..cdf03429304 100644
--- a/src/mame/drivers/enigma2.cpp
+++ b/src/mame/drivers/enigma2.cpp
@@ -602,12 +602,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(enigma2_state::enigma2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(enigma2_main_cpu_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(enigma2_main_cpu_map)
- MCFG_CPU_ADD("audiocpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(enigma2_audio_cpu_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(enigma2_state, irq0_line_hold, 8*52)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(enigma2_audio_cpu_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(enigma2_state, irq0_line_hold, 8*52)
/* video hardware */
@@ -620,9 +620,9 @@ MACHINE_CONFIG_START(enigma2_state::enigma2)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(READ8(enigma2_state, sound_latch_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(enigma2_state, protection_data_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, enigma2_state, sound_latch_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, enigma2_state, protection_data_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -630,13 +630,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(enigma2_state::enigma2a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(enigma2a_main_cpu_map)
- MCFG_CPU_IO_MAP(enigma2a_main_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(enigma2a_main_cpu_map)
+ MCFG_DEVICE_IO_MAP(enigma2a_main_cpu_io_map)
- MCFG_CPU_ADD("audiocpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(enigma2_audio_cpu_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(enigma2_state, irq0_line_hold, 8*52)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(enigma2_audio_cpu_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(enigma2_state, irq0_line_hold, 8*52)
/* video hardware */
@@ -647,9 +647,9 @@ MACHINE_CONFIG_START(enigma2_state::enigma2a)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(READ8(enigma2_state, sound_latch_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(enigma2_state, protection_data_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, enigma2_state, sound_latch_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, enigma2_state, protection_data_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index cde7563b8f5..9328a095a0b 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -215,23 +215,23 @@ WRITE8_MEMBER(enmirage_state::mirage_via_write_portb)
}
MACHINE_CONFIG_START(enmirage_state::mirage)
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(mirage_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(mirage_map)
MCFG_DEFAULT_LAYOUT( layout_mirage )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_ES5503_ADD("es5503", 7000000)
MCFG_ES5503_OUTPUT_CHANNELS(2)
- MCFG_ES5503_IRQ_FUNC(WRITELINE(enmirage_state, mirage_doc_irq))
- MCFG_ES5503_ADC_FUNC(READ8(enmirage_state, mirage_adc_read))
+ MCFG_ES5503_IRQ_FUNC(WRITELINE(*this, enmirage_state, mirage_doc_irq))
+ MCFG_ES5503_ADC_FUNC(READ8(*this, enmirage_state, mirage_adc_read))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("via6522", VIA6522, 1000000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(enmirage_state, mirage_via_write_porta))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(enmirage_state, mirage_via_write_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, enmirage_state, mirage_via_write_porta))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, enmirage_state, mirage_via_write_portb))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index 32ba147b82f..0a070f2c5f7 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -534,16 +534,16 @@ INPUT_PORTS_END
*************************************/
MACHINE_CONFIG_START(eolith_state::eolith45)
- MCFG_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */
- MCFG_CPU_PROGRAM_MAP(eolith_map)
+ MCFG_DEVICE_ADD("maincpu", E132N, 45000000) /* 45 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(eolith_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith_state, eolith_speedup, "screen", 0, 1)
/* Sound CPU */
- MCFG_CPU_ADD("soundcpu", I8032, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(sound_prg_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(eolith_state, sound_p1_w))
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(eolith_state, soundcpu_to_qs1000)) // Sound CPU -> QS1000 CPU serial link
+ MCFG_DEVICE_ADD("soundcpu", I8032, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sound_prg_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, eolith_state, sound_p1_w))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, eolith_state, soundcpu_to_qs1000)) // Sound CPU -> QS1000 CPU serial link
MCFG_MACHINE_RESET_OVERRIDE(eolith_state,eolith)
@@ -574,30 +574,30 @@ MACHINE_CONFIG_START(eolith_state::eolith45)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", MCS51_INT0_LINE))
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
+ MCFG_DEVICE_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
- MCFG_QS1000_IN_P1_CB(READ8(eolith_state, qs1000_p1_r))
- MCFG_QS1000_OUT_P1_CB(WRITE8(eolith_state, qs1000_p1_w))
+ MCFG_QS1000_IN_P1_CB(READ8(*this, eolith_state, qs1000_p1_r))
+ MCFG_QS1000_OUT_P1_CB(WRITE8(*this, eolith_state, qs1000_p1_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(eolith_state::eolith50)
eolith45(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(50000000) /* 50 MHz */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(50000000) /* 50 MHz */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(eolith_state::ironfort)
eolith45(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(44900000) /* Normally 45MHz??? but PCB actually had a 44.9MHz OSC, so it's value is used */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(44900000) /* Normally 45MHz??? but PCB actually had a 44.9MHz OSC, so it's value is used */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(eolith_state::hidctch3)
eolith50(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hidctch3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hidctch3_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp
index 236d8ec2e0c..ef4e57bfda4 100644
--- a/src/mame/drivers/eolith16.cpp
+++ b/src/mame/drivers/eolith16.cpp
@@ -159,8 +159,8 @@ PALETTE_INIT_MEMBER(eolith16_state,eolith16)
MACHINE_CONFIG_START(eolith16_state::eolith16)
- MCFG_CPU_ADD("maincpu", E116T, XTAL(60'000'000)) /* no internal multiplier */
- MCFG_CPU_PROGRAM_MAP(eolith16_map)
+ MCFG_DEVICE_ADD("maincpu", E116T, XTAL(60'000'000)) /* no internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(eolith16_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith16_state, eolith_speedup, "screen", 0, 1)
MCFG_EEPROM_SERIAL_93C66_8BIT_ADD("eeprom")
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index f78b1f419b0..35b47e3bd8c 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -570,13 +570,13 @@ void ep64_state::machine_reset()
MACHINE_CONFIG_START(ep64_state::ep64)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(ep64_mem)
- MCFG_CPU_IO_MAP(ep64_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(ep64_mem)
+ MCFG_DEVICE_IO_MAP(ep64_io)
// video hardware
MCFG_NICK_ADD(NICK_TAG, SCREEN_TAG, XTAL(8'000'000))
- MCFG_NICK_VIRQ_CALLBACK(DEVWRITELINE(DAVE_TAG, dave_device, int1_w))
+ MCFG_NICK_VIRQ_CALLBACK(WRITELINE(DAVE_TAG, dave_device, int1_w))
// sound hardware
MCFG_DAVE_ADD(DAVE_TAG, XTAL(8'000'000), dave_64k_mem, dave_io)
@@ -590,11 +590,11 @@ MACHINE_CONFIG_START(ep64_state::ep64)
MCFG_EP64_EXPANSION_BUS_SLOT_WAIT_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(ep64_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, ep64_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(DAVE_TAG, dave_device, int2_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(DAVE_TAG, dave_device, int2_w))
MCFG_CASSETTE_ADD(CASSETTE1_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp
index 2ea128c4c44..dedbf4a6ba8 100644
--- a/src/mame/drivers/epos.cpp
+++ b/src/mame/drivers/epos.cpp
@@ -460,10 +460,10 @@ MACHINE_START_MEMBER(epos_state,dealer)
MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(11'000'000)/4) /* 2.75 MHz schematics confirm 11MHz XTAL (see notes) */
- MCFG_CPU_PROGRAM_MAP(epos_map)
- MCFG_CPU_IO_MAP(epos_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(11'000'000)/4) /* 2.75 MHz schematics confirm 11MHz XTAL (see notes) */
+ MCFG_DEVICE_PROGRAM_MAP(epos_map)
+ MCFG_DEVICE_IO_MAP(epos_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -480,7 +480,7 @@ MACHINE_CONFIG_START(epos_state::epos) /* EPOS TRISTAR 8000 PCB */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL(11'000'000)/16) /* 0.6875 MHz, confirmed from schematics */
+ MCFG_DEVICE_ADD("aysnd", AY8912, XTAL(11'000'000)/16) /* 0.6875 MHz, confirmed from schematics */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -488,14 +488,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(22'118'400)/8) /* 2.7648 MHz (measured) */
- MCFG_CPU_PROGRAM_MAP(dealer_map)
- MCFG_CPU_IO_MAP(dealer_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(22'118'400)/8) /* 2.7648 MHz (measured) */
+ MCFG_DEVICE_PROGRAM_MAP(dealer_map)
+ MCFG_DEVICE_IO_MAP(dealer_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", epos_state, irq0_line_hold)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(epos_state, i8255_porta_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(epos_state, i8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, epos_state, i8255_porta_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, epos_state, i8255_portc_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -517,11 +517,11 @@ MACHINE_CONFIG_START(epos_state::dealer) /* EPOS TRISTAR 9000 PCB */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(22'118'400)/32) /* 0.6912 MHz (measured) */
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(22'118'400)/32) /* 0.6912 MHz (measured) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(epos_state, ay_porta_mpx_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, epos_state, ay_porta_mpx_r))
// port a writes?
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(epos_state, flip_screen_w)) // flipscreen and ay port a multiplex control
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, epos_state, flip_screen_w)) // flipscreen and ay port a multiplex control
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp
index f4ef46a42cc..2ab1e9eb56b 100644
--- a/src/mame/drivers/eprom.cpp
+++ b/src/mame/drivers/eprom.cpp
@@ -383,11 +383,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(eprom_state::eprom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(extra_map)
+ MCFG_DEVICE_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(extra_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -418,7 +418,7 @@ MACHINE_CONFIG_START(eprom_state::eprom)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(eprom_state, screen_update_eprom)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(eprom_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, eprom_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(eprom_state,eprom)
@@ -435,8 +435,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(eprom_state::klaxp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -461,7 +461,7 @@ MACHINE_CONFIG_START(eprom_state::klaxp)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(eprom_state, screen_update_eprom)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(eprom_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, eprom_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(eprom_state,eprom)
@@ -477,8 +477,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(eprom_state::guts)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(guts_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(guts_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -509,7 +509,7 @@ MACHINE_CONFIG_START(eprom_state::guts)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(eprom_state, screen_update_guts)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(eprom_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, eprom_state, video_int_write_line))
MCFG_VIDEO_START_OVERRIDE(eprom_state,guts)
diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp
index a9067d5a439..c45d4a264a9 100644
--- a/src/mame/drivers/equites.cpp
+++ b/src/mame/drivers/equites.cpp
@@ -1042,25 +1042,25 @@ static const char *const alphamc07_sample_names[] =
// the sound board is the same in all games
MACHINE_CONFIG_START(equites_state::common_sound)
- MCFG_CPU_ADD("audiocpu", I8085A, 6.144_MHz_XTAL) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", I8085A, 6.144_MHz_XTAL) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_I8085A_CLK_OUT_DEVICE("audio8155")
MCFG_DEVICE_ADD("audio8155", I8155, 0)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(equites_state, equites_8155_porta_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(equites_state, equites_8155_portb_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(equites_state, equites_8155_portc_w))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(equites_state, equites_8155_timer_pulse))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, equites_state, equites_8155_porta_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, equites_state, equites_8155_portb_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, equites_state, equites_8155_portc_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, equites_state, equites_8155_timer_pulse))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("msm", MSM5232, MSM5232_MAX_CLOCK) // will be adjusted at runtime through PORT_ADJUSTER
+ MCFG_DEVICE_ADD("msm", MSM5232, MSM5232_MAX_CLOCK) // will be adjusted at runtime through PORT_ADJUSTER
MCFG_MSM5232_SET_CAPACITORS(0.47e-6, 0.47e-6, 0.47e-6, 0.47e-6, 0.47e-6, 0.47e-6, 0.47e-6, 0.47e-6) // verified
- MCFG_MSM5232_GATE_HANDLER_CB(WRITELINE(equites_state, equites_msm5232_gate))
+ MCFG_MSM5232_GATE_HANDLER_CB(WRITELINE(*this, equites_state, equites_msm5232_gate))
MCFG_SOUND_ROUTE(0, "speaker", MSM5232_BASE_VOLUME/2.2) // pin 28 2'-1 : 22k resistor
MCFG_SOUND_ROUTE(1, "speaker", MSM5232_BASE_VOLUME/1.5) // pin 29 4'-1 : 15k resistor
MCFG_SOUND_ROUTE(2, "speaker", MSM5232_BASE_VOLUME) // pin 30 8'-1 : 10k resistor
@@ -1073,18 +1073,18 @@ MACHINE_CONFIG_START(equites_state::common_sound)
MCFG_SOUND_ROUTE(9, "speaker", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section)
MCFG_SOUND_ROUTE(10,"speaker", 0.12) // pin 22 Noise Output (this actually feeds an analog section)
- MCFG_SOUND_ADD("aysnd", AY8910, 6.144_MHz_XTAL/4) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(equites_state, equites_8910porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(equites_state, equites_8910portb_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 6.144_MHz_XTAL/4) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, equites_state, equites_8910porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, equites_state, equites_8910portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("dac1", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_6BIT_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)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(alphamc07_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
@@ -1156,14 +1156,14 @@ void equites_state::machine_reset()
MACHINE_CONFIG_START(equites_state::equites)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12_MHz_XTAL/4) /* 68000P8 running at 3mhz! verified on pcb */
- MCFG_CPU_PROGRAM_MAP(equites_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12_MHz_XTAL/4) /* 68000P8 running at 3mhz! verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(equites_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", equites_state, equites_scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(equites_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(equites_state, mcu_start_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(equites_state, mcu_switch_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, equites_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, equites_state, mcu_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, equites_state, mcu_switch_w))
common_sound(config);
@@ -1192,12 +1192,12 @@ MACHINE_CONFIG_START(gekisou_state::gekisou)
equites(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gekisou_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gekisou_map)
// mcu not dumped, so add simulated mcu
- MCFG_CPU_ADD("mcu", ALPHA8301L, 4000000/8)
- MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_ADD("mcu", ALPHA8301L, 4000000/8)
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
// gekisou has battery-backed RAM to store settings
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1207,15 +1207,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(splndrbt_state::splndrbt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/4) /* 68000P8 running at 6mhz, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(splndrbt_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/4) /* 68000P8 running at 6mhz, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(splndrbt_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", splndrbt_state, splndrbt_scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(equites_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(equites_state, mcu_start_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(equites_state, mcu_switch_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(splndrbt_state, splndrbt_selchar_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, equites_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, equites_state, mcu_start_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, equites_state, mcu_switch_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, splndrbt_state, splndrbt_selchar_w))
common_sound(config);
@@ -1242,8 +1242,8 @@ MACHINE_CONFIG_START(splndrbt_state::hvoltage)
splndrbt(config);
// mcu not dumped, so add simulated mcu
- MCFG_CPU_ADD("mcu", ALPHA8301L, 4000000/8)
- MCFG_CPU_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_ADD("mcu", ALPHA8301L, 4000000/8)
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp
index 661a1fc649d..05762fed05f 100644
--- a/src/mame/drivers/ertictac.cpp
+++ b/src/mame/drivers/ertictac.cpp
@@ -222,9 +222,9 @@ INTERRUPT_GEN_MEMBER(ertictac_state::ertictac_podule_irq)
MACHINE_CONFIG_START(ertictac_state::ertictac)
- MCFG_CPU_ADD("maincpu", ARM, XTAL(24'000'000)/3) /* guess, 12MHz 8MHz or 6MHz, what's the correct divider 2, 3 or 4? */
- MCFG_CPU_PROGRAM_MAP(ertictac_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(ertictac_state, ertictac_podule_irq, 60) // FIXME: timing of this
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(24'000'000)/3) /* guess, 12MHz 8MHz or 6MHz, what's the correct divider 2, 3 or 4? */
+ MCFG_DEVICE_PROGRAM_MAP(ertictac_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ertictac_state, ertictac_podule_irq, 60) // FIXME: timing of this
MCFG_I2CMEM_ADD("i2cmem")
MCFG_I2CMEM_PAGE_SIZE(NVRAM_PAGE_SIZE)
@@ -238,14 +238,14 @@ MACHINE_CONFIG_START(ertictac_state::ertictac)
MCFG_PALETTE_ADD("palette", 0x200)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
- MCFG_SOUND_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac0", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac4", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac5", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac6", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac7", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.05) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp
index d6e1dd1fdf0..02b67c01863 100644
--- a/src/mame/drivers/esd16.cpp
+++ b/src/mame/drivers/esd16.cpp
@@ -633,14 +633,14 @@ DECOSPR_PRIORITY_CB_MEMBER(esd16_state::hedpanic_pri_callback)
MACHINE_CONFIG_START(esd16_state::esd16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(16'000'000)) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(multchmp_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", esd16_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(16'000'000)) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(multchmp_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", esd16_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz */
- MCFG_CPU_PROGRAM_MAP(multchmp_sound_map)
- MCFG_CPU_IO_MAP(multchmp_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(esd16_state, nmi_line_pulse, 32*60) /* IRQ By Main CPU */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(multchmp_sound_map)
+ MCFG_DEVICE_IO_MAP(multchmp_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(esd16_state, nmi_line_pulse, 32*60) /* IRQ By Main CPU */
/* video hardware */
@@ -669,7 +669,7 @@ MACHINE_CONFIG_START(esd16_state::esd16)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(16'000'000)/4) /* 4MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(16'000'000)/4) /* 4MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* 1MHz */
@@ -682,15 +682,15 @@ MACHINE_CONFIG_START(esd16_state::jumppop)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jumppop_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jumppop_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK( XTAL(14'000'000)/4) /* 3.5MHz - Verified */
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_CLOCK( XTAL(14'000'000)/4) /* 3.5MHz - Verified */
MCFG_GFXDECODE_MODIFY("gfxdecode", jumppop)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(14'000'000)/4) /* 3.5MHz - Verified */
+ MCFG_DEVICE_REPLACE("ymsnd", YM3812, XTAL(14'000'000)/4) /* 3.5MHz - Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_OKIM6295_REPLACE("oki", XTAL(14'000'000)/16, PIN7_HIGH) /* 875kHz - Verified */
@@ -702,8 +702,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(esd16_state::hedpanio)
esd16(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hedpanic_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hedpanic_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MACHINE_CONFIG_END
@@ -720,14 +720,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(esd16_state::mchampdx)
hedpanic(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mchampdx_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mchampdx_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(esd16_state::tangtang)
hedpanic(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tangtang_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tangtang_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp
index 61b683e1824..12fda67a8b8 100644
--- a/src/mame/drivers/esh.cpp
+++ b/src/mame/drivers/esh.cpp
@@ -357,15 +357,15 @@ void esh_state::machine_start()
/* DRIVER */
MACHINE_CONFIG_START(esh_state::esh)
/* main cpu */
- MCFG_CPU_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
- MCFG_CPU_PROGRAM_MAP(z80_0_mem)
- MCFG_CPU_IO_MAP(z80_0_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", esh_state, vblank_callback_esh)
+ MCFG_DEVICE_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
+ MCFG_DEVICE_PROGRAM_MAP(z80_0_mem)
+ MCFG_DEVICE_IO_MAP(z80_0_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", esh_state, vblank_callback_esh)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
- MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(esh_state, ld_command_strobe_cb))
+ MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(*this, esh_state, ld_command_strobe_cb))
MCFG_LASERDISC_OVERLAY_DRIVER(256, 256, esh_state, screen_update_esh)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
@@ -380,11 +380,11 @@ MACHINE_CONFIG_START(esh_state::esh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp
index eafd31e2a70..e4257e73ade 100644
--- a/src/mame/drivers/espial.cpp
+++ b/src/mame/drivers/espial.cpp
@@ -322,14 +322,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(espial_state::espial)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(espial_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(espial_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", espial_state, espial_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */
- MCFG_CPU_PROGRAM_MAP(espial_sound_map)
- MCFG_CPU_IO_MAP(espial_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(espial_state, espial_sound_nmi_gen, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3072000) /* 2 MHz?????? */
+ MCFG_DEVICE_PROGRAM_MAP(espial_sound_map)
+ MCFG_DEVICE_IO_MAP(espial_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(espial_state, espial_sound_nmi_gen, 4*60)
MCFG_WATCHDOG_ADD("watchdog")
@@ -352,7 +352,7 @@ MACHINE_CONFIG_START(espial_state::espial)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -361,8 +361,8 @@ MACHINE_CONFIG_START(espial_state::netwars)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(netwars_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(netwars_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/esprit.cpp b/src/mame/drivers/esprit.cpp
index f807f578fd1..bd2fa66c472 100644
--- a/src/mame/drivers/esprit.cpp
+++ b/src/mame/drivers/esprit.cpp
@@ -119,8 +119,8 @@ DRIVER_INIT_MEMBER( esprit_state, init )
MACHINE_CONFIG_START(esprit_state::esprit)
- MCFG_CPU_ADD("maincpu", M6502, 1000000) // no idea of clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000) // no idea of clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -141,8 +141,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(esprit_state::esprit3)
esprit(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mem3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mem3_map)
MACHINE_CONFIG_END
ROM_START( esprit )
diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp
index d6875199e45..743c65c506c 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -586,34 +586,34 @@ INPUT_CHANGED_MEMBER(esq1_state::key_stroke)
}
MACHINE_CONFIG_START(esq1_state::esq1)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000)) // XTAL not directly attached to CPU
- MCFG_CPU_PROGRAM_MAP(esq1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(8'000'000)) // XTAL not directly attached to CPU
+ MCFG_DEVICE_PROGRAM_MAP(esq1_map)
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(8'000'000) / 2)
MCFG_MC68681_SET_EXTERNAL_CLOCKS(XTAL(8'000'000) / 16, XTAL(8'000'000) / 16, XTAL(8'000'000) / 8, XTAL(8'000'000) / 8)
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_a))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_b))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq1_state, duart_output))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, esq1_state, duart_tx_a))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, esq1_state, duart_tx_b))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, esq1_state, duart_output))
MCFG_ESQPANEL2X40_ADD("panel")
- MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", scn2681_device, rx_b_w))
+ MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", scn2681_device, rx_b_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
+ MCFG_MIDI_RX_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("filters", ESQ1_FILTERS, 0)
+ MCFG_DEVICE_ADD("filters", ESQ1_FILTERS, 0)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_ES5503_ADD("es5503", XTAL(8'000'000))
MCFG_ES5503_OUTPUT_CHANNELS(8)
- MCFG_ES5503_IRQ_FUNC(WRITELINE(esq1_state, esq1_doc_irq))
- MCFG_ES5503_ADC_FUNC(READ8(esq1_state, esq1_adc_read))
+ MCFG_ES5503_IRQ_FUNC(WRITELINE(*this, esq1_state, esq1_doc_irq))
+ MCFG_ES5503_ADC_FUNC(READ8(*this, esq1_state, esq1_adc_read))
MCFG_SOUND_ROUTE(0, "filters", 1.0, 0)
MCFG_SOUND_ROUTE(1, "filters", 1.0, 1)
@@ -627,8 +627,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(esq1_state::sq80)
esq1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sq80_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sq80_map)
MCFG_WD1772_ADD(WD1772_TAG, 4000000)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index a87ff198055..0a0f9e18005 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -616,41 +616,41 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke)
#endif
MACHINE_CONFIG_START(esq5505_state::vfx)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(vfx_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vfx_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
- MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
+ MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQPANEL2X40_VFX_ADD("panel")
- MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
- MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
+ MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", mc68681_device, rx_b_w))
+ MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(*this, esq5505_state, analog_w))
MCFG_DEVICE_ADD("duart", MC68681, 4000000)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esq5505_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_a))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_b))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq5505_state, duart_output))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, esq5505_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, esq5505_state, duart_tx_a))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, esq5505_state, duart_tx_b))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, esq5505_state, duart_output))
MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000)
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
+ MCFG_MIDI_RX_HANDLER(WRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(10'000'000) / (16 * 21))
+ MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(10'000'000) / (16 * 21))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("otis", ES5505, XTAL(10'000'000))
+ MCFG_DEVICE_ADD("otis", ES5505, XTAL(10'000'000))
MCFG_ES5505_REGION0("waverom") /* Bank 0 */
MCFG_ES5505_REGION1("waverom2") /* Bank 1 */
MCFG_ES5505_CHANNELS(4) /* channels */
- MCFG_ES5505_IRQ_CB(WRITELINE(esq5505_state, esq5505_otis_irq)) /* irq */
- MCFG_ES5505_READ_PORT_CB(READ16(esq5505_state, analog_r)) /* ADC */
+ MCFG_ES5505_IRQ_CB(WRITELINE(*this, esq5505_state, esq5505_otis_irq)) /* irq */
+ MCFG_ES5505_READ_PORT_CB(READ16(*this, esq5505_state, analog_r)) /* ADC */
MCFG_SOUND_ROUTE(0, "pump", 1.0, 0)
MCFG_SOUND_ROUTE(1, "pump", 1.0, 1)
MCFG_SOUND_ROUTE(2, "pump", 1.0, 2)
@@ -663,13 +663,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(esq5505_state::eps)
vfx(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(eps_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(eps_map)
MCFG_ESQPANEL2X40_VFX_REMOVE("panel")
MCFG_ESQPANEL1X22_ADD("panel")
- MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
- MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
+ MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", mc68681_device, rx_b_w))
+ MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(*this, esq5505_state, analog_w))
MCFG_WD1772_ADD("wd1772", 8000000)
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats)
@@ -678,16 +678,16 @@ MACHINE_CONFIG_START(esq5505_state::eps)
MCFG_HD63450_CPU("maincpu") // CPU - 68000
MCFG_HD63450_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2))
MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50))
- MCFG_HD63450_DMA_END_CB(WRITE8(esq5505_state, dma_end))
- MCFG_HD63450_DMA_ERROR_CB(WRITE8(esq5505_state, dma_error))
- MCFG_HD63450_DMA_READ_0_CB(READ8(esq5505_state, fdc_read_byte)) // ch 0 = fdc, ch 1 = 340001 (ADC?)
- MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(esq5505_state, fdc_write_byte))
+ MCFG_HD63450_DMA_END_CB(WRITE8(*this, esq5505_state, dma_end))
+ MCFG_HD63450_DMA_ERROR_CB(WRITE8(*this, esq5505_state, dma_error))
+ MCFG_HD63450_DMA_READ_0_CB(READ8(*this, esq5505_state, fdc_read_byte)) // ch 0 = fdc, ch 1 = 340001 (ADC?)
+ MCFG_HD63450_DMA_WRITE_0_CB(WRITE8(*this, esq5505_state, fdc_write_byte))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(esq5505_state::vfxsd)
vfx(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(vfxsd_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(vfxsd_map)
MCFG_WD1772_ADD("wd1772", 8000000)
MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats)
@@ -695,41 +695,41 @@ MACHINE_CONFIG_END
// 32-voice machines with the VFX-SD type config
MACHINE_CONFIG_START(esq5505_state::vfx32)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(30'476'100) / 2)
- MCFG_CPU_PROGRAM_MAP(vfxsd_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'476'100) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(vfxsd_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
- MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
+ MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQPANEL2X40_VFX_ADD("panel")
- MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
- MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
+ MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", mc68681_device, rx_b_w))
+ MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(*this, esq5505_state, analog_w))
MCFG_DEVICE_ADD("duart", MC68681, 4000000)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esq5505_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_a))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq5505_state, duart_tx_b))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq5505_state, duart_output))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, esq5505_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, esq5505_state, duart_tx_a))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, esq5505_state, duart_tx_b))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, esq5505_state, duart_output))
MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000)
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
+ MCFG_MIDI_RX_HANDLER(WRITELINE("duart", mc68681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32))
+ MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("otis", ES5505, XTAL(30'476'100) / 2)
+ MCFG_DEVICE_ADD("otis", ES5505, XTAL(30'476'100) / 2)
MCFG_ES5505_REGION0("waverom") /* Bank 0 */
MCFG_ES5505_REGION1("waverom2") /* Bank 1 */
MCFG_ES5505_CHANNELS(4) /* channels */
- MCFG_ES5505_IRQ_CB(WRITELINE(esq5505_state, esq5505_otis_irq)) /* irq */
- MCFG_ES5505_READ_PORT_CB(READ16(esq5505_state, analog_r)) /* ADC */
+ MCFG_ES5505_IRQ_CB(WRITELINE(*this, esq5505_state, esq5505_otis_irq)) /* irq */
+ MCFG_ES5505_READ_PORT_CB(READ16(*this, esq5505_state, analog_r)) /* ADC */
MCFG_SOUND_ROUTE(0, "pump", 1.0, 0)
MCFG_SOUND_ROUTE(1, "pump", 1.0, 1)
MCFG_SOUND_ROUTE(2, "pump", 1.0, 2)
@@ -745,13 +745,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(esq5505_state::sq1)
vfx(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(sq1_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(sq1_map)
MCFG_ESQPANEL2X40_VFX_REMOVE("panel")
MCFG_ESQPANEL2X16_SQ1_ADD("panel")
- MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
- MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
+ MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", mc68681_device, rx_b_w))
+ MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(*this, esq5505_state, analog_w))
MACHINE_CONFIG_END
static INPUT_PORTS_START( vfx )
diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp
index 80f2a5098e1..ed7c24bd44a 100644
--- a/src/mame/drivers/esqasr.cpp
+++ b/src/mame/drivers/esqasr.cpp
@@ -114,28 +114,28 @@ READ16_MEMBER(esqasr_state::esq5506_read_adc)
}
MACHINE_CONFIG_START(esqasr_state::asr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // actually MC68302
- MCFG_CPU_PROGRAM_MAP(asr_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) // actually MC68302
+ MCFG_DEVICE_PROGRAM_MAP(asr_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
+ MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32))
+ MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
MCFG_ES5506_REGION3("waverom4") /* Bank 1 */
MCFG_ES5506_CHANNELS(4) /* channels, Not verified from real hardware */
- MCFG_ES5506_IRQ_CB(WRITELINE(esqasr_state, esq5506_otto_irq)) /* irq */
- MCFG_ES5506_READ_PORT_CB(READ16(esqasr_state, esq5506_read_adc))
+ MCFG_ES5506_IRQ_CB(WRITELINE(*this, esqasr_state, esq5506_otto_irq)) /* irq */
+ MCFG_ES5506_READ_PORT_CB(READ16(*this, esqasr_state, esq5506_read_adc))
MCFG_SOUND_ROUTE(0, "pump", 1.0, 0)
MCFG_SOUND_ROUTE(1, "pump", 1.0, 1)
MCFG_SOUND_ROUTE(2, "pump", 1.0, 2)
@@ -147,28 +147,28 @@ MACHINE_CONFIG_START(esqasr_state::asr)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(esqasr_state::asrx)
- MCFG_CPU_ADD("maincpu", M68340, XTAL(16'000'000)) // 68340
- MCFG_CPU_PROGRAM_MAP(asrx_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, XTAL(16'000'000)) // 68340
+ MCFG_DEVICE_PROGRAM_MAP(asrx_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000)) // Actually ES5511
+ MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000)) // Actually ES5511
MCFG_DEVICE_DISABLE()
MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32)) // Actually ES5511
+ MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32)) // Actually ES5511
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
MCFG_ES5506_REGION3("waverom4") /* Bank 1 */
MCFG_ES5506_CHANNELS(1) /* channels */
- MCFG_ES5506_IRQ_CB(WRITELINE(esqasr_state, esq5506_otto_irq)) /* irq */
- MCFG_ES5506_READ_PORT_CB(READ16(esqasr_state, esq5506_read_adc))
+ MCFG_ES5506_IRQ_CB(WRITELINE(*this, esqasr_state, esq5506_otto_irq)) /* irq */
+ MCFG_ES5506_READ_PORT_CB(READ16(*this, esqasr_state, esq5506_read_adc))
MCFG_SOUND_ROUTE(0, "pump", 1.0, 0)
MCFG_SOUND_ROUTE(1, "pump", 1.0, 1)
MCFG_SOUND_ROUTE(2, "pump", 1.0, 2)
diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp
index dc1c8e45d89..95bdd5a5d27 100644
--- a/src/mame/drivers/esqkt.cpp
+++ b/src/mame/drivers/esqkt.cpp
@@ -215,42 +215,42 @@ WRITE_LINE_MEMBER(esqkt_state::duart_tx_b)
}
MACHINE_CONFIG_START(esqkt_state::kt)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(kt_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(kt_map)
- MCFG_CPU_ADD("esp", ES5510, XTAL(10'000'000))
+ MCFG_DEVICE_ADD("esp", ES5510, XTAL(10'000'000))
MCFG_DEVICE_DISABLE()
MCFG_ESQPANEL2X16_SQ1_ADD("sq1panel")
- MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", scn2681_device, rx_b_w))
+ MCFG_ESQPANEL_TX_CALLBACK(WRITELINE("duart", scn2681_device, rx_b_w))
MCFG_DEVICE_ADD("duart", SCN2681, 4000000)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(esqkt_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(esqkt_state, duart_tx_a))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esqkt_state, duart_tx_b))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esqkt_state, duart_output))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, esqkt_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, esqkt_state, duart_tx_a))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, esqkt_state, duart_tx_b))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, esqkt_state, duart_output))
MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000)
MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000)
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
+ MCFG_MIDI_RX_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w)) // route MIDI Tx send directly to 68681 channel A Rx
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32))
+ MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(16'000'000) / (16 * 32))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ensoniq1", ES5506, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("ensoniq1", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
MCFG_ES5506_REGION3("waverom4") /* Bank 1 */
MCFG_ES5506_CHANNELS(4) /* channels */
- MCFG_ES5506_IRQ_CB(WRITELINE(esqkt_state, esq5506_otto_irq)) /* irq */
- MCFG_ES5506_READ_PORT_CB(READ16(esqkt_state, esq5506_read_adc))
+ MCFG_ES5506_IRQ_CB(WRITELINE(*this, esqkt_state, esq5506_otto_irq)) /* irq */
+ MCFG_ES5506_READ_PORT_CB(READ16(*this, esqkt_state, esq5506_read_adc))
MCFG_SOUND_ROUTE(0, "pump", 1.0, 0)
MCFG_SOUND_ROUTE(1, "pump", 1.0, 1)
MCFG_SOUND_ROUTE(2, "pump", 1.0, 2)
@@ -260,7 +260,7 @@ MACHINE_CONFIG_START(esqkt_state::kt)
MCFG_SOUND_ROUTE(6, "pump", 1.0, 6)
MCFG_SOUND_ROUTE(7, "pump", 1.0, 7)
- MCFG_SOUND_ADD("ensoniq2", ES5506, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("ensoniq2", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp
index 4687c7a8f61..d198ead428c 100644
--- a/src/mame/drivers/esqmr.cpp
+++ b/src/mame/drivers/esqmr.cpp
@@ -252,23 +252,23 @@ READ16_MEMBER(esqmr_state::esq5506_read_adc)
}
MACHINE_CONFIG_START(esqmr_state::mr)
- MCFG_CPU_ADD("maincpu", M68340, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(mr_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mr_map)
MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("ensoniq", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
MCFG_ES5506_REGION3("waverom4") /* Bank 1 */
MCFG_ES5506_CHANNELS(1) /* channels */
- MCFG_ES5506_IRQ_CB(WRITELINE(esqmr_state, esq5506_otto_irq)) /* irq */
- MCFG_ES5506_READ_PORT_CB(READ16(esqmr_state, esq5506_read_adc))
+ MCFG_ES5506_IRQ_CB(WRITELINE(*this, esqmr_state, esq5506_otto_irq)) /* irq */
+ MCFG_ES5506_READ_PORT_CB(READ16(*this, esqmr_state, esq5506_read_adc))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_SOUND_ADD("ensoniq2", ES5506, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("ensoniq2", ES5506, XTAL(16'000'000))
MCFG_ES5506_REGION0("waverom") /* Bank 0 */
MCFG_ES5506_REGION1("waverom2") /* Bank 1 */
MCFG_ES5506_REGION2("waverom3") /* Bank 0 */
diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp
index b0b64bc9ecc..3b9e52f8545 100644
--- a/src/mame/drivers/esripsys.cpp
+++ b/src/mame/drivers/esripsys.cpp
@@ -665,25 +665,25 @@ DRIVER_INIT_MEMBER(esripsys_state,esripsys)
}
MACHINE_CONFIG_START(esripsys_state::esripsys)
- MCFG_CPU_ADD("game_cpu", MC6809E, XTAL(8'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(game_cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", esripsys_state, esripsys_vblank_irq)
+ MCFG_DEVICE_ADD("game_cpu", MC6809E, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(game_cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", esripsys_state, esripsys_vblank_irq)
MCFG_QUANTUM_PERFECT_CPU("game_cpu")
- MCFG_CPU_ADD("frame_cpu", MC6809E, XTAL(8'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(frame_cpu_map)
+ MCFG_DEVICE_ADD("frame_cpu", MC6809E, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(frame_cpu_map)
- MCFG_CPU_ADD("video_cpu", ESRIP, XTAL(40'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(video_cpu_map)
- MCFG_ESRIP_FDT_R_CALLBACK(READ16(esripsys_state, fdt_rip_r))
- MCFG_ESRIP_FDT_W_CALLBACK(WRITE16(esripsys_state, fdt_rip_w))
- MCFG_ESRIP_STATUS_IN_CALLBACK(READ8(esripsys_state, rip_status_in))
+ MCFG_DEVICE_ADD("video_cpu", ESRIP, XTAL(40'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(video_cpu_map)
+ MCFG_ESRIP_FDT_R_CALLBACK(READ16(*this, esripsys_state, fdt_rip_r))
+ MCFG_ESRIP_FDT_W_CALLBACK(WRITE16(*this, esripsys_state, fdt_rip_w))
+ MCFG_ESRIP_STATUS_IN_CALLBACK(READ8(*this, esripsys_state, rip_status_in))
MCFG_ESRIP_DRAW_CALLBACK_OWNER(esripsys_state, esripsys_draw)
MCFG_ESRIP_LBRM_PROM("proms")
MCFG_ESRIP_SCREEN("screen")
- MCFG_CPU_ADD("sound_cpu", MC6809E, XTAL(8'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
+ MCFG_DEVICE_ADD("sound_cpu", MC6809E, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -696,19 +696,19 @@ MACHINE_CONFIG_START(esripsys_state::esripsys)
/* Sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC3410, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("dacvol", MC3408, 0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", MC3410, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dacvol", MC3408, 0) // unknown DAC
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("tms5220nl", TMS5220, 640000)
+ MCFG_DEVICE_ADD("tms5220nl", TMS5220, 640000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* 6840 PTM */
MCFG_DEVICE_ADD("6840ptm", PTM6840, XTAL(8'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_IRQ_CB(WRITELINE(esripsys_state, ptm_irq))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, esripsys_state, ptm_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index a58216dcbb4..1e08251f9e2 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -220,33 +220,33 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(et3400_state::et3400)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(4'000'000) / 4 ) // 1MHz with memory i/o accessory, or 500khz without it
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(4'000'000) / 4 ) // 1MHz with memory i/o accessory, or 500khz without it
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_et3400)
// Devices
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(et3400_state, pia_aw))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(et3400_state, pia_bw))
- MCFG_PIA_READPA_HANDLER(READ8(et3400_state, pia_ar))
- MCFG_PIA_READPB_HANDLER(READ8(et3400_state, pia_br))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, et3400_state, pia_aw))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, et3400_state, pia_bw))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, et3400_state, pia_ar))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, et3400_state, pia_br))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD("displatch1", LS259, 0) // IC28
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(et3400_state, led_w<1>))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, et3400_state, led_w<1>))
MCFG_DEVICE_ADD("displatch2", LS259, 0) // IC27
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(et3400_state, led_w<2>))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, et3400_state, led_w<2>))
MCFG_DEVICE_ADD("displatch3", LS259, 0) // IC26
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(et3400_state, led_w<3>))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, et3400_state, led_w<3>))
MCFG_DEVICE_ADD("displatch4", LS259, 0) // IC25
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(et3400_state, led_w<4>))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, et3400_state, led_w<4>))
MCFG_DEVICE_ADD("displatch5", LS259, 0) // IC24
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(et3400_state, led_w<5>))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, et3400_state, led_w<5>))
MCFG_DEVICE_ADD("displatch6", LS259, 0) // IC23
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(et3400_state, led_w<6>))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, et3400_state, led_w<6>))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index bde64892b81..fe17fa3a487 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -306,15 +306,15 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 )
MACHINE_CONFIG_START(eti660_state::eti660)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(8'867'238)/5)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(8'867'238)/5)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(eti660_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(eti660_state, ef2_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(eti660_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(eti660_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(WRITE8(eti660_state, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, eti660_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, eti660_state, ef2_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, eti660_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, eti660_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, eti660_state, dma_w))
/* video hardware */
MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(8'867'238)/5)
@@ -322,14 +322,14 @@ MACHINE_CONFIG_START(eti660_state::eti660)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(8'867'238)/5, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(eti660_state, rdata_r), READLINE(eti660_state, bdata_r), READLINE(eti660_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(8'867'238)/5, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(*this, eti660_state, rdata_r), READLINE(*this, eti660_state, bdata_r), READLINE(*this, eti660_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(2.2), RES_K(1), RES_K(4.7), RES_K(4.7)) // R7, R5, R6, R4
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(MC6821_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(eti660_state, pia_pa_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(eti660_state, pia_pa_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, eti660_state, pia_pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, eti660_state, pia_pa_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_DEVCB_INVERT
MCFG_PIA_IRQB_HANDLER(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) MCFG_DEVCB_INVERT
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index 455d530ff98..50b350ccab8 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -295,10 +295,10 @@ INTERRUPT_GEN_MEMBER(ettrivia_state::ettrivia_interrupt)
}
MACHINE_CONFIG_START(ettrivia_state::ettrivia)
- MCFG_CPU_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ettrivia_state, ettrivia_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ettrivia_state, ettrivia_interrupt)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -318,14 +318,14 @@ MACHINE_CONFIG_START(ettrivia_state::ettrivia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8912, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8912, 1500000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay3", AY8912, 1500000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp
index dee2bb5f195..9f67203d7f5 100644
--- a/src/mame/drivers/eurocom2.cpp
+++ b/src/mame/drivers/eurocom2.cpp
@@ -434,8 +434,8 @@ static void eurocom_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(eurocom2_state::eurocom2)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(10'717'200)/2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz
- MCFG_CPU_PROGRAM_MAP(eurocom2_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(10'717'200)/2) // EXTAL = CLK/2 = 5.3586 MHz; Q = E = 1.33965 MHz
+ MCFG_DEVICE_PROGRAM_MAP(eurocom2_map)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_RAW_PARAMS(XTAL(10'717'200), VC_TOTAL_HORZ, 0, VC_DISP_HORZ, VC_TOTAL_VERT, 0, VC_DISP_VERT)
@@ -448,12 +448,12 @@ MACHINE_CONFIG_START(eurocom2_state::eurocom2)
MCFG_GENERIC_KEYBOARD_CB(PUT(eurocom2_state, kbd_put))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READCA1_HANDLER(READLINE(eurocom2_state, pia1_ca1_r)) // keyboard strobe
- MCFG_PIA_READCA2_HANDLER(READLINE(eurocom2_state, pia1_ca2_r)) // SST output Q14
- MCFG_PIA_READCB1_HANDLER(READLINE(eurocom2_state, pia1_cb1_r)) // SST output Q6
- MCFG_PIA_CB2_HANDLER(WRITELINE(eurocom2_state, pia1_cb2_w)) // SST reset input
- MCFG_PIA_READPA_HANDLER(READ8(eurocom2_state, kbd_get))
-// MCFG_PIA_READPB_HANDLER(READ8(eurocom2_state, kbd_get))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, eurocom2_state, pia1_ca1_r)) // keyboard strobe
+ MCFG_PIA_READCA2_HANDLER(READLINE(*this, eurocom2_state, pia1_ca2_r)) // SST output Q14
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, eurocom2_state, pia1_cb1_r)) // SST output Q6
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, eurocom2_state, pia1_cb2_w)) // SST reset input
+ MCFG_PIA_READPA_HANDLER(READ8(*this, eurocom2_state, kbd_get))
+// MCFG_PIA_READPB_HANDLER(READ8(*this, eurocom2_state, kbd_get))
// MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
// MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -462,11 +462,11 @@ MACHINE_CONFIG_START(eurocom2_state::eurocom2)
// MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE ("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE ("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE ("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE ("acia", acia6850_device, write_cts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE ("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE ("rs232", rs232_port_device, write_rts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE ("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE ("acia", acia6850_device, write_cts))
MCFG_FD1793_ADD("fdc", XTAL(2'000'000)/2)
// MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -478,24 +478,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(waveterm_state::waveterm)
eurocom2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(waveterm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(waveterm_map)
MCFG_DEVICE_MODIFY("pia2")
- MCFG_PIA_CB2_HANDLER(WRITELINE(waveterm_state, waveterm_kbh_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(waveterm_state, waveterm_kb_w))
- MCFG_PIA_READPB_HANDLER(READ8(waveterm_state, waveterm_kb_r))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, waveterm_state, waveterm_kbh_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, waveterm_state, waveterm_kb_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, waveterm_state, waveterm_kb_r))
// ports A(in/out), B(out), CA1(in), CA2(in), and CB2(out) = interface to PPG bus via DIL socket on WTI board
// CB1 -- front panel "End" button
MCFG_DEVICE_ADD("pia3", PIA6821, 0)
-// MCFG_PIA_READPA_HANDLER(READ8(waveterm_state, pia3_pa_r))
-// MCFG_PIA_WRITEPA_HANDLER(WRITE8(waveterm_state, pia3_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(waveterm_state, pia3_pb_w))
-// MCFG_PIA_READCA1_HANDLER(READLINE(waveterm_state, pia3_ca1_r))
-// MCFG_PIA_READCA2_HANDLER(READLINE(waveterm_state, pia3_ca2_r))
+// MCFG_PIA_READPA_HANDLER(READ8(*this, waveterm_state, pia3_pa_r))
+// MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, waveterm_state, pia3_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, waveterm_state, pia3_pb_w))
+// MCFG_PIA_READCA1_HANDLER(READLINE(*this, waveterm_state, pia3_ca1_r))
+// MCFG_PIA_READCA2_HANDLER(READLINE(*this, waveterm_state, pia3_ca2_r))
MCFG_PIA_READCB1_HANDLER(IOPORT("FP"))
-// MCFG_PIA_CB2_HANDLER(WRITELINE(waveterm_state, pia3_cb2_w))
+// MCFG_PIA_CB2_HANDLER(WRITELINE(*this, waveterm_state, pia3_cb2_w))
MCFG_DEVICE_ADD("ptm", PTM6840, 0)
diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp
index 84722eb92d8..e38e3fcf187 100644
--- a/src/mame/drivers/europc.cpp
+++ b/src/mame/drivers/europc.cpp
@@ -521,22 +521,22 @@ void europc_pc_state::cfg_builtin_720K(device_t *device)
//Euro PC
MACHINE_CONFIG_START(europc_pc_state::europc)
- MCFG_CPU_ADD("maincpu", I8088, 4772720*2)
- MCFG_CPU_PROGRAM_MAP(europc_map)
- MCFG_CPU_IO_MAP(europc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 4772720*2)
+ MCFG_DEVICE_PROGRAM_MAP(europc_map)
+ MCFG_DEVICE_IO_MAP(europc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "aga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "aga", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
MCFG_SLOT_FIXED(true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
MCFG_SLOT_FIXED(true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_builtin_720K)
MCFG_SLOT_FIXED(true)
- MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE("mb:pic8259", pic8259_device, ir1_w))
MCFG_NVRAM_ADD_0FILL("nvram");
@@ -563,9 +563,9 @@ MACHINE_CONFIG_START(europc_pc_state::euroxt)
MCFG_RAM_DEFAULT_SIZE("768K")
MCFG_DEVICE_MODIFY("isa2")
MCFG_SLOT_DEFAULT_OPTION(nullptr)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "xtide", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "xtide", false) // FIXME: determine ISA bus clock
MCFG_SLOT_FIXED(true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
MCFG_SLOT_FIXED(true)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp
index eee5c7d7bdc..72ac11d4420 100644
--- a/src/mame/drivers/eva.cpp
+++ b/src/mame/drivers/eva.cpp
@@ -161,44 +161,44 @@ MACHINE_CONFIG_START(eva_state::tms5110_route)
/* sound hardware */
MCFG_DEVICE_MODIFY("tms5100")
- MCFG_TMS5110_M0_CB(DEVWRITELINE("tms6100", tms6100_device, m0_w))
- MCFG_TMS5110_M1_CB(DEVWRITELINE("tms6100", tms6100_device, m1_w))
- MCFG_TMS5110_ADDR_CB(DEVWRITE8("tms6100", tms6100_device, add_w))
- MCFG_TMS5110_DATA_CB(DEVREADLINE("tms6100", tms6100_device, data_line_r))
- MCFG_TMS5110_ROMCLK_CB(DEVWRITELINE("tms6100", tms6100_device, clk_w))
+ MCFG_TMS5110_M0_CB(WRITELINE("tms6100", tms6100_device, m0_w))
+ MCFG_TMS5110_M1_CB(WRITELINE("tms6100", tms6100_device, m1_w))
+ MCFG_TMS5110_ADDR_CB(WRITE8("tms6100", tms6100_device, add_w))
+ MCFG_TMS5110_DATA_CB(READLINE("tms6100", tms6100_device, data_line_r))
+ MCFG_TMS5110_ROMCLK_CB(WRITELINE("tms6100", tms6100_device, clk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(eva_state::eva24)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP420, 640_kHz_XTAL/2) // guessed
+ MCFG_DEVICE_ADD("maincpu", COP420, 640_kHz_XTAL/2) // guessed
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(eva_state, eva24_write_d))
- MCFG_COP400_WRITE_G_CB(WRITE8(eva_state, eva24_write_g))
- MCFG_COP400_READ_G_CB(READ8(eva_state, eva24_read_g))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, eva_state, eva24_write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, eva_state, eva24_write_g))
+ MCFG_COP400_READ_G_CB(READ8(*this, eva_state, eva24_read_g))
/* sound hardware */
MCFG_DEVICE_ADD("tms6100", TMS6100, 640_kHz_XTAL/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", TMS5110A, 640_kHz_XTAL)
+ MCFG_DEVICE_ADD("tms5100", TMS5110A, 640_kHz_XTAL)
tms5110_route(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(eva_state::eva11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 640_kHz_XTAL/2) // from TMS5110A CPU CK
- MCFG_TMS1XXX_READ_K_CB(READ8(eva_state, eva11_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(eva_state, eva11_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(eva_state, eva11_write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 640_kHz_XTAL/2) // from TMS5110A CPU CK
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, eva_state, eva11_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, eva_state, eva11_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, eva_state, eva11_write_r))
/* sound hardware */
MCFG_DEVICE_ADD("tms6100", TMS6100, 640_kHz_XTAL/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", TMS5110A, 640_kHz_XTAL)
+ MCFG_DEVICE_ADD("tms5100", TMS5110A, 640_kHz_XTAL)
tms5110_route(config);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index d966475ec46..869854b2ec8 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -551,32 +551,32 @@ MC6845_UPDATE_ROW( excali64_state::update_row )
MACHINE_CONFIG_START(excali64_state::excali64)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_MACHINE_RESET_OVERRIDE(excali64_state, excali64)
MCFG_DEVICE_ADD("uart", I8251, 0)
- //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ //MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000) / 16) /* Timer 0: tone gen for speaker */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w))
//MCFG_PIT8253_CLK1(XTAL(16'000'000) / 16) /* Timer 1: baud rate gen for 8251 */
- //MCFG_PIT8253_OUT1_HANDLER(WRITELINE(excali64_state, write_uart_clock))
+ //MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, excali64_state, write_uart_clock))
//MCFG_PIT8253_CLK2(XTAL(16'000'000) / 16) /* Timer 2: not used */
MCFG_DEVICE_ADD("ppi", I8255A, 0 )
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) // parallel port
- MCFG_I8255_OUT_PORTB_CB(WRITE8(excali64_state, ppib_w))
- MCFG_I8255_IN_PORTC_CB(READ8(excali64_state, ppic_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(excali64_state, ppic_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write)) // parallel port
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, excali64_state, ppib_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, excali64_state, ppic_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, excali64_state, ppic_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
@@ -595,25 +595,25 @@ MACHINE_CONFIG_START(excali64_state::excali64)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(excali64_state, update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(excali64_state, crtc_hs))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(excali64_state, crtc_vs))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, excali64_state, crtc_hs))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, excali64_state, crtc_vs))
/* Devices */
MCFG_CASSETTE_ADD( "cassette" )
MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 16)
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", excali64_floppies, "525qd", excali64_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", excali64_floppies, "525qd", excali64_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000)/4)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(excali64_state, busreq_w))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(excali64_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(excali64_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(excali64_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(excali64_state, io_write_byte))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, excali64_state, busreq_w))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, excali64_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, excali64_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, excali64_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, excali64_state, io_write_byte))
MCFG_DEVICE_ADD("u12", TTL74123, 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_GROUNDED) /* Hook up type (no idea what this means) */
@@ -622,10 +622,10 @@ MACHINE_CONFIG_START(excali64_state::excali64)
MCFG_TTL74123_A_PIN_VALUE(0) /* A pin - grounded */
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - driven by port e4 bit 5 */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(excali64_state, motor_w))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, excali64_state, motor_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(excali64_state, cent_busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, excali64_state, cent_busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp
index 3dc285a8032..758f7744366 100644
--- a/src/mame/drivers/exedexes.cpp
+++ b/src/mame/drivers/exedexes.cpp
@@ -222,13 +222,13 @@ void exedexes_state::machine_reset()
MACHINE_CONFIG_START(exedexes_state::exedexes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(exedexes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(exedexes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exedexes_state, exedexes_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(exedexes_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(exedexes_state, irq0_line_hold, 4*60)
/* video hardware */
@@ -240,7 +240,7 @@ MACHINE_CONFIG_START(exedexes_state::exedexes)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(exedexes_state, screen_update_exedexes)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", exedexes)
@@ -254,13 +254,13 @@ MACHINE_CONFIG_START(exedexes_state::exedexes)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("sn1", SN76489, 3000000)
+ MCFG_DEVICE_ADD("sn1", SN76489, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
- MCFG_SOUND_ADD("sn2", SN76489, 3000000)
+ MCFG_DEVICE_ADD("sn2", SN76489, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.36)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp
index cf781c67530..b6dfa06c11d 100644
--- a/src/mame/drivers/exelv.cpp
+++ b/src/mame/drivers/exelv.cpp
@@ -482,21 +482,21 @@ MACHINE_START_MEMBER( exelv_state, exeltel)
MACHINE_CONFIG_START(exelv_state::exl100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS7020_EXL, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(tms7020_mem)
- MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7020_porta_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7020_portb_w))
+ MCFG_DEVICE_ADD("maincpu", TMS7020_EXL, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(tms7020_mem)
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, exelv_state, tms7020_porta_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, exelv_state, tms7020_portb_w))
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exelv_state, exelv_hblank_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(exelv_state, exl100)
- MCFG_CPU_ADD("tms7041", TMS7041, XTAL(4'915'200))
- MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7041_porta_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7041_portb_w))
- MCFG_TMS7000_IN_PORTC_CB(READ8(exelv_state, tms7041_portc_r))
- MCFG_TMS7000_OUT_PORTC_CB(WRITE8(exelv_state, tms7041_portc_w))
- MCFG_TMS7000_IN_PORTD_CB(READ8(exelv_state, tms7041_portd_r))
- MCFG_TMS7000_OUT_PORTD_CB(WRITE8(exelv_state, tms7041_portd_w))
+ MCFG_DEVICE_ADD("tms7041", TMS7041, XTAL(4'915'200))
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, exelv_state, tms7041_porta_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, exelv_state, tms7041_portb_w))
+ MCFG_TMS7000_IN_PORTC_CB(READ8(*this, exelv_state, tms7041_portc_r))
+ MCFG_TMS7000_OUT_PORTC_CB(WRITE8(*this, exelv_state, tms7041_portc_w))
+ MCFG_TMS7000_IN_PORTD_CB(READ8(*this, exelv_state, tms7041_portd_r))
+ MCFG_TMS7000_OUT_PORTD_CB(WRITE8(*this, exelv_state, tms7041_portd_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -523,7 +523,7 @@ MACHINE_CONFIG_START(exelv_state::exl100)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5220c", TMS5220C, 640000)
+ MCFG_DEVICE_ADD("tms5220c", TMS5220C, 640000)
// MCFG_TMS52XX_SPEECHROM("vsm")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -538,21 +538,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(exelv_state::exeltel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS7040, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(tms7040_mem)
- MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7020_porta_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7020_portb_w))
+ MCFG_DEVICE_ADD("maincpu", TMS7040, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(tms7040_mem)
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, exelv_state, tms7020_porta_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, exelv_state, tms7020_portb_w))
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", exelv_state, exelv_hblank_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(exelv_state, exeltel)
- MCFG_CPU_ADD("tms7042", TMS7042, XTAL(4'915'200))
- MCFG_TMS7000_IN_PORTA_CB(READ8(exelv_state, tms7041_porta_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(exelv_state, tms7041_portb_w))
- MCFG_TMS7000_IN_PORTC_CB(READ8(exelv_state, tms7041_portc_r))
- MCFG_TMS7000_OUT_PORTC_CB(WRITE8(exelv_state, tms7041_portc_w))
- MCFG_TMS7000_IN_PORTD_CB(READ8(exelv_state, tms7041_portd_r))
- MCFG_TMS7000_OUT_PORTD_CB(WRITE8(exelv_state, tms7041_portd_w))
+ MCFG_DEVICE_ADD("tms7042", TMS7042, XTAL(4'915'200))
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, exelv_state, tms7041_porta_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, exelv_state, tms7041_portb_w))
+ MCFG_TMS7000_IN_PORTC_CB(READ8(*this, exelv_state, tms7041_portc_r))
+ MCFG_TMS7000_OUT_PORTC_CB(WRITE8(*this, exelv_state, tms7041_portc_w))
+ MCFG_TMS7000_IN_PORTD_CB(READ8(*this, exelv_state, tms7041_portd_r))
+ MCFG_TMS7000_OUT_PORTD_CB(WRITE8(*this, exelv_state, tms7041_portd_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -579,7 +579,7 @@ MACHINE_CONFIG_START(exelv_state::exeltel)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5220c", TMS5220C, 640000)
+ MCFG_DEVICE_ADD("tms5220c", TMS5220C, 640000)
MCFG_TMS52XX_SPEECHROM("vsm")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp
index 1ebc8d89a3a..3a620259457 100644
--- a/src/mame/drivers/exerion.cpp
+++ b/src/mame/drivers/exerion.cpp
@@ -374,11 +374,11 @@ void exerion_state::machine_reset()
MACHINE_CONFIG_START(exerion_state::exerion)
- MCFG_CPU_ADD("maincpu", Z80, EXERION_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, EXERION_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("sub", Z80, EXERION_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", Z80, EXERION_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
/* video hardware */
@@ -397,12 +397,12 @@ MACHINE_CONFIG_START(exerion_state::exerion)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, EXERION_AY8910_CLOCK)
+ MCFG_DEVICE_ADD("ay1", AY8910, EXERION_AY8910_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, EXERION_AY8910_CLOCK)
- MCFG_AY8910_PORT_A_READ_CB(READ8(exerion_state, exerion_porta_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(exerion_state, exerion_portb_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, EXERION_AY8910_CLOCK)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, exerion_state, exerion_porta_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, exerion_state, exerion_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp
index e96dac69b9c..fa287aacd28 100644
--- a/src/mame/drivers/exidy.cpp
+++ b/src/mame/drivers/exidy.cpp
@@ -824,8 +824,8 @@ MACHINE_START_MEMBER(exidy_state,teetert)
MACHINE_CONFIG_START(exidy_state::base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, EXIDY_CPU_CLOCK)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", exidy_state, exidy_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, EXIDY_CPU_CLOCK)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", exidy_state, exidy_vblank_interrupt)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", exidy)
@@ -844,8 +844,8 @@ MACHINE_CONFIG_START(exidy_state::sidetrac)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sidetrac_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sidetrac_map)
/* audio hardware */
spectar_audio(config);
@@ -856,8 +856,8 @@ MACHINE_CONFIG_START(exidy_state::targ)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(targ_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(targ_map)
/* audio hardware */
targ_audio(config);
@@ -868,8 +868,8 @@ MACHINE_CONFIG_START(exidy_state::spectar)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spectar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spectar_map)
/* audio hardware */
spectar_audio(config);
@@ -880,8 +880,8 @@ MACHINE_CONFIG_START(exidy_state::rallys)
spectar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rallys_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rallys_map)
MACHINE_CONFIG_END
@@ -889,8 +889,8 @@ MACHINE_CONFIG_START(exidy_state::venture)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(venture_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(venture_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -903,8 +903,8 @@ MACHINE_CONFIG_START(exidy_state::teetert)
venture(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(exidy_state, nmi_line_pulse, 10*60)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(exidy_state, nmi_line_pulse, 10*60)
MCFG_MACHINE_START_OVERRIDE(exidy_state, teetert )
@@ -927,8 +927,8 @@ MACHINE_CONFIG_START(exidy_state::pepper2)
venture(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pepper2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pepper2_map)
MACHINE_CONFIG_END
@@ -936,8 +936,8 @@ MACHINE_CONFIG_START(exidy_state::fax)
pepper2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fax_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fax_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exidy440.cpp b/src/mame/drivers/exidy440.cpp
index fe0154e6606..fe13d019b0d 100644
--- a/src/mame/drivers/exidy440.cpp
+++ b/src/mame/drivers/exidy440.cpp
@@ -1024,9 +1024,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(exidy440_state::exidy440)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(exidy440_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", exidy440_state, exidy440_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(exidy440_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", exidy440_state, exidy440_vblank_interrupt)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1034,26 +1034,26 @@ MACHINE_CONFIG_START(exidy440_state::exidy440)
exidy440_video(config);
/* audio hardware */
- MCFG_CPU_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK)
- MCFG_CPU_PROGRAM_MAP(exidy440_audio_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(exidy440_audio_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", EXIDY440, EXIDY440_MC3418_CLOCK)
+ MCFG_DEVICE_ADD("custom", EXIDY440, EXIDY440_MC3418_CLOCK)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_DEVICE_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_DEVICE_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_DEVICE_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_DEVICE_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index 5d118c0e16e..d7ba551c047 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -182,27 +182,27 @@ void exp85_state::machine_start()
MACHINE_CONFIG_START(exp85_state::exp85)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085A_TAG, I8085A, 6.144_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(exp85_mem)
- MCFG_CPU_IO_MAP(exp85_io)
- MCFG_I8085A_SID(READLINE(exp85_state, sid_r))
- MCFG_I8085A_SOD(WRITELINE(exp85_state, sod_w))
+ MCFG_DEVICE_ADD(I8085A_TAG, I8085A, 6.144_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(exp85_mem)
+ MCFG_DEVICE_IO_MAP(exp85_io)
+ MCFG_I8085A_SID(READLINE(*this, exp85_state, sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, exp85_state, sod_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(I8155_TAG, I8155, 6.144_MHz_XTAL/2)
MCFG_DEVICE_ADD(I8355_TAG, I8355, 6.144_MHz_XTAL/2)
- MCFG_I8355_IN_PA_CB(READ8(exp85_state, i8355_a_r))
- MCFG_I8355_OUT_PA_CB(WRITE8(exp85_state, i8355_a_w))
+ MCFG_I8355_IN_PA_CB(READ8(*this, exp85_state, i8355_a_r))
+ MCFG_I8355_OUT_PA_CB(WRITE8(*this, exp85_state, i8355_a_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
/* internal ram */
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index 94e925d908b..c558ded2eda 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -910,8 +910,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(expro02_state::expro02)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(expro02_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(expro02_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", expro02_state, scanline, "screen", 0, 1)
/* CALC01 MCU @ 16Mhz (unknown type, simulated) */
@@ -962,8 +962,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::comad)
expro02(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fantasia_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fantasia_map)
MCFG_DEVICE_REMOVE("calc1_mcu")
@@ -986,15 +986,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::fantasia)
comad_noview2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(10000000)
- MCFG_CPU_PROGRAM_MAP(comad_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(10000000)
+ MCFG_DEVICE_PROGRAM_MAP(comad_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::supmodel)
comad_noview2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(supmodel_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(supmodel_map)
MCFG_OKIM6295_REPLACE("oki", 1584000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1002,20 +1002,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::smissw) // 951127 PCB, 12 & 16 clocks
comad_noview2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(smissw_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(smissw_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::fantsia2)
comad_noview2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fantsia2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fantsia2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::galhustl)
comad_noview2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(galhustl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(galhustl_map)
MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1027,8 +1027,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(expro02_state::zipzap)
comad_noview2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zipzap_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zipzap_map)
MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp
index 77d501c9fdd..87052cc70cd 100644
--- a/src/mame/drivers/exprraid.cpp
+++ b/src/mame/drivers/exprraid.cpp
@@ -493,12 +493,12 @@ void exprraid_state::machine_reset()
MACHINE_CONFIG_START(exprraid_state::exprraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO16, XTAL(12'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(master_map)
- MCFG_CPU_IO_MAP(master_io_map)
+ MCFG_DEVICE_ADD("maincpu", DECO16, XTAL(12'000'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_IO_MAP(master_io_map)
- MCFG_CPU_ADD("slave", MC6809, XTAL(12'000'000) / 2) // MC68B09P
- MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_ADD("slave", MC6809, XTAL(12'000'000) / 2) // MC68B09P
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
/* IRQs are caused by the YM3526 */
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -522,19 +522,19 @@ MACHINE_CONFIG_START(exprraid_state::exprraid)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("slave", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL(12'000'000) / 4)
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(exprraid_state, irqhandler))
+ MCFG_DEVICE_ADD("ym2", YM3526, XTAL(12'000'000) / 4)
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, exprraid_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(exprraid_state::exprboot)
exprraid(config);
- MCFG_CPU_REPLACE("maincpu", M6502, 1500000) /* 1.5 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_REPLACE("maincpu", M6502, 1500000) /* 1.5 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp
index 2491e0cf19a..829ff381a22 100644
--- a/src/mame/drivers/exterm.cpp
+++ b/src/mame/drivers/exterm.cpp
@@ -389,8 +389,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(exterm_state::exterm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, 40000000)
- MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(40000000/8) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -398,19 +398,19 @@ MACHINE_CONFIG_START(exterm_state::exterm)
MCFG_TMS340X0_TO_SHIFTREG_CB(exterm_state, to_shiftreg_master) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(exterm_state, from_shiftreg_master) /* read from shiftreg function */
- MCFG_CPU_ADD("slave", TMS34010, 40000000)
- MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_ADD("slave", TMS34010, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(40000000/8) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
MCFG_TMS340X0_TO_SHIFTREG_CB(exterm_state, to_shiftreg_slave) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(exterm_state, from_shiftreg_slave) /* read from shiftreg function */
- MCFG_CPU_ADD("audiocpu", M6502, 2000000)
- MCFG_CPU_PROGRAM_MAP(sound_master_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_master_map)
- MCFG_CPU_ADD("audioslave", M6502, 2000000)
- MCFG_CPU_PROGRAM_MAP(sound_slave_map)
+ MCFG_DEVICE_ADD("audioslave", M6502, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_slave_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch1")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6502_IRQ_LINE))
@@ -440,8 +440,8 @@ MACHINE_CONFIG_START(exterm_state::exterm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", AD7528, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // ad7528j.e2
- MCFG_SOUND_ADD("dacvol", AD7528, 0) // ad7528j.e2
+ MCFG_DEVICE_ADD("dac", AD7528, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // ad7528j.e2
+ MCFG_DEVICE_ADD("dacvol", AD7528, 0) // ad7528j.e2
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/extrema.cpp b/src/mame/drivers/extrema.cpp
index 73ba1b3fad4..f180e1ab2fe 100644
--- a/src/mame/drivers/extrema.cpp
+++ b/src/mame/drivers/extrema.cpp
@@ -50,9 +50,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(extrema_state::extrema)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(extrema_map)
- MCFG_CPU_IO_MAP(extrema_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(extrema_map)
+ MCFG_DEVICE_IO_MAP(extrema_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp
index 08b123be666..d979ffe841f 100644
--- a/src/mame/drivers/exzisus.cpp
+++ b/src/mame/drivers/exzisus.cpp
@@ -232,20 +232,20 @@ GFXDECODE_END
MACHINE_CONFIG_START(exzisus_state::exzisus)
/* basic machine hardware */
- MCFG_CPU_ADD("cpua", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(cpua_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", exzisus_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("cpua", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(cpua_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", exzisus_state, irq0_line_hold)
- MCFG_CPU_ADD("cpub", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", exzisus_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("cpub", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", exzisus_state, irq0_line_hold)
- MCFG_CPU_ADD("cpuc", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(cpuc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", exzisus_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("cpuc", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(cpuc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", exzisus_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/ez2d.cpp b/src/mame/drivers/ez2d.cpp
index 599554bb09a..2e560a3b7bf 100644
--- a/src/mame/drivers/ez2d.cpp
+++ b/src/mame/drivers/ez2d.cpp
@@ -88,8 +88,8 @@ void ez2d_state::machine_reset()
MACHINE_CONFIG_START(ez2d_state::ez2d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // actually a Celeron at 533 MHz
- MCFG_CPU_PROGRAM_MAP(ez2d_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 100000000) // actually a Celeron at 533 MHz
+ MCFG_DEVICE_PROGRAM_MAP(ez2d_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp
index a55ecbfdceb..98950d7023a 100644
--- a/src/mame/drivers/f-32.cpp
+++ b/src/mame/drivers/f-32.cpp
@@ -167,10 +167,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mosaicf2_state::mosaicf2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E132XN, XTAL(20'000'000)*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(common_map)
- MCFG_CPU_IO_MAP(mosaicf2_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaicf2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E132XN, XTAL(20'000'000)*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(common_map)
+ MCFG_DEVICE_IO_MAP(mosaicf2_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mosaicf2_state, irq0_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_EEPROM_ERASE_TIME(attotime::from_usec(1))
@@ -245,10 +245,10 @@ void mosaicf2_state::royalpk2_io(address_map &map)
MACHINE_CONFIG_START(mosaicf2_state::royalpk2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL(50'000'000))
- MCFG_CPU_PROGRAM_MAP(royalpk2_map)
- MCFG_CPU_IO_MAP(royalpk2_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaicf2_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", GMS30C2132, XTAL(50'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(royalpk2_map)
+ MCFG_DEVICE_IO_MAP(royalpk2_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mosaicf2_state, irq1_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_EEPROM_ERASE_TIME(attotime::from_usec(1))
diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp
index 0f6658a79cb..fe77301df93 100644
--- a/src/mame/drivers/f1gp.cpp
+++ b/src/mame/drivers/f1gp.cpp
@@ -394,17 +394,17 @@ MACHINE_RESET_MEMBER(f1gp_state,f1gp)
MACHINE_CONFIG_START(f1gp_state::f1gp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(f1gp_cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(f1gp_cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
- MCFG_CPU_ADD("sub", M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(f1gp_cpu2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(f1gp_cpu2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(20'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(20'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
@@ -413,11 +413,11 @@ MACHINE_CONFIG_START(f1gp_state::f1gp)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("sub", M68K_IRQ_3))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) // loopback for now
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd)) // loopback for now
MCFG_DEVICE_ADD("acia_clock", CLOCK, 1000000) // guessed
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(f1gp_state::f1gp)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -470,13 +470,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(f1gp_state::f1gpb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(f1gpb_cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(f1gpb_cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
- MCFG_CPU_ADD("sub", M68000,10000000) /* 10 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(f1gpb_cpu2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000,10000000) /* 10 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(f1gpb_cpu2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", f1gp_state, irq1_line_hold)
/* NO sound CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
@@ -486,11 +486,11 @@ MACHINE_CONFIG_START(f1gp_state::f1gpb)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("sub", M68K_IRQ_3))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd)) // loopback for now
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd)) // loopback for now
MCFG_DEVICE_ADD("acia_clock", CLOCK, 1000000) // guessed
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -521,8 +521,8 @@ MACHINE_CONFIG_START(f1gp_state::f1gp2)
f1gp(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(f1gp2_cpu1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(f1gp2_cpu1_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", f1gp2)
diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp
index 834b5b2e655..18fee71f6da 100644
--- a/src/mame/drivers/famibox.cpp
+++ b/src/mame/drivers/famibox.cpp
@@ -549,8 +549,8 @@ void famibox_state::machine_start()
MACHINE_CONFIG_START(famibox_state::famibox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(famibox_map)
+ MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(famibox_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp
index 08b9d841be0..f88752a6e42 100644
--- a/src/mame/drivers/fantland.cpp
+++ b/src/mame/drivers/fantland.cpp
@@ -851,13 +851,13 @@ INTERRUPT_GEN_MEMBER(fantland_state::fantland_sound_irq)
MACHINE_CONFIG_START(fantland_state::fantland)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 8000000) // ?
- MCFG_CPU_PROGRAM_MAP(fantland_map)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(fantland_map)
- MCFG_CPU_ADD("audiocpu", I8088, 8000000) // ?
- MCFG_CPU_PROGRAM_MAP(fantland_sound_map)
- MCFG_CPU_IO_MAP(fantland_sound_iomap)
- MCFG_CPU_PERIODIC_INT_DRIVER(fantland_state, fantland_sound_irq, 8000)
+ MCFG_DEVICE_ADD("audiocpu", I8088, 8000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(fantland_sound_map)
+ MCFG_DEVICE_IO_MAP(fantland_sound_iomap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fantland_state, fantland_sound_irq, 8000)
// NMI when soundlatch is written
MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland)
@@ -873,7 +873,7 @@ MACHINE_CONFIG_START(fantland_state::fantland)
MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(fantland_state, screen_update_fantland)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(fantland_state, fantland_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
MCFG_PALETTE_ADD("palette", 256)
@@ -888,7 +888,7 @@ MACHINE_CONFIG_START(fantland_state::fantland)
MCFG_SOUND_ROUTE(0, "speaker", 0.35)
MCFG_SOUND_ROUTE(1, "speaker", 0.35)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -902,12 +902,12 @@ WRITE_LINE_MEMBER(fantland_state::galaxygn_sound_irq)
MACHINE_CONFIG_START(fantland_state::galaxygn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, 8000000) // ?
- MCFG_CPU_PROGRAM_MAP(galaxygn_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, 8000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(galaxygn_map)
- MCFG_CPU_ADD("audiocpu", I8088, 8000000) // ?
- MCFG_CPU_PROGRAM_MAP(fantland_sound_map)
- MCFG_CPU_IO_MAP(galaxygn_sound_iomap)
+ MCFG_DEVICE_ADD("audiocpu", I8088, 8000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(fantland_sound_map)
+ MCFG_DEVICE_IO_MAP(galaxygn_sound_iomap)
// IRQ by YM2151, NMI when soundlatch is written
MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland)
@@ -921,7 +921,7 @@ MACHINE_CONFIG_START(fantland_state::galaxygn)
MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(fantland_state, screen_update_fantland)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(fantland_state, fantland_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
MCFG_PALETTE_ADD("palette", 256)
@@ -933,7 +933,7 @@ MACHINE_CONFIG_START(fantland_state::galaxygn)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_YM2151_ADD("ymsnd", 3000000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(fantland_state, galaxygn_sound_irq))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, fantland_state, galaxygn_sound_irq))
MCFG_SOUND_ROUTE(0, "speaker", 1.0)
MCFG_SOUND_ROUTE(1, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -984,11 +984,11 @@ MACHINE_RESET_MEMBER(fantland_state,borntofi)
MACHINE_CONFIG_START(fantland_state::borntofi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
- MCFG_CPU_PROGRAM_MAP(borntofi_map)
+ MCFG_DEVICE_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
+ MCFG_DEVICE_PROGRAM_MAP(borntofi_map)
- MCFG_CPU_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3]
- MCFG_CPU_PROGRAM_MAP(borntofi_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3]
+ MCFG_DEVICE_PROGRAM_MAP(borntofi_sound_map)
MCFG_MACHINE_START_OVERRIDE(fantland_state,borntofi)
MCFG_MACHINE_RESET_OVERRIDE(fantland_state,borntofi)
@@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(fantland_state::borntofi)
MCFG_SCREEN_VISIBLE_AREA(0, 352-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(fantland_state, screen_update_fantland)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(fantland_state, fantland_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
MCFG_PALETTE_ADD("palette", 256)
@@ -1013,23 +1013,23 @@ MACHINE_CONFIG_START(fantland_state::borntofi)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
// OKI M5205 running at 384kHz [18.432/48]. Sample rate = 384000 / 48
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_0)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fantland_state, borntofi_adpcm_int_0)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_1)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fantland_state, borntofi_adpcm_int_1)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("msm3", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_2)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm3", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fantland_state, borntofi_adpcm_int_2)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("msm4", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_3)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm4", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fantland_state, borntofi_adpcm_int_3)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1038,11 +1038,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fantland_state::wheelrun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V20, XTAL(18'000'000)/2) // D701080C-8 (V20)
- MCFG_CPU_PROGRAM_MAP(wheelrun_map)
+ MCFG_DEVICE_ADD("maincpu", V20, XTAL(18'000'000)/2) // D701080C-8 (V20)
+ MCFG_DEVICE_PROGRAM_MAP(wheelrun_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/2) // Z8400BB1 (Z80B)
- MCFG_CPU_PROGRAM_MAP(wheelrun_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'000'000)/2) // Z8400BB1 (Z80B)
+ MCFG_DEVICE_PROGRAM_MAP(wheelrun_sound_map)
// IRQ by YM3526, NMI when soundlatch is written
MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland)
@@ -1056,7 +1056,7 @@ MACHINE_CONFIG_START(fantland_state::wheelrun)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(fantland_state, screen_update_fantland)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(fantland_state, fantland_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fantland_state, fantland_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fantland)
MCFG_PALETTE_ADD("palette", 256)
@@ -1067,7 +1067,7 @@ MACHINE_CONFIG_START(fantland_state::wheelrun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(14'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(14'000'000)/4)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp
index a219255f572..40063c21787 100644
--- a/src/mame/drivers/fanucs15.cpp
+++ b/src/mame/drivers/fanucs15.cpp
@@ -370,20 +370,20 @@ void fanucs15_state::machine_reset()
MACHINE_CONFIG_START(fanucs15_state::fanucs15)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(maincpu_mem)
+ MCFG_DEVICE_ADD("maincpu", M68020, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_mem)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("pmccpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(pmccpu_mem)
+ MCFG_DEVICE_ADD("pmccpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pmccpu_mem)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("gfxcpu", M68000, XTAL(10'000'000)) // wants bit 15 of 70500 to be set
- MCFG_CPU_PROGRAM_MAP(gfxcpu_mem)
+ MCFG_DEVICE_ADD("gfxcpu", M68000, XTAL(10'000'000)) // wants bit 15 of 70500 to be set
+ MCFG_DEVICE_PROGRAM_MAP(gfxcpu_mem)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("convcpu", I80286, XTAL(8'000'000)) // wants 70500 to return 0x8000 (same as what gfxcpu looks for, basically)
- MCFG_CPU_PROGRAM_MAP(convcpu_mem)
+ MCFG_DEVICE_ADD("convcpu", I80286, XTAL(8'000'000)) // wants 70500 to return 0x8000 (same as what gfxcpu looks for, basically)
+ MCFG_DEVICE_PROGRAM_MAP(convcpu_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp
index 8356ea6b07f..90c0b5d8520 100644
--- a/src/mame/drivers/fanucspmg.cpp
+++ b/src/mame/drivers/fanucspmg.cpp
@@ -966,12 +966,12 @@ FLOPPY_FORMATS_END
MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, I8086, XTAL(15'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(maincpu_mem)
- MCFG_CPU_IO_MAP(maincpu_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(PIC0_TAG, pic8259_device, inta_cb)
- MCFG_I8086_ESC_OPCODE_HANDLER(DEVWRITE32("i8087", i8087_device, insn_w))
- MCFG_I8086_ESC_DATA_HANDLER(DEVWRITE32("i8087", i8087_device, addr_w))
+ MCFG_DEVICE_ADD(MAINCPU_TAG, I8086, XTAL(15'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_mem)
+ MCFG_DEVICE_IO_MAP(maincpu_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(PIC0_TAG, pic8259_device, inta_cb)
+ MCFG_I8086_ESC_OPCODE_HANDLER(WRITE32("i8087", i8087_device, insn_w))
+ MCFG_I8086_ESC_DATA_HANDLER(WRITE32("i8087", i8087_device, addr_w))
MCFG_DEVICE_ADD("i8087", I8087, XTAL(15'000'000)/3)
MCFG_DEVICE_PROGRAM_MAP(maincpu_mem)
@@ -979,8 +979,8 @@ MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
//MCFG_I8087_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI)) // TODO: presumably this is connected to the pic
MCFG_I8087_BUSY_HANDLER(INPUTLINE("maincpu", INPUT_LINE_TEST))
- MCFG_CPU_ADD(SUBCPU_TAG, I8085A, XTAL(16'000'000)/2/2)
- MCFG_CPU_PROGRAM_MAP(subcpu_mem)
+ MCFG_DEVICE_ADD(SUBCPU_TAG, I8085A, XTAL(16'000'000)/2/2)
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_mem)
MCFG_DEVICE_ADD(USART0_TAG, I8251, 0)
MCFG_DEVICE_ADD(USART1_TAG, I8251, 0)
@@ -997,25 +997,25 @@ MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
MCFG_PIT8253_CLK2(XTAL(15'000'000)/12)
MCFG_DEVICE_ADD(DMAC_TAG, I8257, XTAL(15'000'000) / 5)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(fanucspmg_state, hrq_w))
- MCFG_I8257_OUT_TC_CB(WRITELINE(fanucspmg_state, tc_w))
- MCFG_I8257_IN_MEMR_CB(READ8(fanucspmg_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(fanucspmg_state, memory_write_byte))
- MCFG_I8257_IN_IOR_0_CB(READ8(fanucspmg_state, fdcdma_r))
- MCFG_I8257_OUT_IOW_0_CB(WRITE8(fanucspmg_state, fdcdma_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, fanucspmg_state, hrq_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE(*this, fanucspmg_state, tc_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, fanucspmg_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, fanucspmg_state, memory_write_byte))
+ MCFG_I8257_IN_IOR_0_CB(READ8(*this, fanucspmg_state, fdcdma_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, fanucspmg_state, fdcdma_w))
MCFG_DEVICE_ADD(PIC0_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(fanucspmg_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, fanucspmg_state, get_slave_ack))
MCFG_DEVICE_ADD(PIC1_TAG, PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE(PIC0_TAG, pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(PIC0_TAG, pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_UPD765A_ADD(FDC_TAG, true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE(PIC0_TAG, pic8259_device, ir3_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(DMAC_TAG, i8257_device, dreq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(PIC0_TAG, pic8259_device, ir3_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(DMAC_TAG, i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", fanuc_floppies, "525dd", fanucspmg_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", fanuc_floppies, "525dd", fanucspmg_state::floppy_formats)
@@ -1027,7 +1027,7 @@ MACHINE_CONFIG_START(fanucspmg_state::fanucspmg)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(fanucspmg_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(fanucspmg_state, vsync_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, fanucspmg_state, vsync_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fanucspmg_state::fanucspmgm)
@@ -1038,7 +1038,7 @@ MACHINE_CONFIG_START(fanucspmg_state::fanucspmgm)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(fanucspmg_state, crtc_update_row_mono)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(fanucspmg_state, vsync_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, fanucspmg_state, vsync_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 474c7d73be4..e3c83f17e9d 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -635,21 +635,21 @@ INTERRUPT_GEN_MEMBER(fastfred_state::sound_timer_irq)
MACHINE_CONFIG_START(fastfred_state::fastfred)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'432'000)/4) /* 3.108 MHz; xtal from pcb pics, divider not verified */
- MCFG_CPU_PROGRAM_MAP(fastfred_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'432'000)/4) /* 3.108 MHz; xtal from pcb pics, divider not verified */
+ MCFG_DEVICE_PROGRAM_MAP(fastfred_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fastfred_state, sound_timer_irq, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fastfred_state, sound_timer_irq, 4*60)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // "Control Signal Latch" at D10
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(fastfred_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(fastfred_state, colorbank1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(fastfred_state, colorbank2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(fastfred_state, charbank1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(fastfred_state, charbank2_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(fastfred_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(fastfred_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, fastfred_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, fastfred_state, colorbank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, fastfred_state, colorbank2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, fastfred_state, charbank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, fastfred_state, charbank2_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, fastfred_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, fastfred_state, flip_screen_y_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -661,7 +661,7 @@ MACHINE_CONFIG_START(fastfred_state::fastfred)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(fastfred_state, screen_update_fastfred)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(fastfred_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fastfred_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fastfred)
@@ -675,10 +675,10 @@ MACHINE_CONFIG_START(fastfred_state::fastfred)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay8910.1", AY8910, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
+ MCFG_DEVICE_ADD("ay8910.1", AY8910, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8910.2", AY8910, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
+ MCFG_DEVICE_ADD("ay8910.2", AY8910, XTAL(12'432'000)/8) /* 1.554 MHz; xtal from pcb pics, divider not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -686,8 +686,8 @@ MACHINE_CONFIG_START(fastfred_state::jumpcoas)
fastfred(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jumpcoas_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jumpcoas_map)
MCFG_DEVICE_REMOVE("audiocpu")
@@ -703,13 +703,13 @@ MACHINE_CONFIG_START(fastfred_state::imago)
fastfred(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(imago_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(imago_map)
MCFG_DEVICE_MODIFY("outlatch")
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // writes 1 when level starts, 0 when game over
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(fastfred_state, imago_dma_irq_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(fastfred_state, imago_charbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, fastfred_state, imago_dma_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, fastfred_state, imago_charbank_w))
MCFG_MACHINE_START_OVERRIDE(fastfred_state,imago)
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index d5acf5c0e03..23d07b7b6c8 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -645,22 +645,22 @@ GFXDECODE_END
MACHINE_CONFIG_START(fastinvaders_state::fastinvaders)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, 6144100/2 ) // 6144100 Xtal /2 internaly
- MCFG_CPU_PROGRAM_MAP(fastinvaders_map)
-// MCFG_CPU_IO_MAP(fastinvaders_io_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", fastinvaders_state, irq0_line_hold)
- MCFG_I8085A_SID(READLINE(fastinvaders_state, sid_read))
-MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6144100/2 ) // 6144100 Xtal /2 internaly
+ MCFG_DEVICE_PROGRAM_MAP(fastinvaders_map)
+// MCFG_DEVICE_IO_MAP(fastinvaders_io_map)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fastinvaders_state, irq0_line_hold)
+ MCFG_I8085A_SID(READLINE(*this, fastinvaders_state, sid_read))
+MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastinvaders_state, scanline_timer, "screen", 0, 1)
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("dma8257", I8257, 6144100)
- MCFG_I8257_IN_MEMR_CB(READ8(fastinvaders_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(fastinvaders_state, memory_write_byte))
- MCFG_I8257_OUT_DACK_1_CB(WRITE8(fastinvaders_state, dark_1_clr))
- MCFG_I8257_OUT_DACK_2_CB(WRITE8(fastinvaders_state, dark_2_clr))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, fastinvaders_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, fastinvaders_state, memory_write_byte))
+ MCFG_I8257_OUT_DACK_1_CB(WRITE8(*this, fastinvaders_state, dark_1_clr))
+ MCFG_I8257_OUT_DACK_2_CB(WRITE8(*this, fastinvaders_state, dark_2_clr))
MCFG_TIMER_DRIVER_ADD_PERIODIC("count_ar", fastinvaders_state, count_ar, attotime::from_hz(11500000/2))
@@ -683,25 +683,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fastinvaders_state::fastinvaders_8275)
fastinvaders(config);
- MCFG_CPU_MODIFY("maincpu" ) // guess
- MCFG_CPU_IO_MAP(fastinvaders_8275_io)
+ MCFG_DEVICE_MODIFY("maincpu" ) // guess
+ MCFG_DEVICE_IO_MAP(fastinvaders_8275_io)
MCFG_DEVICE_ADD("8275", I8275, 10000000 ) /* guess */ // does not configure a very useful resolution(!)
MCFG_I8275_CHARACTER_WIDTH(16)
// MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(apogee_state, display_pixels)
-// MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
+// MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257",i8257_device, dreq2_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fastinvaders_state::fastinvaders_6845)
fastinvaders(config);
- MCFG_CPU_MODIFY("maincpu" ) // guess
- MCFG_CPU_IO_MAP(fastinvaders_6845_io)
+ MCFG_DEVICE_MODIFY("maincpu" ) // guess
+ MCFG_DEVICE_IO_MAP(fastinvaders_6845_io)
MCFG_MC6845_ADD("6845", MC6845, "screen", 11500000/16) /* confirmed */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(fastinvaders_state,vsync))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(fastinvaders_state,hsync))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, fastinvaders_state,vsync))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, fastinvaders_state,hsync))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index c5a4dd93cfc..19cb1907806 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -202,8 +202,8 @@ void fastlane_state::machine_start()
MACHINE_CONFIG_START(fastlane_state::fastlane)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, XTAL(24'000'000)/2) // 3MHz(XTAL(24'000'000)/8) internally
- MCFG_CPU_PROGRAM_MAP(fastlane_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309, XTAL(24'000'000)/2) // 3MHz(XTAL(24'000'000)/8) internally
+ MCFG_DEVICE_PROGRAM_MAP(fastlane_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fastlane_state, fastlane_scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -230,13 +230,13 @@ MACHINE_CONFIG_START(fastlane_state::fastlane)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("k007232_1", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(fastlane_state, volume_callback0))
+ MCFG_DEVICE_ADD("k007232_1", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, fastlane_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("k007232_2", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(fastlane_state, volume_callback1))
+ MCFG_DEVICE_ADD("k007232_2", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, fastlane_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp
index a23689f12e3..29a87c4ebc5 100644
--- a/src/mame/drivers/fb01.cpp
+++ b/src/mame/drivers/fb01.cpp
@@ -179,9 +179,9 @@ PALETTE_INIT_MEMBER(fb01_state, fb01)
MACHINE_CONFIG_START(fb01_state::fb01)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(fb01_mem)
- MCFG_CPU_IO_MAP(fb01_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(fb01_mem)
+ MCFG_DEVICE_IO_MAP(fb01_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -203,15 +203,15 @@ MACHINE_CONFIG_START(fb01_state::fb01)
MCFG_HD44780_PIXEL_UPDATE_CB(fb01_state,fb01_pixel_update)
MCFG_DEVICE_ADD("upd71051", I8251, XTAL(4'000'000))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(fb01_state, upd71051_rxrdy_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(fb01_state, upd71051_txrdy_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, fb01_state, upd71051_rxrdy_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, fb01_state, upd71051_txrdy_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(4'000'000) / 8) // 500KHz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(fb01_state, write_usart_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, fb01_state, write_usart_clock))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(WRITELINE(fb01_state, midi_in))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(*this, fb01_state, midi_in))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
@@ -219,7 +219,7 @@ MACHINE_CONFIG_START(fb01_state::fb01)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ym2164", XTAL(4'000'000))
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(fb01_state, ym2164_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, fb01_state, ym2164_irq_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 6ebb90adcf2..375a011ca55 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -513,13 +513,13 @@ DRIVER_INIT_MEMBER( fc100_state, fc100 )
MACHINE_CONFIG_START(fc100_state::fc100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(7'159'090)/2)
- MCFG_CPU_PROGRAM_MAP(fc100_mem)
- MCFG_CPU_IO_MAP(fc100_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(7'159'090)/2)
+ MCFG_DEVICE_PROGRAM_MAP(fc100_mem)
+ MCFG_DEVICE_IO_MAP(fc100_io)
/* video hardware */
MCFG_DEVICE_ADD("vdg", M5C6847P1, XTAL(7'159'090)/3) // Clock not verified
- MCFG_MC6847_INPUT_CALLBACK(READ8(fc100_state, mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, fc100_state, mc6847_videoram_r))
MCFG_MC6847_CHARROM_CALLBACK(fc100_state, get_char_rom)
MCFG_MC6847_FIXED_MODE(m5c6847p1_device::MODE_INTEXT)
// other lines not connected
@@ -532,11 +532,11 @@ MACHINE_CONFIG_START(fc100_state::fc100)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("psg", AY8910, XTAL(7'159'090)/3/2) /* AY-3-8910 - clock not verified */
+ MCFG_DEVICE_ADD("psg", AY8910, XTAL(7'159'090)/3/2) /* AY-3-8910 - clock not verified */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JOY0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("JOY1"))
- //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fc100_state, ay_port_a_w))
- //MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(fc100_state, ay_port_b_w))
+ //MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, fc100_state, ay_port_a_w))
+ //MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, fc100_state, ay_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
/* Devices */
@@ -545,10 +545,10 @@ MACHINE_CONFIG_START(fc100_state::fc100)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(fc100_state, txdata_callback))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, fc100_state, txdata_callback))
MCFG_DEVICE_ADD("uart_clock", CLOCK, XTAL(4'915'200)/16/16) // gives 19200
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_c", fc100_state, timer_c, attotime::from_hz(4800)) // cass write
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_p", fc100_state, timer_p, attotime::from_hz(40000)) // cass read
@@ -557,8 +557,8 @@ MACHINE_CONFIG_START(fc100_state::fc100)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "fc100_cart")
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp
index 6a451786644..e02910963f0 100644
--- a/src/mame/drivers/fccpu30.cpp
+++ b/src/mame/drivers/fccpu30.cpp
@@ -658,9 +658,9 @@ static void fccpu30_vme_cards(device_slot_interface &device)
*/
MACHINE_CONFIG_START(cpu30_state::cpu30)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68030, XTAL(25'000'000))
- MCFG_CPU_PROGRAM_MAP (cpu30_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("fga002", fga002_device, iack)
+ MCFG_DEVICE_ADD ("maincpu", M68030, XTAL(25'000'000))
+ MCFG_DEVICE_PROGRAM_MAP (cpu30_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("fga002", fga002_device, iack)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_VME_DEVICE_ADD("vme")
@@ -689,70 +689,70 @@ MACHINE_CONFIG_START(cpu30_state::cpu30)
MCFG_DUSCC68562_ADD("duscc", DUSCC_CLOCK, 0, 0, 0, 0 )
/* Port 1 on Port B */
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P1_TAG, rs232_port_device, write_rts))
/* Port 4 on Port A */
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P4_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P4_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P4_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P4_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P4_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P4_TAG, rs232_port_device, write_rts))
/* DUSCC1 interrupt signal REQN is connected to LOCAL IRQ4 of the FGA-002 and level is programmable */
- MCFG_DUSCC_OUT_INT_CB(DEVWRITELINE("fga002", fga002_device, lirq4_w))
+ MCFG_DUSCC_OUT_INT_CB(WRITELINE("fga002", fga002_device, lirq4_w))
MCFG_DUSCC68562_ADD("duscc2", DUSCC_CLOCK, 0, 0, 0, 0 )
/* Port 2 on Port A */
- MCFG_DUSCC_OUT_TXDA_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRA_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSA_CB(DEVWRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDA_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRA_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSA_CB(WRITELINE(RS232P2_TAG, rs232_port_device, write_rts))
/* Port 3 on Port B */
- MCFG_DUSCC_OUT_TXDB_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_txd))
- MCFG_DUSCC_OUT_DTRB_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_dtr))
- MCFG_DUSCC_OUT_RTSB_CB(DEVWRITELINE(RS232P3_TAG, rs232_port_device, write_rts))
+ MCFG_DUSCC_OUT_TXDB_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_txd))
+ MCFG_DUSCC_OUT_DTRB_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_dtr))
+ MCFG_DUSCC_OUT_RTSB_CB(WRITELINE(RS232P3_TAG, rs232_port_device, write_rts))
/* DUSCC2 interrupt signal REQN is connected to LOCAL IRQ5 of the FGA-002 and level is programmable */
- MCFG_DUSCC_OUT_INT_CB(DEVWRITELINE("fga002", fga002_device, lirq5_w))
+ MCFG_DUSCC_OUT_INT_CB(WRITELINE("fga002", fga002_device, lirq5_w))
- MCFG_RS232_PORT_ADD (RS232P1_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, ctsb_w))
+ MCFG_DEVICE_ADD (RS232P1_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc", duscc68562_device, ctsb_w))
- MCFG_RS232_PORT_ADD (RS232P2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, ctsa_w))
+ MCFG_DEVICE_ADD (RS232P2_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc2", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc2", duscc68562_device, ctsa_w))
- MCFG_RS232_PORT_ADD (RS232P3_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc2", duscc68562_device, ctsb_w))
+ MCFG_DEVICE_ADD (RS232P3_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc2", duscc68562_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc2", duscc68562_device, ctsb_w))
- MCFG_RS232_PORT_ADD (RS232P4_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("duscc", duscc68562_device, ctsa_w))
+ MCFG_DEVICE_ADD (RS232P4_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("duscc", duscc68562_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("duscc", duscc68562_device, ctsa_w))
/* PIT Parallel Interface and Timer device, assumed strapped for on board clock */
MCFG_DEVICE_ADD ("pit1", PIT68230, XTAL(16'000'000) / 2) // The PIT clock is not verified on schema but reversed from behaviour
- MCFG_PIT68230_PA_INPUT_CB(READ8(cpu30_state, rotary_rd))
- MCFG_PIT68230_PB_INPUT_CB(READ8(cpu30_state, flop_dmac_r))
- MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(cpu30_state, flop_dmac_w))
- MCFG_PIT68230_PC_INPUT_CB(READ8(cpu30_state, pit1c_r))
- MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(cpu30_state, pit1c_w))
-// MCFG_PIT68230_TIMER_IRQ_CB(DEVWRITELINE("fga002", fga002_device, lirq2_w)) // The timer interrupt seems to silence the terminal interrupt, needs invectigation
+ MCFG_PIT68230_PA_INPUT_CB(READ8(*this, cpu30_state, rotary_rd))
+ MCFG_PIT68230_PB_INPUT_CB(READ8(*this, cpu30_state, flop_dmac_r))
+ MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(*this, cpu30_state, flop_dmac_w))
+ MCFG_PIT68230_PC_INPUT_CB(READ8(*this, cpu30_state, pit1c_r))
+ MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(*this, cpu30_state, pit1c_w))
+// MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE("fga002", fga002_device, lirq2_w)) // The timer interrupt seems to silence the terminal interrupt, needs invectigation
MCFG_DEVICE_ADD ("pit2", PIT68230, XTAL(16'000'000) / 2) // Th PIT clock is not verified on schema but reversed from behaviour
- MCFG_PIT68230_PB_INPUT_CB(READ8(cpu30_state, board_mem_id_rd))
- MCFG_PIT68230_PA_INPUT_CB(READ8(cpu30_state, pit2a_r))
- MCFG_PIT68230_PA_OUTPUT_CB(WRITE8(cpu30_state, pit2a_w))
- MCFG_PIT68230_PC_INPUT_CB(READ8(cpu30_state, pit2c_r))
- MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(cpu30_state, pit2c_w))
-// MCFG_PIT68230_TIMER_IRQ_CB(DEVWRITELINE("fga002", fga002_device, lirq3_w)) // The timer interrupt seems to silence the terminal interrupt, needs invectigation
+ MCFG_PIT68230_PB_INPUT_CB(READ8(*this, cpu30_state, board_mem_id_rd))
+ MCFG_PIT68230_PA_INPUT_CB(READ8(*this, cpu30_state, pit2a_r))
+ MCFG_PIT68230_PA_OUTPUT_CB(WRITE8(*this, cpu30_state, pit2a_w))
+ MCFG_PIT68230_PC_INPUT_CB(READ8(*this, cpu30_state, pit2c_r))
+ MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(*this, cpu30_state, pit2c_w))
+// MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE("fga002", fga002_device, lirq3_w)) // The timer interrupt seems to silence the terminal interrupt, needs invectigation
/* FGA-002, Force Gate Array */
MCFG_FGA002_ADD("fga002", 0)
- MCFG_FGA002_OUT_INT_CB(WRITELINE(cpu30_state, fga_irq_callback))
- MCFG_FGA002_OUT_LIACK4_CB(DEVREAD8("duscc", duscc_device, iack))
- MCFG_FGA002_OUT_LIACK5_CB(DEVREAD8("duscc2", duscc_device, iack))
+ MCFG_FGA002_OUT_INT_CB(WRITELINE(*this, cpu30_state, fga_irq_callback))
+ MCFG_FGA002_OUT_LIACK4_CB(READ8("duscc", duscc_device, iack))
+ MCFG_FGA002_OUT_LIACK5_CB(READ8("duscc2", duscc_device, iack))
// RTC
MCFG_DEVICE_ADD("rtc", RTC72423, XTAL(32'768)) // Fake crystal value, the 72423 uses it own internal crystal
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("fga002", fga002_device, lirq0_w))
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("fga002", fga002_device, lirq0_w))
// dual ported ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp
index 985edef36a1..4fb94f0880e 100644
--- a/src/mame/drivers/fcombat.cpp
+++ b/src/mame/drivers/fcombat.cpp
@@ -291,11 +291,11 @@ void fcombat_state::machine_reset()
MACHINE_CONFIG_START(fcombat_state::fcombat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 10000000/3)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 10000000/3)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, 10000000/3)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 10000000/3)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
@@ -314,13 +314,13 @@ MACHINE_CONFIG_START(fcombat_state::fcombat)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay3", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 1fd30a261a5..498e23b26a1 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -1618,13 +1618,13 @@ MACHINE_RESET_MEMBER(cps_state,fcrash)
MACHINE_CONFIG_START(cps_state::fcrash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(fcrash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(fcrash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, 24000000/6) /* ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 24000000/6) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,fcrash)
MCFG_MACHINE_RESET_OVERRIDE(cps_state,fcrash)
@@ -1636,7 +1636,7 @@ MACHINE_CONFIG_START(cps_state::fcrash)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -1649,25 +1649,25 @@ MACHINE_CONFIG_START(cps_state::fcrash)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 24000000/6) /* ? */
+ MCFG_DEVICE_ADD("ym1", YM2203, 24000000/6) /* ? */
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM2203, 24000000/6) /* ? */
+ MCFG_DEVICE_ADD("ym2", YM2203, 24000000/6) /* ? */
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 1.0)
- MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
- MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 24000000/64) /* ? */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
- MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 24000000/64) /* ? */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1675,8 +1675,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::cawingbl)
fcrash(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, irq6_line_hold) /* needed to write to scroll values */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, irq6_line_hold) /* needed to write to scroll values */
MCFG_MACHINE_START_OVERRIDE(cps_state, cawingbl)
MACHINE_CONFIG_END
@@ -1684,13 +1684,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::kodb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(fcrash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(fcrash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(kodb_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(kodb_sound_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,kodb)
@@ -1701,7 +1701,7 @@ MACHINE_CONFIG_START(cps_state::kodb)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -1727,12 +1727,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::sf2mdt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(sf2mdt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, irq4_line_hold) /* triggers the sprite ram and scroll writes */
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(sf2mdt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, irq4_line_hold) /* triggers the sprite ram and scroll writes */
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(sf2mdt_z80map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(sf2mdt_z80map)
MCFG_MACHINE_START_OVERRIDE(cps_state, sf2mdt)
MCFG_MACHINE_RESET_OVERRIDE(cps_state,fcrash)
@@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(cps_state::sf2mdt)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -1762,33 +1762,33 @@ MACHINE_CONFIG_START(cps_state::sf2mdt)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* has 2x MSM5205 instead of OKI6295 */
- MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
- MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 24000000/64) /* ? */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
- MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 24000000/64) /* ? */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::sf2b)
sf2mdt(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sf2b_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sf2b_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cps_state::knightsb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24000000 / 2)
- MCFG_CPU_PROGRAM_MAP(knightsb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24000000 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(knightsb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, 29821000 / 8)
- MCFG_CPU_PROGRAM_MAP(knightsb_z80map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 29821000 / 8)
+ MCFG_DEVICE_PROGRAM_MAP(knightsb_z80map)
MCFG_MACHINE_START_OVERRIDE(cps_state, knightsb)
@@ -1799,7 +1799,7 @@ MACHINE_CONFIG_START(cps_state::knightsb)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -1818,13 +1818,13 @@ MACHINE_CONFIG_START(cps_state::knightsb)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* has 2x MSM5205 instead of OKI6295 */
- MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
- MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 24000000/64) /* ? */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
- MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 24000000/64) /* ? */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, cps_state, m5205_int2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2165,12 +2165,12 @@ MACHINE_START_MEMBER(cps_state, dinopic)
MACHINE_CONFIG_START(cps_state::dinopic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(dinopic_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(dinopic_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- //MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000)
+ //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000)
//MCFG_DEVICE_DISABLE() /* no valid dumps .. */
MCFG_MACHINE_START_OVERRIDE(cps_state, dinopic)
@@ -2184,7 +2184,7 @@ MACHINE_CONFIG_START(cps_state::dinopic)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -2325,13 +2325,13 @@ DRIVER_INIT_MEMBER(cps_state, dinopic)
MACHINE_CONFIG_START(cps_state::sgyxz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(sgyxz_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(sgyxz_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,sgyxz)
@@ -2342,7 +2342,7 @@ MACHINE_CONFIG_START(cps_state::sgyxz)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
MCFG_PALETTE_ADD("palette", 0xc00)
@@ -2402,8 +2402,8 @@ ROM_END
MACHINE_CONFIG_START(cps_state::wofabl)
sgyxz(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wofabl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wofabl_map)
MACHINE_CONFIG_END
ROM_START( wofabl )
@@ -2450,12 +2450,12 @@ MACHINE_START_MEMBER(cps_state, punipic)
MACHINE_CONFIG_START(cps_state::punipic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(punipic_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(punipic_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- //MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000)
+ //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000)
//MCFG_DEVICE_DISABLE() /* no valid dumps .. */
MCFG_MACHINE_START_OVERRIDE(cps_state, punipic)
@@ -2469,7 +2469,7 @@ MACHINE_CONFIG_START(cps_state::punipic)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -2646,13 +2646,13 @@ DRIVER_INIT_MEMBER(cps_state, punipic3)
MACHINE_CONFIG_START(cps_state::sf2m1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000) )
- MCFG_CPU_PROGRAM_MAP(sf2m1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(sf2m1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,sf2m1)
@@ -2660,7 +2660,7 @@ MACHINE_CONFIG_START(cps_state::sf2m1)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(CPS_PIXEL_CLOCK, CPS_HTOTAL, CPS_HBEND, CPS_HBSTART, CPS_VTOTAL, CPS_VBEND, CPS_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -3029,12 +3029,12 @@ MACHINE_START_MEMBER(cps_state, slampic)
MACHINE_CONFIG_START(cps_state::slampic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(slampic_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(slampic_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- //MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000)
+ //MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000)
//MCFG_DEVICE_DISABLE() /* no valid dumps .. */
MCFG_MACHINE_START_OVERRIDE(cps_state, slampic)
@@ -3048,7 +3048,7 @@ MACHINE_CONFIG_START(cps_state::slampic)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_fcrash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
@@ -3132,13 +3132,13 @@ void cps_state::varthb_map(address_map &map)
MACHINE_CONFIG_START(cps_state::varthb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(varthb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(varthb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cps_state, cps1_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(cps_state, cps1_int_ack)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(sgyxz_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(sgyxz_sound_map)
MCFG_MACHINE_START_OVERRIDE(cps_state,cps1)
@@ -3149,7 +3149,7 @@ MACHINE_CONFIG_START(cps_state::varthb)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(cps_state, screen_update_cps1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cps_state, screen_vblank_cps1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cps_state, screen_vblank_cps1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cps1)
diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp
index 7247c368367..070cb4b7763 100644
--- a/src/mame/drivers/feversoc.cpp
+++ b/src/mame/drivers/feversoc.cpp
@@ -287,8 +287,8 @@ void feversoc_state::machine_start()
MACHINE_CONFIG_START(feversoc_state::feversoc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",SH2,MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(feversoc_map)
+ MCFG_DEVICE_ADD("maincpu",SH2,MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(feversoc_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -298,7 +298,7 @@ MACHINE_CONFIG_START(feversoc_state::feversoc)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) //dynamic resolution?
MCFG_SCREEN_UPDATE_DRIVER(feversoc_state, screen_update_feversoc)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(feversoc_state, feversoc_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, feversoc_state, feversoc_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", feversoc)
MCFG_PALETTE_ADD("palette", 0x1000)
diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp
index 3d21c7f0697..52611c64a88 100644
--- a/src/mame/drivers/fgoal.cpp
+++ b/src/mame/drivers/fgoal.cpp
@@ -368,8 +368,8 @@ void fgoal_state::machine_reset()
MACHINE_CONFIG_START(fgoal_state::fgoal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 10065000 / 10) /* ? */
- MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 10065000 / 10) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
/* add shifter */
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index 6410032e47c..aadff3d4a34 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -1691,27 +1691,27 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidel6502_state::rsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1800000) // measured approx 1.81MHz
- MCFG_CPU_PROGRAM_MAP(rsc_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1800000) // measured approx 1.81MHz
+ MCFG_DEVICE_PROGRAM_MAP(rsc_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(546)) // from 555 timer, measured
MCFG_TIMER_START_DELAY(attotime::from_hz(546) - attotime::from_usec(38)) // active for 38us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(546))
MCFG_DEVICE_ADD("pia", PIA6821, 0) // MOS 6520
- MCFG_PIA_READPA_HANDLER(READ8(fidel6502_state, csc_pia1_pa_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(fidel6502_state, csc_pia1_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(fidel6502_state, csc_pia1_cb1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(fidel6502_state, csc_pia1_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(fidel6502_state, csc_pia1_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(fidel6502_state, csc_pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(fidel6502_state, csc_pia1_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, fidel6502_state, csc_pia1_pa_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, fidel6502_state, csc_pia1_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, fidel6502_state, csc_pia1_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, fidel6502_state, csc_pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, fidel6502_state, csc_pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia1_cb2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_rsc_v2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1719,35 +1719,35 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::csc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 3.9_MHz_XTAL/2) // from 3.9MHz resonator
- MCFG_CPU_PROGRAM_MAP(csc_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // 38400Hz/64
+ MCFG_DEVICE_ADD("maincpu", M6502, 3.9_MHz_XTAL/2) // from 3.9MHz resonator
+ MCFG_DEVICE_PROGRAM_MAP(csc_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // 38400Hz/64
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(fidel6502_state, csc_pia0_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(fidel6502_state, csc_pia0_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(fidel6502_state, csc_pia0_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(fidel6502_state, csc_pia0_ca2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, fidel6502_state, csc_pia0_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, fidel6502_state, csc_pia0_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, fidel6502_state, csc_pia0_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia0_ca2_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(fidel6502_state, csc_pia1_pa_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(fidel6502_state, csc_pia1_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(fidel6502_state, csc_pia1_cb1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(fidel6502_state, csc_pia1_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(fidel6502_state, csc_pia1_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(fidel6502_state, csc_pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(fidel6502_state, csc_pia1_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, fidel6502_state, csc_pia1_pa_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, fidel6502_state, csc_pia1_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, fidel6502_state, csc_pia1_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, fidel6502_state, csc_pia1_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, fidel6502_state, csc_pia1_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia1_cb2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_csc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
- MCFG_S14001A_EXT_READ_HANDLER(READ8(fidel6502_state, csc_speech_r))
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_S14001A_EXT_READ_HANDLER(READ8(*this, fidel6502_state, csc_speech_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1756,8 +1756,8 @@ MACHINE_CONFIG_START(fidel6502_state::su9)
csc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(su9_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(su9_map)
MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, su9)
@@ -1767,15 +1767,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::eas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 3_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(eas_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
+ MCFG_DEVICE_ADD("maincpu", R65C02, 3_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(eas_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
MCFG_DEVICE_ADD("ppi8255", I8255, 0) // port B: input, port A & C: output
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fidel6502_state, eas_ppi_porta_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fidel6502_state, eas_ppi_porta_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0))
- MCFG_I8255_IN_PORTB_CB(READ8(fidel6502_state, eas_ppi_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fidel6502_state, eas_ppi_portc_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, fidel6502_state, eas_ppi_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fidel6502_state, eas_ppi_portc_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1784,11 +1784,11 @@ MACHINE_CONFIG_START(fidel6502_state::eas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
- MCFG_S14001A_EXT_READ_HANDLER(READ8(fidel6502_state, csc_speech_r))
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_S14001A_EXT_READ_HANDLER(READ8(*this, fidel6502_state, csc_speech_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -1802,20 +1802,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::pc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(pc_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
+ MCFG_DEVICE_ADD("maincpu", R65C02, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(pc_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_eas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
- MCFG_S14001A_EXT_READ_HANDLER(READ8(fidel6502_state, csc_speech_r))
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_S14001A_EXT_READ_HANDLER(READ8(*this, fidel6502_state, csc_speech_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -1830,9 +1830,9 @@ MACHINE_CONFIG_START(fidel6502_state::eag)
eas(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, 5_MHz_XTAL) // R65C02P4
- MCFG_CPU_PROGRAM_MAP(eag_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, 5_MHz_XTAL) // R65C02P4
+ MCFG_DEVICE_PROGRAM_MAP(eag_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
MCFG_DEFAULT_LAYOUT(layout_fidel_eag)
MACHINE_CONFIG_END
@@ -1840,8 +1840,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::sc9d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 3.9_MHz_XTAL/2) // R6502AP, 3.9MHz resonator
- MCFG_CPU_PROGRAM_MAP(sc9d_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 3.9_MHz_XTAL/2) // R6502AP, 3.9MHz resonator
+ MCFG_DEVICE_PROGRAM_MAP(sc9d_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(610)) // from 555 timer (22nF, 102K, 2.7K)
MCFG_TIMER_START_DELAY(attotime::from_hz(610) - attotime::from_usec(41)) // active for 41us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(610))
@@ -1851,7 +1851,7 @@ MACHINE_CONFIG_START(fidel6502_state::sc9d)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -1866,8 +1866,8 @@ MACHINE_CONFIG_START(fidel6502_state::sc9b)
sc9d(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M6502, 1500000) // from ceramic resonator "681 JSA", measured
- MCFG_CPU_PROGRAM_MAP(sc9_map)
+ MCFG_DEVICE_REPLACE("maincpu", M6502, 1500000) // from ceramic resonator "681 JSA", measured
+ MCFG_DEVICE_PROGRAM_MAP(sc9_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::sc9c)
@@ -1881,7 +1881,7 @@ MACHINE_CONFIG_START(fidel6502_state::playmatic)
sc9b(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(3100000) // approximation
MCFG_DEFAULT_LAYOUT(layout_fidel_playmatic)
@@ -1890,8 +1890,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::sc12)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 3_MHz_XTAL) // R65C02P3
- MCFG_CPU_PROGRAM_MAP(sc12_trampoline)
+ MCFG_DEVICE_ADD("maincpu", R65C02, 3_MHz_XTAL) // R65C02P3
+ MCFG_DEVICE_PROGRAM_MAP(sc12_trampoline)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(630)) // from 556 timer (22nF, 102K, 1K)
MCFG_TIMER_START_DELAY(attotime::from_hz(630) - attotime::from_nsec(15250)) // active for 15.25us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(630))
@@ -1909,7 +1909,7 @@ MACHINE_CONFIG_START(fidel6502_state::sc12)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -1924,7 +1924,7 @@ MACHINE_CONFIG_START(fidel6502_state::sc12b)
sc12(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(4_MHz_XTAL) // R65C02P4
// change irq timer frequency
@@ -1941,8 +1941,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fexcel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, 12_MHz_XTAL/4) // G65SC102P-3, 12.0M ceramic resonator
- MCFG_CPU_PROGRAM_MAP(fexcel_map)
+ MCFG_DEVICE_ADD("maincpu", M65SC02, 12_MHz_XTAL/4) // G65SC102P-3, 12.0M ceramic resonator
+ MCFG_DEVICE_PROGRAM_MAP(fexcel_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(630)) // from 556 timer (22nF, 102K, 1K)
MCFG_TIMER_START_DELAY(attotime::from_hz(630) - attotime::from_nsec(15250)) // active for 15.25us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(630))
@@ -1952,7 +1952,7 @@ MACHINE_CONFIG_START(fidel6502_state::fexcel)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1961,31 +1961,31 @@ MACHINE_CONFIG_START(fidel6502_state::fexcel4)
fexcel(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, 4_MHz_XTAL) // R65C02P4
- MCFG_CPU_PROGRAM_MAP(fexcel_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, 4_MHz_XTAL) // R65C02P4
+ MCFG_DEVICE_PROGRAM_MAP(fexcel_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fexcelb)
fexcel(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fexcelb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fexcelb_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fexcelp)
fexcel(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, 5_MHz_XTAL) // R65C02P4
- MCFG_CPU_PROGRAM_MAP(fexcelp_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, 5_MHz_XTAL) // R65C02P4
+ MCFG_DEVICE_PROGRAM_MAP(fexcelp_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::granits)
fexcelp(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(8_MHz_XTAL) // overclocked
MACHINE_CONFIG_END
@@ -1993,8 +1993,8 @@ MACHINE_CONFIG_START(fidel6502_state::fdes2100)
fexcel(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M65C02, 5_MHz_XTAL) // WDC 65C02
- MCFG_CPU_PROGRAM_MAP(fexcelp_map)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 5_MHz_XTAL) // WDC 65C02
+ MCFG_DEVICE_PROGRAM_MAP(fexcelp_map)
// change irq timer frequency
MCFG_DEVICE_REMOVE("irq_on")
@@ -2010,16 +2010,16 @@ MACHINE_CONFIG_START(fidel6502_state::fdes2000)
fdes2100(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, 3_MHz_XTAL) // RP65C02G
- MCFG_CPU_PROGRAM_MAP(fexcelp_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, 3_MHz_XTAL) // RP65C02G
+ MCFG_DEVICE_PROGRAM_MAP(fexcelp_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fexcelv)
fexcelb(config);
/* sound hardware */
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
- MCFG_S14001A_EXT_READ_HANDLER(READ8(fidel6502_state, fexcelv_speech_r))
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_S14001A_EXT_READ_HANDLER(READ8(*this, fidel6502_state, fexcelv_speech_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
@@ -2033,8 +2033,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fdes2100d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, 6_MHz_XTAL) // W65C02P-6
- MCFG_CPU_PROGRAM_MAP(fdesdis_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 6_MHz_XTAL) // W65C02P-6
+ MCFG_DEVICE_PROGRAM_MAP(fdesdis_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(630)) // from 556 timer (22nF, 102K, 1K)
MCFG_TIMER_START_DELAY(attotime::from_hz(630) - attotime::from_nsec(15250)) // active for 15.25us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(630))
@@ -2044,7 +2044,7 @@ MACHINE_CONFIG_START(fidel6502_state::fdes2100d)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -2053,16 +2053,16 @@ MACHINE_CONFIG_START(fidel6502_state::fdes2000d)
fdes2100d(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", R65C02, 3_MHz_XTAL) // R65C02P3
- MCFG_CPU_PROGRAM_MAP(fdesdis_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, 3_MHz_XTAL) // R65C02P3
+ MCFG_DEVICE_PROGRAM_MAP(fdesdis_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::fphantom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 4.9152_MHz_XTAL) // R65C02P4
- MCFG_CPU_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
- MCFG_CPU_PROGRAM_MAP(fphantom_map)
+ MCFG_DEVICE_ADD("maincpu", R65C02, 4.9152_MHz_XTAL) // R65C02P4
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel6502_state, irq0_line_hold, 600) // guessed
+ MCFG_DEVICE_PROGRAM_MAP(fphantom_map)
MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, fphantom)
@@ -2071,7 +2071,7 @@ MACHINE_CONFIG_START(fidel6502_state::fphantom)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -2079,8 +2079,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel6502_state::chesster)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 5_MHz_XTAL) // RP65C02G
- MCFG_CPU_PROGRAM_MAP(chesster_map)
+ MCFG_DEVICE_ADD("maincpu", R65C02, 5_MHz_XTAL) // RP65C02G
+ MCFG_DEVICE_PROGRAM_MAP(chesster_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel6502_state, irq_on, attotime::from_hz(9615)) // R/C circuit, measured
MCFG_TIMER_START_DELAY(attotime::from_hz(9615) - attotime::from_nsec(2600)) // active for 2.6us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(9615))
@@ -2090,7 +2090,7 @@ MACHINE_CONFIG_START(fidel6502_state::chesster)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac8", DAC_8BIT_R2R, 0) // m74hc374b1.ic1 + 8l513_02.z2
+ MCFG_DEVICE_ADD("dac8", DAC_8BIT_R2R, 0) // m74hc374b1.ic1 + 8l513_02.z2
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac8", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac8", -1.0, DAC_VREF_NEG_INPUT)
@@ -2100,9 +2100,9 @@ MACHINE_CONFIG_START(fidel6502_state::kishon)
chesster(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(3.579545_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(kishon_map)
+ MCFG_DEVICE_PROGRAM_MAP(kishon_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index 58d7d59b425..4d8620a1a84 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -560,8 +560,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidel68k_state::fex68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12_MHz_XTAL) // HD68HC000P12
- MCFG_CPU_PROGRAM_MAP(fex68k_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12_MHz_XTAL) // HD68HC000P12
+ MCFG_DEVICE_PROGRAM_MAP(fex68k_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(618)) // theoretical frequency from 556 timer (22nF, 91K + 20K POT @ 14.8K, 0.1K), measurement was 580Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(618) - attotime::from_nsec(1525)) // active for 1.525us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(618))
@@ -571,7 +571,7 @@ MACHINE_CONFIG_START(fidel68k_state::fex68k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -580,24 +580,24 @@ MACHINE_CONFIG_START(fidel68k_state::fex68km2)
fex68k(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fex68km2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fex68km2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::fex68km3)
fex68k(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(16_MHz_XTAL) // factory overclock
- MCFG_CPU_PROGRAM_MAP(fex68km3_map)
+ MCFG_DEVICE_PROGRAM_MAP(fex68km3_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::fdes2265)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) // MC68HC000P12F
- MCFG_CPU_PROGRAM_MAP(fdes2265_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL) // MC68HC000P12F
+ MCFG_DEVICE_PROGRAM_MAP(fdes2265_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(597)) // from 555 timer, measured
MCFG_TIMER_START_DELAY(attotime::from_hz(597) - attotime::from_nsec(6000)) // active for 6us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(597))
@@ -607,7 +607,7 @@ MACHINE_CONFIG_START(fidel68k_state::fdes2265)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -616,8 +616,8 @@ MACHINE_CONFIG_START(fidel68k_state::fdes2325)
fdes2265(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, 20_MHz_XTAL) // MC68EC020RP25
- MCFG_CPU_PROGRAM_MAP(fdes2325_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC020, 20_MHz_XTAL) // MC68EC020RP25
+ MCFG_DEVICE_PROGRAM_MAP(fdes2325_map)
MCFG_DEFAULT_LAYOUT(layout_fidel_desdis_68kg)
MACHINE_CONFIG_END
@@ -625,8 +625,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::eag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(eag_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(eag_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidel68k_state, irq_on, attotime::from_hz(4.9152_MHz_XTAL/0x2000)) // 600Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(4.9152_MHz_XTAL/0x2000) - attotime::from_nsec(8250)) // active for 8.25us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(4.9152_MHz_XTAL/0x2000))
@@ -642,7 +642,7 @@ MACHINE_CONFIG_START(fidel68k_state::eag)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -657,8 +657,8 @@ MACHINE_CONFIG_START(fidel68k_state::eagv7)
eag(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68020, 20_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(eagv7_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68020, 20_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(eagv7_map)
MCFG_RAM_REMOVE("ram")
MACHINE_CONFIG_END
@@ -667,26 +667,26 @@ MACHINE_CONFIG_START(fidel68k_state::eagv9)
eagv7(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68030, 32_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(eagv7_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 32_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(eagv7_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::eagv10)
eagv7(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68040, 25_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(eagv11_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68040, 25_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(eagv11_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidel68k_state::eagv11)
eagv7(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC040, 36_MHz_XTAL*2*2) // wrong! should be M68EC060 @ 72MHz
- MCFG_CPU_PROGRAM_MAP(eagv11_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC040, 36_MHz_XTAL*2*2) // wrong! should be M68EC060 @ 72MHz
+ MCFG_DEVICE_PROGRAM_MAP(eagv11_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(fidel68k_state, irq2_line_hold, 600)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidel68k_state, irq2_line_hold, 600)
MCFG_DEVICE_REMOVE("irq_on") // 8.25us is too long
MCFG_DEVICE_REMOVE("irq_off")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp
index e4d629d2fc9..58ea092483a 100644
--- a/src/mame/drivers/fidelmcs48.cpp
+++ b/src/mame/drivers/fidelmcs48.cpp
@@ -150,20 +150,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidelmcs48_state::sc6)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8040, 11_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(sc6_map)
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(fidelmcs48_state, sc6_mux_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(fidelmcs48_state, sc6_input_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(fidelmcs48_state, sc6_select_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(fidelmcs48_state, sc6_input6_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(fidelmcs48_state, sc6_input7_r))
+ MCFG_DEVICE_ADD("maincpu", I8040, 11_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(sc6_map)
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, fidelmcs48_state, sc6_mux_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, fidelmcs48_state, sc6_input_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, fidelmcs48_state, sc6_select_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, fidelmcs48_state, sc6_input6_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, fidelmcs48_state, sc6_input7_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_sc6)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index b2f27aa25f8..52eb008bc66 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -1655,16 +1655,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fidelz80_state::bcc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3.579545_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(bcc_map)
- MCFG_CPU_IO_MAP(bcc_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(bcc_map)
+ MCFG_DEVICE_IO_MAP(bcc_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_bcc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1672,16 +1672,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::scc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3.9_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(scc_map)
- MCFG_CPU_IO_MAP(scc_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3.9_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(scc_map)
+ MCFG_DEVICE_IO_MAP(scc_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_sc8)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1689,25 +1689,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::cc10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(cc10_map)
- MCFG_CPU_IO_MAP(vcc_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(cc10_map)
+ MCFG_DEVICE_IO_MAP(vcc_io)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fidelz80_state, cc10_ppi_porta_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fidelz80_state, cc10_ppi_porta_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0))
MCFG_I8255_IN_PORTB_CB(IOPORT("LEVEL"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(fidelz80_state, vcc_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(fidelz80_state, vcc_ppi_portc_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, fidelz80_state, vcc_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, fidelz80_state, vcc_ppi_portc_r))
MCFG_I8255_TRISTATE_PORTB_CB(CONSTANT(0))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fidelz80_state, vcc_ppi_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fidelz80_state, vcc_ppi_portc_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_cc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("beeper", BEEP, 1360) // approximation, from 556 timer ic
+ MCFG_DEVICE_ADD("beeper", BEEP, 1360) // approximation, from 556 timer ic
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_TIMER_DRIVER_ADD("beeper_off", fidelz80_state, beeper_off_callback)
MACHINE_CONFIG_END
@@ -1715,18 +1715,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::vcc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(vcc_map)
- MCFG_CPU_IO_MAP(vcc_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(vcc_map)
+ MCFG_DEVICE_IO_MAP(vcc_io)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fidelz80_state, vcc_ppi_porta_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fidelz80_state, vcc_ppi_porta_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0))
- MCFG_I8255_IN_PORTB_CB(READ8(fidelz80_state, vcc_ppi_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(fidelz80_state, vcc_ppi_portb_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, fidelz80_state, vcc_ppi_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, fidelz80_state, vcc_ppi_portb_w))
MCFG_I8255_TRISTATE_PORTB_CB(CONSTANT(0))
- MCFG_I8255_IN_PORTC_CB(READ8(fidelz80_state, vcc_ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fidelz80_state, vcc_ppi_portc_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, fidelz80_state, vcc_ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fidelz80_state, vcc_ppi_portc_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_vcc)
@@ -1735,63 +1735,63 @@ MACHINE_CONFIG_START(fidelz80_state::vcc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
- MCFG_S14001A_EXT_READ_HANDLER(READ8(fidelz80_state, vcc_speech_r))
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_S14001A_EXT_READ_HANDLER(READ8(*this, fidelz80_state, vcc_speech_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::vsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3.9_MHz_XTAL) // 3.9MHz resonator
- MCFG_CPU_PROGRAM_MAP(vsc_map)
- MCFG_CPU_IO_MAP(vsc_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(fidelz80_state, nmi_line_pulse, 587) // 555 timer, measured
+ MCFG_DEVICE_ADD("maincpu", Z80, 3.9_MHz_XTAL) // 3.9MHz resonator
+ MCFG_DEVICE_PROGRAM_MAP(vsc_map)
+ MCFG_DEVICE_IO_MAP(vsc_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(fidelz80_state, nmi_line_pulse, 587) // 555 timer, measured
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fidelz80_state, vsc_ppi_porta_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(fidelz80_state, vsc_ppi_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fidelz80_state, vsc_ppi_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fidelz80_state, vsc_ppi_porta_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, fidelz80_state, vsc_ppi_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fidelz80_state, vsc_ppi_portc_w))
MCFG_DEVICE_ADD("z80pio", Z80PIO, 3.9_MHz_XTAL)
- MCFG_Z80PIO_IN_PA_CB(READ8(fidelz80_state, vsc_pio_porta_r))
- MCFG_Z80PIO_IN_PB_CB(READ8(fidelz80_state, vsc_pio_portb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(fidelz80_state, vsc_pio_portb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, fidelz80_state, vsc_pio_porta_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, fidelz80_state, vsc_pio_portb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, fidelz80_state, vsc_pio_portb_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_vsc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
- MCFG_S14001A_EXT_READ_HANDLER(READ8(fidelz80_state, vcc_speech_r))
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_S14001A_EXT_READ_HANDLER(READ8(*this, fidelz80_state, vcc_speech_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::vbrc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(vbrc_main_map)
- MCFG_CPU_IO_MAP(vbrc_main_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(vbrc_main_map)
+ MCFG_DEVICE_IO_MAP(vbrc_main_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("mcu", I8041, 5_MHz_XTAL)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(fidelz80_state, vbrc_mcu_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(fidelz80_state, vbrc_mcu_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("i8243", i8243_device, p2_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(fidelz80_state, vbrc_mcu_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(fidelz80_state, vbrc_mcu_t1_r))
+ MCFG_DEVICE_ADD("mcu", I8041, 5_MHz_XTAL)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, fidelz80_state, vbrc_mcu_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, fidelz80_state, vbrc_mcu_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8("i8243", i8243_device, p2_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("i8243", i8243_device, prog_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, fidelz80_state, vbrc_mcu_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, fidelz80_state, vbrc_mcu_t1_r))
- MCFG_I8243_ADD("i8243", NOOP, WRITE8(fidelz80_state, vbrc_ioexp_port_w))
+ MCFG_I8243_ADD("i8243", NOOP, WRITE8(*this, fidelz80_state, vbrc_ioexp_port_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fidel_vbrc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // R/C circuit, around 25khz
MCFG_S14001A_BSY_HANDLER(INPUTLINE("maincpu", Z80_INPUT_LINE_WAIT))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
@@ -1799,8 +1799,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fidelz80_state::dsc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3.9_MHz_XTAL) // 3.9MHz resonator
- MCFG_CPU_PROGRAM_MAP(dsc_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3.9_MHz_XTAL) // 3.9MHz resonator
+ MCFG_DEVICE_PROGRAM_MAP(dsc_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", fidelz80_state, irq_on, attotime::from_hz(523)) // from 555 timer (22nF, 120K, 2.7K)
MCFG_TIMER_START_DELAY(attotime::from_hz(523) - attotime::from_usec(41)) // active for 41us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidelz80_state, irq_off, attotime::from_hz(523))
@@ -1810,7 +1810,7 @@ MACHINE_CONFIG_START(fidelz80_state::dsc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index 015c436345e..65c31957275 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -266,17 +266,17 @@ void finalizr_state::machine_reset()
MACHINE_CONFIG_START(finalizr_state::finalizr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, XTAL(18'432'000)/6) /* ??? */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, XTAL(18'432'000)/6) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", finalizr_state, finalizr_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", I8039,XTAL(18'432'000)/2) /* 9.216MHz clkin ?? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(finalizr_state, i8039_irqen_w))
+ MCFG_DEVICE_ADD("audiocpu", I8039,XTAL(18'432'000)/2) /* 9.216MHz clkin ?? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, finalizr_state, i8039_irqen_w))
//MCFG_MCS48_PORT_T0_CLK_CUSTOM(finalizr_state, i8039_T0_w)
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(finalizr_state, i8039_T1_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, finalizr_state, i8039_T1_r))
MCFG_WATCHDOG_ADD("watchdog")
@@ -299,10 +299,10 @@ MACHINE_CONFIG_START(finalizr_state::finalizr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("snsnd", SN76489A, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.325) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.325) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp
index 65bf6b8a6f2..e77d883c088 100644
--- a/src/mame/drivers/fireball.cpp
+++ b/src/mame/drivers/fireball.cpp
@@ -493,20 +493,20 @@ TIMER_DEVICE_CALLBACK_MEMBER( fireball_state::int_0 )
MACHINE_CONFIG_START(fireball_state::fireball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8031, CPU_CLK) //
- MCFG_CPU_PROGRAM_MAP(fireball_map)
- MCFG_CPU_IO_MAP(fireball_io_map)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(fireball_state, p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(fireball_state, p1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(fireball_state, p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(fireball_state, p3_w))
+ MCFG_DEVICE_ADD("maincpu", I8031, CPU_CLK) //
+ MCFG_DEVICE_PROGRAM_MAP(fireball_map)
+ MCFG_DEVICE_IO_MAP(fireball_io_map)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, fireball_state, p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, fireball_state, p1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, fireball_state, p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, fireball_state, p3_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("int_0", fireball_state, int_0, attotime::from_hz(555)) //9ms from scope reading 111Hz take care of this in the handler
MCFG_EEPROM_SERIAL_X24C44_ADD("eeprom")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, AY_CLK)
+ MCFG_DEVICE_ADD("aysnd", AY8912, AY_CLK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Video */
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index c1e2eec1227..29cc81641c9 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -1175,9 +1175,9 @@ static void firebeat_ata_devices(device_slot_interface &device)
MACHINE_CONFIG_START(firebeat_state::firebeat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL(64'000'000))
- MCFG_CPU_PROGRAM_MAP(firebeat_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", firebeat_state, firebeat_interrupt)
+ MCFG_DEVICE_ADD("maincpu", PPC403GCX, XTAL(64'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(firebeat_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", firebeat_state, firebeat_interrupt)
MCFG_MACHINE_START_OVERRIDE(firebeat_state,firebeat)
MCFG_MACHINE_RESET_OVERRIDE(firebeat_state,firebeat)
@@ -1189,7 +1189,7 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
MCFG_FUJITSU_29F016A_ADD("flash_snd2")
MCFG_ATA_INTERFACE_ADD("ata", firebeat_ata_devices, "cdrom", "cdrom", true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(firebeat_state, ata_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, firebeat_state, ata_interrupt))
MCFG_DEVICE_MODIFY("ata:1")
MCFG_SLOT_OPTION_MACHINE_CONFIG( "cdrom", cdrom_config )
@@ -1198,7 +1198,7 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette")
MCFG_DEVICE_ADD("gcu0", K057714, 0)
- MCFG_K057714_IRQ_CALLBACK(WRITELINE(firebeat_state, gcu0_interrupt))
+ MCFG_K057714_IRQ_CALLBACK(WRITELINE(*this, firebeat_state, gcu0_interrupt))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1213,8 +1213,8 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(firebeat_state, sound_irq_callback))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, firebeat_state, sound_irq_callback))
MCFG_DEVICE_ADDRESS_MAP(0, ymz280b_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1224,17 +1224,17 @@ MACHINE_CONFIG_START(firebeat_state::firebeat)
MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL(19'660'800))
MCFG_DEVICE_ADD("duart_midi", PC16552D, 0) // in all memory maps, pgmd to 31250baud
MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch0_irq_callback))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch0_irq_callback))
MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch1_irq_callback))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch1_irq_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(firebeat_state::firebeat2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL(64'000'000))
- MCFG_CPU_PROGRAM_MAP(firebeat2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", firebeat_state, firebeat_interrupt)
+ MCFG_DEVICE_ADD("maincpu", PPC403GCX, XTAL(64'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(firebeat2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", firebeat_state, firebeat_interrupt)
MCFG_MACHINE_START_OVERRIDE(firebeat_state,firebeat)
MCFG_MACHINE_RESET_OVERRIDE(firebeat_state,firebeat)
@@ -1246,7 +1246,7 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
MCFG_FUJITSU_29F016A_ADD("flash_snd2")
MCFG_ATA_INTERFACE_ADD("ata", firebeat_ata_devices, "cdrom", "cdrom", true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(firebeat_state, ata_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, firebeat_state, ata_interrupt))
MCFG_DEVICE_MODIFY("ata:1")
MCFG_SLOT_OPTION_MACHINE_CONFIG( "cdrom", cdrom_config )
@@ -1255,10 +1255,10 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette")
MCFG_DEVICE_ADD("gcu0", K057714, 0)
- MCFG_K057714_IRQ_CALLBACK(WRITELINE(firebeat_state, gcu0_interrupt))
+ MCFG_K057714_IRQ_CALLBACK(WRITELINE(*this, firebeat_state, gcu0_interrupt))
MCFG_DEVICE_ADD("gcu1", K057714, 0)
- MCFG_K057714_IRQ_CALLBACK(WRITELINE(firebeat_state, gcu1_interrupt))
+ MCFG_K057714_IRQ_CALLBACK(WRITELINE(*this, firebeat_state, gcu1_interrupt))
MCFG_SCREEN_ADD("lscreen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1281,8 +1281,8 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
- MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(firebeat_state, sound_irq_callback))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
+ MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(*this, firebeat_state, sound_irq_callback))
MCFG_DEVICE_ADDRESS_MAP(0, ymz280b_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1292,19 +1292,19 @@ MACHINE_CONFIG_START(firebeat_state::firebeat2)
MCFG_DEVICE_ADD("duart_com:chan1", NS16550, XTAL(19'660'800))
MCFG_DEVICE_ADD("duart_midi", PC16552D, 0)
MCFG_DEVICE_ADD("duart_midi:chan0", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch0_irq_callback))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch0_irq_callback))
MCFG_DEVICE_ADD("duart_midi:chan1", NS16550, XTAL(24'000'000))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(firebeat_state, midi_uart_ch1_irq_callback))
- MCFG_MIDI_KBD_ADD("kbd0", DEVWRITELINE("duart_midi:chan0", ins8250_uart_device, rx_w), 31250)
- MCFG_MIDI_KBD_ADD("kbd1", DEVWRITELINE("duart_midi:chan1", ins8250_uart_device, rx_w), 31250)
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, firebeat_state, midi_uart_ch1_irq_callback))
+ MCFG_MIDI_KBD_ADD("kbd0", WRITELINE("duart_midi:chan0", ins8250_uart_device, rx_w), 31250)
+ MCFG_MIDI_KBD_ADD("kbd1", WRITELINE("duart_midi:chan1", ins8250_uart_device, rx_w), 31250)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(firebeat_state::firebeat_spu)
firebeat(config);
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(spu_map)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(spu_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("sputimer", firebeat_state, spu_timer_callback, attotime::from_hz(1000));
@@ -1313,7 +1313,7 @@ MACHINE_CONFIG_START(firebeat_state::firebeat_spu)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_ATA_INTERFACE_ADD("spu_ata", firebeat_ata_devices, "cdrom", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(firebeat_state, spu_ata_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, firebeat_state, spu_ata_interrupt))
MACHINE_CONFIG_END
/*****************************************************************************/
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index c44bfd5c9c5..bbf68f27d73 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -650,13 +650,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(firefox_state::firefox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_XTAL/8) // 68B09E
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_XTAL/8) // 68B09E
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
/* interrupts count starting at end of VBLANK, which is 44, so add 44 */
MCFG_TIMER_DRIVER_ADD_SCANLINE("32v", firefox_state, video_timer_callback, "screen", 96+44, 128)
- MCFG_CPU_ADD("audiocpu", M6502, MASTER_XTAL/8)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, MASTER_XTAL/8)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
@@ -665,20 +665,20 @@ MACHINE_CONFIG_START(firefox_state::firefox)
MCFG_ADC0808_IN1_CB(IOPORT("YAW"))
MCFG_DEVICE_ADD("latch0", LS259, 0) // 7F
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("nvram_1c", x2212_device, recall)) // NVRECALL
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("nvram_1d", x2212_device, recall))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(firefox_state, sound_reset_w)) // RSTSOUND
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("nvram_1c", x2212_device, store)) // NVRSTORE
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("nvram_1d", x2212_device, store))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(firefox_state, firefox_disc_lock_w)) // LOCK
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(firefox_state, audio_enable_right_w)) // SWDSKR
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(firefox_state, audio_enable_left_w)) // SWDSKL
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(firefox_state, firefox_disc_reset_w)) // RSTDSK
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(firefox_state, firefox_disc_write_w)) // WRDSK
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("nvram_1c", x2212_device, recall)) // NVRECALL
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("nvram_1d", x2212_device, recall))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, firefox_state, sound_reset_w)) // RSTSOUND
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("nvram_1c", x2212_device, store)) // NVRSTORE
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("nvram_1d", x2212_device, store))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, firefox_state, firefox_disc_lock_w)) // LOCK
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, firefox_state, audio_enable_right_w)) // SWDSKR
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, firefox_state, audio_enable_left_w)) // SWDSKL
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, firefox_state, firefox_disc_reset_w)) // RSTDSK
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, firefox_state, firefox_disc_write_w)) // WRDSK
MCFG_DEVICE_ADD("latch1", LS259, 0) // 1F
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(firefox_state, coin_counter_right_w)) // COIN COUNTERR
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(firefox_state, coin_counter_left_w)) // COIN COUNTERL
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, firefox_state, coin_counter_right_w)) // COIN COUNTERR
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, firefox_state, coin_counter_left_w)) // COIN COUNTERL
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(OUTPUT("led2")) MCFG_DEVCB_INVERT
@@ -702,10 +702,10 @@ MACHINE_CONFIG_START(firefox_state::firefox)
MCFG_X2212_ADD_AUTOSAVE("nvram_1d")
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_XTAL/8)
- MCFG_RIOT6532_IN_PA_CB(READ8(firefox_state, riot_porta_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(firefox_state, riot_porta_w))
- MCFG_RIOT6532_IN_PB_CB(DEVREAD8("tms", tms5220_device, status_r))
- MCFG_RIOT6532_OUT_PB_CB(DEVWRITE8("tms", tms5220_device, data_w))
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, firefox_state, riot_porta_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, firefox_state, riot_porta_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8("tms", tms5220_device, status_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8("tms", tms5220_device, data_w))
MCFG_RIOT6532_IRQ_CB(INPUTLINE("audiocpu", M6502_IRQ_LINE))
/* sound hardware */
@@ -716,27 +716,27 @@ MACHINE_CONFIG_START(firefox_state::firefox)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_XTAL/8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_XTAL/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_XTAL/8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_XTAL/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("pokey3", POKEY, MASTER_XTAL/8)
+ MCFG_DEVICE_ADD("pokey3", POKEY, MASTER_XTAL/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("pokey4", POKEY, MASTER_XTAL/8)
+ MCFG_DEVICE_ADD("pokey4", POKEY, MASTER_XTAL/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_SOUND_ADD("tms", TMS5220, MASTER_XTAL/2/11)
+ MCFG_DEVICE_ADD("tms", TMS5220, MASTER_XTAL/2/11)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp
index 56f73459073..679abc3a60a 100644
--- a/src/mame/drivers/firetrap.cpp
+++ b/src/mame/drivers/firetrap.cpp
@@ -618,16 +618,16 @@ void firetrap_state::machine_reset()
MACHINE_CONFIG_START(firetrap_state::firetrap)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(firetrap_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", firetrap_state, firetrap_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(firetrap_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", firetrap_state, firetrap_irq)
- MCFG_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -651,14 +651,14 @@ MACHINE_CONFIG_START(firetrap_state::firetrap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
+ MCFG_DEVICE_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(firetrap_state, firetrap_adpcm_int))
+ MCFG_DEVICE_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, firetrap_state, firetrap_adpcm_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 7.8125kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -666,12 +666,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(firetrap_state::firetrapbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(firetrap_bootleg_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", firetrap_state, firetrap_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(firetrap_bootleg_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", firetrap_state, firetrap_irq)
- MCFG_CPU_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, FIRETRAP_XTAL/8) // 1.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
@@ -696,14 +696,14 @@ MACHINE_CONFIG_START(firetrap_state::firetrapbl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
+ MCFG_DEVICE_ADD("ymsnd", YM3526, FIRETRAP_XTAL/4) // 3 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(firetrap_state, firetrap_adpcm_int))
+ MCFG_DEVICE_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, firetrap_state, firetrap_adpcm_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 7.8125kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index 6bcaf40a7bb..bc3d7dfb5ea 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -856,8 +856,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(firetrk_state::firetrk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
- MCFG_CPU_PROGRAM_MAP(firetrk_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
+ MCFG_DEVICE_PROGRAM_MAP(firetrk_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", firetrk_state, firetrk_scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -878,7 +878,7 @@ MACHINE_CONFIG_START(firetrk_state::firetrk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(firetrk)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -888,8 +888,8 @@ MACHINE_CONFIG_START(firetrk_state::superbug)
firetrk(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(superbug_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(superbug_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -903,7 +903,7 @@ MACHINE_CONFIG_START(firetrk_state::superbug)
MCFG_PALETTE_INIT_OWNER(firetrk_state, firetrk)
/* sound hardware */
- MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_DEVICE_REPLACE("discrete", DISCRETE, 0)
MCFG_DISCRETE_INTF(superbug)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -913,8 +913,8 @@ MACHINE_CONFIG_START(firetrk_state::montecar)
firetrk(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(montecar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(montecar_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -928,7 +928,7 @@ MACHINE_CONFIG_START(firetrk_state::montecar)
MCFG_PALETTE_INIT_OWNER(firetrk_state,montecar)
/* sound hardware */
- MCFG_SOUND_REPLACE("discrete", DISCRETE, 0)
+ MCFG_DEVICE_REPLACE("discrete", DISCRETE, 0)
MCFG_DISCRETE_INTF(montecar)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp
index 1020192cb6a..5f75496fbc3 100644
--- a/src/mame/drivers/fitfight.cpp
+++ b/src/mame/drivers/fitfight.cpp
@@ -727,19 +727,19 @@ void fitfight_state::machine_reset()
MACHINE_CONFIG_START(fitfight_state::fitfight)
- MCFG_CPU_ADD("maincpu",M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(fitfight_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold)
-
- MCFG_CPU_ADD("audiocpu", UPD7810, 12000000)
- MCFG_CPU_PROGRAM_MAP(snd_mem)
- MCFG_UPD7810_PORTA_READ_CB(READ8(fitfight_state, snd_porta_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(fitfight_state, snd_porta_w))
- MCFG_UPD7810_PORTB_READ_CB(READ8(fitfight_state, snd_portb_r))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(fitfight_state, snd_portb_w))
- MCFG_UPD7810_PORTC_READ_CB(READ8(fitfight_state, snd_portc_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(fitfight_state, snd_portc_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fitfight_state, snd_irq)
+ MCFG_DEVICE_ADD("maincpu",M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(fitfight_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", UPD7810, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(snd_mem)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, fitfight_state, snd_porta_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, fitfight_state, snd_porta_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, fitfight_state, snd_portb_r))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, fitfight_state, snd_portb_w))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, fitfight_state, snd_portc_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, fitfight_state, snd_portc_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, snd_irq)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fitfight)
@@ -763,9 +763,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fitfight_state::bbprot)
- MCFG_CPU_ADD("maincpu",M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(bbprot_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(bbprot_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fitfight_state, irq2_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", prot)
diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp
index 8037360855c..67ad11556e1 100644
--- a/src/mame/drivers/fk1.cpp
+++ b/src/mame/drivers/fk1.cpp
@@ -412,10 +412,10 @@ uint32_t fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
MACHINE_CONFIG_START(fk1_state::fk1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(fk1_mem)
- MCFG_CPU_IO_MAP(fk1_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fk1_state,fk1_irq_callback)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(fk1_mem)
+ MCFG_DEVICE_IO_MAP(fk1_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fk1_state,fk1_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -430,33 +430,33 @@ MACHINE_CONFIG_START(fk1_state::fk1)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(50)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(fk1_state, fk1_pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, fk1_state, fk1_pit_out0))
MCFG_PIT8253_CLK1(1000000)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(fk1_state, fk1_pit_out1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, fk1_state, fk1_pit_out1))
MCFG_PIT8253_CLK2(0)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(fk1_state, fk1_pit_out2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, fk1_state, fk1_pit_out2))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(fk1_state, fk1_ppi_1_a_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fk1_state, fk1_ppi_1_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(fk1_state, fk1_ppi_1_b_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(fk1_state, fk1_ppi_1_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(fk1_state, fk1_ppi_1_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fk1_state, fk1_ppi_1_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, fk1_state, fk1_ppi_1_a_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fk1_state, fk1_ppi_1_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, fk1_state, fk1_ppi_1_b_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, fk1_state, fk1_ppi_1_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, fk1_state, fk1_ppi_1_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fk1_state, fk1_ppi_1_c_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fk1_state, fk1_ppi_2_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(fk1_state, fk1_ppi_2_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(fk1_state, fk1_ppi_2_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fk1_state, fk1_ppi_2_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fk1_state, fk1_ppi_2_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, fk1_state, fk1_ppi_2_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, fk1_state, fk1_ppi_2_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fk1_state, fk1_ppi_2_c_w))
MCFG_DEVICE_ADD("ppi8255_3", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(fk1_state, fk1_ppi_3_a_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(fk1_state, fk1_ppi_3_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(fk1_state, fk1_ppi_3_b_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(fk1_state, fk1_ppi_3_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(fk1_state, fk1_ppi_3_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fk1_state, fk1_ppi_3_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, fk1_state, fk1_ppi_3_a_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, fk1_state, fk1_ppi_3_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, fk1_state, fk1_ppi_3_b_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, fk1_state, fk1_ppi_3_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, fk1_state, fk1_ppi_3_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fk1_state, fk1_ppi_3_c_w))
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp
index 50254b1479d..b3f815a3c9a 100644
--- a/src/mame/drivers/flicker.cpp
+++ b/src/mame/drivers/flicker.cpp
@@ -398,14 +398,14 @@ void flicker_state::driver_start()
MACHINE_CONFIG_START(flicker_state::flicker)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I4004, 5_MHz_XTAL / 8)
+ MCFG_DEVICE_ADD("maincpu", I4004, 5_MHz_XTAL / 8)
MCFG_I4004_ROM_MAP(flicker_rom)
MCFG_I4004_RAM_MEMORY_MAP(flicker_memory)
MCFG_I4004_ROM_PORTS_MAP(flicker_rom_ports)
MCFG_I4004_RAM_STATUS_MAP(flicker_status)
MCFG_I4004_RAM_PORTS_MAP(flicker_ram_ports)
- MCFG_I4004_CM_RAM1_CB(WRITELINE(flicker_state, cm_ram1_w))
- MCFG_I4004_CM_RAM2_CB(WRITELINE(flicker_state, cm_ram2_w))
+ MCFG_I4004_CM_RAM1_CB(WRITELINE(*this, flicker_state, cm_ram1_w))
+ MCFG_I4004_CM_RAM2_CB(WRITELINE(*this, flicker_state, cm_ram2_w))
// video
MCFG_DEFAULT_LAYOUT(layout_flicker)
diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp
index a94d7677560..cd3e6b2c745 100644
--- a/src/mame/drivers/flipjack.cpp
+++ b/src/mame/drivers/flipjack.cpp
@@ -447,21 +447,21 @@ void flipjack_state::machine_start()
MACHINE_CONFIG_START(flipjack_state::flipjack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(flipjack_main_map)
- MCFG_CPU_IO_MAP(flipjack_main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flipjack_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(flipjack_main_map)
+ MCFG_DEVICE_IO_MAP(flipjack_main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flipjack_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(flipjack_sound_map)
- MCFG_CPU_IO_MAP(flipjack_sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flipjack_state, nmi_line_assert)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(flipjack_sound_map)
+ MCFG_DEVICE_IO_MAP(flipjack_sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flipjack_state, nmi_line_assert)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
MCFG_I8255_IN_PORTC_CB(IOPORT("P3"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(flipjack_state, flipjack_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, flipjack_state, flipjack_portc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -480,11 +480,11 @@ MACHINE_CONFIG_START(flipjack_state::flipjack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(flipjack_state, flipjack_soundlatch_r)) /* Port A read */
+ MCFG_DEVICE_ADD("ay1", AY8910, MASTER_CLOCK/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, flipjack_state, flipjack_soundlatch_r)) /* Port A read */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp
index 0cf8fd2f136..ffe98c72245 100644
--- a/src/mame/drivers/flkatck.cpp
+++ b/src/mame/drivers/flkatck.cpp
@@ -213,12 +213,12 @@ void flkatck_state::machine_reset()
MACHINE_CONFIG_START(flkatck_state::flkatck)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
- MCFG_CPU_PROGRAM_MAP(flkatck_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flkatck_state, flkatck_interrupt)
+ MCFG_DEVICE_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(flkatck_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flkatck_state, flkatck_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,3579545) /* NEC D780C-1, 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(flkatck_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,3579545) /* NEC D780C-1, 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(flkatck_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -250,8 +250,8 @@ MACHINE_CONFIG_START(flkatck_state::flkatck)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(flkatck_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, flkatck_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp
index 01561e7d7f7..e82849c5498 100644
--- a/src/mame/drivers/flower.cpp
+++ b/src/mame/drivers/flower.cpp
@@ -492,17 +492,17 @@ INTERRUPT_GEN_MEMBER(flower_state::slave_vblank_irq)
MACHINE_CONFIG_START(flower_state::flower)
- MCFG_CPU_ADD("mastercpu",Z80,MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(shared_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flower_state, master_vblank_irq)
+ MCFG_DEVICE_ADD("mastercpu",Z80,MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(shared_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flower_state, master_vblank_irq)
- MCFG_CPU_ADD("slavecpu",Z80,MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(shared_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flower_state, slave_vblank_irq)
+ MCFG_DEVICE_ADD("slavecpu",Z80,MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(shared_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flower_state, slave_vblank_irq)
- MCFG_CPU_ADD("audiocpu",Z80,MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(flower_state, irq0_line_hold, 90)
+ MCFG_DEVICE_ADD("audiocpu",Z80,MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(flower_state, irq0_line_hold, 90)
MCFG_QUANTUM_PERFECT_CPU("mastercpu")
@@ -518,7 +518,7 @@ MACHINE_CONFIG_START(flower_state::flower)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("flower", FLOWER_CUSTOM, 96000)
+ MCFG_DEVICE_ADD("flower", FLOWER_CUSTOM, 96000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp
index c9301bf93f9..3c133e38157 100644
--- a/src/mame/drivers/flstory.cpp
+++ b/src/mame/drivers/flstory.cpp
@@ -736,13 +736,13 @@ MACHINE_RESET_MEMBER(flstory_state,flstory)
MACHINE_CONFIG_START(flstory_state::flstory)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(flstory_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(flstory_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* verified on pcb */
@@ -772,7 +772,7 @@ MACHINE_CONFIG_START(flstory_state::flstory)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -780,12 +780,12 @@ MACHINE_CONFIG_START(flstory_state::flstory)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -799,7 +799,7 @@ MACHINE_CONFIG_START(flstory_state::flstory)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -807,13 +807,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::onna34ro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(onna34ro_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'733'000)/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(onna34ro_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
@@ -841,7 +841,7 @@ MACHINE_CONFIG_START(flstory_state::onna34ro)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -849,12 +849,12 @@ MACHINE_CONFIG_START(flstory_state::onna34ro)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -868,15 +868,15 @@ MACHINE_CONFIG_START(flstory_state::onna34ro)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::onna34ro_mcu)
onna34ro(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(onna34ro_mcu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(onna34ro_mcu_map)
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* ? */
MACHINE_CONFIG_END
@@ -884,17 +884,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::victnine)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(victnine_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(victnine_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
-// MCFG_CPU_ADD("mcu", M68705, XTAL(18'432'000)/6) /* ??? */
-// MCFG_CPU_PROGRAM_MAP(m68705_map)
+// MCFG_DEVICE_ADD("mcu", M68705, XTAL(18'432'000)/6) /* ??? */
+// MCFG_DEVICE_PROGRAM_MAP(m68705_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -921,7 +921,7 @@ MACHINE_CONFIG_START(flstory_state::victnine)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -929,12 +929,12 @@ MACHINE_CONFIG_START(flstory_state::victnine)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -948,7 +948,7 @@ MACHINE_CONFIG_START(flstory_state::victnine)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -957,13 +957,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(flstory_state::rumba)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rumba_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rumba_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", flstory_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(flstory_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
/* NMI generated by the main CPU */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(18'432'000)/6) /* ? */
@@ -994,7 +994,7 @@ MACHINE_CONFIG_START(flstory_state::rumba)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -1002,12 +1002,12 @@ MACHINE_CONFIG_START(flstory_state::rumba)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(flstory_state, sound_control_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(flstory_state, sound_control_3_w))
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(8'000'000)/4) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, flstory_state, sound_control_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, flstory_state, sound_control_3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) /* verified on pcb */
MCFG_MSM5232_SET_CAPACITORS(1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6, 1.0e-6) /* 1.0 uF capacitors (verified on real PCB) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -1021,7 +1021,7 @@ MACHINE_CONFIG_START(flstory_state::rumba)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index bc57614ec88..a3087d4d580 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -458,11 +458,11 @@ void flyball_state::machine_reset()
MACHINE_CONFIG_START(flyball_state::flyball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(flyball_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(flyball_map)
MCFG_DEVICE_ADD("outlatch", F9334, 0) // F7
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(flyball_state, lamp_w)) // 1 player lamp
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, flyball_state, lamp_w)) // 1 player lamp
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // crowd very loud
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // footstep off-on
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // crowd off-on
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index b89fc431093..9840aadbcb3 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -2068,20 +2068,20 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
MACHINE_CONFIG_START(fm7_state::fm7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(16'128'000) / 2)
- MCFG_CPU_PROGRAM_MAP(fm7_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(16'128'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(fm7_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809, XTAL(16'128'000) / 2)
- MCFG_CPU_PROGRAM_MAP(fm7_sub_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
+ MCFG_DEVICE_ADD("sub", MC6809, XTAL(16'128'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(fm7_sub_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg", AY8910, XTAL(4'915'200) / 4)
+ MCFG_DEVICE_ADD("psg", AY8910, XTAL(4'915'200) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00)
- MCFG_SOUND_ADD("beeper", BEEP, 1200)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.25)
@@ -2103,8 +2103,8 @@ MACHINE_CONFIG_START(fm7_state::fm7)
MCFG_SOFTWARE_LIST_ADD("cass_list","fm7_cass")
MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
@@ -2113,28 +2113,28 @@ MACHINE_CONFIG_START(fm7_state::fm7)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_SLOT_OPTION_ADD( "dsjoy", DEMPA_SHINBUNSHA_JOYSTICK )
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fm7_state::fm8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'915'200)) // 1.2MHz 68A09
- MCFG_CPU_PROGRAM_MAP(fm8_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'915'200)) // 1.2MHz 68A09
+ MCFG_DEVICE_PROGRAM_MAP(fm8_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809, XTAL(16'128'000) / 2)
- MCFG_CPU_PROGRAM_MAP(fm7_sub_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
+ MCFG_DEVICE_ADD("sub", MC6809, XTAL(16'128'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(fm7_sub_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1200)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2154,40 +2154,40 @@ MACHINE_CONFIG_START(fm7_state::fm8)
MCFG_CASSETTE_INTERFACE("fm7_cass")
MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fm7_state::fm77av)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(16'128'000) / 8)
- MCFG_CPU_PROGRAM_MAP(fm77av_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(16'128'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(fm77av_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809E, XTAL(16'128'000) / 8)
- MCFG_CPU_PROGRAM_MAP(fm77av_sub_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
+ MCFG_DEVICE_ADD("sub", MC6809E, XTAL(16'128'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(fm77av_sub_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2203, XTAL(4'915'200) / 4)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(fm7_state, fm77av_fmirq))
- MCFG_AY8910_PORT_A_READ_CB(READ8(fm7_state, fm77av_joy_1_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(fm7_state, fm77av_joy_2_r))
+ MCFG_DEVICE_ADD("ym", YM2203, XTAL(4'915'200) / 4)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, fm7_state, fm77av_fmirq))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, fm7_state, fm77av_joy_1_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, fm7_state, fm77av_joy_2_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
- MCFG_SOUND_ADD("beeper", BEEP, 1200)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2227,8 +2227,8 @@ MACHINE_CONFIG_START(fm7_state::fm77av)
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_list", "fm7_cass")
MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
@@ -2237,32 +2237,32 @@ MACHINE_CONFIG_START(fm7_state::fm77av)
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_list", "fm7_disk")
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fm7_state::fm11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) // 2MHz 68B09E
- MCFG_CPU_PROGRAM_MAP(fm11_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) // 2MHz 68B09E
+ MCFG_DEVICE_PROGRAM_MAP(fm11_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809, 8000000) // 2MHz 68B09
- MCFG_CPU_PROGRAM_MAP(fm11_sub_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
+ MCFG_DEVICE_ADD("sub", MC6809, 8000000) // 2MHz 68B09
+ MCFG_DEVICE_PROGRAM_MAP(fm11_sub_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
MCFG_QUANTUM_PERFECT_CPU("sub")
- MCFG_CPU_ADD("x86", I8088, 8000000) // 8MHz i8088
- MCFG_CPU_PROGRAM_MAP(fm11_x86_mem)
- MCFG_CPU_IO_MAP(fm11_x86_io)
+ MCFG_DEVICE_ADD("x86", I8088, 8000000) // 8MHz i8088
+ MCFG_DEVICE_PROGRAM_MAP(fm11_x86_mem)
+ MCFG_DEVICE_IO_MAP(fm11_x86_io)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1200)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2299,35 +2299,35 @@ MACHINE_CONFIG_START(fm7_state::fm11)
MCFG_CASSETTE_INTERFACE("fm7_cass")
MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(fm7_state::fm16beta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 8000000) // 8MHz i8086
- MCFG_CPU_PROGRAM_MAP(fm16_mem)
- MCFG_CPU_IO_MAP(fm16_io)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000) // 8MHz i8086
+ MCFG_DEVICE_PROGRAM_MAP(fm16_mem)
+ MCFG_DEVICE_IO_MAP(fm16_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", MC6809, 8000000)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
- MCFG_CPU_PROGRAM_MAP(fm16_sub_mem)
+ MCFG_DEVICE_ADD("sub", MC6809, 8000000)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(fm7_state,fm7_sub_irq_ack)
+ MCFG_DEVICE_PROGRAM_MAP(fm16_sub_mem)
MCFG_QUANTUM_PERFECT_CPU("sub")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1200)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2347,17 +2347,17 @@ MACHINE_CONFIG_START(fm7_state::fm16beta)
MCFG_CASSETTE_INTERFACE("fm7_cass")
MCFG_MB8877_ADD("fdc", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, fm7_state, fm7_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", fm7_floppies, "qd", floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fm7_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(fm7_state, write_centronics_fault))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(fm7_state, write_centronics_ack))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(fm7_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fm7_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, fm7_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, fm7_state, write_centronics_ack))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, fm7_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index ce46712ff09..e1d791a8a21 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -2770,11 +2770,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(towns_state::towns_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I386, 16000000)
- MCFG_CPU_PROGRAM_MAP(towns_mem)
- MCFG_CPU_IO_MAP(towns_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu",I386, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(towns_mem)
+ MCFG_DEVICE_IO_MAP(towns_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
//MCFG_MACHINE_RESET_OVERRIDE(towns_state,towns)
/* video hardware */
@@ -2792,8 +2792,8 @@ MACHINE_CONFIG_START(towns_state::towns_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("fm", YM3438, 16000000 / 2) // actual clock speed unknown
- MCFG_YM2612_IRQ_HANDLER(WRITELINE(towns_state, towns_fm_irq))
+ MCFG_DEVICE_ADD("fm", YM3438, 16000000 / 2) // actual clock speed unknown
+ MCFG_YM2612_IRQ_HANDLER(WRITELINE(*this, towns_state, towns_fm_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
@@ -2801,39 +2801,39 @@ MACHINE_CONFIG_START(towns_state::towns_base)
MCFG_RF5C68_SAMPLE_END_CB(towns_state, towns_pcm_irq)
MCFG_SOUND_ROUTE(0, "lspeaker", 3.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 3.00)
- MCFG_SOUND_ADD("cdda",CDDA,0)
+ MCFG_DEVICE_ADD("cdda",CDDA)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND,0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND,0)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(307200)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(towns_state, towns_pit_out0_changed))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, towns_state, towns_pit_out0_changed))
MCFG_PIT8253_CLK1(307200)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(towns_state, towns_pit_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, towns_state, towns_pit_out1_changed))
MCFG_PIT8253_CLK2(307200)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(towns_state, pit_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, towns_state, pit_out2_changed))
MCFG_DEVICE_ADD("pit2", PIT8253, 0)
MCFG_PIT8253_CLK0(307200) // reserved
MCFG_PIT8253_CLK1(1228800) // RS-232
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(towns_state, pit2_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, towns_state, pit2_out1_changed))
MCFG_PIT8253_CLK2(307200) // reserved
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(towns_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, towns_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_MB8877_ADD("fdc",XTAL(8'000'000)/4) // clock unknown
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(towns_state,mb8877a_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(towns_state,mb8877a_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, towns_state,mb8877a_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, towns_state,mb8877a_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", towns_floppies, "35hd", towns_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", towns_floppies, "35hd", towns_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("fd_list","fmtowns_flop")
@@ -2851,39 +2851,39 @@ MACHINE_CONFIG_START(towns_state::towns_base)
MCFG_FMSCSI_ADD("fmscsi")
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_FMSCSI_IRQ_HANDLER(WRITELINE(towns_state, towns_scsi_irq))
- MCFG_FMSCSI_DRQ_HANDLER(WRITELINE(towns_state, towns_scsi_drq))
+ MCFG_FMSCSI_IRQ_HANDLER(WRITELINE(*this, towns_state, towns_scsi_irq))
+ MCFG_FMSCSI_DRQ_HANDLER(WRITELINE(*this, towns_state, towns_scsi_drq))
MCFG_DEVICE_ADD("dma_1", UPD71071, 0)
MCFG_UPD71071_CPU("maincpu")
MCFG_UPD71071_CLOCK(4000000)
- MCFG_UPD71071_DMA_READ_0_CB(READ16(towns_state, towns_fdc_dma_r))
- MCFG_UPD71071_DMA_READ_1_CB(READ16(towns_state, towns_scsi_dma_r))
- MCFG_UPD71071_DMA_READ_3_CB(READ16(towns_state, towns_cdrom_dma_r))
- MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(towns_state, towns_fdc_dma_w))
- MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(towns_state, towns_scsi_dma_w))
+ MCFG_UPD71071_DMA_READ_0_CB(READ16(*this, towns_state, towns_fdc_dma_r))
+ MCFG_UPD71071_DMA_READ_1_CB(READ16(*this, towns_state, towns_scsi_dma_r))
+ MCFG_UPD71071_DMA_READ_3_CB(READ16(*this, towns_state, towns_cdrom_dma_r))
+ MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(*this, towns_state, towns_fdc_dma_w))
+ MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(*this, towns_state, towns_scsi_dma_w))
MCFG_DEVICE_ADD("dma_2", UPD71071, 0)
MCFG_UPD71071_CPU("maincpu")
MCFG_UPD71071_CLOCK(4000000)
- MCFG_UPD71071_DMA_READ_0_CB(READ16(towns_state, towns_fdc_dma_r))
- MCFG_UPD71071_DMA_READ_1_CB(READ16(towns_state, towns_scsi_dma_r))
- MCFG_UPD71071_DMA_READ_3_CB(READ16(towns_state, towns_cdrom_dma_r))
- MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(towns_state, towns_fdc_dma_w))
- MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(towns_state, towns_scsi_dma_w))
+ MCFG_UPD71071_DMA_READ_0_CB(READ16(*this, towns_state, towns_fdc_dma_r))
+ MCFG_UPD71071_DMA_READ_1_CB(READ16(*this, towns_state, towns_scsi_dma_r))
+ MCFG_UPD71071_DMA_READ_3_CB(READ16(*this, towns_state, towns_cdrom_dma_r))
+ MCFG_UPD71071_DMA_WRITE_0_CB(WRITE16(*this, towns_state, towns_fdc_dma_w))
+ MCFG_UPD71071_DMA_WRITE_1_CB(WRITE16(*this, towns_state, towns_scsi_dma_w))
//MCFG_VIDEO_START_OVERRIDE(towns_state,towns)
MCFG_DEVICE_ADD("i8251", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(towns_state, towns_rxrdy_irq))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(towns_state, towns_txrdy_irq))
- MCFG_I8251_SYNDET_HANDLER(WRITELINE(towns_state, towns_syndet_irq))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232c", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232c", rs232_port_device, write_rts))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232c", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232c", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251",i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251",i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8251",i8251_device, write_cts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, towns_state, towns_rxrdy_irq))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, towns_state, towns_txrdy_irq))
+ MCFG_I8251_SYNDET_HANDLER(WRITELINE(*this, towns_state, towns_syndet_irq))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232c", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232c", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232c", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD("rs232c", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251",i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251",i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("i8251",i8251_device, write_cts))
MCFG_FMT_ICMEMCARD_ADD("icmemcard")
@@ -2893,11 +2893,11 @@ MACHINE_CONFIG_START(towns_state::towns_base)
MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,16M,32M,64M,96M")
MCFG_DEVICE_ADD("rtc58321", MSM58321, 32768_Hz_XTAL)
- MCFG_MSM58321_D0_HANDLER(WRITELINE(towns_state, rtc_d0_w))
- MCFG_MSM58321_D1_HANDLER(WRITELINE(towns_state, rtc_d1_w))
- MCFG_MSM58321_D2_HANDLER(WRITELINE(towns_state, rtc_d2_w))
- MCFG_MSM58321_D3_HANDLER(WRITELINE(towns_state, rtc_d3_w))
- MCFG_MSM58321_BUSY_HANDLER(WRITELINE(towns_state, rtc_busy_w))
+ MCFG_MSM58321_D0_HANDLER(WRITELINE(*this, towns_state, rtc_d0_w))
+ MCFG_MSM58321_D1_HANDLER(WRITELINE(*this, towns_state, rtc_d1_w))
+ MCFG_MSM58321_D2_HANDLER(WRITELINE(*this, towns_state, rtc_d2_w))
+ MCFG_MSM58321_D3_HANDLER(WRITELINE(*this, towns_state, rtc_d3_w))
+ MCFG_MSM58321_BUSY_HANDLER(WRITELINE(*this, towns_state, rtc_busy_w))
MCFG_MSM58321_YEAR0(2000)
MCFG_MSM58321_DEFAULT_24H(true)
MACHINE_CONFIG_END
@@ -2910,11 +2910,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(towns16_state::townsux)
towns_base(config);
- MCFG_CPU_REPLACE("maincpu",I386SX, 16000000)
- MCFG_CPU_PROGRAM_MAP(ux_mem)
- MCFG_CPU_IO_MAP(towns16_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",I386SX, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(ux_mem)
+ MCFG_DEVICE_IO_MAP(towns16_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -2926,11 +2926,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(towns_state::townssj)
towns(config);
- MCFG_CPU_REPLACE("maincpu",PENTIUM, 66000000)
- MCFG_CPU_PROGRAM_MAP(towns_mem)
- MCFG_CPU_IO_MAP(towns_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",PENTIUM, 66000000)
+ MCFG_DEVICE_PROGRAM_MAP(towns_mem)
+ MCFG_DEVICE_IO_MAP(towns_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("8M")
@@ -2939,11 +2939,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(towns_state::townshr)
towns(config);
- MCFG_CPU_REPLACE("maincpu",I486, 20000000)
- MCFG_CPU_PROGRAM_MAP(towns_mem)
- MCFG_CPU_IO_MAP(towns_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",I486, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(towns_mem)
+ MCFG_DEVICE_IO_MAP(towns_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -2952,11 +2952,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(towns_state::townsftv)
towns(config);
- MCFG_CPU_REPLACE("maincpu",I486, 33000000)
- MCFG_CPU_PROGRAM_MAP(towns_mem)
- MCFG_CPU_IO_MAP(towns_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",I486, 33000000)
+ MCFG_DEVICE_PROGRAM_MAP(towns_mem)
+ MCFG_DEVICE_IO_MAP(towns_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("6M")
@@ -2966,11 +2966,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(marty_state::marty)
towns_base(config);
- MCFG_CPU_REPLACE("maincpu",I386SX, 16000000)
- MCFG_CPU_PROGRAM_MAP(marty_mem)
- MCFG_CPU_IO_MAP(towns16_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",I386SX, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(marty_mem)
+ MCFG_DEVICE_IO_MAP(towns16_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", towns_state, towns_vsync_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("6M")
diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp
index c9a9f792010..6f7d5b9de44 100644
--- a/src/mame/drivers/fontwriter.cpp
+++ b/src/mame/drivers/fontwriter.cpp
@@ -92,9 +92,9 @@ static INPUT_PORTS_START( fontwriter )
INPUT_PORTS_END
MACHINE_CONFIG_START(fontwriter_state::fontwriter)
- MCFG_CPU_ADD("maincpu", M37720S1, XTAL(16'000'000)) /* M37720S1 @ 16MHz - main CPU */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", M37720S1, XTAL(16'000'000)) /* M37720S1 @ 16MHz - main CPU */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index 01bdbcce39b..d244df7e966 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -319,8 +319,8 @@ READ8_MEMBER(foodf_state::pot_r)
MACHINE_CONFIG_START(foodf_state::foodf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("adc", ADC0809, MASTER_CLOCK/16)
MCFG_ADC0808_IN0_CB(IOPORT("STICK1_Y"))
@@ -345,26 +345,26 @@ MACHINE_CONFIG_START(foodf_state::foodf)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 384, 0, 256, 259, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(foodf_state, screen_update_foodf)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(foodf_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, foodf_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/2/10)
- MCFG_POKEY_POT0_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT1_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT2_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT3_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT4_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT5_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT6_R_CB(READ8(foodf_state, pot_r))
- MCFG_POKEY_POT7_R_CB(READ8(foodf_state, pot_r))
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK/2/10)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, foodf_state, pot_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, foodf_state, pot_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/2/10)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK/2/10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK/2/10)
+ MCFG_DEVICE_ADD("pokey3", POKEY, MASTER_CLOCK/2/10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp
index b5326076d1c..4935d704917 100644
--- a/src/mame/drivers/force68k.cpp
+++ b/src/mame/drivers/force68k.cpp
@@ -539,8 +539,8 @@ static void fccpu1_vme_cards(device_slot_interface &device)
*/
MACHINE_CONFIG_START(force68k_state::fccpu1)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP (force68k_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP (force68k_mem)
/* P3/Host Port config
* LO command causes ROM monitor to expect S-records on HOST port by default
@@ -550,52 +550,52 @@ MACHINE_CONFIG_START(force68k_state::fccpu1)
*/
MCFG_DEVICE_ADD ("aciahost", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER (DEVWRITELINE ("rs232host", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER (DEVWRITELINE ("rs232host", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER (WRITELINE ("rs232host", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER (WRITELINE ("rs232host", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD ("rs232host", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("aciahost", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("aciahost", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD ("rs232host", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("aciahost", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("aciahost", acia6850_device, write_cts))
/* P4/Terminal Port config */
MCFG_DEVICE_ADD ("aciaterm", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER (DEVWRITELINE ("rs232trm", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER (DEVWRITELINE ("rs232trm", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER (WRITELINE ("rs232trm", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER (WRITELINE ("rs232trm", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("aciaterm", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("aciaterm", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD ("rs232trm", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("aciaterm", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("aciaterm", acia6850_device, write_cts))
/* P5/Remote Port config */
MCFG_DEVICE_ADD ("aciaremt", ACIA6850, 0)
/* Bit Rate Generator */
MCFG_MC14411_ADD ("brg", XTAL(1'843'200))
- MCFG_MC14411_F1_CB(WRITELINE (force68k_state, write_f1_clock))
- MCFG_MC14411_F3_CB(WRITELINE (force68k_state, write_f3_clock))
- MCFG_MC14411_F5_CB(WRITELINE (force68k_state, write_f5_clock))
- MCFG_MC14411_F7_CB(WRITELINE (force68k_state, write_f7_clock))
- MCFG_MC14411_F8_CB(WRITELINE (force68k_state, write_f8_clock))
- MCFG_MC14411_F9_CB(WRITELINE (force68k_state, write_f9_clock))
- MCFG_MC14411_F11_CB(WRITELINE (force68k_state, write_f11_clock))
- MCFG_MC14411_F13_CB(WRITELINE (force68k_state, write_f13_clock))
- MCFG_MC14411_F15_CB(WRITELINE (force68k_state, write_f15_clock))
+ MCFG_MC14411_F1_CB(WRITELINE (*this, force68k_state, write_f1_clock))
+ MCFG_MC14411_F3_CB(WRITELINE (*this, force68k_state, write_f3_clock))
+ MCFG_MC14411_F5_CB(WRITELINE (*this, force68k_state, write_f5_clock))
+ MCFG_MC14411_F7_CB(WRITELINE (*this, force68k_state, write_f7_clock))
+ MCFG_MC14411_F8_CB(WRITELINE (*this, force68k_state, write_f8_clock))
+ MCFG_MC14411_F9_CB(WRITELINE (*this, force68k_state, write_f9_clock))
+ MCFG_MC14411_F11_CB(WRITELINE (*this, force68k_state, write_f11_clock))
+ MCFG_MC14411_F13_CB(WRITELINE (*this, force68k_state, write_f13_clock))
+ MCFG_MC14411_F15_CB(WRITELINE (*this, force68k_state, write_f15_clock))
/* RTC Real Time Clock device */
MCFG_DEVICE_ADD ("rtc", MM58167, XTAL(32'768))
/* PIT Parallel Interface and Timer device, assuming strapped for on board clock */
MCFG_DEVICE_ADD ("pit", PIT68230, XTAL(16'000'000) / 2)
- MCFG_PIT68230_PA_OUTPUT_CB (DEVWRITE8 ("cent_data_out", output_latch_device, write))
- MCFG_PIT68230_H2_CB (DEVWRITELINE ("centronics", centronics_device, write_strobe))
+ MCFG_PIT68230_PA_OUTPUT_CB (WRITE8 ("cent_data_out", output_latch_device, write))
+ MCFG_PIT68230_H2_CB (WRITELINE ("centronics", centronics_device, write_strobe))
// Centronics
MCFG_CENTRONICS_ADD ("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER (WRITELINE (force68k_state, centronics_ack_w))
- MCFG_CENTRONICS_BUSY_HANDLER (WRITELINE (force68k_state, centronics_busy_w))
- MCFG_CENTRONICS_PERROR_HANDLER (WRITELINE (force68k_state, centronics_perror_w))
- MCFG_CENTRONICS_SELECT_HANDLER (WRITELINE (force68k_state, centronics_select_w))
+ MCFG_CENTRONICS_ACK_HANDLER (WRITELINE (*this, force68k_state, centronics_ack_w))
+ MCFG_CENTRONICS_BUSY_HANDLER (WRITELINE (*this, force68k_state, centronics_busy_w))
+ MCFG_CENTRONICS_PERROR_HANDLER (WRITELINE (*this, force68k_state, centronics_perror_w))
+ MCFG_CENTRONICS_SELECT_HANDLER (WRITELINE (*this, force68k_state, centronics_select_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD ("cent_data_out", "centronics")
// EPROM sockets
@@ -611,28 +611,28 @@ MACHINE_CONFIG_END
* such as an optional 68881 FPU
*/
MACHINE_CONFIG_START (force68k_state::fccpu6)
- MCFG_CPU_ADD ("maincpu", M68000, XTAL(8'000'000)) /* Jumper B10 Mode B */
- MCFG_CPU_PROGRAM_MAP (force68k_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68000, XTAL(8'000'000)) /* Jumper B10 Mode B */
+ MCFG_DEVICE_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6a)
- MCFG_CPU_ADD ("maincpu", M68000, XTAL(12'500'000)) /* Jumper B10 Mode A */
- MCFG_CPU_PROGRAM_MAP (force68k_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68000, XTAL(12'500'000)) /* Jumper B10 Mode A */
+ MCFG_DEVICE_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6v)
- MCFG_CPU_ADD ("maincpu", M68010, XTAL(8'000'000)) /* Jumper B10 Mode B */
- MCFG_CPU_PROGRAM_MAP (force68k_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68010, XTAL(8'000'000)) /* Jumper B10 Mode B */
+ MCFG_DEVICE_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6va)
- MCFG_CPU_ADD ("maincpu", M68010, XTAL(12'500'000)) /* Jumper B10 Mode A */
- MCFG_CPU_PROGRAM_MAP (force68k_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68010, XTAL(12'500'000)) /* Jumper B10 Mode A */
+ MCFG_DEVICE_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START (force68k_state::fccpu6vb)
- MCFG_CPU_ADD ("maincpu", M68010, XTAL(12'500'000)) /* Jumper B10 Mode A */
- MCFG_CPU_PROGRAM_MAP (force68k_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68010, XTAL(12'500'000)) /* Jumper B10 Mode A */
+ MCFG_DEVICE_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp
index ef45477609c..de3718fd86e 100644
--- a/src/mame/drivers/forte2.cpp
+++ b/src/mame/drivers/forte2.cpp
@@ -129,9 +129,9 @@ void forte2_state::machine_start()
MACHINE_CONFIG_START(forte2_state::pesadelo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(program_mem)
- MCFG_CPU_IO_MAP(io_mem)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(program_mem)
+ MCFG_DEVICE_IO_MAP(io_mem)
/* video hardware */
MCFG_DEVICE_ADD("tms9928a", TMS9928A, XTAL(10'738'635)/2)
@@ -142,9 +142,9 @@ MACHINE_CONFIG_START(forte2_state::pesadelo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545)/2)
- MCFG_AY8910_PORT_A_READ_CB(READ8(forte2_state, forte2_ay8910_read_input))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(forte2_state, forte2_ay8910_set_input_mask))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(3'579'545)/2)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, forte2_state, forte2_ay8910_read_input))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, forte2_state, forte2_ay8910_set_input_mask))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index 2c11341325d..d91c84a6e86 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -682,9 +682,9 @@ void fortecar_state::machine_reset()
MACHINE_CONFIG_START(fortecar_state::fortecar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz, measured */
- MCFG_CPU_PROGRAM_MAP(fortecar_map)
- MCFG_CPU_IO_MAP(fortecar_ports)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz, measured */
+ MCFG_DEVICE_PROGRAM_MAP(fortecar_map)
+ MCFG_DEVICE_IO_MAP(fortecar_ports)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(200)) /* guess */
@@ -708,8 +708,8 @@ MACHINE_CONFIG_START(fortecar_state::fortecar)
Serial Eprom connected to Port C */
MCFG_I8255_IN_PORTA_CB(IOPORT("SYSTEM"))
MCFG_I8255_IN_PORTB_CB(IOPORT("INPUT"))
- MCFG_I8255_IN_PORTC_CB(READ8(fortecar_state, ppi0_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(fortecar_state, ppi0_portc_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, fortecar_state, ppi0_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fortecar_state, ppi0_portc_w))
MCFG_V3021_ADD("rtc")
@@ -724,9 +724,9 @@ MACHINE_CONFIG_START(fortecar_state::fortecar)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK) /* 1.5 MHz, measured */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fortecar_state, ayporta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(fortecar_state, ayportb_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK) /* 1.5 MHz, measured */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, fortecar_state, ayporta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, fortecar_state, ayportb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index 245c6aa0e67..2b66f76767d 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -634,19 +634,19 @@ DRIVER_INIT_MEMBER( fp1100_state, fp1100 )
MACHINE_CONFIG_START(fp1100_state::fp1100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fp1100_state, vblank_irq)
-
- MCFG_CPU_ADD( "sub", UPD7801, MAIN_CLOCK/4 )
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(fp1100_state, porta_w))
- MCFG_UPD7810_PORTB_READ_CB(READ8(fp1100_state, portb_r))
- MCFG_UPD7810_PORTB_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_UPD7810_PORTC_READ_CB(READ8(fp1100_state, portc_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(fp1100_state, portc_w))
- MCFG_UPD7810_TXD(WRITELINE(fp1100_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fp1100_state, vblank_irq)
+
+ MCFG_DEVICE_ADD( "sub", UPD7801, MAIN_CLOCK/4 )
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, fp1100_state, porta_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, fp1100_state, portb_r))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, fp1100_state, portc_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, fp1100_state, portc_w))
+ MCFG_UPD7810_TXD(WRITELINE(*this, fp1100_state, cass_w))
MCFG_MACHINE_RESET_OVERRIDE(fp1100_state, fp1100)
@@ -662,7 +662,7 @@ MACHINE_CONFIG_START(fp1100_state::fp1100)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) // guess
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) // inside the keyboard
/* CRTC */
@@ -673,7 +673,7 @@ MACHINE_CONFIG_START(fp1100_state::fp1100)
/* Printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(fp1100_state, centronics_busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, fp1100_state, centronics_busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* Cassette */
diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp
index 95bd0f0bce6..7004b6547a6 100644
--- a/src/mame/drivers/fp200.cpp
+++ b/src/mame/drivers/fp200.cpp
@@ -587,11 +587,11 @@ READ_LINE_MEMBER( fp200_state::sid_r )
MACHINE_CONFIG_START(fp200_state::fp200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(fp200_map)
- MCFG_CPU_IO_MAP(fp200_io)
- MCFG_I8085A_SID(READLINE(fp200_state, sid_r))
- MCFG_I8085A_SOD(WRITELINE(fp200_state, sod_w))
+ MCFG_DEVICE_ADD("maincpu",I8085A,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(fp200_map)
+ MCFG_DEVICE_IO_MAP(fp200_io)
+ MCFG_I8085A_SID(READLINE(*this, fp200_state, sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, fp200_state, sod_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -609,7 +609,7 @@ MACHINE_CONFIG_START(fp200_state::fp200)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp
index 35d3ba0912a..ca7bd69c702 100644
--- a/src/mame/drivers/fp6000.cpp
+++ b/src/mame/drivers/fp6000.cpp
@@ -296,9 +296,9 @@ void fp6000_state::machine_reset()
MACHINE_CONFIG_START(fp6000_state::fp6000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 16000000/2)
- MCFG_CPU_PROGRAM_MAP(fp6000_map)
- MCFG_CPU_IO_MAP(fp6000_io)
+ MCFG_DEVICE_ADD("maincpu", I8086, 16000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(fp6000_map)
+ MCFG_DEVICE_IO_MAP(fp6000_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp
index 2c10ba20c7a..416e2284ec1 100644
--- a/src/mame/drivers/freekick.cpp
+++ b/src/mame/drivers/freekick.cpp
@@ -732,17 +732,17 @@ MACHINE_RESET_MEMBER(freekick_state,oigas)
}
MACHINE_CONFIG_START(freekick_state::omega)
- MCFG_CPU_ADD("maincpu", MC8123, XTAL(18'432'000)/6) // unknown divisor
- MCFG_CPU_PROGRAM_MAP(omega_map)
- MCFG_CPU_IO_MAP(omega_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
+ MCFG_DEVICE_ADD("maincpu", MC8123, XTAL(18'432'000)/6) // unknown divisor
+ MCFG_DEVICE_PROGRAM_MAP(omega_map)
+ MCFG_DEVICE_IO_MAP(omega_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 3M
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(freekick_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(freekick_state, coin1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(freekick_state, coin2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(freekick_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, freekick_state, coin1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, freekick_state, coin2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, freekick_state, nmi_enable_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ???
// video hardware
@@ -750,7 +750,7 @@ MACHINE_CONFIG_START(freekick_state::omega)
MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/3, 768/2, 0, 512/2, 263, 0+16, 224+16) // unknown divisor
MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_gigas)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(freekick_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, freekick_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", freekick)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x200)
@@ -758,37 +758,37 @@ MACHINE_CONFIG_START(freekick_state::omega)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL(18'432'000)/6) // unknown divisor
+ MCFG_DEVICE_ADD("sn1", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL(18'432'000)/6) // unknown divisor
+ MCFG_DEVICE_ADD("sn2", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489A, XTAL(18'432'000)/6) // unknown divisor
+ MCFG_DEVICE_ADD("sn3", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn4", SN76489A, XTAL(18'432'000)/6) // unknown divisor
+ MCFG_DEVICE_ADD("sn4", SN76489A, XTAL(18'432'000)/6) // unknown divisor
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(freekick_state::base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(pbillrd_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(pbillrd_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(freekick_state, coin1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(freekick_state, coin2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(freekick_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, freekick_state, coin1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, freekick_state, coin2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, freekick_state, nmi_enable_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 768/2, 0, 512/2, 263, 0+16, 224+16)
MCFG_SCREEN_UPDATE_DRIVER(freekick_state, screen_update_pbillrd)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(freekick_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, freekick_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", freekick)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x200)
@@ -796,24 +796,24 @@ MACHINE_CONFIG_START(freekick_state::base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("sn1", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("sn2", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489A, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("sn3", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn4", SN76489A, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("sn4", SN76489A, XTAL(12'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(freekick_state::pbillrd)
base(config);
MCFG_DEVICE_MODIFY("outlatch") // 10K
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(freekick_state, flipscreen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(freekick_state, flipscreen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_y_w))
/* flip Y/X could be the other way round... */
MCFG_MACHINE_START_OVERRIDE(freekick_state,pbillrd)
@@ -822,31 +822,31 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(freekick_state::pbillrdm)
pbillrd(config);
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(12'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(pbillrd_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, XTAL(12'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(pbillrd_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
MACHINE_CONFIG_END
MACHINE_CONFIG_START(freekick_state::freekick)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(freekick_map)
- MCFG_CPU_IO_MAP(freekick_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(freekick_map)
+ MCFG_DEVICE_IO_MAP(freekick_io_map)
MCFG_DEVICE_MODIFY("outlatch") // 5C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(freekick_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(freekick_state, spinner_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, freekick_state, spinner_select_w))
MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick)
MCFG_MACHINE_RESET_OVERRIDE(freekick_state,freekick)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(freekick_state, snd_rom_addr_l_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(freekick_state, snd_rom_addr_h_w))
- MCFG_I8255_IN_PORTC_CB(READ8(freekick_state, snd_rom_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, freekick_state, snd_rom_addr_l_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, freekick_state, snd_rom_addr_h_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, freekick_state, snd_rom_r))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW1"))
@@ -862,13 +862,13 @@ MACHINE_CONFIG_START(freekick_state::gigas)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gigas_map)
- MCFG_CPU_IO_MAP(gigas_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gigas_map)
+ MCFG_DEVICE_IO_MAP(gigas_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(freekick_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ???
MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick)
@@ -883,14 +883,14 @@ MACHINE_CONFIG_START(freekick_state::gigasm)
base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(12'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(gigas_map)
- MCFG_CPU_IO_MAP(gigas_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, XTAL(12'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(gigas_map)
+ MCFG_DEVICE_IO_MAP(gigas_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(freekick_state, irq0_line_hold, 120) // measured on PCB
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(freekick_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, freekick_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // ???
MCFG_MACHINE_START_OVERRIDE(freekick_state,freekick)
@@ -905,8 +905,8 @@ MACHINE_CONFIG_START(freekick_state::oigas)
gigas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(oigas_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(oigas_io_map)
MCFG_MACHINE_START_OVERRIDE(freekick_state,oigas)
MCFG_MACHINE_RESET_OVERRIDE(freekick_state,oigas)
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index 7f54deced29..c048d289a2f 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -596,8 +596,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(fresh_state::fake_scanline)
MACHINE_CONFIG_START(fresh_state::fresh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24000000/2 )
- MCFG_CPU_PROGRAM_MAP(fresh_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24000000/2 )
+ MCFG_DEVICE_PROGRAM_MAP(fresh_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", fresh_state, fake_scanline, "screen", 0, 1)
/* video hardware */
@@ -617,7 +617,7 @@ MACHINE_CONFIG_START(fresh_state::fresh)
/* sound hw? */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 4000000) // actual clock and type unknown
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 4000000) // actual clock and type unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp
index cd3d0ebaa06..08e79bbc1db 100644
--- a/src/mame/drivers/fromanc2.cpp
+++ b/src/mame/drivers/fromanc2.cpp
@@ -504,17 +504,17 @@ void fromanc2_state::machine_reset()
MACHINE_CONFIG_START(fromanc2_state::fromanc2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc2_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", fromanc2_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc2_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", fromanc2_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
- MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc2_sound_map)
+ MCFG_DEVICE_IO_MAP(fromanc2_sound_io_map)
- MCFG_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc2_sub_map)
- MCFG_CPU_IO_MAP(fromanc2_sub_io_map)
+ MCFG_DEVICE_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc2_sub_map)
+ MCFG_DEVICE_IO_MAP(fromanc2_sub_io_map)
MCFG_MACHINE_START_OVERRIDE(fromanc2_state,fromanc2)
@@ -554,7 +554,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.75)
@@ -564,17 +564,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromanc2_state::fromancr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromancr_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", fromanc2_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromancr_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", fromanc2_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
- MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc2_sound_map)
+ MCFG_DEVICE_IO_MAP(fromanc2_sound_io_map)
- MCFG_CPU_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc2_sub_map)
- MCFG_CPU_IO_MAP(fromanc2_sub_io_map)
+ MCFG_DEVICE_ADD("sub", Z80,32000000/4) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc2_sub_map)
+ MCFG_DEVICE_IO_MAP(fromanc2_sub_io_map)
MCFG_MACHINE_START_OVERRIDE(fromanc2_state,fromanc2)
@@ -614,7 +614,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromancr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.75)
@@ -624,13 +624,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromanc2_state::fromanc4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc4_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", fromanc2_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc4_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", fromanc2_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(fromanc2_sound_map)
- MCFG_CPU_IO_MAP(fromanc2_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/4) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fromanc2_sound_map)
+ MCFG_DEVICE_IO_MAP(fromanc2_sound_io_map)
MCFG_MACHINE_START_OVERRIDE(fromanc2_state,fromanc4)
@@ -638,8 +638,8 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc4)
MCFG_DEVICE_ADD("uart", NS16550, 2000000) // actual type is TL16C550CFN; clock unknown
MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_2))
- //MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("link", rs232_port_device, write_txd))
- //MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("link", rs232_port_device, write_rts))
+ //MCFG_INS8250_OUT_TX_CB(WRITELINE("link", rs232_port_device, write_txd))
+ //MCFG_INS8250_OUT_RTS_CB(WRITELINE("link", rs232_port_device, write_rts))
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "lpalette", fromancr)
@@ -675,7 +675,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc4)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.75)
diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp
index 1e0552d506a..573addc3263 100644
--- a/src/mame/drivers/fromance.cpp
+++ b/src/mame/drivers/fromance.cpp
@@ -903,13 +903,13 @@ MACHINE_RESET_MEMBER(fromance_state,fromance)
MACHINE_CONFIG_START(fromance_state::nekkyoku)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
- MCFG_CPU_PROGRAM_MAP(nekkyoku_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_DEVICE_PROGRAM_MAP(nekkyoku_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
- MCFG_CPU_PROGRAM_MAP(nekkyoku_sub_map)
- MCFG_CPU_IO_MAP(nekkyoku_sub_io_map)
+ MCFG_DEVICE_ADD("sub", Z80,12000000/2) /* 6.00 Mhz ? */
+ MCFG_DEVICE_PROGRAM_MAP(nekkyoku_sub_map)
+ MCFG_DEVICE_IO_MAP(nekkyoku_sub_io_map)
MCFG_GENERIC_LATCH_8_ADD("sublatch")
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
@@ -929,18 +929,18 @@ MACHINE_CONFIG_START(fromance_state::nekkyoku)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, 14318180 / 2) // clock not verified
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(fromance_state,nekkyoku)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 12000000/6) // type not verified
+ MCFG_DEVICE_ADD("aysnd", AY8910, 12000000/6) // type not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fromance_state, fromance_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fromance_state, fromance_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -949,13 +949,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromance_state::idolmj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
- MCFG_CPU_PROGRAM_MAP(fromance_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
+ MCFG_DEVICE_PROGRAM_MAP(fromance_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
- MCFG_CPU_PROGRAM_MAP(fromance_sub_map)
- MCFG_CPU_IO_MAP(idolmj_sub_io_map)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
+ MCFG_DEVICE_PROGRAM_MAP(fromance_sub_map)
+ MCFG_DEVICE_IO_MAP(idolmj_sub_io_map)
MCFG_GENERIC_LATCH_8_ADD("sublatch")
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
@@ -975,18 +975,18 @@ MACHINE_CONFIG_START(fromance_state::idolmj)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(fromance_state,fromance)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(12'000'000) / 6)
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(12'000'000) / 6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fromance_state, fromance_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fromance_state, fromance_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -995,13 +995,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fromance_state::fromance)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
- MCFG_CPU_PROGRAM_MAP(fromance_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
+ MCFG_DEVICE_PROGRAM_MAP(fromance_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fromance_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
- MCFG_CPU_PROGRAM_MAP(fromance_sub_map)
- MCFG_CPU_IO_MAP(fromance_sub_io_map)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(12'000'000) / 2) /* 6.00 Mhz ? */
+ MCFG_DEVICE_PROGRAM_MAP(fromance_sub_map)
+ MCFG_DEVICE_IO_MAP(fromance_sub_io_map)
MCFG_GENERIC_LATCH_8_ADD("sublatch")
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
@@ -1021,18 +1021,18 @@ MACHINE_CONFIG_START(fromance_state::fromance)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(fromance_state,fromance)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(fromance_state, fromance_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, fromance_state, fromance_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp
index 1fa08be7216..65d5da45714 100644
--- a/src/mame/drivers/fruitpc.cpp
+++ b/src/mame/drivers/fruitpc.cpp
@@ -131,35 +131,36 @@ void fruitpc_state::fruitpc_sb_conf(device_t *device)
}
MACHINE_CONFIG_START(fruitpc_state::fruitpc)
- MCFG_CPU_ADD("maincpu", I486, 66000000) // ST STPCD0166BTC3 66 MHz 486 CPU
- MCFG_CPU_PROGRAM_MAP(fruitpc_map)
- MCFG_CPU_IO_MAP(fruitpc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486, 66000000) // ST STPCD0166BTC3 66 MHz 486 CPU
+ MCFG_DEVICE_PROGRAM_MAP(fruitpc_map)
+ MCFG_DEVICE_IO_MAP(fruitpc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
/* video hardware */
pcvideo_vga(config);
MCFG_DEVICE_MODIFY("dma8237_1")
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(fruitpc_state, dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, fruitpc_state, dma8237_1_dack_w))
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_2", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
-
- MCFG_ISA8_SLOT_ADD("isa", "isa1", fruitpc_isa8_cards, "sb15", true)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259_2", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259_1", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259_1", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259_1", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259_1", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237_1", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237_1", am9517a_device, dreq3_w))
+
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", fruitpc_isa8_cards, "sb15", true)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("sb15", fruitpc_sb_def)
MCFG_SLOT_OPTION_MACHINE_CONFIG("sb15", fruitpc_sb_conf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp
index 21ba93db585..8285b2953cb 100644
--- a/src/mame/drivers/ft68m.cpp
+++ b/src/mame/drivers/ft68m.cpp
@@ -84,31 +84,31 @@ void ft68m_state::machine_reset()
MACHINE_CONFIG_START(ft68m_state::ft68m)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(19'660'800) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(19'660'800) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, 0)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_5))
MCFG_DEVICE_ADD("stc", AM9513A, XTAL(19'660'800) / 8)
MCFG_AM9513_OUT2_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_6))
MCFG_AM9513_OUT3_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7))
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("mpsc", upd7201_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mpsc", upd7201_new_device, txca_w))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("mpsc", upd7201_new_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mpsc", upd7201_new_device, txcb_w))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, rxa_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, rxb_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("mpsc", upd7201_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mpsc", upd7201_new_device, txca_w))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("mpsc", upd7201_new_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mpsc", upd7201_new_device, txcb_w))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxa_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("mpsc", upd7201_new_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp
index 40a9f166d05..6964aeb0cc0 100644
--- a/src/mame/drivers/funkball.cpp
+++ b/src/mame/drivers/funkball.cpp
@@ -770,10 +770,10 @@ void funkball_state::machine_reset()
}
MACHINE_CONFIG_START(funkball_state::funkball)
- MCFG_CPU_ADD("maincpu", MEDIAGX, 66666666*3.5) // 66,6 MHz x 3.5
- MCFG_CPU_PROGRAM_MAP(funkball_map)
- MCFG_CPU_IO_MAP(funkball_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", MEDIAGX, 66666666*3.5) // 66,6 MHz x 3.5
+ MCFG_DEVICE_PROGRAM_MAP(funkball_map)
+ MCFG_DEVICE_IO_MAP(funkball_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
@@ -782,7 +782,7 @@ MACHINE_CONFIG_START(funkball_state::funkball)
MCFG_PCI_BUS_LEGACY_DEVICE(18, DEVICE_SELF, funkball_state, cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_DEVICE_ADD("flashbank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(flashbank_map)
diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp
index ac8ed42e1a0..81a98931029 100644
--- a/src/mame/drivers/funkybee.cpp
+++ b/src/mame/drivers/funkybee.cpp
@@ -288,16 +288,16 @@ void funkybee_state::machine_start()
MACHINE_CONFIG_START(funkybee_state::funkybee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(funkybee_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", funkybee_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(funkybee_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", funkybee_state, irq0_line_hold)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(funkybee_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(funkybee_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(funkybee_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(funkybee_state, gfx_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, funkybee_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, funkybee_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, funkybee_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, funkybee_state, gfx_bank_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -317,7 +317,7 @@ MACHINE_CONFIG_START(funkybee_state::funkybee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 1500000) // AY-3-8912 verified for Sky Lancer
+ MCFG_DEVICE_ADD("aysnd", AY8912, 1500000) // AY-3-8912 verified for Sky Lancer
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp
index e29ccfe8082..225e1a0102c 100644
--- a/src/mame/drivers/funkyjet.cpp
+++ b/src/mame/drivers/funkyjet.cpp
@@ -314,12 +314,12 @@ void funkyjet_state::machine_start()
MACHINE_CONFIG_START(funkyjet_state::funkyjet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* 28 MHz crystal */
- MCFG_CPU_PROGRAM_MAP(funkyjet_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", funkyjet_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000)/2) /* 28 MHz crystal */
+ MCFG_DEVICE_PROGRAM_MAP(funkyjet_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", funkyjet_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000)/4) /* Custom chip 45, Audio section crystal is 32.220 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp
index 71ad35418fb..8595f7bf7c9 100644
--- a/src/mame/drivers/funtech.cpp
+++ b/src/mame/drivers/funtech.cpp
@@ -488,10 +488,10 @@ void fun_tech_corp_state::machine_start()
MACHINE_CONFIG_START(fun_tech_corp_state::funtech)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(funtech_map)
- MCFG_CPU_IO_MAP(funtech_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", fun_tech_corp_state, vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(funtech_map)
+ MCFG_DEVICE_IO_MAP(funtech_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", fun_tech_corp_state, vblank_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -513,7 +513,7 @@ MACHINE_CONFIG_START(fun_tech_corp_state::funtech)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000) /* M5255, ? MHz */
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000) /* M5255, ? MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index 4c7880f1727..4a9cc36e3a9 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -3066,8 +3066,8 @@ MACHINE_RESET_MEMBER(funworld_state, lunapark)
MACHINE_CONFIG_START(funworld_state::fw1stpal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(funworld_map)
+ MCFG_DEVICE_ADD("maincpu", M65SC02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(funworld_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3078,7 +3078,7 @@ MACHINE_CONFIG_START(funworld_state::fw1stpal)
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
MCFG_PIA_READPB_HANDLER(IOPORT("DSW"))
- MCFG_PIA_CA2_HANDLER(WRITELINE(funworld_state, pia1_ca2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, funworld_state, pia1_ca2_w))
/* video hardware */
@@ -3104,17 +3104,17 @@ MACHINE_CONFIG_START(funworld_state::fw1stpal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, SND_CLOCK) /* 2MHz */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(funworld_state, funworld_lamp_a_w)) /* portA out */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(funworld_state, funworld_lamp_b_w)) /* portB out */
+ MCFG_DEVICE_ADD("ay8910", AY8910, SND_CLOCK) /* 2MHz */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, funworld_state, funworld_lamp_a_w)) /* portA out */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, funworld_state, funworld_lamp_b_w)) /* portB out */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5) /* analyzed to avoid clips */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::fw2ndpal)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(funworld_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(funworld_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", fw2ndpal)
MACHINE_CONFIG_END
@@ -3123,21 +3123,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::funquiz)
fw1stpal(config);
// fw2ndpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(funquiz_map)
- MCFG_SOUND_REPLACE("ay8910", AY8910, SND_CLOCK) /* 2MHz */
- MCFG_AY8910_PORT_A_READ_CB(READ8(funworld_state, funquiz_ay8910_a_r)) /* portA in */
- MCFG_AY8910_PORT_B_READ_CB(READ8(funworld_state, funquiz_ay8910_b_r)) /* portB in */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(funworld_state, funworld_lamp_a_w)) /* portA out */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(funworld_state, funworld_lamp_b_w)) /* portB out */
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(funquiz_map)
+ MCFG_DEVICE_REPLACE("ay8910", AY8910, SND_CLOCK) /* 2MHz */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, funworld_state, funquiz_ay8910_a_r)) /* portA in */
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, funworld_state, funquiz_ay8910_b_r)) /* portB in */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, funworld_state, funworld_lamp_a_w)) /* portA out */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, funworld_state, funworld_lamp_b_w)) /* portB out */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::magicrd2)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(magicrd2_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magicrd2_map)
MCFG_VIDEO_START_OVERRIDE(funworld_state, magicrd2)
MCFG_DEVICE_REMOVE("crtc")
@@ -3147,52 +3147,52 @@ MACHINE_CONFIG_START(funworld_state::magicrd2)
MCFG_MC6845_CHAR_WIDTH(4)
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_SOUND_REPLACE("ay8910", AY8910, SND_CLOCK) /* 2MHz */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(funworld_state, funworld_lamp_a_w)) /* portA out */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(funworld_state, funworld_lamp_b_w)) /* portB out */
+ MCFG_DEVICE_REPLACE("ay8910", AY8910, SND_CLOCK) /* 2MHz */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, funworld_state, funworld_lamp_a_w)) /* portA out */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, funworld_state, funworld_lamp_b_w)) /* portB out */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.5) /* analyzed to avoid clips */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::royalcd1)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* (G65SC02P in pro version) 2MHz */
- MCFG_CPU_PROGRAM_MAP(magicrd2_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* (G65SC02P in pro version) 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magicrd2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::royalcd2)
fw2ndpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(magicrd2_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magicrd2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::cuoreuno)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(cuoreuno_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cuoreuno_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::saloon)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(saloon_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(saloon_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::witchryl)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(witchryl_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(witchryl_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::lunapark)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000).
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(lunapark_map) // mirrored video RAM (4000/5000 to 6000/7000).
MCFG_MACHINE_START_OVERRIDE(funworld_state, lunapark)
MCFG_MACHINE_RESET_OVERRIDE(funworld_state, lunapark)
MACHINE_CONFIG_END
@@ -3200,31 +3200,31 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::chinatow)
fw2ndpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(chinatow_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(chinatow_map)
MCFG_VIDEO_START_OVERRIDE(funworld_state, chinatow)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::rcdino4)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(chinatow_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(chinatow_map)
MCFG_VIDEO_START_OVERRIDE(funworld_state, chinatow)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::intrgmes)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(intergames_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(intergames_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", fw2ndpal)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(funworld_state::fw_a7_11)
fw1stpal(config);
- MCFG_CPU_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(fw_a7_11_map)
+ MCFG_DEVICE_REPLACE("maincpu", R65C02, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fw_a7_11_map)
// MCFG_GFXDECODE_MODIFY("gfxdecode", fw2ndpal)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp
index 3b004a800ff..a6fb7620706 100644
--- a/src/mame/drivers/funybubl.cpp
+++ b/src/mame/drivers/funybubl.cpp
@@ -222,13 +222,13 @@ void funybubl_state::machine_start()
MACHINE_CONFIG_START(funybubl_state::funybubl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */
- MCFG_CPU_PROGRAM_MAP(funybubl_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", funybubl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */
+ MCFG_DEVICE_PROGRAM_MAP(funybubl_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", funybubl_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz?? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2) /* 4 MHz?? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp
index e87616cf371..6b47040c9f0 100644
--- a/src/mame/drivers/fuukifg2.cpp
+++ b/src/mame/drivers/fuukifg2.cpp
@@ -444,12 +444,12 @@ void fuuki16_state::machine_reset()
MACHINE_CONFIG_START(fuuki16_state::fuuki16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(fuuki16_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000) / 2) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fuuki16_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000) / 2) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(fuuki16_sound_map)
- MCFG_CPU_IO_MAP(fuuki16_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000) / 2) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fuuki16_sound_map)
+ MCFG_DEVICE_IO_MAP(fuuki16_sound_io_map)
/* video hardware */
@@ -472,11 +472,11 @@ MACHINE_CONFIG_START(fuuki16_state::fuuki16)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(28'640'000) / 8) /* 3.58 MHz */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(28'640'000) / 8) /* 3.58 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.15)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL(28'640'000) / 8) /* 3.58 MHz */
+ MCFG_DEVICE_ADD("ym2", YM3812, XTAL(28'640'000) / 8) /* 3.58 MHz */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp
index 1acf7c7ef50..ef66a2e6d08 100644
--- a/src/mame/drivers/fuukifg3.cpp
+++ b/src/mame/drivers/fuukifg3.cpp
@@ -552,12 +552,12 @@ void fuuki32_state::machine_reset()
MACHINE_CONFIG_START(fuuki32_state::fuuki32)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */
- MCFG_CPU_PROGRAM_MAP(fuuki32_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(fuuki32_map)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */
- MCFG_CPU_PROGRAM_MAP(fuuki32_sound_map)
- MCFG_CPU_IO_MAP(fuuki32_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(fuuki32_sound_map)
+ MCFG_DEVICE_IO_MAP(fuuki32_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -565,7 +565,7 @@ MACHINE_CONFIG_START(fuuki32_state::fuuki32)
MCFG_SCREEN_SIZE(64 * 8, 32 * 8)
MCFG_SCREEN_VISIBLE_AREA(0, 40 * 8 - 1, 0, 30 * 8 - 1)
MCFG_SCREEN_UPDATE_DRIVER(fuuki32_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(fuuki32_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, fuuki32_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fuuki32)
@@ -578,7 +578,7 @@ MACHINE_CONFIG_START(fuuki32_state::fuuki32)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf1", YMF278B, YMF278B_STD_CLOCK) // 33.8688MHz
+ MCFG_DEVICE_ADD("ymf1", YMF278B, YMF278B_STD_CLOCK) // 33.8688MHz
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp
index 6bdf1ffaf1e..172e4167a25 100644
--- a/src/mame/drivers/g627.cpp
+++ b/src/mame/drivers/g627.cpp
@@ -296,14 +296,14 @@ WRITE8_MEMBER( g627_state::lamp_w )
MACHINE_CONFIG_START(g627_state::g627)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 14138000/8)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 14138000/8)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("i8156", I8156, 14138000/8)
- MCFG_I8155_IN_PORTA_CB(READ8(g627_state, porta_r))
- MCFG_I8155_IN_PORTB_CB(READ8(g627_state, portb_r))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(g627_state, portc_w))
+ MCFG_I8155_IN_PORTA_CB(READ8(*this, g627_state, porta_r))
+ MCFG_I8155_IN_PORTB_CB(READ8(*this, g627_state, portb_r))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, g627_state, portc_w))
MCFG_I8155_OUT_TIMEROUT_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(g627_state::g627)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("astrocade", ASTROCADE, 14138000/8) // 0066-117XX audio chip
+ MCFG_DEVICE_ADD("astrocade", ASTROCADE, 14138000/8) // 0066-117XX audio chip
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Video */
diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp
index 8b5f043f95c..974c415b7d7 100644
--- a/src/mame/drivers/gaelco.cpp
+++ b/src/mame/drivers/gaelco.cpp
@@ -627,20 +627,20 @@ void gaelco_state::machine_start()
MACHINE_CONFIG_START(gaelco_state::bigkarnk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */
- MCFG_CPU_PROGRAM_MAP(bigkarnk_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bigkarnk_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", MC6809E, 8867000/4) /* 68B09EP, 2.21675 MHz? */
- MCFG_CPU_PROGRAM_MAP(bigkarnk_snd_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, 8867000/4) /* 68B09EP, 2.21675 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(bigkarnk_snd_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco_state, coin1_lockout_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco_state, coin2_lockout_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gaelco_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gaelco_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco_state, coin1_lockout_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco_state, coin2_lockout_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gaelco_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gaelco_state, coin2_counter_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -663,7 +663,7 @@ MACHINE_CONFIG_START(gaelco_state::bigkarnk)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
- MCFG_SOUND_ADD("ymsnd", YM3812, 3580000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3580000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
@@ -673,9 +673,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco_state::maniacsq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2 ) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(maniacsq_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2 ) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(maniacsq_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -703,17 +703,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco_state::squash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2 ) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(squash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2 ) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(squash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
MCFG_DEVICE_ADD("outlatch", LS259, 0) // B8
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco_state, coin1_lockout_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco_state, coin2_lockout_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gaelco_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gaelco_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco_state, coin1_lockout_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco_state, coin2_lockout_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gaelco_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gaelco_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // used
/* video hardware */
@@ -742,17 +742,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco_state::thoop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2 ) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(thoop_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2 ) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(thoop_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco_state, irq6_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
MCFG_DEVICE_ADD("outlatch", LS259, 0) // B8
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco_state, coin1_lockout_w)) // not inverted
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco_state, coin2_lockout_w)) // not inverted
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gaelco_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gaelco_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco_state, coin1_lockout_w)) // not inverted
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco_state, coin2_lockout_w)) // not inverted
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gaelco_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gaelco_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // used
/* video hardware */
diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index 945c0754071..9693237d03c 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -179,9 +179,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::maniacsq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(26'000'000) / 2) /* 13 MHz? */
- MCFG_CPU_PROGRAM_MAP(maniacsq_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(26'000'000) / 2) /* 13 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(maniacsq_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -192,7 +192,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsq)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0080000)
@@ -606,9 +606,9 @@ ROM_END
MACHINE_CONFIG_START(gaelco2_state::play2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(11'059'200)) /* or from the 34MHz? (34MHz drives the CG-1V-149 PLD?) */
- MCFG_CPU_PROGRAM_MAP(play2000_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(11'059'200)) /* or from the 34MHz? (34MHz drives the CG-1V-149 PLD?) */
+ MCFG_DEVICE_PROGRAM_MAP(play2000_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
// MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(11'059'200)) /* 11.0592MHz */
// MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
@@ -622,7 +622,7 @@ MACHINE_CONFIG_START(gaelco2_state::play2000)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0200000)
@@ -704,18 +704,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bang_state::bang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 2) /* 15 MHz */
- MCFG_CPU_PROGRAM_MAP(bang_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'000'000) / 2) /* 15 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bang_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bang_state, bang_irq, "screen", 0, 1)
MCFG_EEPROM_SERIAL_93C66_ADD("eeprom")
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco2_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco2_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) /* EEPROM data */
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) /* EEPROM serial clock */
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco2_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco2_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) /* EEPROM data */
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) /* EEPROM serial clock */
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -726,7 +726,7 @@ MACHINE_CONFIG_START(bang_state::bang)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0200000)
@@ -950,9 +950,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::alighunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(alighunt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(alighunt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -963,7 +963,7 @@ MACHINE_CONFIG_START(gaelco2_state::alighunt)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0400000)
@@ -1248,15 +1248,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::touchgo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(touchgo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000) / 2) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(touchgo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC6
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco2_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco2_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gaelco2_state, coin3_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gaelco2_state, coin4_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco2_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco2_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gaelco2_state, coin3_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gaelco2_state, coin4_counter_w))
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -1278,7 +1278,7 @@ MACHINE_CONFIG_START(gaelco2_state::touchgo)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2_right)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(gaelco2_state,gaelco2_dual)
@@ -1551,18 +1551,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco2_state::snowboar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(30'000'000) / 2) /* 15 MHz */
- MCFG_CPU_PROGRAM_MAP(snowboar_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(30'000'000) / 2) /* 15 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(snowboar_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
MCFG_EEPROM_SERIAL_93C66_ADD("eeprom")
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco2_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco2_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) /* EEPROM data */
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) /* EEPROM serial clock */
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco2_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco2_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) /* EEPROM data */
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) /* EEPROM serial clock */
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -1573,7 +1573,7 @@ MACHINE_CONFIG_START(gaelco2_state::snowboar)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0400000)
@@ -1593,18 +1593,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco2_state::maniacsqs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz - see PCB layout above with ROM set */
- MCFG_CPU_PROGRAM_MAP(snowboar_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz - see PCB layout above with ROM set */
+ MCFG_DEVICE_PROGRAM_MAP(snowboar_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco2_state, irq6_line_hold)
MCFG_EEPROM_SERIAL_93C66_ADD("eeprom")
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco2_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco2_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) /* EEPROM data */
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) /* EEPROM serial clock */
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco2_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco2_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) /* EEPROM data */
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) /* EEPROM serial clock */
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) /* EEPROM chip select */
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -1615,7 +1615,7 @@ MACHINE_CONFIG_START(gaelco2_state::maniacsqs)
MCFG_SCREEN_SIZE(64*16, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 0x0080000)
@@ -1838,18 +1838,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wrally2_state::wrally2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(26'000'000) / 2) /* 13 MHz */
- MCFG_CPU_PROGRAM_MAP(wrally2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(26'000'000) / 2) /* 13 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrally2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", gaelco2_state, irq6_line_hold)
MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(26'000'000) / 2) /* 13 MHz */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gaelco2_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gaelco2_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wrally2_state, wrally2_adc_clk)) /* ADCs clock-in line */
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(wrally2_state, wrally2_adc_cs)) /* ADCs chip select line */
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gaelco2_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gaelco2_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wrally2_state, wrally2_adc_clk)) /* ADCs clock-in line */
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wrally2_state, wrally2_adc_cs)) /* ADCs chip select line */
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -1871,7 +1871,7 @@ MACHINE_CONFIG_START(wrally2_state::wrally2)
MCFG_SCREEN_SIZE(384, 32*16)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(gaelco2_state, screen_update_gaelco2_right)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp
index 422751e0396..d6ee065b9c8 100644
--- a/src/mame/drivers/gaelco3d.cpp
+++ b/src/mame/drivers/gaelco3d.cpp
@@ -927,19 +927,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelco3d_state::gaelco3d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 15000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco3d_state, vblank_gen)
+ MCFG_DEVICE_ADD("maincpu", M68000, 15000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco3d_state, vblank_gen)
- MCFG_CPU_ADD("tms", TMS32031, 60000000)
- MCFG_CPU_PROGRAM_MAP(tms_map)
+ MCFG_DEVICE_ADD("tms", TMS32031, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(tms_map)
MCFG_TMS3203X_MCBL(true)
- MCFG_TMS3203X_IACK_CB(WRITE8(gaelco3d_state, tms_iack_w))
+ MCFG_TMS3203X_IACK_CB(WRITE8(*this, gaelco3d_state, tms_iack_w))
- MCFG_CPU_ADD("adsp", ADSP2115, 16000000)
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(gaelco3d_state, adsp_tx_callback))
- MCFG_CPU_PROGRAM_MAP(adsp_program_map)
- MCFG_CPU_DATA_MAP(adsp_data_map)
+ MCFG_DEVICE_ADD("adsp", ADSP2115, 16000000)
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, gaelco3d_state, adsp_tx_callback))
+ MCFG_DEVICE_PROGRAM_MAP(adsp_program_map)
+ MCFG_DEVICE_DATA_MAP(adsp_data_map)
MCFG_EEPROM_SERIAL_93C66_ADD("eeprom")
MCFG_EEPROM_SERIAL_ENABLE_STREAMING()
@@ -949,26 +949,26 @@ MACHINE_CONFIG_START(gaelco3d_state::gaelco3d)
MCFG_TIMER_DRIVER_ADD("adsp_timer", gaelco3d_state, adsp_autobuffer_irq)
MCFG_DEVICE_ADD("serial", GAELCO_SERIAL, 0)
- MCFG_GAELCO_SERIAL_IRQ_HANDLER(WRITELINE(gaelco3d_state, ser_irq))
+ MCFG_GAELCO_SERIAL_IRQ_HANDLER(WRITELINE(*this, gaelco3d_state, ser_irq))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC5 on bottom board next to EEPROM
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("serial", gaelco_serial_device, tr_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("serial", gaelco_serial_device, rts_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gaelco3d_state, tms_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(gaelco3d_state, tms_irq_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(gaelco3d_state, unknown_13a_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("serial", gaelco_serial_device, tr_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("serial", gaelco_serial_device, rts_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, gaelco3d_state, tms_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, gaelco3d_state, tms_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, gaelco3d_state, unknown_13a_w))
MCFG_DEVICE_ADD("outlatch", LS259, 0) // IC2 on top board near edge connector
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gaelco3d_state, tms_control3_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gaelco3d_state, radikalb_lamp_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gaelco3d_state, unknown_137_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("serial", gaelco_serial_device, irq_enable))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gaelco3d_state, analog_port_clock_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(gaelco3d_state, analog_port_latch_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("serial", gaelco_serial_device, unknown_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gaelco3d_state, tms_control3_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gaelco3d_state, radikalb_lamp_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gaelco3d_state, unknown_137_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("serial", gaelco_serial_device, irq_enable))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, gaelco3d_state, analog_port_clock_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, gaelco3d_state, analog_port_latch_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("serial", gaelco_serial_device, unknown_w))
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("adsp", ADSP2115_IRQ2))
@@ -987,16 +987,16 @@ MACHINE_CONFIG_START(gaelco3d_state::gaelco3d)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: front mono */
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: left rear */
- MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac3", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: right rear */
- MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac4", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* speedup: seat speaker */
MACHINE_CONFIG_END
@@ -1005,12 +1005,12 @@ MACHINE_CONFIG_START(gaelco3d_state::gaelco3d2)
gaelco3d(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, 25000000)
- MCFG_CPU_PROGRAM_MAP(main020_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaelco3d_state, vblank_gen)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC020, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(main020_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco3d_state, vblank_gen)
- MCFG_CPU_MODIFY("tms")
- MCFG_CPU_CLOCK(50000000)
+ MCFG_DEVICE_MODIFY("tms")
+ MCFG_DEVICE_CLOCK(50000000)
MCFG_MACHINE_RESET_OVERRIDE(gaelco3d_state,gaelco3d2)
MACHINE_CONFIG_END
@@ -1018,7 +1018,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaelco3d_state::footbpow)
gaelco3d2(config);
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gaelco3d_state, fp_analog_clock_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, gaelco3d_state, fp_analog_clock_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gaelcopc.cpp b/src/mame/drivers/gaelcopc.cpp
index fbb0fafd17b..f1b26b20259 100644
--- a/src/mame/drivers/gaelcopc.cpp
+++ b/src/mame/drivers/gaelcopc.cpp
@@ -71,8 +71,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaelcopc_state::gaelcopc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */
- MCFG_CPU_PROGRAM_MAP(gaelcopc_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */
+ MCFG_DEVICE_PROGRAM_MAP(gaelcopc_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp
index 558fc1db0a9..1a2a02feaec 100644
--- a/src/mame/drivers/gaiden.cpp
+++ b/src/mame/drivers/gaiden.cpp
@@ -760,12 +760,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(gaiden_state::shadoww)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */
- MCFG_CPU_PROGRAM_MAP(gaiden_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaiden_state, irq5_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gaiden_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaiden_state, irq5_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* IRQs are triggered by the YM2203 */
MCFG_WATCHDOG_ADD("watchdog")
@@ -801,14 +801,14 @@ MACHINE_CONFIG_START(gaiden_state::shadoww)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 4000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -820,14 +820,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaiden_state::wildfang)
shadoww(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wildfang_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wildfang_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaiden_state::raiga)
shadoww(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(raiga_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(raiga_map)
MCFG_MACHINE_RESET_OVERRIDE(gaiden_state,raiga)
@@ -837,13 +837,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gaiden_state::drgnbowl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(drgnbowl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaiden_state, irq5_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(drgnbowl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaiden_state, irq5_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 12000000/2) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(drgnbowl_sound_map)
- MCFG_CPU_IO_MAP(drgnbowl_sound_port_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/2) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(drgnbowl_sound_map)
+ MCFG_DEVICE_IO_MAP(drgnbowl_sound_port_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -992,12 +992,12 @@ void gaiden_state::mastninj_map(address_map &map)
MACHINE_CONFIG_START(gaiden_state::mastninj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz? */
- MCFG_CPU_PROGRAM_MAP(mastninj_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaiden_state, irq5_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(mastninj_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaiden_state, irq5_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ?? MHz */
- MCFG_CPU_PROGRAM_MAP(mastninj_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ?? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mastninj_sound_map)
MCFG_MACHINE_START_OVERRIDE(gaiden_state,mastninj)
@@ -1027,31 +1027,31 @@ MACHINE_CONFIG_START(gaiden_state::mastninj)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
// YM2203 clocks chosen by analogy with Automat; actual rate unknown, but 4 MHz is obviously too fast
- MCFG_SOUND_ADD("ym1", YM2203, 1250000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1250000)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_SOUND_ADD("ym2", YM2203, 1250000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 1250000)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
MCFG_DEVICE_ADD("adpcm_select1", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm1", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm1", msm5205_device, data_w))
MCFG_DEVICE_ADD("adpcm_select2", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm2", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm2", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("msm2", msm5205_device, vclk_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(gaiden_state, vck_flipflop_w))
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE("msm2", msm5205_device, vclk_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, gaiden_state, vck_flipflop_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp
index 0edb037b2e4..8ba37806145 100644
--- a/src/mame/drivers/gal3.cpp
+++ b/src/mame/drivers/gal3.cpp
@@ -605,29 +605,29 @@ static GFXDECODE_START( namcos21 )
GFXDECODE_END
MACHINE_CONFIG_START(gal3_state::gal3)
- MCFG_CPU_ADD("maincpu", M68020, 49152000/2)
- MCFG_CPU_PROGRAM_MAP(cpu_mst_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68020, 49152000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mst_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold)
- MCFG_CPU_ADD("cpuslv", M68020, 49152000/2)
- MCFG_CPU_PROGRAM_MAP(cpu_slv_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("cpuslv", M68020, 49152000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_slv_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold)
- MCFG_CPU_ADD("rs_cpu", M68000, 49152000/4)
- MCFG_CPU_PROGRAM_MAP(rs_cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gal3_state, irq5_line_hold) /// programmable via 148 IC
+ MCFG_DEVICE_ADD("rs_cpu", M68000, 49152000/4)
+ MCFG_DEVICE_PROGRAM_MAP(rs_cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", gal3_state, irq5_line_hold) /// programmable via 148 IC
- MCFG_CPU_ADD("sound_cpu", M68000, 12000000) // ??
- MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
+ MCFG_DEVICE_ADD("sound_cpu", M68000, 12000000) // ??
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu_map)
- MCFG_CPU_ADD("psn_b1_cpu", M68000, 12000000) // ??
- MCFG_CPU_PROGRAM_MAP(psn_b1_cpu_map)
+ MCFG_DEVICE_ADD("psn_b1_cpu", M68000, 12000000) // ??
+ MCFG_DEVICE_PROGRAM_MAP(psn_b1_cpu_map)
/*
- MCFG_CPU_ADD("psn_b2_cpu", M68000, 12000000) // ??
- MCFG_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MCFG_DEVICE_ADD("psn_b2_cpu", M68000, 12000000) // ??
+ MCFG_DEVICE_PROGRAM_MAP(psn_b1_cpu_map,0)
- MCFG_CPU_ADD("psn_b3_cpu", M68000, 12000000) // ??
- MCFG_CPU_PROGRAM_MAP(psn_b1_cpu_map,0)
+ MCFG_DEVICE_ADD("psn_b3_cpu", M68000, 12000000) // ??
+ MCFG_DEVICE_PROGRAM_MAP(psn_b1_cpu_map,0)
*/
MCFG_QUANTUM_TIME(attotime::from_hz(60*8000)) /* 8000 CPU slices per frame */
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 6765f9caa3c..d2f52325bf3 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -1566,19 +1566,19 @@ WRITE_LINE_MEMBER(galaga_state::vblank_irq)
MACHINE_CONFIG_START(bosco_state::bosco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(bosco_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bosco_map)
- MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(bosco_map)
+ MCFG_DEVICE_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bosco_map)
- MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(bosco_map)
+ MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bosco_map)
MCFG_DEVICE_ADD("misclatch", LS259, 0) // 3C on CPU board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, irq1_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(galaga_state, irq2_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(galaga_state, nmion_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, galaga_state, irq1_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, galaga_state, irq2_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, galaga_state, nmion_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
@@ -1590,16 +1590,16 @@ MACHINE_CONFIG_START(bosco_state::bosco)
MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0H"))
MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("IN1L"))
MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H"))
- MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0))
- MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1))
+ MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(*this, galaga_state,out_0))
+ MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(*this, galaga_state,out_1))
MCFG_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
MCFG_NAMCO_52XX_DISCRETE("discrete")
MCFG_NAMCO_52XX_BASENODE(NODE_04)
MCFG_NAMCO_52XX_EXT_CLOCK(ATTOSECONDS_IN_NSEC(PERIOD_OF_555_ASTABLE_NSEC(RES_K(33), RES_K(10), CAP_U(0.0047))))
- MCFG_NAMCO_52XX_ROMREAD_CB(READ8(galaga_state,namco_52xx_rom_r))
- MCFG_NAMCO_52XX_SI_CB(READ8(galaga_state,namco_52xx_si_r))
+ MCFG_NAMCO_52XX_ROMREAD_CB(READ8(*this, galaga_state,namco_52xx_rom_r))
+ MCFG_NAMCO_52XX_SI_CB(READ8(*this, galaga_state,namco_52xx_si_r))
MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
MCFG_NAMCO_54XX_DISCRETE("discrete")
@@ -1607,22 +1607,22 @@ MACHINE_CONFIG_START(bosco_state::bosco)
MCFG_NAMCO_06XX_ADD("06xx_0", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
- MCFG_NAMCO_06XX_READ_2_CB(DEVREAD8("50xx_1", namco_50xx_device, read))
- MCFG_NAMCO_06XX_READ_REQUEST_2_CB(DEVWRITELINE("50xx_1", namco_50xx_device, read_request))
- MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("50xx_1", namco_50xx_device, write))
- MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_2_CB(READ8("50xx_1", namco_50xx_device, read))
+ MCFG_NAMCO_06XX_READ_REQUEST_2_CB(WRITELINE("50xx_1", namco_50xx_device, read_request))
+ MCFG_NAMCO_06XX_WRITE_2_CB(WRITE8("50xx_1", namco_50xx_device, write))
+ MCFG_NAMCO_06XX_WRITE_3_CB(WRITE8("54xx", namco_54xx_device, write))
MCFG_NAMCO_06XX_ADD("06xx_1", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("sub")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("50xx_2", namco_50xx_device, read))
- MCFG_NAMCO_06XX_READ_REQUEST_0_CB(DEVWRITELINE("50xx_2", namco_50xx_device, read_request))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("50xx_2", namco_50xx_device, write))
- MCFG_NAMCO_06XX_WRITE_1_CB(DEVWRITE8("52xx", namco_52xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("50xx_2", namco_50xx_device, read))
+ MCFG_NAMCO_06XX_READ_REQUEST_0_CB(WRITELINE("50xx_2", namco_50xx_device, read_request))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("50xx_2", namco_50xx_device, write))
+ MCFG_NAMCO_06XX_WRITE_1_CB(WRITE8("52xx", namco_52xx_device, write))
MCFG_DEVICE_ADD("videolatch", LS259, 0) // 1B on video board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, flip_screen_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, galaga_state, flip_screen_w)) MCFG_DEVCB_INVERT
// Q4-Q5 to 05XX for starfield blink
//MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITE("50xx_2", namco_50xx_device, reset_w))
//MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITE("52xx", namco_52xx_device, reset_w))
@@ -1638,8 +1638,8 @@ MACHINE_CONFIG_START(bosco_state::bosco)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 16, 224+16)
MCFG_SCREEN_UPDATE_DRIVER(bosco_state, screen_update_bosco)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bosco_state, screen_vblank_bosco))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(galaga_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bosco_state, screen_vblank_bosco))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, galaga_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bosco)
@@ -1651,12 +1651,12 @@ MACHINE_CONFIG_START(bosco_state::bosco)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(bosco)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -1664,19 +1664,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaga_state::galaga)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(galaga_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(galaga_map)
- MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(galaga_map)
+ MCFG_DEVICE_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(galaga_map)
- MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(galaga_map)
+ MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(galaga_map)
MCFG_DEVICE_ADD("misclatch", LS259, 0) // 3C on CPU board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, irq1_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(galaga_state, irq2_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(galaga_state, nmion_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, galaga_state, irq1_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, galaga_state, irq2_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, galaga_state, nmion_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
@@ -1686,8 +1686,8 @@ MACHINE_CONFIG_START(galaga_state::galaga)
MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0H"))
MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("IN1L"))
MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H"))
- MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0))
- MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1))
+ MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(*this, galaga_state,out_0))
+ MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(*this, galaga_state,out_1))
MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
MCFG_NAMCO_54XX_DISCRETE("discrete")
@@ -1695,13 +1695,13 @@ MACHINE_CONFIG_START(galaga_state::galaga)
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
- MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_WRITE_3_CB(WRITE8("54xx", namco_54xx_device, write))
MCFG_DEVICE_ADD("videolatch", LS259, 0) // 5K on video board
// Q0-Q5 to 05XX for starfield control
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(galaga_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, galaga_state, flip_screen_w))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -1714,8 +1714,8 @@ MACHINE_CONFIG_START(galaga_state::galaga)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(galaga_state, screen_update_galaga)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galaga_state, screen_vblank_galaga))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(galaga_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, screen_vblank_galaga))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, galaga_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaga)
@@ -1727,12 +1727,12 @@ MACHINE_CONFIG_START(galaga_state::galaga)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(galaga)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -1748,11 +1748,11 @@ MACHINE_CONFIG_START(galaga_state::galagab)
/* FIXME: bootlegs should not have any Namco custom chip. However, this workaround is needed atm */
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
- MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(galaga_mem4)
+ MCFG_DEVICE_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(galaga_mem4)
/* sound hardware */
MCFG_DEVICE_REMOVE("discrete")
@@ -1760,29 +1760,29 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaga_state::gatsbee)
galaga(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gatsbee_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gatsbee_main_map)
MCFG_DEVICE_ADD("extralatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, gatsbee_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, galaga_state, gatsbee_bank_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(xevious_state::xevious)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(xevious_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(xevious_map)
- MCFG_CPU_ADD("sub", Z80,MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(xevious_map)
+ MCFG_DEVICE_ADD("sub", Z80,MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(xevious_map)
- MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(xevious_map)
+ MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(xevious_map)
MCFG_DEVICE_ADD("misclatch", LS259, 0) // 5K
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, irq1_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(galaga_state, irq2_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(galaga_state, nmion_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, galaga_state, irq1_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, galaga_state, irq2_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, galaga_state, nmion_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
@@ -1794,8 +1794,8 @@ MACHINE_CONFIG_START(xevious_state::xevious)
MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0H"))
MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("IN1L"))
MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H"))
- MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0))
- MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1))
+ MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(*this, galaga_state,out_0))
+ MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(*this, galaga_state,out_1))
MCFG_NAMCO_54XX_ADD("54xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
MCFG_NAMCO_54XX_DISCRETE("discrete")
@@ -1803,12 +1803,12 @@ MACHINE_CONFIG_START(xevious_state::xevious)
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
- MCFG_NAMCO_06XX_READ_2_CB(DEVREAD8("50xx", namco_50xx_device, read))
- MCFG_NAMCO_06XX_READ_REQUEST_2_CB(DEVWRITELINE("50xx", namco_50xx_device, read_request))
- MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("50xx", namco_50xx_device, write))
- MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_2_CB(READ8("50xx", namco_50xx_device, read))
+ MCFG_NAMCO_06XX_READ_REQUEST_2_CB(WRITELINE("50xx", namco_50xx_device, read_request))
+ MCFG_NAMCO_06XX_WRITE_2_CB(WRITE8("50xx", namco_50xx_device, write))
+ MCFG_NAMCO_06XX_WRITE_3_CB(WRITE8("54xx", namco_54xx_device, write))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -1822,7 +1822,7 @@ MACHINE_CONFIG_START(xevious_state::xevious)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(xevious_state, screen_update_xevious)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galaga_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xevious)
MCFG_PALETTE_ADD("palette", 128*4+64*8+64*2)
@@ -1833,12 +1833,12 @@ MACHINE_CONFIG_START(xevious_state::xevious)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
/* discrete circuit on the 54XX outputs */
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(galaga)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -1855,15 +1855,15 @@ MACHINE_CONFIG_START(xevious_state::battles)
/* FIXME: bootlegs should not have any Namco custom chip. However, this workaround is needed atm */
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
- MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(battles_mem4)
+ MCFG_DEVICE_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(battles_mem4)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galaga_state, vblank_irq))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(xevious_state, battles_interrupt_4))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, vblank_irq))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, xevious_state, battles_interrupt_4))
MCFG_TIMER_DRIVER_ADD("battles_nmi", xevious_state, battles_nmi_generate)
@@ -1872,7 +1872,7 @@ MACHINE_CONFIG_START(xevious_state::battles)
/* sound hardware */
MCFG_DEVICE_REMOVE("discrete")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(battles_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -1881,19 +1881,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(digdug_state::digdug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(digdug_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(digdug_map)
- MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(digdug_map)
+ MCFG_DEVICE_ADD("sub", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(digdug_map)
- MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(digdug_map)
+ MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(digdug_map)
MCFG_DEVICE_ADD("misclatch", LS259, 0) // 8R
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(galaga_state, irq1_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(galaga_state, irq2_clear_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(galaga_state, nmion_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, galaga_state, irq1_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, galaga_state, irq2_clear_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, galaga_state, nmion_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
// Q5-Q7 also used (see below)
@@ -1904,13 +1904,13 @@ MACHINE_CONFIG_START(digdug_state::digdug)
MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0H"))
MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("IN1L"))
MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("IN1H"))
- MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(galaga_state,out_0))
- MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(galaga_state,out_1))
+ MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(*this, galaga_state,out_0))
+ MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(*this, galaga_state,out_1))
MCFG_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/6/2) /* 1.536 MHz */
- MCFG_NAMCO_53XX_K_CB(DEVREADLINE("misclatch", ls259_device, q7_r)) MCFG_DEVCB_BIT(3) // MOD 2 = K3
- MCFG_DEVCB_CHAIN_INPUT(DEVREADLINE("misclatch", ls259_device, q6_r)) MCFG_DEVCB_BIT(2) // MOD 1 = K2
- MCFG_DEVCB_CHAIN_INPUT(DEVREADLINE("misclatch", ls259_device, q5_r)) MCFG_DEVCB_BIT(1) // MOD 0 = K1
+ MCFG_NAMCO_53XX_K_CB(READLINE("misclatch", ls259_device, q7_r)) MCFG_DEVCB_BIT(3) // MOD 2 = K3
+ MCFG_DEVCB_CHAIN_INPUT(READLINE("misclatch", ls259_device, q6_r)) MCFG_DEVCB_BIT(2) // MOD 1 = K2
+ MCFG_DEVCB_CHAIN_INPUT(READLINE("misclatch", ls259_device, q5_r)) MCFG_DEVCB_BIT(1) // MOD 0 = K1
// K0 is left unconnected
MCFG_NAMCO_53XX_INPUT_0_CB(IOPORT("DSWA"))
MCFG_NAMCO_53XX_INPUT_1_CB(IOPORT("DSWA_HI"))
@@ -1919,16 +1919,16 @@ MACHINE_CONFIG_START(digdug_state::digdug)
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/6/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
- MCFG_NAMCO_06XX_READ_1_CB(DEVREAD8("53xx", namco_53xx_device, read))
- MCFG_NAMCO_06XX_READ_REQUEST_1_CB(DEVWRITELINE("53xx", namco_53xx_device, read_request))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_1_CB(READ8("53xx", namco_53xx_device, read))
+ MCFG_NAMCO_06XX_READ_REQUEST_1_CB(WRITELINE("53xx", namco_53xx_device, read_request))
MCFG_DEVICE_ADD("videolatch", LS259, 0) // 5R
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(digdug_state, bg_select_w)) MCFG_DEVCB_MASK(0x33)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(digdug_state, tx_color_mode_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(digdug_state, bg_disable_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(digdug_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, digdug_state, bg_select_w)) MCFG_DEVCB_MASK(0x33)
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, digdug_state, tx_color_mode_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, digdug_state, bg_disable_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, digdug_state, flip_screen_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -1944,7 +1944,7 @@ MACHINE_CONFIG_START(digdug_state::digdug)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 288, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(digdug_state, screen_update_digdug)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galaga_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaga_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", digdug)
MCFG_PALETTE_ADD("palette", 16*2+64*4+64*4)
@@ -1955,7 +1955,7 @@ MACHINE_CONFIG_START(digdug_state::digdug)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90 * 10.0 / 16.0)
MACHINE_CONFIG_END
@@ -1965,8 +1965,8 @@ MACHINE_CONFIG_START(digdug_state::dzigzag)
/* basic machine hardware */
- MCFG_CPU_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(dzigzag_mem4)
+ MCFG_DEVICE_ADD("sub3", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dzigzag_mem4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp
index 74b98a3aaef..33e3e9b9777 100644
--- a/src/mame/drivers/galastrm.cpp
+++ b/src/mame/drivers/galastrm.cpp
@@ -202,9 +202,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(galastrm_state::galastrm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(galastrm_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galastrm_state, galastrm_interrupt) /* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(galastrm_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galastrm_state, galastrm_interrupt) /* VBL */
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -216,10 +216,10 @@ MACHINE_CONFIG_START(galastrm_state::galastrm)
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_3_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(galastrm_state, coin_word_w))
+ MCFG_TC0510NIO_WRITE_3_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, galastrm_state, coin_word_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index 89e2ff8b69a..e7d1ce9071f 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -465,9 +465,9 @@ void galaxi_state::machine_reset()
MACHINE_CONFIG_START(galaxi_state::galaxi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(galaxi_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxi_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(galaxi_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxi_state, irq4_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(galaxi_state::magjoker)
galaxi(config);
/* sound hardware */
- MCFG_SOUND_MODIFY("oki")
+ MCFG_DEVICE_MODIFY("oki")
/* ADPCM samples are recorded with extremely low volume */
MCFG_SOUND_ROUTES_RESET()
@@ -508,8 +508,8 @@ MACHINE_CONFIG_START(galaxi_state::lastfour)
galaxi(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lastfour_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lastfour_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp
index 2bcbc18fcd4..8e4dd6e249c 100644
--- a/src/mame/drivers/galaxia.cpp
+++ b/src/mame/drivers/galaxia.cpp
@@ -294,12 +294,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(galaxia_state::galaxia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/8)
- MCFG_CPU_PROGRAM_MAP(galaxia_mem_map)
- MCFG_CPU_IO_MAP(galaxia_io_map)
- MCFG_CPU_DATA_MAP(galaxia_data_map)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(cvs_state, write_s2650_flag))
+ MCFG_DEVICE_ADD("maincpu", S2650, XTAL(14'318'181)/8)
+ MCFG_DEVICE_PROGRAM_MAP(galaxia_mem_map)
+ MCFG_DEVICE_IO_MAP(galaxia_io_map)
+ MCFG_DEVICE_DATA_MAP(galaxia_data_map)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, cvs_state, write_s2650_flag))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(galaxia_state::galaxia)
MCFG_SCREEN_VISIBLE_AREA(0*8, 30*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(galaxia_state, screen_update_galaxia)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galaxia_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaxia_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxia)
MCFG_PALETTE_ADD("palette", 0x18+2)
@@ -338,12 +338,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxia_state::astrowar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL(14'318'181)/8)
- MCFG_CPU_PROGRAM_MAP(astrowar_mem_map)
- MCFG_CPU_IO_MAP(galaxia_io_map)
- MCFG_CPU_DATA_MAP(galaxia_data_map)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(cvs_state, write_s2650_flag))
+ MCFG_DEVICE_ADD("maincpu", S2650, XTAL(14'318'181)/8)
+ MCFG_DEVICE_PROGRAM_MAP(astrowar_mem_map)
+ MCFG_DEVICE_IO_MAP(galaxia_io_map)
+ MCFG_DEVICE_DATA_MAP(galaxia_data_map)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, cvs_state, write_s2650_flag))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -354,7 +354,7 @@ MACHINE_CONFIG_START(galaxia_state::astrowar)
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(galaxia_state, screen_update_astrowar)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galaxia_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galaxia_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", astrowar)
MCFG_PALETTE_ADD("palette", 0x18+2)
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 623f1eb28c2..82aa7fbc5fc 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -5781,9 +5781,9 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(galaxian_state::galaxian_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
- MCFG_CPU_PROGRAM_MAP(galaxian_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxian_state, interrupt_gen)
+ MCFG_DEVICE_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(galaxian_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxian_state, interrupt_gen)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -5811,36 +5811,36 @@ MACHINE_CONFIG_START(galaxian_state::konami_base)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, konami_portc_0_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, konami_portc_0_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(galaxian_state, konami_sound_control_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, galaxian_state, konami_sound_control_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN3"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, konami_portc_1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, konami_portc_1_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::konami_sound_1x_ay8910)
/* 2nd CPU to drive sound */
- MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(frogger_sound_map)
- MCFG_CPU_IO_MAP(frogger_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(frogger_sound_map)
+ MCFG_DEVICE_IO_MAP(frogger_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(5.1), RES_K(5.1), RES_K(5.1))
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(galaxian_state, frogger_sound_timer_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, galaxian_state, frogger_sound_timer_r))
MCFG_SOUND_ROUTE(0, "konami", 1.0, 0)
MCFG_SOUND_ROUTE(1, "konami", 1.0, 1)
MCFG_SOUND_ROUTE(2, "konami", 1.0, 2)
- MCFG_SOUND_ADD("konami", DISCRETE, 0)
+ MCFG_DEVICE_ADD("konami", DISCRETE)
MCFG_DISCRETE_INTF(konami_sound)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
@@ -5849,30 +5849,30 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::konami_sound_2x_ay8910)
/* 2nd CPU to drive sound */
- MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(konami_sound_map)
- MCFG_CPU_IO_MAP(konami_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(konami_sound_map)
+ MCFG_DEVICE_IO_MAP(konami_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(5.1), RES_K(5.1), RES_K(5.1))
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(galaxian_state, konami_sound_timer_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, galaxian_state, konami_sound_timer_r))
MCFG_SOUND_ROUTE(0, "konami", 1.0, 0)
MCFG_SOUND_ROUTE(1, "konami", 1.0, 1)
MCFG_SOUND_ROUTE(2, "konami", 1.0, 2)
- MCFG_SOUND_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("8910.1", AY8910, KONAMI_SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(5.1), RES_K(5.1), RES_K(5.1))
MCFG_SOUND_ROUTE(0, "konami", 1.0, 3)
MCFG_SOUND_ROUTE(1, "konami", 1.0, 4)
MCFG_SOUND_ROUTE(2, "konami", 1.0, 5)
- MCFG_SOUND_ADD("konami", DISCRETE, 0)
+ MCFG_DEVICE_ADD("konami", DISCRETE)
MCFG_DISCRETE_INTF(konami_sound)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -5902,8 +5902,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::spactrai)
galaxian(config);
/* strange memory map with RAM in the middle of ROM, there's a large block on the ROM board */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spactrai_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spactrai_map)
MACHINE_CONFIG_END
@@ -5917,12 +5917,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::tenspot)
galaxian(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxian_state, fakechange_interrupt_gen)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxian_state, fakechange_interrupt_gen)
/* basic machine hardware */
- MCFG_CPU_ADD("selectcpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2) // ?? mhz
- MCFG_CPU_PROGRAM_MAP(tenspot_select_map)
+ MCFG_DEVICE_ADD("selectcpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2) // ?? mhz
+ MCFG_DEVICE_PROGRAM_MAP(tenspot_select_map)
//MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* separate tile/sprite ROMs */
@@ -5936,11 +5936,11 @@ MACHINE_CONFIG_START(galaxian_state::zigzag)
MCFG_GFXDECODE_MODIFY("gfxdecode", pacmanbl)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zigzag_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zigzag_map)
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) /* matches PCB video - unconfirmed */
+ MCFG_DEVICE_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) /* matches PCB video - unconfirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -5960,16 +5960,16 @@ MACHINE_CONFIG_START(galaxian_state::mooncrst)
galaxian_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mooncrst_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mooncrst_map)
mooncrst_audio(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::moonqsr)
mooncrst(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(moonqsr_decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(moonqsr_decrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -5977,14 +5977,14 @@ MACHINE_CONFIG_START(galaxian_state::fantastc)
galaxian_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fantastc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fantastc_map)
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
+ MCFG_DEVICE_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("8910.1", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
+ MCFG_DEVICE_ADD("8910.1", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
@@ -6008,14 +6008,14 @@ MACHINE_CONFIG_START(galaxian_state::timefgtr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galaxian_state, timefgtr_scanline, "screen", 0, 1)
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(timefgtr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(timefgtr_map)
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
+ MCFG_DEVICE_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("8910.1", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
+ MCFG_DEVICE_ADD("8910.1", AY8910, GALAXIAN_PIXEL_CLOCK/3/2) // 3.072MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
@@ -6026,11 +6026,11 @@ MACHINE_CONFIG_START(galaxian_state::jumpbug)
MCFG_DEVICE_REMOVE("watchdog")
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jumpbug_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jumpbug_map)
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2/2) /* matches PCB video - unconfirmed */
+ MCFG_DEVICE_ADD("8910.0", AY8910, GALAXIAN_PIXEL_CLOCK/3/2/2) /* matches PCB video - unconfirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -6039,15 +6039,15 @@ MACHINE_CONFIG_START(galaxian_state::checkman)
mooncrst(config);
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", Z80, 1620000) /* 1.62 MHz */
- MCFG_CPU_PROGRAM_MAP(checkman_sound_map)
- MCFG_CPU_IO_MAP(checkman_sound_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxian_state, irq0_line_hold) /* NMIs are triggered by the main CPU */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 1620000) /* 1.62 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(checkman_sound_map)
+ MCFG_DEVICE_IO_MAP(checkman_sound_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxian_state, irq0_line_hold) /* NMIs are triggered by the main CPU */
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, 1789750)
+ MCFG_DEVICE_ADD("8910.0", AY8910, 1789750)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -6056,20 +6056,20 @@ MACHINE_CONFIG_START(galaxian_state::checkmaj)
galaxian_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(galaxian_map_base) /* no discrete sound */
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", Z80, 1620000)
- MCFG_CPU_PROGRAM_MAP(checkmaj_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 1620000)
+ MCFG_DEVICE_PROGRAM_MAP(checkmaj_sound_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("irq0", galaxian_state, checkmaj_irq0_gen, "screen", 0, 8)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, 1620000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("8910.0", AY8910, 1620000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 2)
MACHINE_CONFIG_END
@@ -6078,10 +6078,10 @@ MACHINE_CONFIG_START(galaxian_state::mshuttle)
galaxian_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mshuttle_map)
- MCFG_CPU_OPCODES_MAP(mshuttle_decrypted_opcodes_map)
- MCFG_CPU_IO_MAP(mshuttle_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mshuttle_map)
+ MCFG_DEVICE_OPCODES_MAP(mshuttle_decrypted_opcodes_map)
+ MCFG_DEVICE_IO_MAP(mshuttle_portmap)
/* sound hardware */
MCFG_CCLIMBER_AUDIO_ADD("cclimber_audio")
@@ -6092,14 +6092,14 @@ MACHINE_CONFIG_START(galaxian_state::kingball)
mooncrst(config);
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", Z80,5000000/2)
- MCFG_CPU_PROGRAM_MAP(kingball_sound_map)
- MCFG_CPU_IO_MAP(kingball_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80,5000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(kingball_sound_map)
+ MCFG_DEVICE_IO_MAP(kingball_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware */
- MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.53) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.53) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -6110,8 +6110,8 @@ MACHINE_CONFIG_START(galaxian_state::frogger)
konami_sound_1x_ay8910(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(frogger_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(frogger_map)
MACHINE_CONFIG_END
@@ -6120,11 +6120,11 @@ MACHINE_CONFIG_START(galaxian_state::froggermc)
konami_sound_1x_ay8910(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mooncrst_map_base) /* no discrete sound ! */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mooncrst_map_base) /* no discrete sound ! */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, galaxian_state, froggermc_audiocpu_irq_ack)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, galaxian_state, froggermc_audiocpu_irq_ack)
MACHINE_CONFIG_END
@@ -6133,8 +6133,8 @@ MACHINE_CONFIG_START(galaxian_state::froggers)
konami_sound_1x_ay8910(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(theend_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(theend_map)
MACHINE_CONFIG_END
@@ -6143,8 +6143,8 @@ MACHINE_CONFIG_START(galaxian_state::frogf)
konami_sound_1x_ay8910(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(frogf_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(frogf_map)
MACHINE_CONFIG_END
@@ -6153,16 +6153,16 @@ MACHINE_CONFIG_START(galaxian_state::turtles)
konami_sound_2x_ay8910(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(turtles_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(turtles_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::amigo2) // bootleg has no i8255s
galaxian_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(amigo2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(amigo2_map)
konami_sound_2x_ay8910(config);
MACHINE_CONFIG_END
@@ -6173,11 +6173,11 @@ MACHINE_CONFIG_START(galaxian_state::turpins)
// the ROMs came from a blister, so there aren't PCB infos available. Chip types and clocks are guessed.
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(turpins_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(turpins_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(turpins_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(turpins_sound_map)
MACHINE_CONFIG_END
@@ -6186,43 +6186,43 @@ MACHINE_CONFIG_START(galaxian_state::theend)
konami_sound_2x_ay8910(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(theend_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(theend_map)
MCFG_DEVICE_MODIFY("ppi8255_0")
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, theend_coin_counter_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, theend_coin_counter_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::scramble)
scramble_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(theend_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(theend_map)
MCFG_DEVICE_MODIFY("ppi8255_1")
- MCFG_I8255_IN_PORTC_CB(READ8(galaxian_state, scramble_protection_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, scramble_protection_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, galaxian_state, scramble_protection_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, scramble_protection_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::jungsub)
galaxian_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jungsub_map)
- MCFG_CPU_IO_MAP(jungsub_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jungsub_map)
+ MCFG_DEVICE_IO_MAP(jungsub_io_map)
- MCFG_CPU_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) // clock not verified
- MCFG_CPU_PROGRAM_MAP(checkman_sound_map)
- MCFG_CPU_IO_MAP(checkman_sound_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxian_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, KONAMI_SOUND_CLOCK/8) // clock not verified
+ MCFG_DEVICE_PROGRAM_MAP(checkman_sound_map)
+ MCFG_DEVICE_IO_MAP(checkman_sound_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxian_state, irq0_line_hold)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
/* sound hardware */
- MCFG_SOUND_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8) // clock not verified
+ MCFG_DEVICE_ADD("8910.0", AY8910, KONAMI_SOUND_CLOCK/8) // clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -6230,61 +6230,61 @@ MACHINE_CONFIG_START(galaxian_state::explorer)
galaxian_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(explorer_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(explorer_map)
/* 2nd CPU to drive sound */
- MCFG_CPU_ADD("audiocpu", Z80,KONAMI_SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(konami_sound_map)
- MCFG_CPU_IO_MAP(konami_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80,KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(konami_sound_map)
+ MCFG_DEVICE_IO_MAP(konami_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware is a pair of AY-3-8912 */
- MCFG_SOUND_ADD("8910.0", AY8912, KONAMI_SOUND_CLOCK/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(galaxian_state, explorer_sound_latch_r))
+ MCFG_DEVICE_ADD("8910.0", AY8912, KONAMI_SOUND_CLOCK/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, galaxian_state, explorer_sound_latch_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("8910.1", AY8912, KONAMI_SOUND_CLOCK/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(galaxian_state, konami_sound_timer_r))
+ MCFG_DEVICE_ADD("8910.1", AY8912, KONAMI_SOUND_CLOCK/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, galaxian_state, konami_sound_timer_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::takeoff) // takeoff shares the same main map as explorer, but uses only one AY8912 for sound.
explorer(config);
- MCFG_SOUND_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(XTAL(12'000'000) / 8) // XTAL verified, divider not verified
/* 2nd CPU to drive sound */
- MCFG_SOUND_MODIFY("audiocpu")
+ MCFG_DEVICE_MODIFY("audiocpu")
MCFG_DEVICE_CLOCK(XTAL(12'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(takeoff_sound_map)
- MCFG_CPU_IO_MAP(takeoff_sound_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(takeoff_sound_map)
+ MCFG_DEVICE_IO_MAP(takeoff_sound_portmap)
/* sound hardware */
MCFG_DEVICE_REMOVE("8910.0")
MCFG_DEVICE_REMOVE("8910.1")
- MCFG_SOUND_ADD("8912", AY8912, XTAL(12'000'000) / 8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(galaxian_state, explorer_sound_latch_r))
+ MCFG_DEVICE_ADD("8912", AY8912, XTAL(12'000'000) / 8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, galaxian_state, explorer_sound_latch_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::scorpion)
scramble_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(theend_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(theend_map)
MCFG_DEVICE_MODIFY("ppi8255_1")
- MCFG_I8255_IN_PORTC_CB(READ8(galaxian_state, scorpion_protection_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, scorpion_protection_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, galaxian_state, scorpion_protection_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, scorpion_protection_w))
/* extra AY8910 with I/O ports */
- MCFG_SOUND_ADD("8910.2", AY8910, KONAMI_SOUND_CLOCK/8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("digitalker", digitalker_device, digitalker_data_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(galaxian_state, scorpion_digitalker_control_w))
+ MCFG_DEVICE_ADD("8910.2", AY8910, KONAMI_SOUND_CLOCK/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("digitalker", digitalker_device, digitalker_data_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, galaxian_state, scorpion_digitalker_control_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DIGITALKER_ADD("digitalker", 4000000)
@@ -6297,26 +6297,26 @@ MACHINE_CONFIG_START(galaxian_state::sfx)
MCFG_DEVICE_REMOVE("watchdog")
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sfx_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sfx_map)
/* 3rd CPU for the sample player */
- MCFG_CPU_ADD("audio2", Z80, KONAMI_SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(sfx_sample_map)
- MCFG_CPU_IO_MAP(sfx_sample_portmap)
+ MCFG_DEVICE_ADD("audio2", Z80, KONAMI_SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(sfx_sample_map)
+ MCFG_DEVICE_IO_MAP(sfx_sample_portmap)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("soundlatch2", generic_latch_8_device, read))
+ MCFG_I8255_IN_PORTA_CB(READ8("soundlatch2", generic_latch_8_device, read))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
/* port on 2nd 8910 is used for communication */
- MCFG_SOUND_MODIFY("8910.1")
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("soundlatch2", generic_latch_8_device, write))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(galaxian_state, sfx_sample_control_w))
+ MCFG_DEVICE_MODIFY("8910.1")
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("soundlatch2", generic_latch_8_device, write))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, galaxian_state, sfx_sample_control_w))
/* DAC for the sample player */
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // 16-pin IC (not identified by schematics)
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // 16-pin IC (not identified by schematics)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -6326,13 +6326,13 @@ MACHINE_CONFIG_START(galaxian_state::monsterz)
sfx(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(monsterz_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(monsterz_map)
MCFG_DEVICE_MODIFY("ppi8255_1")
- MCFG_I8255_OUT_PORTA_CB(WRITE8(galaxian_state, monsterz_porta_1_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(galaxian_state, monsterz_portb_1_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, monsterz_portc_1_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, galaxian_state, monsterz_porta_1_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, galaxian_state, monsterz_portb_1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, monsterz_portc_1_w))
/* there are likely other differences too, but those can wait until after protection is sorted out */
@@ -6342,16 +6342,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::scobra)
scramble_base(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scobra_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scobra_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::anteatergg)
galaxian(config);
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(anteatergg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(anteatergg_map)
MACHINE_CONFIG_END
/*
@@ -6407,11 +6407,11 @@ MACHINE_CONFIG_START(galaxian_state::quaak)
konami_sound_2x_ay8910(config);
MCFG_DEVICE_MODIFY("8910.0")
- MCFG_AY8910_PORT_B_READ_CB(READ8(galaxian_state, frogger_sound_timer_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, galaxian_state, frogger_sound_timer_r))
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scobra_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scobra_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxian_state::froggeram)
@@ -6419,11 +6419,11 @@ MACHINE_CONFIG_START(galaxian_state::froggeram)
konami_sound_2x_ay8910(config);
MCFG_DEVICE_MODIFY("8910.0")
- MCFG_AY8910_PORT_B_READ_CB(READ8(galaxian_state, frogger_sound_timer_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, galaxian_state, frogger_sound_timer_r))
/* alternate memory map */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(froggeram_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(froggeram_map)
MACHINE_CONFIG_END
@@ -6431,7 +6431,7 @@ MACHINE_CONFIG_START(galaxian_state::anteater)
scobra(config);
/* quiet down the sounds */
- MCFG_SOUND_MODIFY("konami")
+ MCFG_DEVICE_MODIFY("konami")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
@@ -6441,8 +6441,8 @@ MACHINE_CONFIG_START(galaxian_state::anteateruk)
anteater(config);
/* strange memory map, maybe a kind of protection */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(anteateruk_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(anteateruk_map)
MACHINE_CONFIG_END
@@ -6450,8 +6450,8 @@ MACHINE_CONFIG_START(galaxian_state::anteaterg)
anteater(config);
/* strange memory map, maybe a kind of protection */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(anteaterg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(anteaterg_map)
MACHINE_CONFIG_END
@@ -6459,7 +6459,7 @@ MACHINE_CONFIG_START(galaxian_state::moonwar)
scobra(config);
MCFG_DEVICE_MODIFY("ppi8255_0")
- MCFG_I8255_OUT_PORTC_CB(WRITE8(galaxian_state, moonwar_port_select_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, galaxian_state, moonwar_port_select_w))
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(galaxian_state,moonwar) // bullets are less yellow
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index 1085627033f..2d00ca15e00 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -2245,16 +2245,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(galaxold_state::galaxold_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(galaxold_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(galaxold_map)
MCFG_MACHINE_RESET_OVERRIDE(galaxold_state,galaxold)
MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(galaxold_state,galaxold_7474_9m_1_callback))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, galaxold_state,galaxold_7474_9m_1_callback))
MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(galaxold_state,galaxold_7474_9m_2_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, galaxold_state,galaxold_7474_9m_2_q_callback))
MCFG_TIMER_DRIVER_ADD("int_timer", galaxold_state, galaxold_interrupt_timer)
@@ -2291,8 +2291,8 @@ MACHINE_CONFIG_START(galaxold_state::mooncrst)
galaxold_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mooncrst_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mooncrst_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(galaxold_state,mooncrst)
@@ -2311,8 +2311,8 @@ MACHINE_CONFIG_START(galaxold_state::videotron)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hustlerb3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hustlerb3_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(galaxold_state,mooncrst)
@@ -2331,8 +2331,8 @@ MACHINE_CONFIG_START(galaxold_state::scramblb)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scramblb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scramblb_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -2347,8 +2347,8 @@ MACHINE_CONFIG_START(galaxold_state::scramb2)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scramb2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scramb2_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -2363,8 +2363,8 @@ MACHINE_CONFIG_START(galaxold_state::scrambler)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scrambler_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scrambler_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -2379,8 +2379,8 @@ MACHINE_CONFIG_START(galaxold_state::guttang)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(guttang_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(guttang_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -2396,8 +2396,8 @@ MACHINE_CONFIG_START(galaxold_state::_4in1)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(_4in1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(_4in1_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", _4in1)
@@ -2410,8 +2410,8 @@ MACHINE_CONFIG_START(galaxold_state::bagmanmc)
mooncrst(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bagmanmc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bagmanmc_map)
MCFG_MACHINE_RESET_OVERRIDE(galaxold_state, devilfsg )
@@ -2424,8 +2424,8 @@ MACHINE_CONFIG_START(galaxold_state::dkongjrm)
mooncrst(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dkongjrm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dkongjrm_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(galaxold_state,dkongjrm)
@@ -2434,8 +2434,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxold_state::dkongjrmc)
mooncrst(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dkongjrmc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dkongjrmc_map)
MCFG_VIDEO_START_OVERRIDE(galaxold_state,dkongjrmc)
MACHINE_CONFIG_END
@@ -2445,8 +2445,8 @@ MACHINE_CONFIG_START(galaxold_state::rockclim)
mooncrst(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rockclim_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rockclim_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", rockclim)
/* video hardware */
@@ -2464,10 +2464,10 @@ MACHINE_CONFIG_START(galaxold_state::ozon1)
galaxold_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ozon1_map)
- MCFG_CPU_IO_MAP(ozon1_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxold_state, nmi_line_pulse)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ozon1_map)
+ MCFG_DEVICE_IO_MAP(ozon1_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxold_state, nmi_line_pulse)
MCFG_MACHINE_RESET_REMOVE()
@@ -2477,7 +2477,7 @@ MACHINE_CONFIG_START(galaxold_state::ozon1)
MCFG_PALETTE_INIT_OWNER(galaxold_state,rockclim)
MCFG_VIDEO_START_OVERRIDE(galaxold_state,ozon1)
- MCFG_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -2485,11 +2485,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxold_state::drivfrcg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(drivfrcg)
- MCFG_CPU_IO_MAP(drivfrcg_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) // ???
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(drivfrcg)
+ MCFG_DEVICE_IO_MAP(drivfrcg_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) // ???
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2518,9 +2518,9 @@ MACHINE_CONFIG_START(galaxold_state::bongo)
galaxold_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bongo)
- MCFG_CPU_IO_MAP(bongo_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bongo)
+ MCFG_DEVICE_IO_MAP(bongo_io)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(galaxold_state,bongo)
@@ -2528,7 +2528,7 @@ MACHINE_CONFIG_START(galaxold_state::bongo)
MCFG_SCREEN_UPDATE_DRIVER(galaxold_state, screen_update_galaxold)
/* sound hardware */
- MCFG_SOUND_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, PIXEL_CLOCK/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -2538,11 +2538,11 @@ MACHINE_CONFIG_START(galaxold_state::hunchbkg)
galaxold_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", S2650, PIXEL_CLOCK / 4)
+ MCFG_DEVICE_REPLACE("maincpu", S2650, PIXEL_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(hunchbkg)
- MCFG_CPU_DATA_MAP(hunchbkg_data)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(galaxold_state,hunchbkg_irq_callback)
+ MCFG_DEVICE_PROGRAM_MAP(hunchbkg)
+ MCFG_DEVICE_DATA_MAP(hunchbkg_data)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(galaxold_state,hunchbkg_irq_callback)
MCFG_DEVICE_MODIFY("7474_9m_1")
/* the nmi line seems to be inverted on the cpu plugin board */
@@ -2558,8 +2558,8 @@ MACHINE_CONFIG_START(galaxold_state::spcwarp)
hunchbkg(config);
/* hunchbkg, but with a different memory map */
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spcwarp)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spcwarp)
MACHINE_CONFIG_END
@@ -2567,19 +2567,19 @@ MACHINE_CONFIG_START(galaxold_state::tazzmang)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tazzmang)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tazzmang)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxold_state::racknrol)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(racknrol)
- MCFG_CPU_IO_MAP(racknrol_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ???
+ MCFG_DEVICE_ADD("maincpu", S2650, PIXEL_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(racknrol)
+ MCFG_DEVICE_IO_MAP(racknrol_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ???
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian)
@@ -2595,7 +2595,7 @@ MACHINE_CONFIG_START(galaxold_state::racknrol)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("snsnd", SN76489A, PIXEL_CLOCK/2) // SN76489AN
+ MCFG_DEVICE_ADD("snsnd", SN76489A, PIXEL_CLOCK/2) // SN76489AN
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -2603,12 +2603,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxold_state::hexpoola)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(racknrol)
- MCFG_CPU_IO_MAP(hexpoola_io)
- MCFG_CPU_DATA_MAP(hexpoola_data)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ???
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt)
+ MCFG_DEVICE_ADD("maincpu", S2650, PIXEL_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(racknrol)
+ MCFG_DEVICE_IO_MAP(hexpoola_io)
+ MCFG_DEVICE_DATA_MAP(hexpoola_data)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ???
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxold_state, hunchbks_vh_interrupt)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galaxian)
MCFG_PALETTE_ADD("palette", 32)
@@ -2623,7 +2623,7 @@ MACHINE_CONFIG_START(galaxold_state::hexpoola)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("snsnd", SN76496, PIXEL_CLOCK/2)
+ MCFG_DEVICE_ADD("snsnd", SN76496, PIXEL_CLOCK/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -2632,8 +2632,8 @@ MACHINE_CONFIG_START(galaxold_state::ckongg)
galaxian(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ckongg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ckongg_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", gmgalax)
@@ -2645,8 +2645,8 @@ MACHINE_CONFIG_START(galaxold_state::ckongmc)
mooncrst(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ckongmc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ckongmc_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", gmgalax)
@@ -2657,8 +2657,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxold_state::bullsdrtg)
hexpoola(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_DATA_MAP(bullsdrtg_data_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_DATA_MAP(bullsdrtg_data_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp
index db4b3d58b11..3355935bf50 100644
--- a/src/mame/drivers/galaxy.cpp
+++ b/src/mame/drivers/galaxy.cpp
@@ -177,10 +177,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(galaxy_state::galaxy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(galaxy_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(galaxy_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -219,11 +219,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galaxy_state::galaxyp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(galaxyp_mem)
- MCFG_CPU_IO_MAP(galaxyp_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(galaxyp_mem)
+ MCFG_DEVICE_IO_MAP(galaxyp_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galaxy_state, galaxy_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(galaxy_state,galaxy_irq_callback)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -244,7 +244,7 @@ MACHINE_CONFIG_START(galaxy_state::galaxyp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL/4)
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL/4)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp
index 5b758cdad77..22d89e8fdd5 100644
--- a/src/mame/drivers/galeb.cpp
+++ b/src/mame/drivers/galeb.cpp
@@ -166,8 +166,8 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(galeb_state::galeb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1000000)
- MCFG_CPU_PROGRAM_MAP(galeb_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(galeb_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -185,7 +185,7 @@ MACHINE_CONFIG_START(galeb_state::galeb)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp
index 361fbfbd901..059a94ae35a 100644
--- a/src/mame/drivers/galgame.cpp
+++ b/src/mame/drivers/galgame.cpp
@@ -323,11 +323,11 @@ void galaxygame_state::machine_reset()
MACHINE_CONFIG_START(galaxygame_state::galaxygame)
- MCFG_CPU_ADD("maincpu", T11, 3000000 )
- MCFG_CPU_PROGRAM_MAP(galaxygame_map)
+ MCFG_DEVICE_ADD("maincpu", T11, 3000000 )
+ MCFG_DEVICE_PROGRAM_MAP(galaxygame_map)
MCFG_T11_INITIAL_MODE(5 << 13)
- MCFG_CPU_PERIODIC_INT_DRIVER(galaxygame_state, galaxygame_irq, 60)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(galaxygame_state,galaxygame_irq_callback)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(galaxygame_state, galaxygame_irq, 60)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(galaxygame_state,galaxygame_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index 8ebce2d3acb..31d42ef4a3c 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -184,9 +184,9 @@ protected:
DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starpak2_cart", "Galaxy Games StarPak 2 Cartridge")
MACHINE_CONFIG_START(galgames_starpak2_cart_device::device_add_mconfig)
- MCFG_CPU_ADD("pic", PIC16C56, XTAL(4'000'000)) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word)
- MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w))
+ MCFG_DEVICE_ADD("pic", PIC16C56, XTAL(4'000'000)) // !! PIC12C508 !! 4MHz internal RC oscillator (selected by the configuration word)
+ MCFG_PIC16C5x_READ_B_CB( READ8( *this, galgames_cart_device, int_pic_data_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, galgames_cart_device, int_pic_data_w))
MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom")
MACHINE_CONFIG_END
@@ -215,10 +215,10 @@ protected:
DEFINE_DEVICE_TYPE(GALGAMES_STARPAK3_CART, galgames_starpak3_cart_device, "starpak3_cart", "Galaxy Games StarPak 3 Cartridge")
MACHINE_CONFIG_START(galgames_starpak3_cart_device::device_add_mconfig)
- MCFG_CPU_ADD("pic", PIC16C56, XTAL(4'000'000))
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(galgames_cart_device, int_pic_bank_w))
- MCFG_PIC16C5x_READ_B_CB( READ8( galgames_cart_device, int_pic_data_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(galgames_cart_device, int_pic_data_w))
+ MCFG_DEVICE_ADD("pic", PIC16C56, XTAL(4'000'000))
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, galgames_cart_device, int_pic_bank_w))
+ MCFG_PIC16C5x_READ_B_CB( READ8( *this, galgames_cart_device, int_pic_data_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, galgames_cart_device, int_pic_data_w))
MCFG_EEPROM_SERIAL_93C76_8BIT_ADD("eeprom")
MACHINE_CONFIG_END
@@ -978,8 +978,8 @@ int galgames_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high)
}
MACHINE_CONFIG_START(galgames_state::galgames_base)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(galgames_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(galgames_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galgames_state, scanline_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -998,7 +998,7 @@ MACHINE_CONFIG_START(galgames_state::galgames_base)
MCFG_CESBLIT_ADD("blitter", "screen", XTAL(24'000'000))
MCFG_CESBLIT_MAP(blitter_map)
MCFG_CESBLIT_COMPUTE_ADDR(galgames_compute_addr)
- MCFG_CESBLIT_IRQ_CB(WRITELINE(galgames_state, blitter_irq_callback))
+ MCFG_CESBLIT_IRQ_CB(WRITELINE(*this, galgames_state, blitter_irq_callback))
MCFG_PALETTE_ADD("palette", 0x1000) // only 0x100 used
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp
index 854c7bb07d9..43cab98addb 100644
--- a/src/mame/drivers/galivan.cpp
+++ b/src/mame/drivers/galivan.cpp
@@ -432,15 +432,15 @@ MACHINE_RESET_MEMBER(galivan_state,ninjemak)
MACHINE_CONFIG_START(galivan_state::galivan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
- MCFG_CPU_PROGRAM_MAP(galivan_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galivan_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(galivan_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galivan_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(galivan_state,galivan)
MCFG_MACHINE_RESET_OVERRIDE(galivan_state,galivan)
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(galivan_state::galivan)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(galivan_state, screen_update_galivan)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galivan)
@@ -469,11 +469,11 @@ MACHINE_CONFIG_START(galivan_state::galivan)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(8'000'000)/2)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(8'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -481,8 +481,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(dangarj_state::dangarj)
galivan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(dangarj_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(dangarj_io_map)
MCFG_DEVICE_ADD("prot_chip", NB1412M2, XTAL(8'000'000)) // divided by 2 maybe
MACHINE_CONFIG_END
@@ -490,15 +490,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galivan_state::ninjemak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
- MCFG_CPU_PROGRAM_MAP(ninjemak_map)
- MCFG_CPU_IO_MAP(ninjemak_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galivan_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(ninjemak_map)
+ MCFG_DEVICE_IO_MAP(ninjemak_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galivan_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(galivan_state, irq0_line_hold, XTAL(8'000'000)/2/512) // ?
MCFG_MACHINE_START_OVERRIDE(galivan_state,ninjemak)
MCFG_MACHINE_RESET_OVERRIDE(galivan_state,ninjemak)
@@ -514,7 +514,7 @@ MACHINE_CONFIG_START(galivan_state::ninjemak)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(galivan_state, screen_update_ninjemak)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galivan)
@@ -529,11 +529,11 @@ MACHINE_CONFIG_START(galivan_state::ninjemak)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(8'000'000)/2)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(8'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp
index f04d87a182c..1c00dbb6d33 100644
--- a/src/mame/drivers/galpani2.cpp
+++ b/src/mame/drivers/galpani2.cpp
@@ -624,13 +624,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(galpani2_state::galpani2_interrupt2)
MACHINE_CONFIG_START(galpani2_state::galpani2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(27'000'000)/2) /* Confirmed on galpani2i PCB */
- MCFG_CPU_PROGRAM_MAP(galpani2_mem1)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(27'000'000)/2) /* Confirmed on galpani2i PCB */
+ MCFG_DEVICE_PROGRAM_MAP(galpani2_mem1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("m_scantimer", galpani2_state, galpani2_interrupt1, "screen", 0, 1)
//MCFG_QUANTUM_PERFECT_CPU("maincpu")
- MCFG_CPU_ADD("sub", M68000, XTAL(27'000'000)/2) /* Confirmed on galpani2i PCB */
- MCFG_CPU_PROGRAM_MAP(galpani2_mem2)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(27'000'000)/2) /* Confirmed on galpani2i PCB */
+ MCFG_DEVICE_PROGRAM_MAP(galpani2_mem2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("s_scantimer", galpani2_state, galpani2_interrupt2, "screen", 0, 1)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index c1e0b927ad8..71f3d93fef4 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -430,8 +430,8 @@ void galpani3_state::galpani3_map(address_map &map)
MACHINE_CONFIG_START(galpani3_state::galpani3)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'636'363)/2) // Confirmed from PCB
- MCFG_CPU_PROGRAM_MAP(galpani3_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'636'363)/2) // Confirmed from PCB
+ MCFG_DEVICE_PROGRAM_MAP(galpani3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpani3_state, galpani3_vblank, "screen", 0, 1)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -465,7 +465,7 @@ MACHINE_CONFIG_START(galpani3_state::galpani3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(33'333'000) / 2) // Confirmed from PCB
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(33'333'000) / 2) // Confirmed from PCB
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp
index 6164810d164..ba6c7da10ed 100644
--- a/src/mame/drivers/galpanic.cpp
+++ b/src/mame/drivers/galpanic.cpp
@@ -235,8 +235,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(galpanic_state::galpanic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(galpanic_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(galpanic_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpanic_state, scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -248,7 +248,7 @@ MACHINE_CONFIG_START(galpanic_state::galpanic)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(galpanic_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(galpanic_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, galpanic_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", galpanic)
@@ -271,8 +271,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(galpanic_state::galpanica)
galpanic(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(galpanica_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(galpanica_map)
/* basic machine hardware */
MCFG_DEVICE_ADD("calc1_mcu", KANEKO_HIT, 0)
diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp
index a0f9324eb5b..00ebf942629 100644
--- a/src/mame/drivers/galspnbl.cpp
+++ b/src/mame/drivers/galspnbl.cpp
@@ -217,12 +217,12 @@ void galspnbl_state::machine_start()
MACHINE_CONFIG_START(galspnbl_state::galspnbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", galspnbl_state, irq3_line_hold)/* also has vector for 6, but it does nothing */
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", galspnbl_state, irq3_line_hold)/* also has vector for 6, but it does nothing */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* 4 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000)) /* 4 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* NMI is caused by the main CPU */
@@ -252,7 +252,7 @@ MACHINE_CONFIG_START(galspnbl_state::galspnbl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* Use value from Super Pinball Action - NEEDS VERIFICATION!! */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* Use value from Super Pinball Action - NEEDS VERIFICATION!! */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp
index 0dcca70406b..1da9006fce3 100644
--- a/src/mame/drivers/gamate.cpp
+++ b/src/mame/drivers/gamate.cpp
@@ -179,14 +179,14 @@ TIMER_CALLBACK_MEMBER(gamate_state::gamate_timer2)
}
MACHINE_CONFIG_START(gamate_state::gamate)
- MCFG_CPU_ADD("maincpu", M6502, 4433000/2) // NCR 65CX02
- MCFG_CPU_PROGRAM_MAP(gamate_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, 4433000/2) // NCR 65CX02
+ MCFG_DEVICE_PROGRAM_MAP(gamate_mem)
MCFG_GAMATE_VIDEO_ADD("video")
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // Stereo headphone output
- MCFG_SOUND_ADD("ay8910", AY8910, 4433000 / 4) // AY compatible, no actual AY chip present
+ MCFG_DEVICE_ADD("ay8910", AY8910, 4433000 / 4) // AY compatible, no actual AY chip present
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp
index 069c59d7505..6b5f7da4a88 100644
--- a/src/mame/drivers/gambl186.cpp
+++ b/src/mame/drivers/gambl186.cpp
@@ -471,9 +471,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gambl186_state::gambl186)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(gambl186_map)
- MCFG_CPU_IO_MAP(gambl186_io)
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gambl186_map)
+ MCFG_DEVICE_IO_MAP(gambl186_io)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -486,7 +486,7 @@ MACHINE_CONFIG_START(gambl186_state::gambl186)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("7759", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp
index a5a8ba25476..95a928c8610 100644
--- a/src/mame/drivers/gamecom.cpp
+++ b/src/mame/drivers/gamecom.cpp
@@ -250,11 +250,11 @@ INTERRUPT_GEN_MEMBER(gamecom_state::gamecom_interrupt)
MACHINE_CONFIG_START(gamecom_state::gamecom)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", SM8500, XTAL(11'059'200)/2 ) /* actually it's an sm8521 microcontroller containing an sm8500 cpu */
- MCFG_CPU_PROGRAM_MAP( gamecom_mem_map)
- MCFG_SM8500_DMA_CB( WRITE8( gamecom_state, gamecom_handle_dma ) )
- MCFG_SM8500_TIMER_CB( WRITE8( gamecom_state, gamecom_update_timers ) )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gamecom_state, gamecom_interrupt)
+ MCFG_DEVICE_ADD( "maincpu", SM8500, XTAL(11'059'200)/2 ) /* actually it's an sm8521 microcontroller containing an sm8500 cpu */
+ MCFG_DEVICE_PROGRAM_MAP( gamecom_mem_map)
+ MCFG_SM8500_DMA_CB( WRITE8( *this, gamecom_state, gamecom_handle_dma ) )
+ MCFG_SM8500_TIMER_CB( WRITE8( *this, gamecom_state, gamecom_update_timers ) )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gamecom_state, gamecom_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -276,9 +276,9 @@ MACHINE_CONFIG_START(gamecom_state::gamecom)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "speaker" )
/* TODO: much more complex than this */
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC (Digital audio)
- MCFG_SOUND_ADD("dac0", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC (Frequency modulation)
- MCFG_SOUND_ADD("dac1", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC (Frequency modulation)
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC (Digital audio)
+ MCFG_DEVICE_ADD("dac0", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC (Frequency modulation)
+ MCFG_DEVICE_ADD("dac1", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC (Frequency modulation)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp
index 673ee9145d6..85869f35b9c 100644
--- a/src/mame/drivers/gamecstl.cpp
+++ b/src/mame/drivers/gamecstl.cpp
@@ -442,10 +442,10 @@ void gamecstl_state::machine_reset()
MACHINE_CONFIG_START(gamecstl_state::gamecstl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 200000000)
- MCFG_CPU_PROGRAM_MAP(gamecstl_map)
- MCFG_CPU_IO_MAP(gamecstl_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 200000000)
+ MCFG_DEVICE_PROGRAM_MAP(gamecstl_map)
+ MCFG_DEVICE_IO_MAP(gamecstl_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(gamecstl_state::gamecstl)
MCFG_PCI_BUS_LEGACY_DEVICE(7, DEVICE_SELF, gamecstl_state, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gamecube.cpp b/src/mame/drivers/gamecube.cpp
index a58dc64a414..356b1daeb18 100644
--- a/src/mame/drivers/gamecube.cpp
+++ b/src/mame/drivers/gamecube.cpp
@@ -143,8 +143,8 @@ void gamecube_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START(gamecube_state::gc)
- MCFG_CPU_ADD("maincpu", PPC603, 485000000 / 100) // 485 MHz IBM "Gekko" (750CXe/750FX based)
- MCFG_CPU_PROGRAM_MAP(ppc_mem)
+ MCFG_DEVICE_ADD("maincpu", PPC603, 485000000 / 100) // 485 MHz IBM "Gekko" (750CXe/750FX based)
+ MCFG_DEVICE_PROGRAM_MAP(ppc_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp
index 9fe9cebc143..e555c21f524 100644
--- a/src/mame/drivers/gameking.cpp
+++ b/src/mame/drivers/gameking.cpp
@@ -283,9 +283,9 @@ INTERRUPT_GEN_MEMBER(gameking_state::gameking_frame_int) // guess to get over bi
MACHINE_CONFIG_START(gameking_state::gameking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 6000000)
- MCFG_CPU_PROGRAM_MAP(gameking_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gameking_state, gameking_frame_int)
+ MCFG_DEVICE_ADD("maincpu", R65C02, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(gameking_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gameking_state, gameking_frame_int)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp
index 45690003b5f..7640f1df6e9 100644
--- a/src/mame/drivers/gameplan.cpp
+++ b/src/mame/drivers/gameplan.cpp
@@ -962,15 +962,15 @@ MACHINE_RESET_MEMBER(gameplan_state,gameplan)
MACHINE_CONFIG_START(gameplan_state::gameplan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(gameplan_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(gameplan_main_map)
- MCFG_CPU_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(gameplan_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, GAMEPLAN_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(gameplan_audio_map)
MCFG_DEVICE_ADD("riot", RIOT6532, GAMEPLAN_AUDIO_CPU_CLOCK)
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gameplan_state, r6532_soundlatch_w))
- MCFG_RIOT6532_IRQ_CB(WRITELINE(gameplan_state, r6532_irq))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gameplan_state, r6532_soundlatch_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, gameplan_state, r6532_irq))
MCFG_MACHINE_START_OVERRIDE(gameplan_state,gameplan)
MCFG_MACHINE_RESET_OVERRIDE(gameplan_state,gameplan)
@@ -983,47 +983,47 @@ MACHINE_CONFIG_START(gameplan_state::gameplan)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, GAMEPLAN_AY8910_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, GAMEPLAN_MAIN_CPU_CLOCK)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(gameplan_state, video_data_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, gameplan_video_command_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, video_command_trigger_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(gameplan_state, via_irq))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, gameplan_state, video_data_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, gameplan_video_command_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, video_command_trigger_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, gameplan_state, via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, GAMEPLAN_MAIN_CPU_CLOCK)
- MCFG_VIA6522_READPA_HANDLER(READ8(gameplan_state, io_port_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, io_select_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(gameplan_state, coin_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, gameplan_state, io_port_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, io_select_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gameplan_state, coin_w))
MCFG_DEVICE_ADD("via6522_2", VIA6522, GAMEPLAN_MAIN_CPU_CLOCK)
- MCFG_VIA6522_READPB_HANDLER(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(gameplan_state, audio_cmd_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, audio_trigger_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(gameplan_state, audio_reset_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, gameplan_state, audio_cmd_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, audio_trigger_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gameplan_state, audio_reset_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gameplan_state::leprechn)
gameplan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(LEPRECHAUN_MAIN_CPU_CLOCK)
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(leprechn_audio_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(leprechn_audio_map)
/* video hardware */
leprechn_video(config);
/* via */
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_READPB_HANDLER(READ8(gameplan_state, leprechn_videoram_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, leprechn_video_command_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, gameplan_state, leprechn_videoram_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, leprechn_video_command_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp
index adc7e8afd8c..0c42fa216fe 100644
--- a/src/mame/drivers/gamepock.cpp
+++ b/src/mame/drivers/gamepock.cpp
@@ -43,13 +43,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gamepock_state::gamepock)
- MCFG_CPU_ADD("maincpu", UPD78C06, XTAL(6'000'000)) /* uPD78C06AG */
- MCFG_CPU_PROGRAM_MAP( gamepock_mem)
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(gamepock_state, port_a_w))
- MCFG_UPD7810_PORTB_READ_CB(READ8(gamepock_state, port_b_r))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(gamepock_state, port_b_w))
- MCFG_UPD7810_PORTC_READ_CB(READ8(gamepock_state, port_c_r))
- MCFG_UPD7810_TO(WRITELINE(gamepock_state,gamepock_to_w))
+ MCFG_DEVICE_ADD("maincpu", UPD78C06, XTAL(6'000'000)) /* uPD78C06AG */
+ MCFG_DEVICE_PROGRAM_MAP( gamepock_mem)
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, gamepock_state, port_a_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, gamepock_state, port_b_r))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, gamepock_state, port_b_w))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, gamepock_state, port_c_r))
+ MCFG_UPD7810_TO(WRITELINE(*this, gamepock_state,gamepock_to_w))
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE( 60 )
@@ -64,7 +64,7 @@ MACHINE_CONFIG_START(gamepock_state::gamepock)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* cartridge */
diff --git a/src/mame/drivers/gammagic.cpp b/src/mame/drivers/gammagic.cpp
index 68e30455f00..a05c122a50f 100644
--- a/src/mame/drivers/gammagic.cpp
+++ b/src/mame/drivers/gammagic.cpp
@@ -129,10 +129,10 @@ void gammagic_state::machine_start()
}
MACHINE_CONFIG_START(gammagic_state::gammagic)
- MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Intel Pentium 133
- MCFG_CPU_PROGRAM_MAP(gammagic_map)
- MCFG_CPU_IO_MAP(gammagic_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 133000000) // Intel Pentium 133
+ MCFG_DEVICE_PROGRAM_MAP(gammagic_map)
+ MCFG_DEVICE_IO_MAP(gammagic_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp
index d92d8965b6f..1cebda068ed 100644
--- a/src/mame/drivers/gamtor.cpp
+++ b/src/mame/drivers/gamtor.cpp
@@ -87,9 +87,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gaminator_state::gaminator)
- MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* definitely Coldfire, model / clock uncertain */
- MCFG_CPU_PROGRAM_MAP(gaminator_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gaminator_state, irq6_line_hold) // irq6 seems to be needed to get past the ROM checking
+ MCFG_DEVICE_ADD("maincpu", MCF5206E, 40000000) /* definitely Coldfire, model / clock uncertain */
+ MCFG_DEVICE_PROGRAM_MAP(gaminator_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaminator_state, irq6_line_hold) // irq6 seems to be needed to get past the ROM checking
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index 2bba7af5040..dc413debac7 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -524,14 +524,14 @@ void gaplus_state::machine_start()
MACHINE_CONFIG_START(gaplus_state::gaplus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_ADD("sub", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_ADD("sub2", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(cpu3_map)
+ MCFG_DEVICE_ADD("sub2", MC6809E, XTAL(24'576'000)/16) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cpu3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* a high value to ensure proper synchronization of the CPUs */
@@ -542,8 +542,8 @@ MACHINE_CONFIG_START(gaplus_state::gaplus)
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_NAMCO56XX_OUT_0_CB(WRITE8(gaplus_state, out_lamps0))
- MCFG_NAMCO56XX_OUT_1_CB(WRITE8(gaplus_state, out_lamps1))
+ MCFG_NAMCO56XX_OUT_0_CB(WRITE8(*this, gaplus_state, out_lamps0))
+ MCFG_NAMCO56XX_OUT_1_CB(WRITE8(*this, gaplus_state, out_lamps1))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("DSWA_HIGH"))
@@ -556,8 +556,8 @@ MACHINE_CONFIG_START(gaplus_state::gaplus)
//MCFG_NAMCO_62XX_INPUT_1_CB(IOPORT("IN0H"))
//MCFG_NAMCO_62XX_INPUT_2_CB(IOPORT("IN1L"))
//MCFG_NAMCO_62XX_INPUT_3_CB(IOPORT("IN1H"))
- //MCFG_NAMCO_62XX_OUTPUT_0_CB(WRITE8(gaplus_state,out_0))
- //MCFG_NAMCO_62XX_OUTPUT_1_CB(WRITE8(gaplus_state,out_1))
+ //MCFG_NAMCO_62XX_OUTPUT_0_CB(WRITE8(*this, gaplus_state,out_0))
+ //MCFG_NAMCO_62XX_OUTPUT_1_CB(WRITE8(*this, gaplus_state,out_1))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -566,8 +566,8 @@ MACHINE_CONFIG_START(gaplus_state::gaplus)
MCFG_SCREEN_SIZE(36*8, 28*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(gaplus_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gaplus_state, screen_vblank))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(gaplus_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gaplus_state, screen_vblank))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, gaplus_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gaplus)
@@ -578,11 +578,11 @@ MACHINE_CONFIG_START(gaplus_state::gaplus)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_15XX, XTAL(24'576'000)/1024)
+ MCFG_DEVICE_ADD("namco", NAMCO_15XX, XTAL(24'576'000)/1024)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(gaplus_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -609,8 +609,8 @@ MACHINE_CONFIG_START(gaplus_state::gapluso)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gaplus_state, screen_vblank))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(gaplus_state, gapluso_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gaplus_state, screen_vblank))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, gaplus_state, gapluso_vblank_irq))
MCFG_DEVICE_REPLACE("namcoio_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("COINS"))
diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp
index 3bca255213c..2b6bca3c766 100644
--- a/src/mame/drivers/gatron.cpp
+++ b/src/mame/drivers/gatron.cpp
@@ -568,16 +568,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(gatron_state::gat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */
- MCFG_CPU_PROGRAM_MAP(gat_map)
- MCFG_CPU_IO_MAP(gat_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */
+ MCFG_DEVICE_PROGRAM_MAP(gat_map)
+ MCFG_DEVICE_IO_MAP(gat_portmap)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gatron_state, output_port_1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gatron_state, output_port_1_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -595,7 +595,7 @@ MACHINE_CONFIG_START(gatron_state::gat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, MASTER_CLOCK/8 ) // Present in Bingo PCB. Clock need to be verified.
+ MCFG_DEVICE_ADD("snsnd", SN76489, MASTER_CLOCK/8 ) // Present in Bingo PCB. Clock need to be verified.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp
index 234ae401861..c0ebf50a211 100644
--- a/src/mame/drivers/gauntlet.cpp
+++ b/src/mame/drivers/gauntlet.cpp
@@ -490,11 +490,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(gauntlet_state::gauntlet_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, ATARI_CLOCK_14MHz/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -519,7 +519,7 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(gauntlet_state, screen_update_gauntlet)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gauntlet_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gauntlet_state, video_int_write_line))
/* sound hardware */
MCFG_ATARI_SOUND_COMM_ADD("soundcomm", "audiocpu", INPUTLINE("maincpu", M68K_IRQ_6))
@@ -529,21 +529,21 @@ MACHINE_CONFIG_START(gauntlet_state::gauntlet_base)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.48)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.48)
- MCFG_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.32)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.32)
- MCFG_SOUND_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */
+ MCFG_DEVICE_ADD("tms", TMS5220C, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MCFG_DEVICE_ADD("soundctl", LS259, 0) // 16T/U
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("ymsnd", ym2151_device, reset_w)) // music reset, low reset
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("tms", tms5220_device, wsq_w)) // speech write, active low
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("tms", tms5220_device, rsq_w)) // speech reset, active low
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gauntlet_state, speech_squeak_w)) // speech squeak, low = 650 Hz
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(gauntlet_state, coin_counter_right_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gauntlet_state, coin_counter_left_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("ymsnd", ym2151_device, reset_w)) // music reset, low reset
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("tms", tms5220_device, wsq_w)) // speech write, active low
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("tms", tms5220_device, rsq_w)) // speech reset, active low
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gauntlet_state, speech_squeak_w)) // speech squeak, low = 650 Hz
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, gauntlet_state, coin_counter_right_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, gauntlet_state, coin_counter_left_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp
index 60070ff82e2..da3a32f4d71 100644
--- a/src/mame/drivers/gb.cpp
+++ b/src/mame/drivers/gb.cpp
@@ -613,9 +613,9 @@ PALETTE_INIT_MEMBER(megaduck_state, megaduck)
MACHINE_CONFIG_START(gb_state::gameboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, XTAL(4'194'304))
- MCFG_CPU_PROGRAM_MAP(gameboy_map)
- MCFG_LR35902_TIMER_CB( WRITE8( gb_state, gb_timer_callback ) )
+ MCFG_DEVICE_ADD("maincpu", LR35902, XTAL(4'194'304))
+ MCFG_DEVICE_PROGRAM_MAP(gameboy_map)
+ MCFG_LR35902_TIMER_CB( WRITE8( *this, gb_state, gb_timer_callback ) )
MCFG_LR35902_HALT_BUG
/* video hardware */
@@ -638,7 +638,7 @@ MACHINE_CONFIG_START(gb_state::gameboy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", DMG_APU, XTAL(4'194'304))
+ MCFG_DEVICE_ADD("apu", DMG_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -652,9 +652,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gb_state::supergb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, 4295454) /* 4.295454 MHz, derived from SNES xtal */
- MCFG_CPU_PROGRAM_MAP(sgb_map)
- MCFG_LR35902_TIMER_CB( WRITE8(gb_state, gb_timer_callback ) )
+ MCFG_DEVICE_ADD("maincpu", LR35902, 4295454) /* 4.295454 MHz, derived from SNES xtal */
+ MCFG_DEVICE_PROGRAM_MAP(sgb_map)
+ MCFG_LR35902_TIMER_CB( WRITE8(*this, gb_state, gb_timer_callback ) )
MCFG_LR35902_HALT_BUG
MCFG_MACHINE_START_OVERRIDE(gb_state, sgb)
@@ -679,7 +679,7 @@ MACHINE_CONFIG_START(gb_state::supergb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", DMG_APU, 4295454)
+ MCFG_DEVICE_ADD("apu", DMG_APU, 4295454)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -694,8 +694,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gb_state::supergb2)
gameboy(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sgb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sgb_map)
MCFG_MACHINE_START_OVERRIDE(gb_state, sgb)
MCFG_MACHINE_RESET_OVERRIDE(gb_state, sgb)
@@ -730,9 +730,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gb_state::gbcolor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, XTAL(4'194'304)) // todo XTAL(8'388'000)
- MCFG_CPU_PROGRAM_MAP(gbc_map)
- MCFG_LR35902_TIMER_CB( WRITE8(gb_state, gb_timer_callback ) )
+ MCFG_DEVICE_ADD("maincpu", LR35902, XTAL(4'194'304)) // todo XTAL(8'388'000)
+ MCFG_DEVICE_PROGRAM_MAP(gbc_map)
+ MCFG_LR35902_TIMER_CB( WRITE8(*this, gb_state, gb_timer_callback ) )
MCFG_MACHINE_START_OVERRIDE(gb_state,gbc)
MCFG_MACHINE_RESET_OVERRIDE(gb_state,gbc)
@@ -758,7 +758,7 @@ MACHINE_CONFIG_START(gb_state::gbcolor)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", CGB04_APU, XTAL(4'194'304))
+ MCFG_DEVICE_ADD("apu", CGB04_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -776,9 +776,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megaduck_state::megaduck)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LR35902, XTAL(4'194'304)) /* 4.194304 MHz */
- MCFG_CPU_PROGRAM_MAP(megaduck_map)
- MCFG_LR35902_TIMER_CB( WRITE8(gb_state, gb_timer_callback ) )
+ MCFG_DEVICE_ADD("maincpu", LR35902, XTAL(4'194'304)) /* 4.194304 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megaduck_map)
+ MCFG_LR35902_TIMER_CB( WRITE8(*this, gb_state, gb_timer_callback ) )
MCFG_LR35902_HALT_BUG
/* video hardware */
@@ -804,7 +804,7 @@ MACHINE_CONFIG_START(megaduck_state::megaduck)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("apu", DMG_APU, XTAL(4'194'304))
+ MCFG_DEVICE_ADD("apu", DMG_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index fdc931e2916..9dc09ce975d 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -1432,25 +1432,25 @@ static void gba_cart(device_slot_interface &device)
MACHINE_CONFIG_START(gba_state::gbadv)
- MCFG_CPU_ADD("maincpu", ARM7, XTAL(16'777'216))
- MCFG_CPU_PROGRAM_MAP(gba_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, XTAL(16'777'216))
+ MCFG_DEVICE_PROGRAM_MAP(gba_map)
MCFG_GBA_LCD_ADD("lcd")
- MCFG_GBA_LCD_INT_HBLANK(WRITELINE(gba_state, int_hblank_callback))
- MCFG_GBA_LCD_INT_VBLANK(WRITELINE(gba_state, int_vblank_callback))
- MCFG_GBA_LCD_INT_VCOUNT(WRITELINE(gba_state, int_vcount_callback))
- MCFG_GBA_LCD_DMA_HBLANK(WRITELINE(gba_state, dma_hblank_callback))
- MCFG_GBA_LCD_DMA_VBLANK(WRITELINE(gba_state, dma_vblank_callback))
+ MCFG_GBA_LCD_INT_HBLANK(WRITELINE(*this, gba_state, int_hblank_callback))
+ MCFG_GBA_LCD_INT_VBLANK(WRITELINE(*this, gba_state, int_vblank_callback))
+ MCFG_GBA_LCD_INT_VCOUNT(WRITELINE(*this, gba_state, int_vcount_callback))
+ MCFG_GBA_LCD_DMA_HBLANK(WRITELINE(*this, gba_state, dma_hblank_callback))
+ MCFG_GBA_LCD_DMA_VBLANK(WRITELINE(*this, gba_state, dma_vblank_callback))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", CGB04_APU, XTAL(16'777'216)/4)
+ MCFG_DEVICE_ADD("custom", CGB04_APU, XTAL(16'777'216)/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_SOUND_ADD("ldaca", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("rdaca", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("ldacb", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("rdacb", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("ldaca", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdaca", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("ldacb", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdacb", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldaca", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldaca", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdaca", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdaca", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp
index ec354030674..243986cdbf7 100644
--- a/src/mame/drivers/gberet.cpp
+++ b/src/mame/drivers/gberet.cpp
@@ -411,8 +411,8 @@ MACHINE_RESET_MEMBER(gberet_state,gberet)
MACHINE_CONFIG_START(gberet_state::gberet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) // X1S (generated by a custom IC)
- MCFG_CPU_PROGRAM_MAP(gberet_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) // X1S (generated by a custom IC)
+ MCFG_DEVICE_PROGRAM_MAP(gberet_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gberet_state, gberet_interrupt_tick, "screen", 0, 16)
MCFG_WATCHDOG_ADD("watchdog")
@@ -437,7 +437,7 @@ MACHINE_CONFIG_START(gberet_state::gberet)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(18'432'000)/12) /* type verified on real and bootleg pcb */
+ MCFG_DEVICE_ADD("snsnd", SN76489A, XTAL(18'432'000)/12) /* type verified on real and bootleg pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -445,17 +445,17 @@ MACHINE_CONFIG_START(gberet_state::mrgoemon)
gberet(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mrgoemon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mrgoemon_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gberet_state::gberetb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000)/4) // divider guessed
- MCFG_CPU_PROGRAM_MAP(gberetb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gberet_state, irq0_line_assert)
- MCFG_CPU_PERIODIC_INT_DRIVER(gberet_state, nmi_line_assert, XTAL(20'000'000)/0x8000) // divider guessed
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(20'000'000)/4) // divider guessed
+ MCFG_DEVICE_PROGRAM_MAP(gberetb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gberet_state, irq0_line_assert)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(gberet_state, nmi_line_assert, XTAL(20'000'000)/0x8000) // divider guessed
MCFG_MACHINE_START_OVERRIDE(gberet_state,gberet)
MCFG_MACHINE_RESET_OVERRIDE(gberet_state,gberet)
@@ -478,7 +478,7 @@ MACHINE_CONFIG_START(gberet_state::gberetb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(20'000'000)/12) // divider guessed
+ MCFG_DEVICE_ADD("snsnd", SN76489A, XTAL(20'000'000)/12) // divider guessed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp
index b95570be55a..7ddfc95ca32 100644
--- a/src/mame/drivers/gcpinbal.cpp
+++ b/src/mame/drivers/gcpinbal.cpp
@@ -365,9 +365,9 @@ void gcpinbal_state::machine_reset()
MACHINE_CONFIG_START(gcpinbal_state::gcpinbal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(gcpinbal_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gcpinbal_state, gcpinbal_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gcpinbal_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gcpinbal_state, gcpinbal_interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -396,11 +396,11 @@ MACHINE_CONFIG_START(gcpinbal_state::gcpinbal)
MCFG_ES8712_ADD("essnd", 0)
MCFG_ES8712_RESET_HANDLER(INPUTLINE("maincpu", 3))
- MCFG_ES8712_MSM_WRITE_CALLBACK(DEVWRITE8("msm", msm6585_device, data_w))
+ MCFG_ES8712_MSM_WRITE_CALLBACK(WRITE8("msm", msm6585_device, data_w))
MCFG_ES8712_MSM_TAG("msm")
- MCFG_SOUND_ADD("msm", MSM6585, 640_kHz_XTAL)
- MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("essnd", es8712_device, msm_int))
+ MCFG_DEVICE_ADD("msm", MSM6585, 640_kHz_XTAL)
+ MCFG_MSM6585_VCK_CALLBACK(WRITELINE("essnd", es8712_device, msm_int))
MCFG_MSM6585_PRESCALER_SELECTOR(S40) /* 16 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp
index 104e452b8a1..f0b5fd85359 100644
--- a/src/mame/drivers/gei.cpp
+++ b/src/mame/drivers/gei.cpp
@@ -971,9 +971,9 @@ INTERRUPT_GEN_MEMBER(gei_state::vblank_irq)
MACHINE_CONFIG_START(gei_state::getrivia)
- MCFG_CPU_ADD("maincpu",Z80,4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(getrivia_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gei_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu",Z80,4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(getrivia_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gei_state, vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -991,18 +991,18 @@ MACHINE_CONFIG_START(gei_state::getrivia)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSWA"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gei_state, sound_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gei_state, sound_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(gei_state, lamps_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gei_state, lamps2_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, gei_state, lamps_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gei_state, lamps2_w))
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1010,21 +1010,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::findout)
getrivia(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(findout_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(findout_map)
MCFG_DEVICE_REMOVE("ppi8255_1")
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(gei_state, lamps_w))
- MCFG_I8255_IN_PORTC_CB(READ8(gei_state, portC_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, gei_state, lamps_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, gei_state, portC_r))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::quizvid)
findout(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(quizvid_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(quizvid_map)
MCFG_DEVICE_REMOVE("palette")
MCFG_PALETTE_ADD_3BIT_GRB("palette")
@@ -1037,8 +1037,8 @@ MACHINE_CONFIG_START(gei_state::gselect)
MCFG_DEVICE_REMOVE("ticket")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gselect_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gselect_map)
MCFG_DEVICE_REMOVE("ppi8255_0")
MCFG_DEVICE_REMOVE("ppi8255_1")
@@ -1046,13 +1046,13 @@ MACHINE_CONFIG_START(gei_state::gselect)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSWA"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gei_state, sound2_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gei_state, sound2_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(gei_state, lamps_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, gei_state, lamps_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gei_state, nmi_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gei_state, nmi_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::jokpokera)
@@ -1062,8 +1062,8 @@ MACHINE_CONFIG_START(gei_state::jokpokera)
MCFG_DEVICE_REMOVE("ticket")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gselect_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gselect_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::amuse)
@@ -1071,8 +1071,8 @@ MACHINE_CONFIG_START(gei_state::amuse)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(amuse_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(amuse_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::gepoker)
@@ -1080,29 +1080,29 @@ MACHINE_CONFIG_START(gei_state::gepoker)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gepoker_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gepoker_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::amuse1)
getrivia(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(amuse1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(amuse1_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::suprpokr)
getrivia(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(suprpokr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(suprpokr_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gei_state::sprtauth)
getrivia(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sprtauth_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sprtauth_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp
index 83bc5e58ec0..35984d71461 100644
--- a/src/mame/drivers/geneve.cpp
+++ b/src/mame/drivers/geneve.cpp
@@ -697,32 +697,32 @@ MACHINE_CONFIG_START(geneve_state::geneve_60hz)
// basic machine hardware
// TMS9995 CPU @ 12.0 MHz
MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, memmap, crumap)
- MCFG_TMS9995_EXTOP_HANDLER( WRITE8(geneve_state, external_operation) )
- MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(geneve_state, clock_out) )
- MCFG_TMS9995_DBIN_HANDLER( WRITELINE(geneve_state, dbin_line) )
+ MCFG_TMS9995_EXTOP_HANDLER( WRITE8(*this, geneve_state, external_operation) )
+ MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(*this, geneve_state, clock_out) )
+ MCFG_TMS9995_DBIN_HANDLER( WRITELINE(*this, geneve_state, dbin_line) )
// Video hardware
MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL(21'477'272)) /* typical 9938 clock, not verified */
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(geneve_state, set_tms9901_INT2_from_v9938))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, geneve_state, set_tms9901_INT2_from_v9938))
MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL(21'477'272))
// Main board components
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(geneve_state, read_by_9901) )
- MCFG_TMS9901_P0_HANDLER( WRITELINE( geneve_state, peripheral_bus_reset) )
- MCFG_TMS9901_P1_HANDLER( WRITELINE( geneve_state, VDP_reset) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( geneve_state, joystick_select) )
- MCFG_TMS9901_P4_HANDLER( DEVWRITELINE( GENEVE_MAPPER_TAG, bus::ti99::internal::geneve_mapper_device, pfm_select_lsb) ) // new for PFM
- MCFG_TMS9901_P5_HANDLER( DEVWRITELINE( GENEVE_MAPPER_TAG, bus::ti99::internal::geneve_mapper_device, pfm_output_enable) ) // new for PFM
- MCFG_TMS9901_P6_HANDLER( DEVWRITELINE( GENEVE_KEYBOARD_TAG, bus::ti99::internal::geneve_keyboard_device, reset_line) )
- MCFG_TMS9901_P7_HANDLER( WRITELINE( geneve_state, extbus_wait_states) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( geneve_state, video_wait_states) )
- MCFG_TMS9901_P13_HANDLER( DEVWRITELINE( GENEVE_MAPPER_TAG, bus::ti99::internal::geneve_mapper_device, pfm_select_msb) ) // new for PFM
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( geneve_state, tms9901_interrupt) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, geneve_state, read_by_9901) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, geneve_state, peripheral_bus_reset) )
+ MCFG_TMS9901_P1_HANDLER( WRITELINE( *this, geneve_state, VDP_reset) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, geneve_state, joystick_select) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( GENEVE_MAPPER_TAG, bus::ti99::internal::geneve_mapper_device, pfm_select_lsb) ) // new for PFM
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( GENEVE_MAPPER_TAG, bus::ti99::internal::geneve_mapper_device, pfm_output_enable) ) // new for PFM
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( GENEVE_KEYBOARD_TAG, bus::ti99::internal::geneve_keyboard_device, reset_line) )
+ MCFG_TMS9901_P7_HANDLER( WRITELINE( *this, geneve_state, extbus_wait_states) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, geneve_state, video_wait_states) )
+ MCFG_TMS9901_P13_HANDLER( WRITELINE( GENEVE_MAPPER_TAG, bus::ti99::internal::geneve_mapper_device, pfm_select_msb) ) // new for PFM
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, geneve_state, tms9901_interrupt) )
// Mapper
MCFG_DEVICE_ADD(GENEVE_MAPPER_TAG, GENEVE_MAPPER, 0)
- MCFG_GENEVE_READY_HANDLER( WRITELINE(geneve_state, mapper_ready) )
+ MCFG_GENEVE_READY_HANDLER( WRITELINE(*this, geneve_state, mapper_ready) )
// Clock
MCFG_DEVICE_ADD(GENEVE_CLOCK_TAG, MM58274C, 0)
@@ -731,19 +731,19 @@ MACHINE_CONFIG_START(geneve_state::geneve_60hz)
// Peripheral expansion box (Geneve composition)
MCFG_DEVICE_ADD( TI_PERIBOX_TAG, TI99_PERIBOX_GEN, 0)
- MCFG_PERIBOX_INTA_HANDLER( WRITELINE(geneve_state, inta) )
- MCFG_PERIBOX_INTB_HANDLER( WRITELINE(geneve_state, intb) )
- MCFG_PERIBOX_READY_HANDLER( WRITELINE(geneve_state, ext_ready) )
+ MCFG_PERIBOX_INTA_HANDLER( WRITELINE(*this, geneve_state, inta) )
+ MCFG_PERIBOX_INTB_HANDLER( WRITELINE(*this, geneve_state, intb) )
+ MCFG_PERIBOX_READY_HANDLER( WRITELINE(*this, geneve_state, ext_ready) )
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("sound_out")
- MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN76496, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD(TI_SOUNDCHIP_TAG, SN76496, 3579545) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
- MCFG_SN76496_READY_HANDLER( WRITELINE(geneve_state, ext_ready) )
+ MCFG_SN76496_READY_HANDLER( WRITELINE(*this, geneve_state, ext_ready) )
// User interface devices
MCFG_DEVICE_ADD( GENEVE_KEYBOARD_TAG, GENEVE_KEYBOARD, 0 )
- MCFG_GENEVE_KBINT_HANDLER( WRITELINE(geneve_state, keyboard_interrupt) )
+ MCFG_GENEVE_KBINT_HANDLER( WRITELINE(*this, geneve_state, keyboard_interrupt) )
MCFG_GENEVE_JOYPORT_ADD( TI_JOYPORT_TAG )
MCFG_COLORBUS_MOUSE_ADD( COLORBUS_TAG )
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index 441ddd1ba05..1f4b102782a 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -695,9 +695,9 @@ DEVICE_IMAGE_UNLOAD_MEMBER(geniusiq_state,iq128_cart)
MACHINE_CONFIG_START(geniusiq_state::iq128)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // The main crystal is at 32MHz, not sure whats the CPU freq
- MCFG_CPU_PROGRAM_MAP(geniusiq_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(geniusiq_state, irq6_line_hold, 125) // the internal clock is increased by 1 sec every 125 interrupts
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) // The main crystal is at 32MHz, not sure whats the CPU freq
+ MCFG_DEVICE_PROGRAM_MAP(geniusiq_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(geniusiq_state, irq6_line_hold, 125) // the internal clock is increased by 1 sec every 125 interrupts
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/genpc.cpp b/src/mame/drivers/genpc.cpp
index 9fda89429dc..9fbd3798df6 100644
--- a/src/mame/drivers/genpc.cpp
+++ b/src/mame/drivers/genpc.cpp
@@ -54,19 +54,19 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(genpc_state::pcmda)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, 4772720)
- MCFG_CPU_PROGRAM_MAP(pc8_map)
- MCFG_CPU_IO_MAP(pc8_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 4772720)
+ MCFG_DEVICE_PROGRAM_MAP(pc8_map)
+ MCFG_DEVICE_IO_MAP(pc8_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "mda", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "adlib", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "mda", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "hdc", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "adlib", false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp
index 87cdff42d8b..2f107867db3 100644
--- a/src/mame/drivers/ggconnie.cpp
+++ b/src/mame/drivers/ggconnie.cpp
@@ -269,9 +269,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ggconnie_state::ggconnie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(sgx_mem)
- MCFG_CPU_IO_MAP(sgx_io)
+ MCFG_DEVICE_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(sgx_mem)
+ MCFG_DEVICE_IO_MAP(sgx_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -280,10 +280,10 @@ MACHINE_CONFIG_START(ggconnie_state::ggconnie)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD("huc6260", HUC6260, PCE_MAIN_CLOCK/3)
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6202", huc6202_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6202", huc6202_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6202", huc6202_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6202", huc6202_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6202", huc6202_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6202", huc6202_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6202", huc6202_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6202", huc6202_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270_0", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
@@ -291,23 +291,23 @@ MACHINE_CONFIG_START(ggconnie_state::ggconnie)
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD( "huc6202", HUC6202, 0 )
- MCFG_HUC6202_NEXT_PIXEL_0_CB(DEVREAD16("huc6270_0", huc6270_device, next_pixel))
- MCFG_HUC6202_TIME_TIL_NEXT_EVENT_0_CB(DEVREAD16("huc6270_0", huc6270_device, time_until_next_event))
- MCFG_HUC6202_VSYNC_CHANGED_0_CB(DEVWRITELINE("huc6270_0", huc6270_device, vsync_changed))
- MCFG_HUC6202_HSYNC_CHANGED_0_CB(DEVWRITELINE("huc6270_0", huc6270_device, hsync_changed))
- MCFG_HUC6202_READ_0_CB(DEVREAD8("huc6270_0", huc6270_device, read))
- MCFG_HUC6202_WRITE_0_CB(DEVWRITE8("huc6270_0", huc6270_device, write))
- MCFG_HUC6202_NEXT_PIXEL_1_CB(DEVREAD16("huc6270_1", huc6270_device, next_pixel))
- MCFG_HUC6202_TIME_TIL_NEXT_EVENT_1_CB(DEVREAD16("huc6270_1", huc6270_device, time_until_next_event))
- MCFG_HUC6202_VSYNC_CHANGED_1_CB(DEVWRITELINE("huc6270_1", huc6270_device, vsync_changed))
- MCFG_HUC6202_HSYNC_CHANGED_1_CB(DEVWRITELINE("huc6270_1", huc6270_device, hsync_changed))
- MCFG_HUC6202_READ_1_CB(DEVREAD8("huc6270_1", huc6270_device, read))
- MCFG_HUC6202_WRITE_1_CB(DEVWRITE8("huc6270_1", huc6270_device, write))
+ MCFG_HUC6202_NEXT_PIXEL_0_CB(READ16("huc6270_0", huc6270_device, next_pixel))
+ MCFG_HUC6202_TIME_TIL_NEXT_EVENT_0_CB(READ16("huc6270_0", huc6270_device, time_until_next_event))
+ MCFG_HUC6202_VSYNC_CHANGED_0_CB(WRITELINE("huc6270_0", huc6270_device, vsync_changed))
+ MCFG_HUC6202_HSYNC_CHANGED_0_CB(WRITELINE("huc6270_0", huc6270_device, hsync_changed))
+ MCFG_HUC6202_READ_0_CB(READ8("huc6270_0", huc6270_device, read))
+ MCFG_HUC6202_WRITE_0_CB(WRITE8("huc6270_0", huc6270_device, write))
+ MCFG_HUC6202_NEXT_PIXEL_1_CB(READ16("huc6270_1", huc6270_device, next_pixel))
+ MCFG_HUC6202_TIME_TIL_NEXT_EVENT_1_CB(READ16("huc6270_1", huc6270_device, time_until_next_event))
+ MCFG_HUC6202_VSYNC_CHANGED_1_CB(WRITELINE("huc6270_1", huc6270_device, vsync_changed))
+ MCFG_HUC6202_HSYNC_CHANGED_1_CB(WRITELINE("huc6270_1", huc6270_device, hsync_changed))
+ MCFG_HUC6202_READ_1_CB(READ8("huc6270_1", huc6270_device, read))
+ MCFG_HUC6202_WRITE_1_CB(WRITE8("huc6270_1", huc6270_device, write))
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MCFG_C6280_CPU("maincpu")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index a2d3cfec2a2..76ad5ca7dfa 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -604,7 +604,7 @@ void ghosteo_state::machine_reset()
MACHINE_CONFIG_START(ghosteo_state::ghosteo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM9, 200000000)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 200000000)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -619,20 +619,20 @@ MACHINE_CONFIG_START(ghosteo_state::ghosteo)
MCFG_DEVICE_ADD("s3c2410", S3C2410, 12000000)
MCFG_S3C2410_PALETTE("palette")
MCFG_S3C2410_SCREEN("screen")
- MCFG_S3C2410_CORE_PIN_R_CB(READ32(ghosteo_state, s3c2410_core_pin_r))
- MCFG_S3C2410_GPIO_PORT_R_CB(READ32(ghosteo_state, s3c2410_gpio_port_r))
- MCFG_S3C2410_GPIO_PORT_W_CB(WRITE32(ghosteo_state, s3c2410_gpio_port_w))
- MCFG_S3C2410_I2C_SCL_W_CB(WRITELINE(ghosteo_state, s3c2410_i2c_scl_w))
- MCFG_S3C2410_I2C_SDA_R_CB(READLINE(ghosteo_state, s3c2410_i2c_sda_r))
- MCFG_S3C2410_I2C_SDA_W_CB(WRITELINE(ghosteo_state, s3c2410_i2c_sda_w))
- MCFG_S3C2410_NAND_COMMAND_W_CB(WRITE8(ghosteo_state, s3c2410_nand_command_w))
- MCFG_S3C2410_NAND_ADDRESS_W_CB(WRITE8(ghosteo_state, s3c2410_nand_address_w))
- MCFG_S3C2410_NAND_DATA_R_CB(READ8(ghosteo_state, s3c2410_nand_data_r))
- MCFG_S3C2410_NAND_DATA_W_CB(WRITE8(ghosteo_state, s3c2410_nand_data_w))
+ MCFG_S3C2410_CORE_PIN_R_CB(READ32(*this, ghosteo_state, s3c2410_core_pin_r))
+ MCFG_S3C2410_GPIO_PORT_R_CB(READ32(*this, ghosteo_state, s3c2410_gpio_port_r))
+ MCFG_S3C2410_GPIO_PORT_W_CB(WRITE32(*this, ghosteo_state, s3c2410_gpio_port_w))
+ MCFG_S3C2410_I2C_SCL_W_CB(WRITELINE(*this, ghosteo_state, s3c2410_i2c_scl_w))
+ MCFG_S3C2410_I2C_SDA_R_CB(READLINE(*this, ghosteo_state, s3c2410_i2c_sda_r))
+ MCFG_S3C2410_I2C_SDA_W_CB(WRITELINE(*this, ghosteo_state, s3c2410_i2c_sda_w))
+ MCFG_S3C2410_NAND_COMMAND_W_CB(WRITE8(*this, ghosteo_state, s3c2410_nand_command_w))
+ MCFG_S3C2410_NAND_ADDRESS_W_CB(WRITE8(*this, ghosteo_state, s3c2410_nand_address_w))
+ MCFG_S3C2410_NAND_DATA_R_CB(READ8(*this, ghosteo_state, s3c2410_nand_data_r))
+ MCFG_S3C2410_NAND_DATA_W_CB(WRITE8(*this, ghosteo_state, s3c2410_nand_data_w))
// MCFG_DEVICE_ADD("nand", NAND, 0)
// MCFG_NAND_TYPE(NAND_CHIP_K9F5608U0D) // or another variant with ID 0xEC 0x75 ?
-// MCFG_NAND_RNB_CALLBACK(DEVWRITELINE("s3c2410", s3c2410_device, s3c24xx_pin_frnb_w))
+// MCFG_NAND_RNB_CALLBACK(WRITELINE("s3c2410", s3c2410_device, s3c24xx_pin_frnb_w))
// MCFG_I2CMEM_ADD("i2cmem", 0xA0, 0, 0x100, nullptr)
@@ -640,31 +640,31 @@ MACHINE_CONFIG_START(ghosteo_state::ghosteo)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("qs1000", qs1000_device, set_irq))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("qs1000", qs1000_device, set_irq))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
+ MCFG_DEVICE_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
- MCFG_QS1000_IN_P1_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_QS1000_OUT_P1_CB(WRITE8(ghosteo_state, qs1000_p1_w))
- MCFG_QS1000_OUT_P2_CB(WRITE8(ghosteo_state, qs1000_p2_w))
- MCFG_QS1000_OUT_P3_CB(WRITE8(ghosteo_state, qs1000_p3_w))
+ MCFG_QS1000_IN_P1_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_QS1000_OUT_P1_CB(WRITE8(*this, ghosteo_state, qs1000_p1_w))
+ MCFG_QS1000_OUT_P2_CB(WRITE8(*this, ghosteo_state, qs1000_p2_w))
+ MCFG_QS1000_OUT_P3_CB(WRITE8(*this, ghosteo_state, qs1000_p3_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ghosteo_state::bballoon)
ghosteo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bballoon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bballoon_map)
MCFG_I2CMEM_ADD("i2cmem")
MCFG_I2CMEM_DATA_SIZE(256)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ghosteo_state::touryuu)
ghosteo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(touryuu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(touryuu_map)
MCFG_I2CMEM_ADD("i2cmem")
MCFG_I2CMEM_DATA_SIZE(1024)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp
index c38f32a9842..3a99a57b1ca 100644
--- a/src/mame/drivers/giclassic.cpp
+++ b/src/mame/drivers/giclassic.cpp
@@ -297,9 +297,9 @@ void giclassicsvr_state::machine_reset()
MACHINE_CONFIG_START(giclassic_state::giclassic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2) // PCB is marked "68000 12 MHz", but only visible osc is 20 MHz
- MCFG_CPU_PROGRAM_MAP(satellite_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", giclassic_state, giclassic_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000) / 2) // PCB is marked "68000 12 MHz", but only visible osc is 20 MHz
+ MCFG_DEVICE_PROGRAM_MAP(satellite_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", giclassic_state, giclassic_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -323,9 +323,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(giclassicsvr_state::giclassvr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // unknown speed
- MCFG_CPU_PROGRAM_MAP(server_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", giclassicsvr_state, giclassicsvr_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) // unknown speed
+ MCFG_DEVICE_PROGRAM_MAP(server_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", giclassicsvr_state, giclassicsvr_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp
index b51a21f65a0..6b8d6f8cfce 100644
--- a/src/mame/drivers/gijoe.cpp
+++ b/src/mame/drivers/gijoe.cpp
@@ -294,12 +294,12 @@ void gijoe_state::machine_reset()
MACHINE_CONFIG_START(gijoe_state::gijoe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz Confirmed */
- MCFG_CPU_PROGRAM_MAP(gijoe_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gijoe_state, gijoe_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(gijoe_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gijoe_state, gijoe_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) /* Amuse & confirmed. Z80E at 8MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/4) /* Amuse & confirmed. Z80E at 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index d1f1cfb45a2..6ce506eb6ed 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -548,71 +548,71 @@ MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
MACHINE_CONFIG_START(gimix_state::gimix)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(gimix_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gimix_mem)
/* rtc */
MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(WRITELINE(gimix_state,irq_w))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, gimix_state,irq_w))
/* timer */
MCFG_DEVICE_ADD("timer", PTM6840, XTAL(2'000'000)) // clock is a guess
- MCFG_PTM6840_IRQ_CB(WRITELINE(gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable)
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable)
/* floppy disks */
MCFG_FD1797_ADD("fdc",XTAL(8'000'000) / 4)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(gimix_state,fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(gimix_state,fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, gimix_state,fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, gimix_state,fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", gimix_floppies, "525hd", gimix_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", gimix_floppies, "525hd", gimix_state::floppy_formats)
/* parallel ports */
MCFG_DEVICE_ADD("pia1",PIA6821,XTAL(2'000'000))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(gimix_state,pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(gimix_state,pia_pb_w))
- MCFG_PIA_READPA_HANDLER(READ8(gimix_state,pia_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(gimix_state,pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, gimix_state,pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, gimix_state,pia_pb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, gimix_state,pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, gimix_state,pia_pb_r))
MCFG_DEVICE_ADD("pia2",PIA6821,XTAL(2'000'000))
/* serial ports */
MCFG_DEVICE_ADD("acia1",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial1",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial1",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial1",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial1",rs232_port_device,write_rts))
MCFG_DEVICE_ADD("acia2",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial2",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial2",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial2",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial2",rs232_port_device,write_rts))
MCFG_DEVICE_ADD("acia3",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial3",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial3",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial3",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial3",rs232_port_device,write_rts))
MCFG_DEVICE_ADD("acia4",ACIA6850,XTAL(2'000'000))
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial4",rs232_port_device,write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial4",rs232_port_device,write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial4",rs232_port_device,write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial4",rs232_port_device,write_rts))
- MCFG_RS232_PORT_ADD("serial1",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia1",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia1",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial1",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia1",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia1",acia6850_device,write_cts))
- MCFG_RS232_PORT_ADD("serial2",default_rs232_devices,"terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia2",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia2",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial2",RS232_PORT, default_rs232_devices,"terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia2",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia2",acia6850_device,write_cts))
- MCFG_RS232_PORT_ADD("serial3",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia3",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia3",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial3",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia3",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia3",acia6850_device,write_cts))
- MCFG_RS232_PORT_ADD("serial4",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia4",acia6850_device,write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia4",acia6850_device,write_cts))
+ MCFG_DEVICE_ADD("serial4",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia4",acia6850_device,write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia4",acia6850_device,write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_rxc))
/* banking */
MCFG_ADDRESS_BANK("bank1")
diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp
index 9d21569deb3..1532d541b22 100644
--- a/src/mame/drivers/ginganin.cpp
+++ b/src/mame/drivers/ginganin.cpp
@@ -248,17 +248,17 @@ WRITE_LINE_MEMBER(ginganin_state::ptm_irq)
MACHINE_CONFIG_START(ginganin_state::ginganin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ginganin_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ginganin_state, irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */
+ MCFG_DEVICE_ADD("maincpu", M68000, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ginganin_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ginganin_state, irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */
- MCFG_CPU_ADD("audiocpu", MC6809, SOUND_CLOCK) // MBL68B09?
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, SOUND_CLOCK) // MBL68B09?
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("6840ptm", PTM6840, SOUND_CLOCK/2)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(ginganin_state, ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, ginganin_state, ptm_irq))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -278,10 +278,10 @@ MACHINE_CONFIG_START(ginganin_state::ginganin)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("psg", YM2149, SOUND_CLOCK / 2)
+ MCFG_DEVICE_ADD("psg", YM2149, SOUND_CLOCK / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", Y8950, SOUND_CLOCK) /* The Y8950 is basically a YM3526 with ADPCM built in */
+ MCFG_DEVICE_ADD("ymsnd", Y8950, SOUND_CLOCK) /* The Y8950 is basically a YM3526 with ADPCM built in */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp
index 3d087e1f31e..425193d9155 100644
--- a/src/mame/drivers/gizmondo.cpp
+++ b/src/mame/drivers/gizmondo.cpp
@@ -187,8 +187,8 @@ DRIVER_INIT_MEMBER(gizmondo_state,gizmondo)
}
MACHINE_CONFIG_START(gizmondo_state::gizmondo)
- MCFG_CPU_ADD("maincpu", ARM9, 40000000)
- MCFG_CPU_PROGRAM_MAP(gizmondo_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(gizmondo_map)
MCFG_PALETTE_ADD("palette", 32768)
@@ -206,8 +206,8 @@ MACHINE_CONFIG_START(gizmondo_state::gizmondo)
MCFG_DEVICE_ADD("s3c2440", S3C2440, 12000000)
MCFG_S3C2440_PALETTE("palette")
MCFG_S3C2440_SCREEN("screen")
- MCFG_S3C2440_GPIO_PORT_R_CB(READ32(gizmondo_state, s3c2440_gpio_port_r))
- MCFG_S3C2440_GPIO_PORT_W_CB(WRITE32(gizmondo_state, s3c2440_gpio_port_w))
+ MCFG_S3C2440_GPIO_PORT_R_CB(READ32(*this, gizmondo_state, s3c2440_gpio_port_r))
+ MCFG_S3C2440_GPIO_PORT_W_CB(WRITE32(*this, gizmondo_state, s3c2440_gpio_port_w))
MCFG_DISKONCHIP_G3_ADD("diskonchip", 64)
diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp
index ad23fb327b8..d3008752953 100644
--- a/src/mame/drivers/gkigt.cpp
+++ b/src/mame/drivers/gkigt.cpp
@@ -608,17 +608,17 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(igt_gameking_state::igt_gameking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I960, XTAL(24'000'000))
- MCFG_CPU_PROGRAM_MAP(igt_gameking_map)
+ MCFG_DEVICE_ADD("maincpu", I960, XTAL(24'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(igt_gameking_map)
MCFG_SC28C94_ADD("quart1", XTAL(24'000'000) / 6)
- MCFG_SC28C94_D_TX_CALLBACK(DEVWRITELINE("diag", rs232_port_device, write_txd))
+ MCFG_SC28C94_D_TX_CALLBACK(WRITELINE("diag", rs232_port_device, write_txd))
MCFG_SC28C94_ADD("quart2", XTAL(24'000'000) / 6)
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", I960_IRQ0))
- MCFG_RS232_PORT_ADD("diag", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("quart1", sc28c94_device, rx_d_w))
+ MCFG_DEVICE_ADD("diag", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("quart1", sc28c94_device, rx_d_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", igt_gameking)
@@ -630,7 +630,7 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(igt_gameking_state, screen_update_igt_gameking)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(igt_gameking_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igt_gameking_state, vblank_irq))
// Xilinx used as video chip XTAL(26'666'666) on board
MCFG_PALETTE_ADD("palette", 0x100)
@@ -640,7 +640,7 @@ MACHINE_CONFIG_START(igt_gameking_state::igt_gameking)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) // enhanced sound on optional Media-Lite sub board
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400)) // enhanced sound on optional Media-Lite sub board
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -648,8 +648,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igt_gameking_state::igt_ms72c)
igt_gameking(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(igt_ms72c_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(igt_ms72c_map)
MACHINE_CONFIG_END
ROM_START( ms3 )
diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp
index b7f2372b017..ae554ec524f 100644
--- a/src/mame/drivers/gladiatr.cpp
+++ b/src/mame/drivers/gladiatr.cpp
@@ -941,18 +941,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(ppking_state::ppking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 12_MHz_XTAL/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(ppking_cpu1_map)
- MCFG_CPU_IO_MAP(ppking_cpu1_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ppking_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12_MHz_XTAL/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(ppking_cpu1_map)
+ MCFG_DEVICE_IO_MAP(ppking_cpu1_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ppking_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 12_MHz_XTAL/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_IO_MAP(ppking_cpu2_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(ppking_state, irq0_line_assert, 60)
+ MCFG_DEVICE_ADD("sub", Z80, 12_MHz_XTAL/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_IO_MAP(ppking_cpu2_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ppking_state, irq0_line_assert, 60)
- MCFG_CPU_ADD("audiocpu", MC6809, 12_MHz_XTAL/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(ppking_cpu3_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, 12_MHz_XTAL/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(ppking_cpu3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -960,13 +960,13 @@ MACHINE_CONFIG_START(ppking_state::ppking)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 5L on main board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(ppking_state, spritebuffer_w))
-// MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gladiatr_state, spritebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, ppking_state, spritebuffer_w))
+// MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gladiatr_state, spritebank_w))
// MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(MEMBANK("bank1"))
-// MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(ppking_state, nmi_mask_w))
+// MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, ppking_state, nmi_mask_w))
// MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) // shadowed by aforementioned hack
// Q6 used
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(ppking_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, ppking_state, flipscreen_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -989,16 +989,16 @@ MACHINE_CONFIG_START(ppking_state::ppking)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/8) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state_base, ym_irq))
- MCFG_AY8910_PORT_A_READ_CB(READ8(ppking_state, ppking_f1_r))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/8) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, gladiatr_state_base, ym_irq))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ppking_state, ppking_f1_r))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) /* port B read */
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MCFG_SOUND_ROUTE(2, "mono", 0.60)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 455_kHz_XTAL) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm", MSM5205, 455_kHz_XTAL) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -1006,60 +1006,60 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gladiatr_state::gladiatr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 12_MHz_XTAL/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(gladiatr_cpu1_map)
- MCFG_CPU_IO_MAP(gladiatr_cpu1_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gladiatr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12_MHz_XTAL/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(gladiatr_cpu1_map)
+ MCFG_DEVICE_IO_MAP(gladiatr_cpu1_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gladiatr_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 12_MHz_XTAL/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_IO_MAP(gladiatr_cpu2_io)
+ MCFG_DEVICE_ADD("sub", Z80, 12_MHz_XTAL/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_IO_MAP(gladiatr_cpu2_io)
- MCFG_CPU_ADD("audiocpu", MC6809, 12_MHz_XTAL/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(gladiatr_cpu3_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, 12_MHz_XTAL/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(gladiatr_cpu3_map)
MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator)
MCFG_NVRAM_ADD_0FILL("nvram") // NEC uPD449 CMOS SRAM
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 5L on main board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gladiatr_state, spritebuffer_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gladiatr_state, spritebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gladiatr_state, spritebuffer_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gladiatr_state, spritebank_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(MEMBANK("bank1"))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) // shadowed by aforementioned hack
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(gladiatr_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, gladiatr_state, flipscreen_w))
MCFG_DEVICE_ADD("cctl", I8741, 12_MHz_XTAL/2) /* verified on pcb */
MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(3)
MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(2)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, cctl_p1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, cctl_p2_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, gladiatr_state, cctl_p1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, gladiatr_state, cctl_p2_r))
MCFG_DEVICE_ADD("ccpu", I8741, 12_MHz_XTAL/2) /* verified on pcb */
MCFG_MCS48_PORT_P1_IN_CB(IOPORT("IN0"))
MCFG_MCS48_PORT_P2_IN_CB(IOPORT("IN1"))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(gladiatr_state, ccpu_p2_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, gladiatr_state, ccpu_p2_w))
MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(1)
MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(0)
MCFG_DEVICE_ADD("ucpu", I8741, 12_MHz_XTAL/2) /* verified on pcb */
- MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, ucpu_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gladiatr_state, ucpu_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, ucpu_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(gladiatr_state, tclk_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(gladiatr_state, ucpu_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, gladiatr_state, ucpu_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, gladiatr_state, ucpu_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, gladiatr_state, ucpu_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, gladiatr_state, tclk_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, gladiatr_state, ucpu_t1_r))
MCFG_DEVICE_ADD("csnd", I8741, 12_MHz_XTAL/2) /* verified on pcb */
- MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, csnd_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gladiatr_state, csnd_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, csnd_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(gladiatr_state, tclk_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(gladiatr_state, csnd_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, gladiatr_state, csnd_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, gladiatr_state, csnd_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, gladiatr_state, csnd_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, gladiatr_state, tclk_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, gladiatr_state, csnd_t1_r))
/* lazy way to make polled serial between MCUs work */
MCFG_QUANTUM_PERFECT_CPU("ucpu")
MCFG_CLOCK_ADD("tclk", 12_MHz_XTAL/8/128/2) /* verified on pcb */
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(gladiatr_state, tclk_w));
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, gladiatr_state, tclk_w));
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1080,16 +1080,16 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/8) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state_base, ym_irq))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/8) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, gladiatr_state_base, ym_irq))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) /* port B read */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(gladiatr_state, gladiator_int_control_w)) /* port A write */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, gladiatr_state, gladiator_int_control_w)) /* port A write */
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
MCFG_SOUND_ROUTE(2, "mono", 0.60)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 455_kHz_XTAL) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm", MSM5205, 455_kHz_XTAL) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp
index 2671902cdf3..3d0cd7ec51a 100644
--- a/src/mame/drivers/glasgow.cpp
+++ b/src/mame/drivers/glasgow.cpp
@@ -313,8 +313,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(glasgow_state::glasgow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(glasgow_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(glasgow_mem)
MCFG_MEPHISTO_SENSORS_BOARD_ADD("board")
@@ -322,7 +322,7 @@ MACHINE_CONFIG_START(glasgow_state::glasgow)
MCFG_DEFAULT_LAYOUT(layout_glasgow)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 44)
+ MCFG_DEVICE_ADD("beeper", BEEP, 44)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", glasgow_state, update_nmi, attotime::from_hz(50))
@@ -332,16 +332,16 @@ MACHINE_CONFIG_START(amsterd_state::amsterd)
glasgow(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(amsterd_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(amsterd_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(amsterd_state::dallas32)
glasgow(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68020, 14_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(dallas32_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68020, 14_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(dallas32_mem)
MCFG_DEVICE_REMOVE("nmi_timer")
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", amsterd_state, update_nmi32, attotime::from_hz(50))
diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp
index d48b3532a2b..ab929299d09 100644
--- a/src/mame/drivers/glass.cpp
+++ b/src/mame/drivers/glass.cpp
@@ -234,15 +234,15 @@ void glass_state::machine_reset()
MACHINE_CONFIG_START(glass_state::glass)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz verified on PCB */
- MCFG_CPU_PROGRAM_MAP(glass_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", glass_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(glass_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", glass_state, interrupt)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(glass_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(glass_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(glass_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(glass_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, glass_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, glass_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, glass_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, glass_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // Sound Muting (if bit 0 == 1, sound output stream = 0)
/* video hardware */
diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp
index 543174d0e4b..3ee7ad6bf4d 100644
--- a/src/mame/drivers/globalfr.cpp
+++ b/src/mame/drivers/globalfr.cpp
@@ -68,8 +68,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(globalfr_state::globalfr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M37702S1, 4000000)
- MCFG_CPU_PROGRAM_MAP(globalfr_map)
+ MCFG_DEVICE_ADD("maincpu", M37702S1, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(globalfr_map)
MCFG_S16LF01_ADD("vfd",0)
MCFG_DEFAULT_LAYOUT(layout_globalfr)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/globalvr.cpp b/src/mame/drivers/globalvr.cpp
index 3678d8aae0b..dbfad8f7446 100644
--- a/src/mame/drivers/globalvr.cpp
+++ b/src/mame/drivers/globalvr.cpp
@@ -89,8 +89,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(globalvr_state::globalvr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM, 100000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(globalvr_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 100000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(globalvr_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index 4adff8bb975..64d44ff559d 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -483,8 +483,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(gluck2_state::gluck2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
- MCFG_CPU_PROGRAM_MAP(gluck2_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(gluck2_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -512,7 +512,7 @@ MACHINE_CONFIG_START(gluck2_state::gluck2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("SW2"))
/* Output ports have a minimal activity during init.
@@ -520,7 +520,7 @@ MACHINE_CONFIG_START(gluck2_state::gluck2)
*/
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2413, SND_CLOCK)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, SND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp
index 299e9f975b1..8f9c263fd3b 100644
--- a/src/mame/drivers/gmaster.cpp
+++ b/src/mame/drivers/gmaster.cpp
@@ -332,18 +332,18 @@ void gmaster_state::machine_start()
MACHINE_CONFIG_START(gmaster_state::gmaster)
- MCFG_CPU_ADD("maincpu", UPD7810, XTAL(12'000'000)/2/*?*/) // upd78c11 in the unit
- MCFG_CPU_PROGRAM_MAP(gmaster_mem)
+ MCFG_DEVICE_ADD("maincpu", UPD7810, XTAL(12'000'000)/2/*?*/) // upd78c11 in the unit
+ MCFG_DEVICE_PROGRAM_MAP(gmaster_mem)
MCFG_UPD7810_PORTA_READ_CB(IOPORT("JOY"))
- MCFG_UPD7810_PORTB_READ_CB(READ8(gmaster_state, gmaster_portb_r))
- MCFG_UPD7810_PORTC_READ_CB(READ8(gmaster_state, gmaster_portc_r))
- MCFG_UPD7810_PORTD_READ_CB(READ8(gmaster_state, gmaster_portd_r))
- MCFG_UPD7810_PORTF_READ_CB(READ8(gmaster_state, gmaster_portf_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(gmaster_state, gmaster_porta_w))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(gmaster_state, gmaster_portb_w))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(gmaster_state, gmaster_portc_w))
- MCFG_UPD7810_PORTD_WRITE_CB(WRITE8(gmaster_state, gmaster_portd_w))
- MCFG_UPD7810_PORTF_WRITE_CB(WRITE8(gmaster_state, gmaster_portf_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, gmaster_state, gmaster_portb_r))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, gmaster_state, gmaster_portc_r))
+ MCFG_UPD7810_PORTD_READ_CB(READ8(*this, gmaster_state, gmaster_portd_r))
+ MCFG_UPD7810_PORTF_READ_CB(READ8(*this, gmaster_state, gmaster_portf_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, gmaster_state, gmaster_porta_w))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, gmaster_state, gmaster_portb_w))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, gmaster_state, gmaster_portc_w))
+ MCFG_UPD7810_PORTD_WRITE_CB(WRITE8(*this, gmaster_state, gmaster_portd_w))
+ MCFG_UPD7810_PORTF_WRITE_CB(WRITE8(*this, gmaster_state, gmaster_portf_w))
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -356,7 +356,7 @@ MACHINE_CONFIG_START(gmaster_state::gmaster)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_linear_slot, "gmaster_cart")
diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp
index 55723487f62..992b4d9a546 100644
--- a/src/mame/drivers/gng.cpp
+++ b/src/mame/drivers/gng.cpp
@@ -391,20 +391,20 @@ void gng_state::machine_reset()
MACHINE_CONFIG_START(gng_state::gng)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(gng_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gng_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(gng_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gng_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(gng_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(gng_state, irq0_line_hold, 4*60)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 9B on A board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gng_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gng_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(gng_state, ym_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gng_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gng_state, coin_counter_2_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, gng_state, ym_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gng_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gng_state, coin_counter_2_w))
/* video hardware */
MCFG_BUFFERED_SPRITERAM8_ADD("spriteram")
@@ -415,7 +415,7 @@ MACHINE_CONFIG_START(gng_state::gng)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(gng_state, screen_update_gng)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gng)
@@ -428,13 +428,13 @@ MACHINE_CONFIG_START(gng_state::gng)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
MCFG_SOUND_ROUTE(3, "mono", 0.20)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
@@ -443,8 +443,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gng_state::diamond)
gng(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(diamond_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(diamond_map)
MCFG_DEVICE_REMOVE("mainlatch")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp
index 478c6e99356..e03e3e8c57f 100644
--- a/src/mame/drivers/go2000.cpp
+++ b/src/mame/drivers/go2000.cpp
@@ -342,13 +342,13 @@ void go2000_state::machine_start()
MACHINE_CONFIG_START(go2000_state::go2000)
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(go2000_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", go2000_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(go2000_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", go2000_state, irq1_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(go2000_sound_map)
- MCFG_CPU_IO_MAP(go2000_sound_io)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(go2000_sound_map)
+ MCFG_DEVICE_IO_MAP(go2000_sound_io)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", go2000)
@@ -368,7 +368,7 @@ MACHINE_CONFIG_START(go2000_state::go2000)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp
index 8154a237b8e..108b8b45868 100644
--- a/src/mame/drivers/goal92.cpp
+++ b/src/mame/drivers/goal92.cpp
@@ -299,12 +299,12 @@ void goal92_state::machine_reset()
MACHINE_CONFIG_START(goal92_state::goal92)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,12000000)
- MCFG_CPU_PROGRAM_MAP(goal92_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", goal92_state, irq6_line_hold) /* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000)
+ MCFG_DEVICE_PROGRAM_MAP(goal92_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", goal92_state, irq6_line_hold) /* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu)
/* IRQs are triggered by the main CPU */
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(goal92_state::goal92)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) // black border at bottom is a game bug...
MCFG_SCREEN_UPDATE_DRIVER(goal92_state, screen_update_goal92)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(goal92_state, screen_vblank_goal92))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, goal92_state, screen_vblank_goal92))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", goal92)
@@ -327,15 +327,15 @@ MACHINE_CONFIG_START(goal92_state::goal92)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 2500000/2)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(goal92_state, irqhandler))
+ MCFG_DEVICE_ADD("ym1", YM2203, 2500000/2)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, goal92_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM2203, 2500000/2)
+ MCFG_DEVICE_ADD("ym2", YM2203, 2500000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(goal92_state, goal92_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, goal92_state, goal92_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp
index 719ccf462e5..3c253234978 100644
--- a/src/mame/drivers/goindol.cpp
+++ b/src/mame/drivers/goindol.cpp
@@ -238,13 +238,13 @@ void goindol_state::machine_reset()
MACHINE_CONFIG_START(goindol_state::goindol)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* XTAL confirmed, divisor is not */
- MCFG_CPU_PROGRAM_MAP(goindol_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", goindol_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* XTAL confirmed, divisor is not */
+ MCFG_DEVICE_PROGRAM_MAP(goindol_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", goindol_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* XTAL confirmed, divisor is not */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(goindol_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* XTAL confirmed, divisor is not */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(goindol_state, irq0_line_hold, 4*60)
/* video hardware */
@@ -264,7 +264,7 @@ MACHINE_CONFIG_START(goindol_state::goindol)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* Confirmed pitch from recording */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* Confirmed pitch from recording */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gokidetor.cpp b/src/mame/drivers/gokidetor.cpp
index 686f33a0702..15b0d4a9a8a 100644
--- a/src/mame/drivers/gokidetor.cpp
+++ b/src/mame/drivers/gokidetor.cpp
@@ -121,8 +121,8 @@ void gokidetor_state::sound_map(address_map &map)
MACHINE_CONFIG_START(gokidetor_state::gokidetor)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4) // divider not verified
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4) // divider not verified
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
// IRQ from ???
// NMI related to E002 input and TE7750 port 7
@@ -131,16 +131,16 @@ MACHINE_CONFIG_START(gokidetor_state::gokidetor)
MCFG_TE7750_IN_PORT1_CB(IOPORT("IN1"))
MCFG_TE7750_IN_PORT2_CB(IOPORT("IN2"))
MCFG_TE7750_IN_PORT3_CB(IOPORT("IN3"))
- MCFG_TE7750_OUT_PORT4_CB(WRITE8(gokidetor_state, out4_w))
- MCFG_TE7750_OUT_PORT5_CB(WRITE8(gokidetor_state, out5_w))
- MCFG_TE7750_OUT_PORT6_CB(WRITE8(gokidetor_state, out6_w))
- MCFG_TE7750_OUT_PORT7_CB(WRITE8(gokidetor_state, out7_w))
+ MCFG_TE7750_OUT_PORT4_CB(WRITE8(*this, gokidetor_state, out4_w))
+ MCFG_TE7750_OUT_PORT5_CB(WRITE8(*this, gokidetor_state, out5_w))
+ MCFG_TE7750_OUT_PORT6_CB(WRITE8(*this, gokidetor_state, out6_w))
+ MCFG_TE7750_OUT_PORT7_CB(WRITE8(*this, gokidetor_state, out7_w))
MCFG_TE7750_IN_PORT8_CB(IOPORT("IN8"))
- MCFG_TE7750_OUT_PORT8_CB(WRITE8(gokidetor_state, out8_w))
- MCFG_TE7750_OUT_PORT9_CB(WRITE8(gokidetor_state, out9_w))
+ MCFG_TE7750_OUT_PORT8_CB(WRITE8(*this, gokidetor_state, out8_w))
+ MCFG_TE7750_OUT_PORT9_CB(WRITE8(*this, gokidetor_state, out9_w))
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
MCFG_PC060HA_MASTER_CPU("maincpu")
@@ -148,9 +148,9 @@ MACHINE_CONFIG_START(gokidetor_state::gokidetor)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(gokidetor_state, ym_porta_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, gokidetor_state, ym_porta_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp
index 5a34493cd24..c2cc3314fd4 100644
--- a/src/mame/drivers/goldngam.cpp
+++ b/src/mame/drivers/goldngam.cpp
@@ -595,8 +595,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(goldngam_state::swisspkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(swisspkr_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(swisspkr_map)
MCFG_DEVICE_ADD("ptm", PTM6840, 2'000'000)
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M68K_IRQ_2))
@@ -621,7 +621,7 @@ MACHINE_CONFIG_START(goldngam_state::swisspkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("aysnd", AY8912, MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -630,9 +630,9 @@ MACHINE_CONFIG_START(goldngam_state::moviecrd)
swisspkr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(moviecrd_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(goldngam_state, moviecrd_irq_ack)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(moviecrd_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(goldngam_state, moviecrd_irq_ack)
MCFG_DEVICE_MODIFY("ptm")
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M68K_IRQ_1))
@@ -645,7 +645,7 @@ MACHINE_CONFIG_START(goldngam_state::moviecrd)
MCFG_DEVICE_ADD("duart2", MC68681, 3'686'400)
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", MOVIECRD_DUART2_IRQ))
- MCFG_SOUND_REPLACE("aysnd", YM2149, MASTER_CLOCK/4)
+ MCFG_DEVICE_REPLACE("aysnd", YM2149, MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 785b9238576..c0fb21f356c 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -4295,19 +4295,19 @@ MACHINE_RESET_MEMBER(goldnpkr_state, mondial)
MACHINE_CONFIG_START(goldnpkr_state::goldnpkr_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(goldnpkr_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(goldnpkr_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, goldnpkr_mux_port_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, lamps_a_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, goldnpkr_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, goldnpkr_state, lamps_a_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("SW1"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, mux_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, goldnpkr_state, mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4334,7 +4334,7 @@ MACHINE_CONFIG_START(goldnpkr_state::goldnpkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4344,16 +4344,16 @@ MACHINE_CONFIG_START(goldnpkr_state::pottnpkr)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pottnpkr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pottnpkr_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(pottnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4363,12 +4363,12 @@ MACHINE_CONFIG_START(goldnpkr_state::witchcrd)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(witchcrd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(witchcrd_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -4376,7 +4376,7 @@ MACHINE_CONFIG_START(goldnpkr_state::witchcrd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4386,14 +4386,14 @@ MACHINE_CONFIG_START(goldnpkr_state::wcfalcon)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(witchcrd_falcon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(witchcrd_falcon_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, wcfalcon_snd_w)) /* port A out, custom handler due to address + data are muxed */
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, wcfalcon_snd_w)) /* port A out, custom handler due to address + data are muxed */
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -4401,7 +4401,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wcfalcon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -4410,12 +4410,12 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcard)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wildcard_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wildcard_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
/* video hardware */
// MCFG_GFXDECODE_MODIFY("gfxdecode", wildcard)
@@ -4425,7 +4425,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcard)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4435,12 +4435,12 @@ MACHINE_CONFIG_START(goldnpkr_state::wcrdxtnd)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wcrdxtnd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wcrdxtnd_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", wcrdxtnd)
@@ -4450,7 +4450,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wcrdxtnd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4460,18 +4460,18 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcrdb)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wildcrdb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wildcrdb_map)
- MCFG_CPU_ADD("mcu", Z80, MASTER_CLOCK/4) /* guess */
- MCFG_CPU_PROGRAM_MAP(wildcrdb_mcu_map)
- MCFG_CPU_IO_MAP(wildcrdb_mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", Z80, MASTER_CLOCK/4) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(wildcrdb_mcu_map)
+ MCFG_DEVICE_IO_MAP(wildcrdb_mcu_io_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, wcfalcon_snd_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, wcfalcon_snd_w))
/* video hardware */
// MCFG_GFXDECODE_MODIFY("gfxdecode", wildcard)
@@ -4481,7 +4481,7 @@ MACHINE_CONFIG_START(goldnpkr_state::wildcrdb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/4) /* guess, seems ok */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -4490,12 +4490,12 @@ MACHINE_CONFIG_START(goldnpkr_state::genie)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(genie_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(genie_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -4503,7 +4503,7 @@ MACHINE_CONFIG_START(goldnpkr_state::genie)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4513,12 +4513,12 @@ MACHINE_CONFIG_START(goldnpkr_state::geniea)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(goldnpkr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(goldnpkr_map)
// MCFG_DEVICE_MODIFY("pia0")
-// MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
-// MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, mux_port_w))
+// MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+// MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, mux_port_w))
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -4526,7 +4526,7 @@ MACHINE_CONFIG_START(goldnpkr_state::geniea)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4536,15 +4536,15 @@ MACHINE_CONFIG_START(goldnpkr_state::mondial)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mondial_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mondial_map)
MCFG_MACHINE_START_OVERRIDE(goldnpkr_state, mondial)
MCFG_MACHINE_RESET_OVERRIDE(goldnpkr_state, mondial)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4553,24 +4553,24 @@ MACHINE_CONFIG_START(goldnpkr_state::bchancep)
goldnpkr_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bchancep_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bchancep_map)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pia0_a_r))
- MCFG_PIA_READPB_HANDLER(READ8(goldnpkr_state, pia0_b_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, pia0_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, pia0_b_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pia0_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, goldnpkr_state, pia0_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, pia0_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, goldnpkr_state, pia0_b_w))
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pia1_a_r))
- MCFG_PIA_READPB_HANDLER(READ8(goldnpkr_state, pia1_b_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, pia1_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, pia1_b_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pia1_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, goldnpkr_state, pia1_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, pia1_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, goldnpkr_state, pia1_b_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(pottnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4702,8 +4702,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(blitz_state::megadpkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(megadpkr_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(megadpkr_map)
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(megadpkr_banked_map)
@@ -4711,20 +4711,20 @@ MACHINE_CONFIG_START(blitz_state::megadpkr)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(16)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x4000)
- MCFG_CPU_ADD("mcu", M68705P5, CPU_CLOCK) /* unknown */
- MCFG_M68705_PORTB_W_CB(WRITE8(blitz_state, mcu_portb_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(blitz_state, mcu_portc_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, CPU_CLOCK) /* unknown */
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, blitz_state, mcu_portb_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, blitz_state, mcu_portc_w))
MCFG_M48T02_ADD("timekpr")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(goldnpkr_state, pottnpkr_mux_port_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, lamps_a_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, goldnpkr_state, lamps_a_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("SW1"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(goldnpkr_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(goldnpkr_state, mux_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, goldnpkr_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, goldnpkr_state, mux_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4746,7 +4746,7 @@ MACHINE_CONFIG_START(blitz_state::megadpkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(goldnpkr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index e304503bda3..98b537ddc2b 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -8099,9 +8099,9 @@ WRITE8_MEMBER(goldstar_state::ay8910_outputb_w)
MACHINE_CONFIG_START(goldstar_state::goldstar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(goldstar_map)
- MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(goldstar_map)
+ MCFG_DEVICE_IO_MAP(goldstar_readport)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8122,7 +8122,7 @@ MACHINE_CONFIG_START(goldstar_state::goldstar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8136,9 +8136,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::goldstbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(goldstar_map)
- MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(goldstar_map)
+ MCFG_DEVICE_IO_MAP(goldstar_readport)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8159,7 +8159,7 @@ MACHINE_CONFIG_START(goldstar_state::goldstbl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8182,9 +8182,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sanghopm_state::star100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(star100_map)
- MCFG_CPU_IO_MAP(star100_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(star100_map)
+ MCFG_DEVICE_IO_MAP(star100_readport)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8207,7 +8207,7 @@ MACHINE_CONFIG_START(sanghopm_state::star100)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW5"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW6"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8221,11 +8221,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::super9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(goldstar_map)
-// MCFG_CPU_PROGRAM_MAP(nfm_map)
- MCFG_CPU_IO_MAP(goldstar_readport)
-// MCFG_CPU_IO_MAP(unkch_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(goldstar_map)
+// MCFG_DEVICE_PROGRAM_MAP(nfm_map)
+ MCFG_DEVICE_IO_MAP(goldstar_readport)
+// MCFG_DEVICE_IO_MAP(unkch_portmap)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8246,7 +8246,7 @@ MACHINE_CONFIG_START(goldstar_state::super9)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8319,9 +8319,9 @@ PALETTE_INIT_MEMBER(goldstar_state, lucky8)
MACHINE_CONFIG_START(cb3_state::ncb3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ncb3_map)
- MCFG_CPU_IO_MAP(ncb3_readwriteport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ncb3_map)
+ MCFG_DEVICE_IO_MAP(ncb3_readwriteport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8356,10 +8356,10 @@ MACHINE_CONFIG_START(cb3_state::ncb3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8394,9 +8394,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::wcherry)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(wcherry_map)
- MCFG_CPU_IO_MAP(wcherry_readwriteport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(wcherry_map)
+ MCFG_DEVICE_IO_MAP(wcherry_readwriteport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8430,10 +8430,10 @@ MACHINE_CONFIG_START(goldstar_state::wcherry)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8443,9 +8443,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cmaster_state::cm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cm_map)
- MCFG_CPU_IO_MAP(cm_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cm_map)
+ MCFG_DEVICE_IO_MAP(cm_portmap)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8476,7 +8476,7 @@ MACHINE_CONFIG_START(cmaster_state::cm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8491,9 +8491,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::cmast91)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cm_map)
- MCFG_CPU_IO_MAP(cmast91_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cm_map)
+ MCFG_DEVICE_IO_MAP(cmast91_portmap)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8524,7 +8524,7 @@ MACHINE_CONFIG_START(goldstar_state::cmast91)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8541,9 +8541,9 @@ WRITE_LINE_MEMBER(wingco_state::masked_irq)
MACHINE_CONFIG_START(wingco_state::lucky8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lucky8_map)
- //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lucky8_map)
+ //MCFG_DEVICE_IO_MAP(goldstar_readport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8557,9 +8557,9 @@ MACHINE_CONFIG_START(wingco_state::lucky8)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(wingco_state, system_outputa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(wingco_state, system_outputb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, system_outputc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, wingco_state, system_outputa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, wingco_state, system_outputb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, system_outputc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8569,7 +8569,7 @@ MACHINE_CONFIG_START(wingco_state::lucky8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(goldstar_state, screen_update_goldstar)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(wingco_state, masked_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wingco_state, masked_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3)
MCFG_PALETTE_ADD("palette", 256)
@@ -8582,23 +8582,23 @@ MACHINE_CONFIG_START(wingco_state::lucky8)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", YM2149, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", YM2149, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW4"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(goldstar_state, ay8910_outputa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(goldstar_state, ay8910_outputb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(wingco_state::bingowng)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lucky8_map)
- //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lucky8_map)
+ //MCFG_DEVICE_IO_MAP(goldstar_readport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8612,9 +8612,9 @@ MACHINE_CONFIG_START(wingco_state::bingowng)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(wingco_state, system_outputa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(wingco_state, system_outputb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, system_outputc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, wingco_state, system_outputa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, wingco_state, system_outputb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, system_outputc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8624,7 +8624,7 @@ MACHINE_CONFIG_START(wingco_state::bingowng)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(wingco_state, screen_update_bingowng)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(wingco_state, masked_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wingco_state, masked_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ncb3)
MCFG_PALETTE_ADD("palette", 256)
@@ -8636,14 +8636,14 @@ MACHINE_CONFIG_START(wingco_state::bingowng)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW4"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(goldstar_state, ay8910_outputa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(goldstar_state, ay8910_outputb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -8656,11 +8656,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wingco_state::flam7_w4)
lucky8(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(flaming7_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(flaming7_map)
MCFG_DEVICE_MODIFY("ppi8255_0")
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, fl7w4_outc802_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, fl7w4_outc802_w))
MCFG_DS2401_ADD("fl7w4_id")
MACHINE_CONFIG_END
@@ -8668,14 +8668,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wingco_state::flaming7)
lucky8(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(flaming7_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(flaming7_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", flaming7)
// to do serial protection.
MCFG_DEVICE_MODIFY("ppi8255_0")
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, fl7w4_outc802_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, fl7w4_outc802_w))
MCFG_DS2401_ADD("fl7w4_id")
MACHINE_CONFIG_END
@@ -8683,14 +8683,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wingco_state::flam7_tw)
lucky8(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(flaming7_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(flaming7_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", flam7_tw)
// to do serial protection.
MCFG_DEVICE_MODIFY("ppi8255_0")
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, fl7w4_outc802_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, fl7w4_outc802_w))
MCFG_DS2401_ADD("fl7w4_id")
MACHINE_CONFIG_END
@@ -8698,8 +8698,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wingco_state::mbstar)
lucky8(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mbstar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mbstar_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(wingco_state, screen_update_mbstar)
@@ -8723,9 +8723,9 @@ PALETTE_INIT_MEMBER(wingco_state, magodds)
MACHINE_CONFIG_START(wingco_state::magodds)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(magodds_map)
- //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(magodds_map)
+ //MCFG_DEVICE_IO_MAP(goldstar_readport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8739,9 +8739,9 @@ MACHINE_CONFIG_START(wingco_state::magodds)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(wingco_state, system_outputa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(wingco_state, system_outputb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, system_outputc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, wingco_state, system_outputa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, wingco_state, system_outputb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, system_outputc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8751,7 +8751,7 @@ MACHINE_CONFIG_START(wingco_state::magodds)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(wingco_state, screen_update_magical)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(wingco_state, masked_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wingco_state, masked_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", magodds)
MCFG_PALETTE_ADD("palette", 256)
@@ -8763,14 +8763,14 @@ MACHINE_CONFIG_START(wingco_state::magodds)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) // shut up annoying whine
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW4"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(goldstar_state, ay8910_outputa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(goldstar_state, ay8910_outputb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -8778,9 +8778,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::kkotnoli)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kkotnoli_map)
- //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kkotnoli_map)
+ //MCFG_DEVICE_IO_MAP(goldstar_readport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8813,7 +8813,7 @@ MACHINE_CONFIG_START(goldstar_state::kkotnoli)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -8822,9 +8822,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::ladylinr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ladylinr_map)
- //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ladylinr_map)
+ //MCFG_DEVICE_IO_MAP(goldstar_readport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8854,10 +8854,10 @@ MACHINE_CONFIG_START(goldstar_state::ladylinr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK) // unused?
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK) // unused?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -8865,9 +8865,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wingco_state::wcat3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(wcat3_map)
- //MCFG_CPU_IO_MAP(goldstar_readport)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(wcat3_map)
+ //MCFG_DEVICE_IO_MAP(goldstar_readport)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8881,9 +8881,9 @@ MACHINE_CONFIG_START(wingco_state::wcat3)
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(wingco_state, system_outputa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(wingco_state, system_outputb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wingco_state, system_outputc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, wingco_state, system_outputa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, wingco_state, system_outputb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wingco_state, system_outputc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -8905,14 +8905,14 @@ MACHINE_CONFIG_START(wingco_state::wcat3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("snsnd", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW4"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(goldstar_state, ay8910_outputa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(goldstar_state, ay8910_outputb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -8922,9 +8922,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cmaster_state::amcoe1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cm_map)
- MCFG_CPU_IO_MAP(amcoe1_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cm_map)
+ MCFG_DEVICE_IO_MAP(amcoe1_portmap)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -8955,7 +8955,7 @@ MACHINE_CONFIG_START(cmaster_state::amcoe1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -8979,9 +8979,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cmaster_state::amcoe2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cm_map)
- MCFG_CPU_IO_MAP(amcoe2_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cm_map)
+ MCFG_DEVICE_IO_MAP(amcoe2_portmap)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -9012,7 +9012,7 @@ MACHINE_CONFIG_START(cmaster_state::amcoe2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) /* analyzed for clips */
@@ -9022,8 +9022,8 @@ MACHINE_CONFIG_START(cmaster_state::nfm)
amcoe2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nfm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nfm_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", nfm)
MACHINE_CONFIG_END
@@ -9038,9 +9038,9 @@ WRITE_LINE_MEMBER(unkch_state::vblank_irq)
MACHINE_CONFIG_START(unkch_state::unkch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(unkch_map)
- MCFG_CPU_IO_MAP(unkch_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(unkch_map)
+ MCFG_DEVICE_IO_MAP(unkch_portmap)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -9052,7 +9052,7 @@ MACHINE_CONFIG_START(unkch_state::unkch)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(unkch_state, screen_update_unkch)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(unkch_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, unkch_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", unkch)
MCFG_PALETTE_ADD("palette", 512)
@@ -9062,7 +9062,7 @@ MACHINE_CONFIG_START(unkch_state::unkch)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -9077,9 +9077,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(goldstar_state::pkrmast)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cm_map)
- MCFG_CPU_IO_MAP(pkrmast_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cm_map)
+ MCFG_DEVICE_IO_MAP(pkrmast_portmap)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -9100,7 +9100,7 @@ MACHINE_CONFIG_START(goldstar_state::pkrmast)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -9110,9 +9110,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(unkch_state::megaline)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(megaline_map)
- MCFG_CPU_IO_MAP(megaline_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(megaline_map)
+ MCFG_DEVICE_IO_MAP(megaline_portmap)
//MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
//MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
@@ -9138,20 +9138,20 @@ MACHINE_CONFIG_START(unkch_state::megaline)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn1", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn2", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn2", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn3", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn3", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW4"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(goldstar_state, ay8910_outputa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(goldstar_state, ay8910_outputb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, goldstar_state, ay8910_outputb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -9160,11 +9160,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(unkch_state::bonusch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 12_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(bonusch_map)
- MCFG_CPU_IO_MAP(bonusch_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(bonusch_map)
+ MCFG_DEVICE_IO_MAP(bonusch_portmap)
- MCFG_CPU_ADD("mcu", I80C51, 12_MHz_XTAL)
+ MCFG_DEVICE_ADD("mcu", I80C51, 12_MHz_XTAL)
MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -9185,16 +9185,16 @@ MACHINE_CONFIG_START(unkch_state::bonusch)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn1", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn2", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn2", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn3", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn3", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn4", SN76489, PSG_CLOCK)
+ MCFG_DEVICE_ADD("sn4", SN76489, PSG_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp
index 2fdfd67a7e4..a7032b6d649 100644
--- a/src/mame/drivers/gomoku.cpp
+++ b/src/mame/drivers/gomoku.cpp
@@ -124,13 +124,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(gomoku_state::gomoku)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/12) /* 1.536 MHz ? */
- MCFG_CPU_PROGRAM_MAP(gomoku_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gomoku_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/12) /* 1.536 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(gomoku_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gomoku_state, irq0_line_hold)
MCFG_DEVICE_ADD("latch", LS259, 0) // 7J
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(gomoku_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gomoku_state, bg_dispsw_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, gomoku_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gomoku_state, bg_dispsw_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // start LED?
/* video hardware */
@@ -149,7 +149,7 @@ MACHINE_CONFIG_START(gomoku_state::gomoku)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("gomoku", GOMOKU, 0)
+ MCFG_DEVICE_ADD("gomoku", GOMOKU_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp
index cdc2072da6b..74702911d20 100644
--- a/src/mame/drivers/good.cpp
+++ b/src/mame/drivers/good.cpp
@@ -289,9 +289,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(good_state::good)
- MCFG_CPU_ADD("maincpu", M68000, 16000000 /2)
- MCFG_CPU_PROGRAM_MAP(good_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", good_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000 /2)
+ MCFG_DEVICE_PROGRAM_MAP(good_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", good_state, irq2_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", good)
diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp
index f4f2b28b199..27a01ec6a8f 100644
--- a/src/mame/drivers/goodejan.cpp
+++ b/src/mame/drivers/goodejan.cpp
@@ -652,12 +652,12 @@ WRITE16_MEMBER( goodejan_state::layer_scroll_w )
MACHINE_CONFIG_START(goodejan_state::goodejan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, GOODEJAN_MHZ2/2)
- MCFG_CPU_PROGRAM_MAP(goodejan_map)
- MCFG_CPU_IO_MAP(goodejan_io_map)
+ MCFG_DEVICE_ADD("maincpu", V30, GOODEJAN_MHZ2/2)
+ MCFG_DEVICE_PROGRAM_MAP(goodejan_map)
+ MCFG_DEVICE_IO_MAP(goodejan_io_map)
- MCFG_CPU_ADD("audiocpu", Z80, GOODEJAN_MHZ1/2)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, GOODEJAN_MHZ1/2)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -667,11 +667,11 @@ MACHINE_CONFIG_START(goodejan_state::goodejan)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) //TODO: dynamic resolution
MCFG_SCREEN_UPDATE_DRIVER(goodejan_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(goodejan_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, goodejan_state, vblank_irq))
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(goodejan_state, layer_en_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(goodejan_state, layer_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, goodejan_state, layer_en_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, goodejan_state, layer_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", goodejan)
MCFG_PALETTE_ADD("palette", 0x1000)
@@ -680,8 +680,8 @@ MACHINE_CONFIG_START(goodejan_state::goodejan)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, GOODEJAN_MHZ1/2)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, GOODEJAN_MHZ1/2)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", GOODEJAN_MHZ2/16, PIN7_LOW)
@@ -690,14 +690,14 @@ MACHINE_CONFIG_START(goodejan_state::goodejan)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(goodejan_state::totmejan)
goodejan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(totmejan_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(totmejan_io_map)
MACHINE_CONFIG_END
ROM_START( totmejan )
diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp
index 6708981a03b..77422304641 100644
--- a/src/mame/drivers/gotcha.cpp
+++ b/src/mame/drivers/gotcha.cpp
@@ -262,11 +262,11 @@ void gotcha_state::machine_reset()
MACHINE_CONFIG_START(gotcha_state::gotcha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */
- MCFG_CPU_PROGRAM_MAP(gotcha_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gotcha_map)
- MCFG_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,6000000) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 93e464e3b8f..13a8129a94b 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -675,7 +675,7 @@ static const char *const qbert_knocker_names[] =
MACHINE_CONFIG_START(gottlieb_state::qbert_knocker)
MCFG_SPEAKER_ADD("knocker", 0.0, 0.0, 1.0)
- MCFG_SOUND_ADD("knocker_sam", SAMPLES, 0)
+ MCFG_DEVICE_ADD("knocker_sam", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(qbert_knocker_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "knocker", 1.0)
@@ -1769,9 +1769,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(gottlieb_state::gottlieb_core)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(gottlieb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gottlieb_state, gottlieb_interrupt)
+ MCFG_DEVICE_ADD("maincpu", I8088, CPU_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(gottlieb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gottlieb_state, gottlieb_interrupt)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1793,21 +1793,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gottlieb_state::gottlieb1)
gottlieb_core(config);
- MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0)
+ MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gottlieb_state::gottlieb2)
gottlieb_core(config);
- MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0)
+ MCFG_DEVICE_ADD("r2sound", GOTTLIEB_SOUND_REV2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gottlieb_state::g2laser)
gottlieb_core(config);
- MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0)
+ MCFG_DEVICE_ADD("r2sound", GOTTLIEB_SOUND_REV2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_LASERDISC_PR8210_ADD("laserdisc")
@@ -1833,7 +1833,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gottlieb_state::gottlieb1_votrax)
gottlieb_core(config);
- MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_VOTRAX, 0)
+ MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1_VOTRAX)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1842,8 +1842,8 @@ MACHINE_CONFIG_START(gottlieb_state::reactor)
gottlieb1_votrax(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(reactor_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(reactor_map)
MCFG_DEVICE_REMOVE("nvram")
MACHINE_CONFIG_END
@@ -1870,7 +1870,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gottlieb_state::cobram3)
gottlieb_core(config);
- MCFG_SOUND_ADD("r2sound", GOTTLIEB_SOUND_REV2, 0)
+ MCFG_DEVICE_ADD("r2sound", GOTTLIEB_SOUND_REV2)
MCFG_GOTTLIEB_ENABLE_COBRAM3_MODS()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
@@ -1886,7 +1886,7 @@ MACHINE_CONFIG_START(gottlieb_state::cobram3)
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
/* sound hardware */
- MCFG_SOUND_MODIFY("r2sound:dac")
+ MCFG_DEVICE_MODIFY("r2sound:dac")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "r2sound", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp
index 7ea8b30d746..92aeda65f7b 100644
--- a/src/mame/drivers/gotya.cpp
+++ b/src/mame/drivers/gotya.cpp
@@ -212,9 +212,9 @@ void gotya_state::machine_reset()
MACHINE_CONFIG_START(gotya_state::gotya)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(gotya_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gotya_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(gotya_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gotya_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -235,7 +235,7 @@ MACHINE_CONFIG_START(gotya_state::gotya)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index ec89e0b8812..23fa83d957a 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -528,8 +528,8 @@ READ8_MEMBER( goupil_g2_state::visu24x80_ram_r )
MACHINE_CONFIG_START(goupil_g1_state::goupil_g1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(goupil_mem)
+ MCFG_DEVICE_ADD("maincpu",M6808, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(goupil_mem)
/* sound hardware */
// TODO !
@@ -551,9 +551,9 @@ MACHINE_CONFIG_START(goupil_g1_state::goupil_g1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("goupil_sl", goupil_g1_state, goupil_scanline, "screen", 0, 10)
MCFG_DEVICE_ADD("m_via_video", VIA6522, CPU_CLOCK / 4)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(goupil_g1_state, via_video_pba_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(goupil_g1_state, via_video_pbb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(goupil_g1_state, via_video_ca2_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, goupil_g1_state, via_video_pba_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, goupil_g1_state, via_video_pbb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, goupil_g1_state, via_video_ca2_w))
MCFG_DEVICE_ADD("m_via_keyb", VIA6522, CPU_CLOCK / 4)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
@@ -567,24 +567,24 @@ MACHINE_CONFIG_START(goupil_g1_state::goupil_g1)
MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("i8279_kb1", I8279, CPU_CLOCK)
- MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g1_state, scanlines_kbd1_w)) // scan SL lines
- MCFG_I8279_IN_RL_CB(READ8(goupil_g1_state, kbd1_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g1_state, shift_kb1_r))
- MCFG_I8279_IN_CTRL_CB(READ8(goupil_g1_state, ctrl_kb1_r))
- MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("m_via_keyb", via6522_device, write_ca1))
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, goupil_g1_state, scanlines_kbd1_w)) // scan SL lines
+ MCFG_I8279_IN_RL_CB(READ8(*this, goupil_g1_state, kbd1_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(READ8(*this, goupil_g1_state, shift_kb1_r))
+ MCFG_I8279_IN_CTRL_CB(READ8(*this, goupil_g1_state, ctrl_kb1_r))
+ MCFG_I8279_OUT_IRQ_CB(WRITELINE("m_via_keyb", via6522_device, write_ca1))
MCFG_DEVICE_ADD("i8279_kb2", I8279, CPU_CLOCK)
- MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g1_state, scanlines_kbd2_w)) // scan SL lines
- MCFG_I8279_IN_RL_CB(READ8(goupil_g1_state, kbd2_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g1_state, shift_kb2_r))
- MCFG_I8279_IN_CTRL_CB(READ8(goupil_g1_state, ctrl_kb2_r))
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, goupil_g1_state, scanlines_kbd2_w)) // scan SL lines
+ MCFG_I8279_IN_RL_CB(READ8(*this, goupil_g1_state, kbd2_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(READ8(*this, goupil_g1_state, shift_kb2_r))
+ MCFG_I8279_IN_CTRL_CB(READ8(*this, goupil_g1_state, ctrl_kb2_r))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(goupil_g2_state::goupil_g2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(goupil_g2_mem)
+ MCFG_DEVICE_ADD("maincpu",M6808, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(goupil_g2_mem)
/* sound hardware */
// TODO !
@@ -613,9 +613,9 @@ MACHINE_CONFIG_START(goupil_g2_state::goupil_g2)
MCFG_MC6845_ADDR_CHANGED_CB(goupil_g2_state, crtc_update_addr_changed)
MCFG_DEVICE_ADD("m_via_video", VIA6522, CPU_CLOCK / 4)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(goupil_g2_state, via_video_pba_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(goupil_g2_state, via_video_pbb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(goupil_g2_state, via_video_ca2_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, goupil_g2_state, via_video_pba_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, goupil_g2_state, via_video_pbb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, goupil_g2_state, via_video_ca2_w))
MCFG_DEVICE_ADD("m_via_keyb", VIA6522, CPU_CLOCK / 4)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
@@ -629,17 +629,17 @@ MACHINE_CONFIG_START(goupil_g2_state::goupil_g2)
MCFG_FLOPPY_DRIVE_ADD("fd1791:1", goupil_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("i8279_kb1", I8279, CPU_CLOCK)
- MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g2_state, scanlines_kbd1_w)) // scan SL lines
- MCFG_I8279_IN_RL_CB(READ8(goupil_g2_state, kbd1_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g2_state, shift_kb1_r))
- MCFG_I8279_IN_CTRL_CB(READ8(goupil_g2_state, ctrl_kb1_r))
- MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("m_via_keyb", via6522_device, write_ca1))
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, goupil_g2_state, scanlines_kbd1_w)) // scan SL lines
+ MCFG_I8279_IN_RL_CB(READ8(*this, goupil_g2_state, kbd1_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(READ8(*this, goupil_g2_state, shift_kb1_r))
+ MCFG_I8279_IN_CTRL_CB(READ8(*this, goupil_g2_state, ctrl_kb1_r))
+ MCFG_I8279_OUT_IRQ_CB(WRITELINE("m_via_keyb", via6522_device, write_ca1))
MCFG_DEVICE_ADD("i8279_kb2", I8279, CPU_CLOCK)
- MCFG_I8279_OUT_SL_CB(WRITE8(goupil_g2_state, scanlines_kbd2_w)) // scan SL lines
- MCFG_I8279_IN_RL_CB(READ8(goupil_g2_state, kbd2_r)) // kbd RL lines
- MCFG_I8279_IN_SHIFT_CB(READ8(goupil_g2_state, shift_kb2_r))
- MCFG_I8279_IN_CTRL_CB(READ8(goupil_g2_state, ctrl_kb2_r))
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, goupil_g2_state, scanlines_kbd2_w)) // scan SL lines
+ MCFG_I8279_IN_RL_CB(READ8(*this, goupil_g2_state, kbd2_r)) // kbd RL lines
+ MCFG_I8279_IN_SHIFT_CB(READ8(*this, goupil_g2_state, shift_kb2_r))
+ MCFG_I8279_IN_CTRL_CB(READ8(*this, goupil_g2_state, ctrl_kb2_r))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp
index 2e05e30d2b8..2596d26d06e 100644
--- a/src/mame/drivers/gp2x.cpp
+++ b/src/mame/drivers/gp2x.cpp
@@ -360,8 +360,8 @@ static INPUT_PORTS_START( gp2x )
INPUT_PORTS_END
MACHINE_CONFIG_START(gp2x_state::gp2x)
- MCFG_CPU_ADD("maincpu", ARM9, 80000000)
- MCFG_CPU_PROGRAM_MAP(gp2x_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 80000000)
+ MCFG_DEVICE_PROGRAM_MAP(gp2x_map)
MCFG_PALETTE_ADD("palette", 32768)
diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp
index 036edd527a2..4ee1630a3fd 100644
--- a/src/mame/drivers/gp32.cpp
+++ b/src/mame/drivers/gp32.cpp
@@ -1675,8 +1675,8 @@ void gp32_state::machine_reset()
}
MACHINE_CONFIG_START(gp32_state::gp32)
- MCFG_CPU_ADD("maincpu", ARM9, 40000000)
- MCFG_CPU_PROGRAM_MAP(gp32_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(gp32_map)
MCFG_PALETTE_ADD("palette", 32768)
@@ -1691,8 +1691,8 @@ MACHINE_CONFIG_START(gp32_state::gp32)
MCFG_DEFAULT_LAYOUT(layout_lcd_rot)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index 7f5d3fe5658..18fc0f6c5b3 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -432,9 +432,9 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(gp_1_state::gp_1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2457600)
- MCFG_CPU_PROGRAM_MAP(gp_1_map)
- MCFG_CPU_IO_MAP(gp_1_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2457600)
+ MCFG_DEVICE_PROGRAM_MAP(gp_1_map)
+ MCFG_DEVICE_IO_MAP(gp_1_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -447,9 +447,9 @@ MACHINE_CONFIG_START(gp_1_state::gp_1)
/* Devices */
MCFG_DEVICE_ADD("ppi", I8255A, 0 )
- MCFG_I8255_OUT_PORTA_CB(WRITE8(gp_1_state, porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(gp_1_state, portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gp_1_state, portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, gp_1_state, porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, gp_1_state, portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gp_1_state, portc_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, 2457600 )
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // Todo: absence of ints will cause a watchdog reset
@@ -459,7 +459,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gp_1_state::gp_1s)
gp_1(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, 0) // attack_decay_cap + attack_res: N/C
@@ -477,9 +477,9 @@ MACHINE_CONFIG_START(gp_1_state::gp_1s)
MCFG_DEVICE_REMOVE("ppi")
MCFG_DEVICE_ADD("ppi", I8255A, 0 )
- MCFG_I8255_OUT_PORTA_CB(WRITE8(gp_1_state, portas_w))
- MCFG_I8255_IN_PORTB_CB(READ8(gp_1_state, portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gp_1_state, portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, gp_1_state, portas_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, gp_1_state, portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gp_1_state, portc_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp
index 6ab7e390471..3d535651099 100644
--- a/src/mame/drivers/gp_2.cpp
+++ b/src/mame/drivers/gp_2.cpp
@@ -581,9 +581,9 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(gp_2_state::gp_2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2457600)
- MCFG_CPU_PROGRAM_MAP(gp_2_map)
- MCFG_CPU_IO_MAP(gp_2_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2457600)
+ MCFG_DEVICE_PROGRAM_MAP(gp_2_map)
+ MCFG_DEVICE_IO_MAP(gp_2_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -596,9 +596,9 @@ MACHINE_CONFIG_START(gp_2_state::gp_2)
/* Devices */
MCFG_DEVICE_ADD("ppi", I8255A, 0 )
- MCFG_I8255_OUT_PORTA_CB(WRITE8(gp_2_state, porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(gp_2_state, portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(gp_2_state, portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, gp_2_state, porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, gp_2_state, portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, gp_2_state, portc_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, 2457600 )
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // Todo: absence of ints will cause a watchdog reset
diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp
index 88fa31d5ff5..d33c0ec29aa 100644
--- a/src/mame/drivers/gpworld.cpp
+++ b/src/mame/drivers/gpworld.cpp
@@ -496,10 +496,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(gpworld_state::gpworld)
/* main cpu */
- MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mainmem)
- MCFG_CPU_IO_MAP(mainport)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gpworld_state, vblank_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, GUESSED_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mainmem)
+ MCFG_DEVICE_IO_MAP(mainport)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gpworld_state, vblank_callback)
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
@@ -515,7 +515,7 @@ MACHINE_CONFIG_START(gpworld_state::gpworld)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index 23ba59f720c..8f8992ec6b7 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -280,18 +280,18 @@ void gradius3_state::machine_reset()
MACHINE_CONFIG_START(gradius3_state::gradius3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(gradius3_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gradius3_state, cpuA_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gradius3_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gradius3_state, cpuA_interrupt)
- MCFG_CPU_ADD("sub", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(gradius3_map2)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gradius3_map2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gradius3_state, gradius3_sub_scanline, "screen", 0, 1)
/* 4 is triggered by cpu A, the others are unknown but */
/* required for the game to run. */
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(gradius3_s_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(gradius3_s_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -330,8 +330,8 @@ MACHINE_CONFIG_START(gradius3_state::gradius3)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(gradius3_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, gradius3_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.20)
diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp
index 1737c71bed8..bd81552b700 100644
--- a/src/mame/drivers/grchamp.cpp
+++ b/src/mame/drivers/grchamp.cpp
@@ -739,21 +739,21 @@ MACHINE_CONFIG_START(grchamp_state::grchamp)
/* basic machine hardware */
/* CPU BOARD */
- MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", grchamp_state, cpu0_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, PIXEL_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", grchamp_state, cpu0_interrupt)
/* GAME BOARD */
- MCFG_CPU_ADD("sub", Z80, PIXEL_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_IO_MAP(sub_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", grchamp_state, cpu1_interrupt)
+ MCFG_DEVICE_ADD("sub", Z80, PIXEL_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_IO_MAP(sub_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", grchamp_state, cpu1_interrupt)
/* SOUND BOARD */
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(grchamp_state, irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(grchamp_state, irq0_line_hold, (double)SOUND_CLOCK/4/16/16/10/16)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -776,20 +776,20 @@ MACHINE_CONFIG_START(grchamp_state::grchamp)
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK/4) /* 3B */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(grchamp_state, portA_0_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(grchamp_state, portB_0_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, SOUND_CLOCK/4) /* 3B */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, grchamp_state, portA_0_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, grchamp_state, portB_0_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK/4)
+ MCFG_DEVICE_ADD("ay2", AY8910, SOUND_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MCFG_SOUND_ADD("ay3", AY8910, SOUND_CLOCK/4) /* 1B */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(grchamp_state, portA_2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(grchamp_state, portB_2_w))
+ MCFG_DEVICE_ADD("ay3", AY8910, SOUND_CLOCK/4) /* 1B */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, grchamp_state, portA_2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, grchamp_state, portB_2_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(grchamp)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp
index de5c7a8f812..ce92b36564f 100644
--- a/src/mame/drivers/grfd2301.cpp
+++ b/src/mame/drivers/grfd2301.cpp
@@ -115,9 +115,9 @@ uint32_t grfd2301_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
MACHINE_CONFIG_START(grfd2301_state::grfd2301)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp
index 6c0631427ed..f46826c6d94 100644
--- a/src/mame/drivers/gridcomp.cpp
+++ b/src/mame/drivers/gridcomp.cpp
@@ -363,10 +363,10 @@ INPUT_PORTS_END
* IRQ7 ring
*/
MACHINE_CONFIG_START(gridcomp_state::grid1101)
- MCFG_CPU_ADD("maincpu", I8086, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(grid1101_map)
- MCFG_CPU_IO_MAP(grid1101_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(gridcomp_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(grid1101_map)
+ MCFG_DEVICE_IO_MAP(grid1101_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(gridcomp_state, irq_callback)
MCFG_MACHINE_START_OVERRIDE(gridcomp_state, gridcomp)
MCFG_MACHINE_RESET_OVERRIDE(gridcomp_state, gridcomp)
@@ -375,13 +375,13 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101)
MCFG_I80130_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DRIVER(gridcomp_state, screen_update_110x)
MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000)/2, 424, 0, 320, 262, 0, 240) // XXX 66 Hz refresh
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir3_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir3_w))
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_SCREEN_PALETTE("palette")
@@ -392,8 +392,8 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101)
MCFG_DEVICE_ADD("i7220", I7220, XTAL(4'000'000))
MCFG_I7220_DATA_SIZE(3) // 3 1-Mbit MBM's
- MCFG_I7220_IRQ_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w))
- MCFG_I7220_DRQ_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w))
+ MCFG_I7220_IRQ_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir1_w))
+ MCFG_I7220_DRQ_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir1_w))
MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL(4'032'000))
@@ -412,9 +412,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gridcomp_state::grid1121)
grid1101(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(24'000'000) / 3) // XXX
- MCFG_CPU_PROGRAM_MAP(grid1121_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(24'000'000) / 3) // XXX
+ MCFG_DEVICE_PROGRAM_MAP(grid1121_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gridcomp_state::grid1129)
diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp
index 310df700f57..abc650f55e8 100644
--- a/src/mame/drivers/gridlee.cpp
+++ b/src/mame/drivers/gridlee.cpp
@@ -399,8 +399,8 @@ static const char *const sample_names[] =
MACHINE_CONFIG_START(gridlee_state::gridlee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, GRIDLEE_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, GRIDLEE_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -409,9 +409,9 @@ MACHINE_CONFIG_START(gridlee_state::gridlee)
MCFG_DEVICE_ADD("latch", LS259, 0) // type can only be guessed
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0"))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1"))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gridlee_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gridlee_state, coin_counter_w))
// Q6 unknown - only written to at startup
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(gridlee_state, cocktail_flip_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, gridlee_state, cocktail_flip_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -425,10 +425,10 @@ MACHINE_CONFIG_START(gridlee_state::gridlee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("gridlee", GRIDLEE, 0)
+ MCFG_DEVICE_ADD("gridlee", GRIDLEE, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp
index d558ae1c277..90ca7f1b34a 100644
--- a/src/mame/drivers/groundfx.cpp
+++ b/src/mame/drivers/groundfx.cpp
@@ -238,9 +238,9 @@ INTERRUPT_GEN_MEMBER(groundfx_state::interrupt)
MACHINE_CONFIG_START(groundfx_state::groundfx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20MHz - verified */
- MCFG_CPU_PROGRAM_MAP(groundfx_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", groundfx_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20MHz - verified */
+ MCFG_DEVICE_PROGRAM_MAP(groundfx_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", groundfx_state, interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -253,12 +253,12 @@ MACHINE_CONFIG_START(groundfx_state::groundfx)
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_2_CB(IOPORT("BUTTONS"))
- MCFG_TC0510NIO_READ_3_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_INPUT(READLINE(groundfx_state, frame_counter_r)) MCFG_DEVCB_BIT(0)
- MCFG_TC0510NIO_WRITE_3_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(groundfx_state, coin_word_w))
+ MCFG_TC0510NIO_READ_3_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVCB_CHAIN_INPUT(READLINE(*this, groundfx_state, frame_counter_r)) MCFG_DEVCB_BIT(0)
+ MCFG_TC0510NIO_WRITE_3_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, groundfx_state, coin_word_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("SYSTEM"))
/* video hardware */
diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp
index d8ee462dda7..bade5acc52e 100644
--- a/src/mame/drivers/gstream.cpp
+++ b/src/mame/drivers/gstream.cpp
@@ -826,10 +826,10 @@ void gstream_state::machine_reset()
MACHINE_CONFIG_START(gstream_state::gstream)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(gstream_32bit_map)
- MCFG_CPU_IO_MAP(gstream_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gstream_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(gstream_32bit_map)
+ MCFG_DEVICE_IO_MAP(gstream_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gstream_state, irq0_line_hold)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -859,10 +859,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gstream_state::x2222)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(x2222_32bit_map)
- MCFG_CPU_IO_MAP(x2222_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gstream_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(x2222_32bit_map)
+ MCFG_DEVICE_IO_MAP(x2222_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gstream_state, irq0_line_hold)
// MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp
index 97d711397fb..8adb833d360 100644
--- a/src/mame/drivers/gstriker.cpp
+++ b/src/mame/drivers/gstriker.cpp
@@ -494,13 +494,13 @@ INPUT_PORTS_END
/*** MACHINE DRIVER **********************************************************/
MACHINE_CONFIG_START(gstriker_state::gstriker)
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(gstriker_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(gstriker_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
MCFG_DEVICE_ADD("io", VS9209, 0)
MCFG_VS9209_IN_PORTA_CB(IOPORT("P1"))
@@ -508,15 +508,15 @@ MACHINE_CONFIG_START(gstriker_state::gstriker)
MCFG_VS9209_IN_PORTC_CB(IOPORT("SYSTEM"))
MCFG_VS9209_IN_PORTD_CB(IOPORT("DSW1"))
MCFG_VS9209_IN_PORTE_CB(IOPORT("DSW2"))
- MCFG_VS9209_IN_PORTH_CB(DEVREADLINE("soundlatch", generic_latch_8_device, pending_r)) MCFG_DEVCB_BIT(0)
- MCFG_VS9209_OUT_PORTH_CB(DEVWRITELINE("watchdog", mb3773_device, write_line_ck)) MCFG_DEVCB_BIT(3)
+ MCFG_VS9209_IN_PORTH_CB(READLINE("soundlatch", generic_latch_8_device, pending_r)) MCFG_DEVCB_BIT(0)
+ MCFG_VS9209_OUT_PORTH_CB(WRITELINE("watchdog", mb3773_device, write_line_ck)) MCFG_DEVCB_BIT(3)
MCFG_DEVICE_ADD("watchdog", MB3773, 0)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- //MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("link", rs232_port_device, write_txd))
- //MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("link", rs232_port_device, write_rts))
+ //MCFG_ACIA6850_TXD_HANDLER(WRITELINE("link", rs232_port_device, write_txd))
+ //MCFG_ACIA6850_RTS_HANDLER(WRITELINE("link", rs232_port_device, write_rts))
MCFG_SCREEN_ADD("screen", RASTER)
// MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
@@ -525,7 +525,7 @@ MACHINE_CONFIG_START(gstriker_state::gstriker)
MCFG_SCREEN_SIZE(64*8, 64*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(gstriker_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gstriker_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gstriker_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gstriker)
@@ -554,7 +554,7 @@ MACHINE_CONFIG_START(gstriker_state::gstriker)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -564,13 +564,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gstriker_state::twc94)
gstriker(config);
- MCFG_CPU_REPLACE("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(twcup94_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(twcup94_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold)
MCFG_DEVICE_MODIFY("io")
- MCFG_VS9209_OUT_PORTH_CB(WRITE8(gstriker_state, twcup94_prot_reg_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("watchdog", mb3773_device, write_line_ck)) MCFG_DEVCB_BIT(3)
+ MCFG_VS9209_OUT_PORTH_CB(WRITE8(*this, gstriker_state, twcup94_prot_reg_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("watchdog", mb3773_device, write_line_ck)) MCFG_DEVCB_BIT(3)
MCFG_DEVICE_REMOVE("acia")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp
index f58a6adfc01..6c297b8d39d 100644
--- a/src/mame/drivers/gsword.cpp
+++ b/src/mame/drivers/gsword.cpp
@@ -785,25 +785,25 @@ GFXDECODE_END
MACHINE_CONFIG_START(gsword_state::gsword)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_IO_MAP(cpu1_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gsword_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'000'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_IO_MAP(cpu1_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gsword_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(18'000'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_IO_MAP(cpu2_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(gsword_state, sound_interrupt, 4*60)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(18'000'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_IO_MAP(cpu2_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(gsword_state, sound_interrupt, 4*60)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu3_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'000'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* Allow time for 2nd cpu to interleave*/
MCFG_TAITO8741_ADD("taito8741")
MCFG_TAITO8741_MODES(TAITO8741_MASTER,TAITO8741_SLAVE,TAITO8741_PORT,TAITO8741_PORT)
MCFG_TAITO8741_CONNECT(1,0,0,0)
- MCFG_TAITO8741_PORT_HANDLERS(IOPORT("DSW2"),IOPORT("DSW1"),READ8(gsword_state,i8741_2_r),READ8(gsword_state,i8741_3_r))
+ MCFG_TAITO8741_PORT_HANDLERS(IOPORT("DSW2"),IOPORT("DSW1"),READ8(*this, gsword_state,i8741_2_r),READ8(*this, gsword_state,i8741_3_r))
#if 1
/* to MCU timeout champbbj */
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -828,14 +828,14 @@ MACHINE_CONFIG_START(gsword_state::gsword)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'000'000)/12) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'000'000)/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(gsword_state, nmi_set_w)) /* portA write */
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, gsword_state, nmi_set_w)) /* portA write */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -843,30 +843,30 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(josvolly_state::josvolly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18000000/4) /* ? */
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_IO_MAP(josvolly_cpu1_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(josvolly_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18000000/4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_IO_MAP(josvolly_cpu1_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(josvolly_state, irq0_line_hold, 2*60)
- MCFG_CPU_ADD("audiocpu", Z80, 12000000/4) /* ? */
- MCFG_CPU_PROGRAM_MAP(josvolly_cpu2_map)
- MCFG_CPU_IO_MAP(josvolly_cpu2_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", josvolly_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(josvolly_cpu2_map)
+ MCFG_DEVICE_IO_MAP(josvolly_cpu2_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", josvolly_state, irq0_line_assert)
MCFG_DEVICE_ADD("mcu1", I8741, 18000000/2) /* ? */
- MCFG_MCS48_PORT_P1_IN_CB(READ8(josvolly_state, mcu1_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(josvolly_state, mcu1_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(josvolly_state, mcu1_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(josvolly_state, mcu1_p2_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, josvolly_state, mcu1_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, josvolly_state, mcu1_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, josvolly_state, mcu1_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, josvolly_state, mcu1_p2_w))
MCFG_DEVICE_ADD("mcu2", I8741, 12000000/2) /* ? */
- MCFG_MCS48_PORT_P1_IN_CB(READ8(josvolly_state, mcu2_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(josvolly_state, mcu2_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(josvolly_state, mcu2_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(josvolly_state, mcu2_p2_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, josvolly_state, mcu2_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, josvolly_state, mcu2_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, josvolly_state, mcu2_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, josvolly_state, mcu2_p2_w))
// TEST0 and TEST1 are driven by P20 and P21 on the other MCU
- MCFG_MCS48_PORT_T0_IN_CB(DEVREAD8("mcu1", i8741_device, p2_r)) MCFG_DEVCB_RSHIFT(0)
- MCFG_MCS48_PORT_T1_IN_CB(DEVREAD8("mcu1", i8741_device, p2_r)) MCFG_DEVCB_RSHIFT(1)
+ MCFG_MCS48_PORT_T0_IN_CB(READ8("mcu1", i8741_device, p2_r)) MCFG_DEVCB_RSHIFT(0)
+ MCFG_MCS48_PORT_T1_IN_CB(READ8("mcu1", i8741_device, p2_r)) MCFG_DEVCB_RSHIFT(1)
MCFG_DEVICE_ADD("aa_007", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1")) // 1PL
@@ -894,14 +894,14 @@ MACHINE_CONFIG_START(josvolly_state::josvolly)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
#if 0
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp
index 502b0c9d7ab..7c6d3600e4f 100644
--- a/src/mame/drivers/gticlub.cpp
+++ b/src/mame/drivers/gticlub.cpp
@@ -953,16 +953,16 @@ uint32_t gticlub_state::screen_update_hangplt(screen_device &screen, bitmap_rgb3
MACHINE_CONFIG_START(gticlub_state::gticlub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
- MCFG_CPU_PROGRAM_MAP(gticlub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gticlub_state, gticlub_vblank)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gticlub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gticlub_state, gticlub_vblank)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc_map)
+ MCFG_DEVICE_DATA_MAP(sharc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1062,19 +1062,19 @@ MACHINE_RESET_MEMBER(gticlub_state,hangplt)
MACHINE_CONFIG_START(gticlub_state::hangplt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
- MCFG_CPU_PROGRAM_MAP(hangplt_map)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hangplt_map)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(hangplt_sharc0_map)
+ MCFG_DEVICE_DATA_MAP(hangplt_sharc0_map)
- MCFG_CPU_ADD("dsp2", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp2", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(hangplt_sharc1_map)
+ MCFG_DEVICE_DATA_MAP(hangplt_sharc1_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1094,14 +1094,14 @@ MACHINE_CONFIG_START(gticlub_state::hangplt)
MCFG_VOODOO_TMUMEM(2,2)
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(gticlub_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, gticlub_state,voodoo_vblank_0))
MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(2,2)
MCFG_VOODOO_SCREEN_TAG("rscreen")
MCFG_VOODOO_CPU_TAG("dsp2")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(gticlub_state,voodoo_vblank_1))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, gticlub_state,voodoo_vblank_1))
MCFG_DEVICE_ADD("k033906_1", K033906, 0)
MCFG_K033906_VOODOO("voodoo0")
diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp
index 0ac9be4d0ee..e569d960c3d 100644
--- a/src/mame/drivers/gts1.cpp
+++ b/src/mame/drivers/gts1.cpp
@@ -700,40 +700,40 @@ WRITE8_MEMBER(gts1_state::gts1_do_w)
MACHINE_CONFIG_START(gts1_state::gts1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPS4_2, XTAL(3'579'545)) // divided by 18 in the CPU
- MCFG_CPU_PROGRAM_MAP(gts1_map)
- MCFG_CPU_DATA_MAP(gts1_data)
- MCFG_CPU_IO_MAP(gts1_io)
- MCFG_PPS4_DISCRETE_INPUT_A_CB(READ8(gts1_state, gts1_pa_r))
- MCFG_PPS4_DISCRETE_OUTPUT_CB(WRITE8(gts1_state, gts1_do_w))
+ MCFG_DEVICE_ADD("maincpu", PPS4_2, XTAL(3'579'545)) // divided by 18 in the CPU
+ MCFG_DEVICE_PROGRAM_MAP(gts1_map)
+ MCFG_DEVICE_DATA_MAP(gts1_data)
+ MCFG_DEVICE_IO_MAP(gts1_io)
+ MCFG_PPS4_DISCRETE_INPUT_A_CB(READ8(*this, gts1_state, gts1_pa_r))
+ MCFG_PPS4_DISCRETE_OUTPUT_CB(WRITE8(*this, gts1_state, gts1_do_w))
MCFG_NVRAM_ADD_0FILL("nvram")
/* A1753CE 2048 x 8 ROM (000-7ff), 128 x 4 RAM (00-7f) and 16 I/O lines (20 ... 2f) */
MCFG_DEVICE_ADD( "u5", RA17XX, 0 )
- MCFG_RA17XX_READ ( READ8 (gts1_state,gts1_switches_r) )
- MCFG_RA17XX_WRITE( WRITE8(gts1_state,gts1_switches_w) )
+ MCFG_RA17XX_READ ( READ8 (*this, gts1_state,gts1_switches_r) )
+ MCFG_RA17XX_WRITE( WRITE8(*this, gts1_state,gts1_switches_w) )
MCFG_RA17XX_CPU("maincpu")
/* A1752CF 2048 x 8 ROM (800-fff), 128 x 4 RAM (80-ff) and 16 I/O lines (40 ... 4f) */
MCFG_DEVICE_ADD( "u4", RA17XX, 0 )
- MCFG_RA17XX_READ ( READ8 (gts1_state,gts1_solenoid_r) )
- MCFG_RA17XX_WRITE( WRITE8(gts1_state,gts1_solenoid_w) )
+ MCFG_RA17XX_READ ( READ8 (*this, gts1_state,gts1_solenoid_r) )
+ MCFG_RA17XX_WRITE( WRITE8(*this, gts1_state,gts1_solenoid_w) )
MCFG_RA17XX_CPU("maincpu")
/* 10696 General Purpose Input/Output */
MCFG_DEVICE_ADD( "u2", R10696, 0 )
- MCFG_R10696_IO( READ8 (gts1_state,gts1_nvram_r),
- WRITE8(gts1_state,gts1_nvram_w) )
+ MCFG_R10696_IO( READ8 (*this, gts1_state,gts1_nvram_r),
+ WRITE8(*this, gts1_state,gts1_nvram_w) )
/* 10696 General Purpose Input/Output */
MCFG_DEVICE_ADD( "u3", R10696, 0 )
- MCFG_R10696_IO( READ8 (gts1_state,gts1_lamp_apm_r),
- WRITE8(gts1_state,gts1_lamp_apm_w) )
+ MCFG_R10696_IO( READ8 (*this, gts1_state,gts1_lamp_apm_r),
+ WRITE8(*this, gts1_state,gts1_lamp_apm_w) )
/* 10788 General Purpose Display and Keyboard */
MCFG_DEVICE_ADD( "u6", R10788, XTAL(3'579'545) / 18 ) // divided in the circuit
- MCFG_R10788_UPDATE( WRITE8(gts1_state,gts1_display_w) )
+ MCFG_R10788_UPDATE( WRITE8(*this, gts1_state,gts1_display_w) )
/* Video */
MCFG_DEFAULT_LAYOUT( layout_gts1 )
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index fdd842265fa..27a35ddd66a 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -215,7 +215,7 @@ INPUT_CHANGED_MEMBER( gts3_state::test_inp )
m_u4->write_ca1(newval);
}
-// This trampoline needed; DEVWRITELINE("maincpu", m65c02_device, nmi_line) does not work
+// This trampoline needed; WRITELINE("maincpu", m65c02_device, nmi_line) does not work
WRITE_LINE_MEMBER( gts3_state::nmi_w )
{
m_maincpu->set_input_line(INPUT_LINE_NMI, (state) ? CLEAR_LINE : HOLD_LINE);
@@ -283,8 +283,8 @@ DRIVER_INIT_MEMBER( gts3_state, gts3 )
MACHINE_CONFIG_START(gts3_state::gts3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(gts3_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(gts3_map)
MCFG_NVRAM_ADD_0FILL("nvram")
/* Video */
@@ -295,20 +295,20 @@ MACHINE_CONFIG_START(gts3_state::gts3)
MCFG_DEVICE_ADD("u4", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
- MCFG_VIA6522_READPA_HANDLER(READ8(gts3_state, u4a_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(gts3_state, u4b_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3_state, u4b_w))
- //MCFG_VIA6522_CA2_HANDLER(WRITELINE(gts3_state, u4ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3_state, nmi_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, gts3_state, u4a_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, gts3_state, u4b_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gts3_state, u4b_w))
+ //MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gts3_state, u4ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gts3_state, nmi_w))
MCFG_DEVICE_ADD("u5", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
- //MCFG_VIA6522_READPA_HANDLER(READ8(gts3_state, u5a_r))
- //MCFG_VIA6522_READPB_HANDLER(READ8(gts3_state, u5b_r))
- //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3_state, u5b_w))
- //MCFG_VIA6522_CA2_HANDLER(WRITELINE(gts3_state, u5ca2_w))
- //MCFG_VIA6522_CB1_HANDLER(WRITELINE(gts3_state, u5cb1_w))
- //MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3_state, u5cb2_w))
+ //MCFG_VIA6522_READPA_HANDLER(READ8(*this, gts3_state, u5a_r))
+ //MCFG_VIA6522_READPB_HANDLER(READ8(*this, gts3_state, u5b_r))
+ //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gts3_state, u5b_w))
+ //MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gts3_state, u5ca2_w))
+ //MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, gts3_state, u5cb1_w))
+ //MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gts3_state, u5cb2_w))
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index fe3ce919bee..23ba16e4762 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -229,7 +229,7 @@ INPUT_CHANGED_MEMBER( gts3a_state::test_inp )
m_u4->write_ca1(newval);
}
-// This trampoline needed; DEVWRITELINE("maincpu", m65c02_device, nmi_line) does not work
+// This trampoline needed; WRITELINE("maincpu", m65c02_device, nmi_line) does not work
WRITE_LINE_MEMBER( gts3a_state::nmi_w )
{
m_maincpu->set_input_line(INPUT_LINE_NMI, (state) ? CLEAR_LINE : HOLD_LINE);
@@ -340,12 +340,12 @@ MC6845_UPDATE_ROW( gts3a_state::crtc_update_row )
MACHINE_CONFIG_START(gts3a_state::gts3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(gts3a_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(gts3a_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 6116LP + DS1210
- MCFG_CPU_ADD("dmdcpu", M65C02, XTAL(3'579'545) / 2)
- MCFG_CPU_PROGRAM_MAP(gts3a_dmd_map)
+ MCFG_DEVICE_ADD("dmdcpu", M65C02, XTAL(3'579'545) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(gts3a_dmd_map)
/* Video */
MCFG_SCREEN_ADD("screen", LCD)
@@ -367,20 +367,20 @@ MACHINE_CONFIG_START(gts3a_state::gts3a)
MCFG_DEVICE_ADD("u4", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
- MCFG_VIA6522_READPA_HANDLER(READ8(gts3a_state, u4a_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(gts3a_state, u4b_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3a_state, u4b_w))
- //MCFG_VIA6522_CA2_HANDLER(WRITELINE(gts3a_state, u4ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3a_state, nmi_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, gts3a_state, u4a_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, gts3a_state, u4b_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gts3a_state, u4b_w))
+ //MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gts3a_state, u4ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gts3a_state, nmi_w))
MCFG_DEVICE_ADD("u5", VIA6522, XTAL(4'000'000) / 2)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M65C02_IRQ_LINE))
- //MCFG_VIA6522_READPA_HANDLER(READ8(gts3a_state, u5a_r))
- //MCFG_VIA6522_READPB_HANDLER(READ8(gts3a_state, u5b_r))
- //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gts3a_state, u5b_w))
- //MCFG_VIA6522_CA2_HANDLER(WRITELINE(gts3a_state, u5ca2_w))
- //MCFG_VIA6522_CB1_HANDLER(WRITELINE(gts3a_state, u5cb1_w))
- //MCFG_VIA6522_CB2_HANDLER(WRITELINE(gts3a_state, u5cb2_w))
+ //MCFG_VIA6522_READPA_HANDLER(READ8(*this, gts3a_state, u5a_r))
+ //MCFG_VIA6522_READPB_HANDLER(READ8(*this, gts3a_state, u5b_r))
+ //MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gts3a_state, u5b_w))
+ //MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gts3a_state, u5ca2_w))
+ //MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, gts3a_state, u5cb1_w))
+ //MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, gts3a_state, u5cb2_w))
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp
index 0858ca32f6a..ee880e2c0e2 100644
--- a/src/mame/drivers/gts80.cpp
+++ b/src/mame/drivers/gts80.cpp
@@ -355,8 +355,8 @@ DRIVER_INIT_MEMBER( gts80_state, gts80 )
/* with Sound Board */
MACHINE_CONFIG_START(gts80_state::gts80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4)
- MCFG_CPU_PROGRAM_MAP(gts80_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(3'579'545)/4)
+ MCFG_DEVICE_PROGRAM_MAP(gts80_map)
MCFG_NVRAM_ADD_1FILL("nvram") // must be 1
@@ -365,22 +365,22 @@ MACHINE_CONFIG_START(gts80_state::gts80)
/* Devices */
MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port1a_r)) // sw_r
- //MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port1a_w))
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port1b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port1b_w)) // sw_w
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80_state, port1a_r)) // sw_r
+ //MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80_state, port1a_w))
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80_state, port1b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port2a_r)) // pa7 - slam tilt
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port2a_w)) // digit select
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port2b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port2b_w)) // seg
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80_state, port2a_r)) // pa7 - slam tilt
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80_state, port2a_w)) // digit select
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80_state, port2b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL(3'579'545)/4)
- //MCFG_RIOT6532_IN_PA_CB(READ8(gts80_state, port3a_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80_state, port3a_w)) // sol, snd
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80_state, port3b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80_state, port3b_w)) // lamps
+ //MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80_state, port3a_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80_state, port3a_w)) // sol, snd
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80_state, port3b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80_state, port3b_w)) // lamps
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
/* Sound */
@@ -390,20 +390,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gts80_state::gts80_s)
gts80(config);
- MCFG_SOUND_ADD("r0sound", GOTTLIEB_SOUND_REV0, 0)
+ MCFG_DEVICE_ADD("r0sound", GOTTLIEB_SOUND_REV0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gts80_state::gts80_hh)
gts80(config);
- MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0)
+ MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gts80_state::gts80_ss)
gts80(config);
- MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0)
- //MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) // votrax crashes
+ MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1)
+ //MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX) // votrax crashes
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index a8586f37d42..1f9755f55c1 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -345,8 +345,8 @@ DRIVER_INIT_MEMBER( gts80a_state, gts80a )
/* with Sound Board */
MACHINE_CONFIG_START(gts80a_state::gts80a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4)
- MCFG_CPU_PROGRAM_MAP(gts80a_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(3'579'545)/4)
+ MCFG_DEVICE_PROGRAM_MAP(gts80a_map)
MCFG_NVRAM_ADD_1FILL("nvram") // must be 1
@@ -355,22 +355,22 @@ MACHINE_CONFIG_START(gts80a_state::gts80a)
/* Devices */
MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(gts80a_state, port1a_r)) // sw_r
- //MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80a_state, port1a_w))
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80a_state, port1b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80a_state, port1b_w)) // sw_w
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80a_state, port1a_r)) // sw_r
+ //MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80a_state, port1a_w))
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80a_state, port1b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80a_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(gts80a_state, port2a_r)) // pa7 - slam tilt
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80a_state, port2a_w)) // digit select
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80a_state, port2b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80a_state, port2b_w)) // seg
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80a_state, port2a_r)) // pa7 - slam tilt
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80a_state, port2a_w)) // digit select
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80a_state, port2b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80a_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL(3'579'545)/4)
- //MCFG_RIOT6532_IN_PA_CB(READ8(gts80a_state, port3a_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80a_state, port3a_w)) // sol, snd
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80a_state, port3b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80a_state, port3b_w)) // lamps
+ //MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80a_state, port3a_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80a_state, port3a_w)) // sol, snd
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80a_state, port3b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80a_state, port3b_w)) // lamps
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
/* Sound */
@@ -380,14 +380,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gts80a_state::gts80a_s)
gts80a(config);
- MCFG_SOUND_ADD("r0sound", GOTTLIEB_SOUND_REV0, 0)
+ MCFG_DEVICE_ADD("r0sound", GOTTLIEB_SOUND_REV0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gts80a_state::gts80a_ss)
gts80a(config);
- MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0)
- //MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) // votrax crashes
+ MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1)
+ //MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) // votrax crashes
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -458,9 +458,9 @@ void caveman_state::video_io_map(address_map &map)
MACHINE_CONFIG_START(caveman_state::caveman)
gts80a_ss(config);
- MCFG_CPU_ADD("video_cpu", I8088, 5000000)
- MCFG_CPU_PROGRAM_MAP(video_map)
- MCFG_CPU_IO_MAP(video_io_map)
+ MCFG_DEVICE_ADD("video_cpu", I8088, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(video_map)
+ MCFG_DEVICE_IO_MAP(video_io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp
index 94e9b54cee4..f4a2c810b8c 100644
--- a/src/mame/drivers/gts80b.cpp
+++ b/src/mame/drivers/gts80b.cpp
@@ -387,8 +387,8 @@ DRIVER_INIT_MEMBER( gts80b_state, gts80b )
/* with Sound Board */
MACHINE_CONFIG_START(gts80b_state::gts80b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4)
- MCFG_CPU_PROGRAM_MAP(gts80b_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(3'579'545)/4)
+ MCFG_DEVICE_PROGRAM_MAP(gts80b_map)
MCFG_NVRAM_ADD_1FILL("nvram") // must be 1
@@ -397,22 +397,22 @@ MACHINE_CONFIG_START(gts80b_state::gts80b)
/* Devices */
MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(gts80b_state, port1a_r)) // sw_r
- //MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80b_state, port1a_w))
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80b_state, port1b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80b_state, port1b_w)) // sw_w
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80b_state, port1a_r)) // sw_r
+ //MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80b_state, port1a_w))
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80b_state, port1b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80b_state, port1b_w)) // sw_w
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("riot2", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(gts80b_state, port2a_r)) // pa7 - slam tilt
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80b_state, port2a_w)) // digit select
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80b_state, port2b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80b_state, port2b_w)) // seg
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80b_state, port2a_r)) // pa7 - slam tilt
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80b_state, port2a_w)) // digit select
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80b_state, port2b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80b_state, port2b_w)) // seg
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_DEVICE_ADD("riot3", RIOT6532, XTAL(3'579'545)/4)
- //MCFG_RIOT6532_IN_PA_CB(READ8(gts80b_state, port3a_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(gts80b_state, port3a_w)) // sol, snd
- //MCFG_RIOT6532_IN_PB_CB(READ8(gts80b_state, port3b_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(gts80b_state, port3b_w)) // lamps
+ //MCFG_RIOT6532_IN_PA_CB(READ8(*this, gts80b_state, port3a_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, gts80b_state, port3a_w)) // sol, snd
+ //MCFG_RIOT6532_IN_PB_CB(READ8(*this, gts80b_state, port3b_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, gts80b_state, port3b_w)) // lamps
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
/* Sound */
@@ -422,14 +422,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gts80b_state::gts80b_s)
gts80b(config);
- MCFG_SOUND_ADD("r0sound", GOTTLIEB_SOUND_REV0, 0)
+ MCFG_DEVICE_ADD("r0sound", GOTTLIEB_SOUND_REV0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
//static MACHINE_CONFIG_START( gts80b_ss )
//static gts80b(config);
-// MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1, 0)
-// //MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0) // votrax crashes
+// MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1)
+// //MCFG_DEVICE_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX0) // votrax crashes
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
//MACHINE_CONFIG_END
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index a0a88b316e6..91dcad6ba8d 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -470,8 +470,8 @@ static void guab_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(guab_state::guab)
/* TODO: Verify clock */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(guab_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(guab_map)
/* TODO: Use real video timings */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(guab_state::guab)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* TODO: Verify clock */
- MCFG_SOUND_ADD("snsnd", SN76489, 2000000)
+ MCFG_DEVICE_ADD("snsnd", SN76489, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("6840ptm", PTM6840, 1000000)
@@ -509,35 +509,35 @@ MACHINE_CONFIG_START(guab_state::guab)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("i8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(guab_state, output1_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(guab_state, output2_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(guab_state, output3_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, guab_state, output1_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, guab_state, output2_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, guab_state, output3_w))
MCFG_DEVICE_ADD("i8255_3", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(guab_state, output4_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(guab_state, output5_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(guab_state, output6_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, guab_state, output4_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, guab_state, output5_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, guab_state, output6_w))
MCFG_DEVICE_ADD("i8255_4", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(guab_state, sn76489_ready_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(guab_state, sn76489_buffer_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(guab_state, system_w))
- MCFG_I8255_IN_PORTC_CB(READ8(guab_state, watchdog_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(guab_state, watchdog_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, guab_state, sn76489_ready_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, guab_state, sn76489_buffer_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, guab_state, system_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, guab_state, watchdog_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, guab_state, watchdog_w))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", 4))
- MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232_1", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", acia_1_rs232_defaults)
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) // source? the ptm doesn't seem to output any common baud values
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0)
diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp
index fceebd31a7c..238cc0d1d11 100644
--- a/src/mame/drivers/gumbo.cpp
+++ b/src/mame/drivers/gumbo.cpp
@@ -238,9 +238,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(gumbo_state::gumbo)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(14'318'181)/2)
- MCFG_CPU_PROGRAM_MAP(gumbo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gumbo_state, irq1_line_hold) // all the same
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(14'318'181)/2)
+ MCFG_DEVICE_PROGRAM_MAP(gumbo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gumbo_state, irq1_line_hold) // all the same
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gumbo)
@@ -265,15 +265,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(gumbo_state::mspuzzle)
gumbo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mspuzzle_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mspuzzle_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(gumbo_state::dblpoint)
gumbo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dblpoint_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dblpoint_map)
MACHINE_CONFIG_END
ROM_START( gumbo )
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index 3f3059d074b..d42bf2cbf64 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -231,9 +231,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(gunbustr_state::gunbustr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(gunbustr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gunbustr_state, gunbustr_interrupt) /* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gunbustr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gunbustr_state, gunbustr_interrupt) /* VBL */
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -241,10 +241,10 @@ MACHINE_CONFIG_START(gunbustr_state::gunbustr)
MCFG_TC0510NIO_READ_0_CB(IOPORT("EXTRA"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("INPUTS"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("SPECIAL"))
- MCFG_TC0510NIO_WRITE_3_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(gunbustr_state, coin_word_w))
+ MCFG_TC0510NIO_WRITE_3_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, gunbustr_state, coin_word_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("SYSTEM"))
/* video hardware */
diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp
index 8a05c6cf6cd..3f1501768c8 100644
--- a/src/mame/drivers/gundealr.cpp
+++ b/src/mame/drivers/gundealr.cpp
@@ -441,9 +441,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::scanline)
MACHINE_CONFIG_START(gundealr_state::gundealr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz verified for Yam! Yam!? */
- MCFG_CPU_PROGRAM_MAP(gundealr_main_map)
- MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* 6 MHz verified for Yam! Yam!? */
+ MCFG_DEVICE_PROGRAM_MAP(gundealr_main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gundealr_state, scanline, "screen", 0, 1)
/* video hardware */
@@ -461,7 +461,7 @@ MACHINE_CONFIG_START(gundealr_state::gundealr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* 1.5Mhz verified for Yam! Yam!? */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* 1.5Mhz verified for Yam! Yam!? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -531,8 +531,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::yamyam_mcu_sim)
MACHINE_CONFIG_START(gundealr_state::yamyam)
gundealr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(yamyam_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(yamyam_main_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcusim", gundealr_state, yamyam_mcu_sim, attotime::from_hz(6000000/60)) /* 6mhz confirmed */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp
index 7f970f3b801..bf5e6c37fcc 100644
--- a/src/mame/drivers/gunpey.cpp
+++ b/src/mame/drivers/gunpey.cpp
@@ -1219,9 +1219,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(gunpey_state::scanline)
MACHINE_CONFIG_START(gunpey_state::gunpey)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, 57242400 / 4)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", V30, 57242400 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", gunpey_state, scanline, "screen", 0, 1)
/* video hardware */
@@ -1238,7 +1238,7 @@ MACHINE_CONFIG_START(gunpey_state::gunpey)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp
index ec0ca9df33f..0e9854b554b 100644
--- a/src/mame/drivers/gunsmoke.cpp
+++ b/src/mame/drivers/gunsmoke.cpp
@@ -304,13 +304,13 @@ void gunsmoke_state::machine_reset()
MACHINE_CONFIG_START(gunsmoke_state::gunsmoke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(gunsmoke_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gunsmoke_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(gunsmoke_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gunsmoke_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 3000000) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(gunsmoke_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(gunsmoke_state, irq0_line_hold, 4*60)
MCFG_WATCHDOG_ADD("watchdog")
@@ -334,13 +334,13 @@ MACHINE_CONFIG_START(gunsmoke_state::gunsmoke)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.22)
MCFG_SOUND_ROUTE(1, "mono", 0.22)
MCFG_SOUND_ROUTE(2, "mono", 0.22)
MCFG_SOUND_ROUTE(3, "mono", 0.14)
- MCFG_SOUND_ADD("ym2", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.22)
MCFG_SOUND_ROUTE(1, "mono", 0.22)
MCFG_SOUND_ROUTE(2, "mono", 0.22)
diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp
index c7a95f6cdd6..87100c0b8ea 100644
--- a/src/mame/drivers/gyruss.cpp
+++ b/src/mame/drivers/gyruss.cpp
@@ -477,36 +477,36 @@ WRITE_LINE_MEMBER(gyruss_state::vblank_irq)
MACHINE_CONFIG_START(gyruss_state::gyruss)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(main_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu1_map)
- MCFG_CPU_ADD("sub", KONAMI1, MASTER_CLOCK/12) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(main_cpu2_map)
+ MCFG_DEVICE_ADD("sub", KONAMI1, MASTER_CLOCK/12) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu2_map)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(audio_cpu1_map)
- MCFG_CPU_IO_MAP(audio_cpu1_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_cpu1_map)
+ MCFG_DEVICE_IO_MAP(audio_cpu1_io_map)
- MCFG_CPU_ADD("audio2", I8039, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(audio_cpu2_map)
- MCFG_CPU_IO_MAP(audio_cpu2_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gyruss_state, gyruss_dac_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(gyruss_state, gyruss_irq_clear_w))
+ MCFG_DEVICE_ADD("audio2", I8039, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(audio_cpu2_map)
+ MCFG_DEVICE_IO_MAP(audio_cpu2_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, gyruss_state, gyruss_dac_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, gyruss_state, gyruss_irq_clear_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 3C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(gyruss_state, master_nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(gyruss_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(gyruss_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(gyruss_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, gyruss_state, master_nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, gyruss_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, gyruss_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, gyruss_state, flipscreen_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(gyruss_state, screen_update_gyruss)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(gyruss_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, gyruss_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", gyruss)
MCFG_PALETTE_ADD("palette", 16*4+16*16)
@@ -519,45 +519,45 @@ MACHINE_CONFIG_START(gyruss_state::gyruss)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(gyruss_state, gyruss_filter0_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, gyruss_state, gyruss_filter0_w))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 1)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 2)
- MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(gyruss_state, gyruss_filter1_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, gyruss_state, gyruss_filter1_w))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 3)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 4)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 5)
- MCFG_SOUND_ADD("ay3", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay3", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
- MCFG_AY8910_PORT_A_READ_CB(READ8(gyruss_state, gyruss_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, gyruss_state, gyruss_portA_r))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 6)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 7)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 8)
- MCFG_SOUND_ADD("ay4", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay4", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 9)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 10)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 11)
- MCFG_SOUND_ADD("ay5", AY8910, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("ay5", AY8910, SOUND_CLOCK/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(3.3), RES_K(3.3), RES_K(3.3))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 12)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 13)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 14)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(gyruss_sound)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp
index d4287b6889d..fc444c386e1 100644
--- a/src/mame/drivers/h19.cpp
+++ b/src/mame/drivers/h19.cpp
@@ -519,9 +519,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(h19_state::h19)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, H19_CLOCK) // From schematics
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, H19_CLOCK) // From schematics
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
// TODO: make configurable, Heath offered 3 different CRTs - White, Green, Amber.
@@ -554,13 +554,13 @@ MACHINE_CONFIG_START(h19_state::h19)
MCFG_MM5740_MATRIX_X7(IOPORT("X7"))
MCFG_MM5740_MATRIX_X8(IOPORT("X8"))
MCFG_MM5740_MATRIX_X9(IOPORT("X9"))
- MCFG_MM5740_SHIFT_CB(READLINE(h19_state, mm5740_shift_r))
- MCFG_MM5740_CONTROL_CB(READLINE(h19_state, mm5740_control_r))
- MCFG_MM5740_DATA_READY_CB(WRITELINE(h19_state, mm5740_data_ready_w))
+ MCFG_MM5740_SHIFT_CB(READLINE(*this, h19_state, mm5740_shift_r))
+ MCFG_MM5740_CONTROL_CB(READLINE(*this, h19_state, mm5740_control_r))
+ MCFG_MM5740_DATA_READY_CB(WRITELINE(*this, h19_state, mm5740_data_ready_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, H19_BEEP_FRQ)
+ MCFG_DEVICE_ADD("beeper", BEEP, H19_BEEP_FRQ)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 303e730cde4..be9787195f2 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -312,29 +312,29 @@ TIMER_DEVICE_CALLBACK_MEMBER(h8_state::h8_p)
MACHINE_CONFIG_START(h8_state::h8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, H8_CLOCK)
- MCFG_CPU_PROGRAM_MAP(h8_mem)
- MCFG_CPU_IO_MAP(h8_io)
- MCFG_I8085A_STATUS(WRITE8(h8_state, h8_status_callback))
- MCFG_I8085A_INTE(WRITELINE(h8_state, h8_inte_callback))
+ MCFG_DEVICE_ADD("maincpu", I8080, H8_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(h8_mem)
+ MCFG_DEVICE_IO_MAP(h8_io)
+ MCFG_I8085A_STATUS(WRITE8(*this, h8_state, h8_status_callback))
+ MCFG_I8085A_INTE(WRITELINE(*this, h8_state, h8_inte_callback))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_h8)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, H8_BEEP_FRQ)
+ MCFG_DEVICE_ADD("beeper", BEEP, H8_BEEP_FRQ)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* Devices */
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(h8_state, txdata_callback))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, h8_state, txdata_callback))
MCFG_DEVICE_ADD("cassette_clock", CLOCK, 4800)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp
index 2dfcf4a2ef3..a2bdbc18aec 100644
--- a/src/mame/drivers/h89.cpp
+++ b/src/mame/drivers/h89.cpp
@@ -185,15 +185,15 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(h89_state::h89)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(12'288'000) / 6)
- MCFG_CPU_PROGRAM_MAP(h89_mem)
- MCFG_CPU_IO_MAP(h89_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(12'288'000) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(h89_mem)
+ MCFG_DEVICE_IO_MAP(h89_io)
MCFG_DEVICE_ADD( "ins8250", INS8250, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, rx_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ins8250", ins8250_uart_device, rx_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", h89_state, h89_irq_timer, attotime::from_hz(100))
diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp
index c6b721195b6..b66dfad44d6 100644
--- a/src/mame/drivers/halleys.cpp
+++ b/src/mame/drivers/halleys.cpp
@@ -1928,13 +1928,13 @@ void halleys_state::machine_reset()
MACHINE_CONFIG_START(halleys_state::halleys)
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(19'968'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(halleys_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(19'968'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(halleys_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", halleys_state, halleys_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(halleys_state, irq0_line_hold, (double)6000000/(4*16*16*10*16))
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(6'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(halleys_state, irq0_line_hold, (double)6000000/(4*16*16*10*16))
// video hardware
@@ -1955,25 +1955,25 @@ MACHINE_CONFIG_START(halleys_state::halleys)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay3", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay4", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(halleys_state, sndnmi_msk_w)) // port Bwrite
+ MCFG_DEVICE_ADD("ay4", AY8910, XTAL(6'000'000)/4) /* verified on pcb */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, halleys_state, sndnmi_msk_w)) // port Bwrite
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(halleys_state::benberob)
halleys(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(19'968'000)/12) /* not verified but pcb identical to halley's comet */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(19'968'000)/12) /* not verified but pcb identical to halley's comet */
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(halleys_state, benberob_scanline)
diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp
index ef987457a86..c2eb84b96a6 100644
--- a/src/mame/drivers/hanaawas.cpp
+++ b/src/mame/drivers/hanaawas.cpp
@@ -218,10 +218,10 @@ void hanaawas_state::machine_reset()
MACHINE_CONFIG_START(hanaawas_state::hanaawas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(hanaawas_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", hanaawas_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(hanaawas_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", hanaawas_state, irq0_line_assert)
/* video hardware */
@@ -241,9 +241,9 @@ MACHINE_CONFIG_START(hanaawas_state::hanaawas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 18432000/12)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 18432000/12)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(hanaawas_state, hanaawas_portB_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, hanaawas_state, hanaawas_portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index ec88fb26bd5..ac9a60f4b93 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -475,11 +475,11 @@ WRITE_LINE_MEMBER( hankin_state::ic2_cb2_w )
MACHINE_CONFIG_START(hankin_state::hankin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, 3276800)
- MCFG_CPU_PROGRAM_MAP(hankin_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, 3276800)
+ MCFG_DEVICE_PROGRAM_MAP(hankin_map)
- MCFG_CPU_ADD("audiocpu", M6802, 3276800) // guess, xtal value not shown
- MCFG_CPU_PROGRAM_MAP(hankin_sub_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 3276800) // guess, xtal value not shown
+ MCFG_DEVICE_PROGRAM_MAP(hankin_sub_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -490,38 +490,38 @@ MACHINE_CONFIG_START(hankin_state::hankin)
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
/* Devices */
MCFG_DEVICE_ADD("ic10", PIA6821, 0)
- //MCFG_PIA_READPA_HANDLER(READ8(hankin_state, ic10_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(hankin_state, ic10_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(hankin_state, ic10_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(hankin_state, ic10_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(hankin_state, ic10_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(hankin_state, ic10_cb2_w))
+ //MCFG_PIA_READPA_HANDLER(READ8(*this, hankin_state, ic10_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, hankin_state, ic10_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, hankin_state, ic10_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, hankin_state, ic10_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, hankin_state, ic10_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, hankin_state, ic10_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_DEVICE_ADD("ic11", PIA6821, 0)
- //MCFG_PIA_READPA_HANDLER(READ8(hankin_state, ic11_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(hankin_state, ic11_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(hankin_state, ic11_b_r))
- //MCFG_PIA_WRITEPB_HANDLER(WRITE8(hankin_state, ic11_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(hankin_state, ic11_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(hankin_state, ic11_cb2_w))
+ //MCFG_PIA_READPA_HANDLER(READ8(*this, hankin_state, ic11_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, hankin_state, ic11_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, hankin_state, ic11_b_r))
+ //MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, hankin_state, ic11_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, hankin_state, ic11_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, hankin_state, ic11_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6802_IRQ_LINE))
MCFG_DEVICE_ADD("ic2", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(hankin_state, ic2_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(hankin_state, ic2_a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(hankin_state, ic2_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(hankin_state, ic2_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(hankin_state, ic2_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(hankin_state, ic2_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, hankin_state, ic2_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, hankin_state, ic2_a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, hankin_state, ic2_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, hankin_state, ic2_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, hankin_state, ic2_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, hankin_state, ic2_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp
index 4823b5349b0..8c11c15bfd0 100644
--- a/src/mame/drivers/hapyfish.cpp
+++ b/src/mame/drivers/hapyfish.cpp
@@ -59,8 +59,8 @@ void hapyfish_state::video_start()
MACHINE_CONFIG_START(hapyfish_state::hapyfish)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM9, 20000000) // ?? ARM baesd CPU
- MCFG_CPU_PROGRAM_MAP(hapyfish_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 20000000) // ?? ARM baesd CPU
+ MCFG_DEVICE_PROGRAM_MAP(hapyfish_map)
MCFG_DEVICE_DISABLE()
/* video hardware */
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index fe298971730..9e71bd5cb15 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -1455,9 +1455,9 @@ WRITE_LINE_MEMBER(harddriv_state::video_int_write_line)
MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(driver_68k_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(harddriv_state, hd68k_irq_gen, HARDDRIV_MASTER_CLOCK/16/16/16/16/2)
+ MCFG_DEVICE_ADD("maincpu", M68010, HARDDRIV_MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(driver_68k_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(harddriv_state, hd68k_irq_gen, HARDDRIV_MASTER_CLOCK/16/16/16/16/2)
MCFG_SLAPSTIC_ADD("slapstic", 117)
MCFG_SLAPSTIC_68K_ACCESS(1)
@@ -1474,13 +1474,13 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
MCFG_ADC0808_IN6_CB(IOPORT("8BADC.6"))
MCFG_ADC0808_IN7_CB(IOPORT("8BADC.7"))
- MCFG_CPU_ADD("gsp", TMS34010, HARDDRIV_GSP_CLOCK)
- MCFG_CPU_PROGRAM_MAP(driver_gsp_map)
+ MCFG_DEVICE_ADD("gsp", TMS34010, HARDDRIV_GSP_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(driver_gsp_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(4000000) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(4) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_IND16_CB(harddriv_state, scanline_driver) /* scanline callback (indexed16) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(harddriv_state, hdgsp_irq_gen))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, harddriv_state, hdgsp_irq_gen))
MCFG_TMS340X0_TO_SHIFTREG_CB(harddriv_state, hdgsp_write_to_shiftreg)
MCFG_TMS340X0_FROM_SHIFTREG_CB(harddriv_state, hdgsp_read_from_shiftreg)
MCFG_VIDEO_SET_SCREEN("screen")
@@ -1491,11 +1491,11 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
MCFG_EEPROM_2816_ADD("210e") // MK48Z02
MCFG_DEVICE_ADD("duartn68681", MC68681, XTAL(3'686'400))
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(harddriv_state, harddriv_duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE ("rs232", rs232_port_device, write_txd))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, harddriv_state, harddriv_duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE ("rs232", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE ("duartn68681", mc68681_device, rx_a_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE ("duartn68681", mc68681_device, rx_a_w))
/* video hardware */
MCFG_PALETTE_ADD("palette", 1024)
@@ -1505,7 +1505,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
MCFG_SCREEN_UPDATE_DEVICE("gsp", tms34010_device, tms340x0_ind16)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(harddriv_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, harddriv_state, video_int_write_line))
MACHINE_CONFIG_END
@@ -1515,12 +1515,12 @@ MACHINE_CONFIG_START(harddriv_state::driver_msp)
driver_nomsp(config);
/* basic machine hardware */
- MCFG_CPU_ADD("msp", TMS34010, XTAL(50'000'000))
- MCFG_CPU_PROGRAM_MAP(driver_msp_map)
+ MCFG_DEVICE_ADD("msp", TMS34010, XTAL(50'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(driver_msp_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(harddriv_state, hdmsp_irq_gen))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, harddriv_state, hdmsp_irq_gen))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_REMOVE("slapstic")
@@ -1533,11 +1533,11 @@ MACHINE_CONFIG_START(harddriv_state::multisync_nomsp)
driver_nomsp(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(multisync_68k_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(multisync_68k_map)
- MCFG_CPU_MODIFY("gsp")
- MCFG_CPU_PROGRAM_MAP(multisync_gsp_map)
+ MCFG_DEVICE_MODIFY("gsp")
+ MCFG_DEVICE_PROGRAM_MAP(multisync_gsp_map)
MCFG_TMS340X0_PIXEL_CLOCK(6000000) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_IND16_CB(harddriv_state, scanline_multisync) /* scanline callback (indexed16) */
@@ -1554,12 +1554,12 @@ MACHINE_CONFIG_START(harddriv_state::multisync_msp)
multisync_nomsp(config);
/* basic machine hardware */
- MCFG_CPU_ADD("msp", TMS34010, XTAL(50'000'000))
- MCFG_CPU_PROGRAM_MAP(driver_msp_map)
+ MCFG_DEVICE_ADD("msp", TMS34010, XTAL(50'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(driver_msp_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(harddriv_state, hdmsp_irq_gen))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, harddriv_state, hdmsp_irq_gen))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_REMOVE("slapstic")
@@ -1572,11 +1572,11 @@ MACHINE_CONFIG_START(harddriv_state::multisync2)
multisync_nomsp(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(multisync2_68k_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(multisync2_68k_map)
- MCFG_CPU_MODIFY("gsp")
- MCFG_CPU_PROGRAM_MAP(multisync2_gsp_map)
+ MCFG_DEVICE_MODIFY("gsp")
+ MCFG_DEVICE_PROGRAM_MAP(multisync2_gsp_map)
MCFG_DEVICE_REMOVE("slapstic")
MACHINE_CONFIG_END
@@ -1593,9 +1593,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::adsp)
/* basic machine hardware */
- MCFG_CPU_ADD("adsp", ADSP2100, XTAL(32'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(adsp_program_map)
- MCFG_CPU_DATA_MAP(adsp_data_map)
+ MCFG_DEVICE_ADD("adsp", ADSP2100, XTAL(32'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(adsp_program_map)
+ MCFG_DEVICE_DATA_MAP(adsp_data_map)
MACHINE_CONFIG_END
@@ -1603,31 +1603,31 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::ds3)
/* basic machine hardware */
- MCFG_CPU_ADD("adsp", ADSP2101, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(ds3_program_map)
- MCFG_CPU_DATA_MAP(ds3_data_map)
+ MCFG_DEVICE_ADD("adsp", ADSP2101, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ds3_program_map)
+ MCFG_DEVICE_DATA_MAP(ds3_data_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_CPU_ADD("ds3sdsp", ADSP2105, XTAL(10'000'000))
- MCFG_ADSP21XX_SPORT_RX_CB(READ32(harddriv_state, hdds3sdsp_serial_rx_callback))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(harddriv_state, hdds3sdsp_serial_tx_callback))
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(harddriv_state, hdds3sdsp_timer_enable_callback))
- MCFG_CPU_PROGRAM_MAP(ds3sdsp_program_map)
- MCFG_CPU_DATA_MAP(ds3sdsp_data_map)
+ MCFG_DEVICE_ADD("ds3sdsp", ADSP2105, XTAL(10'000'000))
+ MCFG_ADSP21XX_SPORT_RX_CB(READ32(*this, harddriv_state, hdds3sdsp_serial_rx_callback))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, harddriv_state, hdds3sdsp_serial_tx_callback))
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, harddriv_state, hdds3sdsp_timer_enable_callback))
+ MCFG_DEVICE_PROGRAM_MAP(ds3sdsp_program_map)
+ MCFG_DEVICE_DATA_MAP(ds3sdsp_data_map)
MCFG_TIMER_DRIVER_ADD("ds3sdsp_timer", harddriv_state, ds3sdsp_internal_timer_callback)
- MCFG_CPU_ADD("ds3xdsp", ADSP2105, XTAL(10'000'000))
- MCFG_ADSP21XX_SPORT_RX_CB(READ32(harddriv_state, hdds3xdsp_serial_rx_callback))
- MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(harddriv_state, hdds3xdsp_serial_tx_callback))
- MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(harddriv_state, hdds3xdsp_timer_enable_callback))
- MCFG_CPU_PROGRAM_MAP(ds3xdsp_program_map)
- MCFG_CPU_DATA_MAP(ds3xdsp_data_map)
+ MCFG_DEVICE_ADD("ds3xdsp", ADSP2105, XTAL(10'000'000))
+ MCFG_ADSP21XX_SPORT_RX_CB(READ32(*this, harddriv_state, hdds3xdsp_serial_rx_callback))
+ MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, harddriv_state, hdds3xdsp_serial_tx_callback))
+ MCFG_ADSP21XX_TIMER_FIRED_CB(WRITELINE(*this, harddriv_state, hdds3xdsp_timer_enable_callback))
+ MCFG_DEVICE_PROGRAM_MAP(ds3xdsp_program_map)
+ MCFG_DEVICE_DATA_MAP(ds3xdsp_data_map)
MCFG_TIMER_DRIVER_ADD("ds3xdsp_timer", harddriv_state, ds3xdsp_internal_timer_callback)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1645,9 +1645,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::dsk)
/* basic machine hardware */
- MCFG_CPU_ADD("dsp32", DSP32C, XTAL(40'000'000))
- MCFG_DSP32C_OUTPUT_CALLBACK(WRITE32(harddriv_state,hddsk_update_pif))
- MCFG_CPU_PROGRAM_MAP(dsk_dsp32_map)
+ MCFG_DEVICE_ADD("dsp32", DSP32C, XTAL(40'000'000))
+ MCFG_DSP32C_OUTPUT_CALLBACK(WRITE32(*this, harddriv_state,hddsk_update_pif))
+ MCFG_DEVICE_PROGRAM_MAP(dsk_dsp32_map)
MCFG_EEPROM_2816_ADD("dsk_10c") // MK48Z02
MCFG_EEPROM_2816_ADD("dsk_30c") // MK48Z02
@@ -1661,9 +1661,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(harddriv_state::dsk2)
/* basic machine hardware */
- MCFG_CPU_ADD("dsp32", DSP32C, XTAL(40'000'000))
- MCFG_DSP32C_OUTPUT_CALLBACK(WRITE32(harddriv_state,hddsk_update_pif))
- MCFG_CPU_PROGRAM_MAP(dsk2_dsp32_map)
+ MCFG_DEVICE_ADD("dsp32", DSP32C, XTAL(40'000'000))
+ MCFG_DSP32C_OUTPUT_CALLBACK(WRITE32(*this, harddriv_state,hddsk_update_pif))
+ MCFG_DEVICE_PROGRAM_MAP(dsk2_dsp32_map)
/* ASIC65 */
MCFG_ASIC65_ADD("asic65", ASIC65_STANDARD)
@@ -1858,7 +1858,7 @@ MACHINE_CONFIG_START(stunrun_board_device_state::device_add_mconfig)
multisync_nomsp(config);
/* basic machine hardware */ /* multisync board without MSP */
- MCFG_CPU_MODIFY("gsp")
+ MCFG_DEVICE_MODIFY("gsp")
MCFG_TMS340X0_PIXEL_CLOCK(5000000) /* pixel clock */
adsp(config); /* ADSP board */
MCFG_DEVICE_REMOVE("slapstic")
@@ -1870,7 +1870,7 @@ MACHINE_CONFIG_START(stunrun_board_device_state::device_add_mconfig)
/* sund hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(harddriv_state, sound_int_write_line))
+ MCFG_ATARI_JSA_II_ADD("jsa", WRITELINE(*this, harddriv_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN0", 5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1937,7 +1937,7 @@ MACHINE_CONFIG_START(steeltal_board_device_state::device_add_mconfig)
/* sund hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(harddriv_state, sound_int_write_line))
+ MCFG_ATARI_JSA_III_ADD("jsa", WRITELINE(*this, harddriv_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("IN0", 5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1963,7 +1963,7 @@ MACHINE_CONFIG_START(strtdriv_board_device_state::device_add_mconfig)
/* basic machine hardware */ /* multisync board */
ds3(config); /* DS III board */
- MCFG_CPU_MODIFY("ds3xdsp") /* DS III auxiliary sound DSP has no code */
+ MCFG_DEVICE_MODIFY("ds3xdsp") /* DS III auxiliary sound DSP has no code */
MCFG_DEVICE_DISABLE()
dsk(config); /* DSK board */
@@ -2077,7 +2077,7 @@ MACHINE_CONFIG_START(harddriv_new_state::racedriv_panorama_machine)
// MCFG_QUANTUM_TIME(attotime::from_hz(100000))
MCFG_DEVICE_MODIFY("mainpcb:duartn68681")
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(harddriv_new_state, tx_a))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, harddriv_new_state, tx_a))
// boots with 'PROGRAM OK' when using standard Hard Drivin' board type (needs 137412-115 slapstic)
MCFG_DEVICE_MODIFY("mainpcb:slapstic")
diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp
index 382ac8028a5..62cc30c005b 100644
--- a/src/mame/drivers/harriet.cpp
+++ b/src/mame/drivers/harriet.cpp
@@ -81,8 +81,8 @@ void harriet_state::machine_reset()
MACHINE_CONFIG_START(harriet_state::harriet)
- MCFG_CPU_ADD("maincpu", M68010, 40_MHz_XTAL / 4) // MC68010FN10
- MCFG_CPU_PROGRAM_MAP(harriet_map)
+ MCFG_DEVICE_ADD("maincpu", M68010, 40_MHz_XTAL / 4) // MC68010FN10
+ MCFG_DEVICE_PROGRAM_MAP(harriet_map)
//MCFG_DEVICE_ADD("dmac", MC68450, DMAC_CLOCK)
@@ -92,13 +92,13 @@ MACHINE_CONFIG_START(harriet_state::harriet)
MCFG_MC68901_TIMER_CLOCK(2.4576_MHz_XTAL)
MCFG_MC68901_RX_CLOCK(9600)
MCFG_MC68901_TX_CLOCK(9600)
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_M48T02_ADD("timekpr")
MCFG_NVRAM_ADD_0FILL("zpram") // MK48Z02
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mfp", mc68901_device, write_rx))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("mfp", mc68901_device, write_rx))
//MCFG_DEVICE_ADD("wdc1", WD33C93, WD_CLOCK)
//MCFG_DEVICE_ADD("wdc2", WD33C93, WD_CLOCK)
diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp
index 623a7dc1b18..3a9d0b292a8 100644
--- a/src/mame/drivers/hazelgr.cpp
+++ b/src/mame/drivers/hazelgr.cpp
@@ -72,19 +72,19 @@ static const z80_daisy_config daisy_chain[] =
// All frequencies are guesswork, in an effort to get something to happen
MACHINE_CONFIG_START(haze_state::haze)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,2000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,2000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, 1'000'000)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg3))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc2", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc2", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc2", z80ctc_device, trg2))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc2", z80ctc_device, trg3))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc3", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc3", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc1", z80ctc_device, trg3))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc2", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc2", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc2", z80ctc_device, trg2))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc2", z80ctc_device, trg3))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc3", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc3", z80ctc_device, trg1))
MCFG_DEVICE_ADD("ctc1", Z80CTC, 1'000'000 )
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp
index 354b1602e7f..7fe06fcd42e 100644
--- a/src/mame/drivers/hazeltin.cpp
+++ b/src/mame/drivers/hazeltin.cpp
@@ -692,9 +692,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(hazl1500_state::hazl1500)
/* basic machine hardware */
- MCFG_CPU_ADD(CPU_TAG, I8080, XTAL(18'000'000)/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC
- MCFG_CPU_PROGRAM_MAP(hazl1500_mem)
- MCFG_CPU_IO_MAP(hazl1500_io)
+ MCFG_DEVICE_ADD(CPU_TAG, I8080, XTAL(18'000'000)/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC
+ MCFG_DEVICE_PROGRAM_MAP(hazl1500_mem)
+ MCFG_DEVICE_IO_MAP(hazl1500_io)
MCFG_QUANTUM_PERFECT_CPU(CPU_TAG)
MCFG_INPUT_MERGER_ANY_HIGH("mainint")
@@ -714,11 +714,11 @@ MACHINE_CONFIG_START(hazl1500_state::hazl1500)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hazl1500)
MCFG_DEVICE_ADD(BAUDGEN_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("uart", ay51013_device, write_tcp))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", ay51013_device, write_rcp))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("uart", ay51013_device, write_tcp))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", ay51013_device, write_rcp))
MCFG_DEVICE_ADD(UART_TAG, AY51013, 0)
- MCFG_AY51013_WRITE_DAV_CB(DEVWRITELINE("mainint", input_merger_device, in_w<0>))
+ MCFG_AY51013_WRITE_DAV_CB(WRITELINE("mainint", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD(NETLIST_TAG, NETLIST_CPU, VIDEOBRD_CLOCK)
MCFG_NETLIST_SETUP(hazelvid)
@@ -769,9 +769,9 @@ MACHINE_CONFIG_START(hazl1500_state::hazl1500)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(hazl1500_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(hazl1500_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(hazl1500_state, ay3600_data_ready_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, hazl1500_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, hazl1500_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, hazl1500_state, ay3600_data_ready_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp
index 0ae989184ec..352be579cbf 100644
--- a/src/mame/drivers/hcastle.cpp
+++ b/src/mame/drivers/hcastle.cpp
@@ -189,12 +189,12 @@ void hcastle_state::machine_reset()
MACHINE_CONFIG_START(hcastle_state::hcastle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */
- MCFG_CPU_PROGRAM_MAP(hcastle_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", hcastle_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */
+ MCFG_DEVICE_PROGRAM_MAP(hcastle_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", hcastle_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -227,12 +227,12 @@ MACHINE_CONFIG_START(hcastle_state::hcastle)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(hcastle_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, hcastle_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.44)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) /* from schematic; NMI handler is just a retn */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp
index d7848d31fb7..a83cae19385 100644
--- a/src/mame/drivers/headonb.cpp
+++ b/src/mame/drivers/headonb.cpp
@@ -165,10 +165,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(headonb_state::headonb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(20'000'000) / 10) // divider guessed
- MCFG_CPU_PROGRAM_MAP(headonb_map)
- MCFG_CPU_IO_MAP(headonb_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", headonb_state, irq0_line_hold) // where is irqack?
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(20'000'000) / 10) // divider guessed
+ MCFG_DEVICE_PROGRAM_MAP(headonb_map)
+ MCFG_DEVICE_IO_MAP(headonb_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", headonb_state, irq0_line_hold) // where is irqack?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp
index a2efc03cfbf..a0462d487ce 100644
--- a/src/mame/drivers/hec2hrp.cpp
+++ b/src/mame/drivers/hec2hrp.cpp
@@ -414,10 +414,10 @@ static void minidisc_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(hec2hrp_state::hec2hr)
/******************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(hec2hrp_mem)
- MCFG_CPU_IO_MAP(hec2hrp_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hec2hrp_mem)
+ MCFG_DEVICE_IO_MAP(hec2hrp_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp)
@@ -449,10 +449,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hec2hrp_state::hec2hrp)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(hec2hrp_mem)
- MCFG_CPU_IO_MAP(hec2hrp_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hec2hrp_mem)
+ MCFG_DEVICE_IO_MAP(hec2hrp_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) /* put on the Z80 irq in Hz*/
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp)
@@ -489,18 +489,18 @@ static void hector_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(hec2hrp_state::hec2mx40)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
- MCFG_CPU_IO_MAP(hec2mx40_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem)
+ MCFG_DEVICE_IO_MAP(hec2mx40_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
/* Disc II unit */
- MCFG_CPU_ADD("disc2cpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
- MCFG_CPU_IO_MAP(hecdisc2_io)
+ MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hecdisc2_mem)
+ MCFG_DEVICE_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(hec2hrp_state, disc2_fdc_interrupt))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(hec2hrp_state, disc2_fdc_dma_irq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_interrupt))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_dma_irq))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
@@ -533,20 +533,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hec2hrp_state::hec2hrx)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
- MCFG_CPU_IO_MAP(hec2hrx_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem)
+ MCFG_DEVICE_IO_MAP(hec2hrx_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
/* Disc II unit */
- MCFG_CPU_ADD("disc2cpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
- MCFG_CPU_IO_MAP(hecdisc2_io)
+ MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hecdisc2_mem)
+ MCFG_DEVICE_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(hec2hrp_state, disc2_fdc_interrupt))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(hec2hrp_state, disc2_fdc_dma_irq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_interrupt))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_dma_irq))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats)
@@ -578,10 +578,10 @@ MACHINE_CONFIG_START(hec2hrp_state::hec2mdhrx)
/*****************************************************************************/
// minidisc
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
- MCFG_CPU_IO_MAP(hec2mdhrx_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem)
+ MCFG_DEVICE_IO_MAP(hec2mdhrx_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2mdhrx)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx)
@@ -619,20 +619,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hec2hrp_state::hec2mx80)
/*****************************************************************************/
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(hec2hrx_mem)
- MCFG_CPU_IO_MAP(hec2mx80_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hec2hrx_mem)
+ MCFG_DEVICE_IO_MAP(hec2mx80_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hec2hrp_state, irq0_line_hold, 50) // put on the Z80 irq in Hz
MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
/* Disc II unit */
- MCFG_CPU_ADD("disc2cpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(hecdisc2_mem)
- MCFG_CPU_IO_MAP(hecdisc2_io)
+ MCFG_DEVICE_ADD("disc2cpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hecdisc2_mem)
+ MCFG_DEVICE_IO_MAP(hecdisc2_io)
MCFG_UPD765A_ADD("upd765", false, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(hec2hrp_state, disc2_fdc_interrupt))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(hec2hrp_state, disc2_fdc_dma_irq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_interrupt))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, hec2hrp_state, disc2_fdc_dma_irq))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", hector_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", hector_floppies, "525hd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp
index ec9f9211573..a1cebfd9f64 100644
--- a/src/mame/drivers/hexion.cpp
+++ b/src/mame/drivers/hexion.cpp
@@ -255,15 +255,15 @@ TIMER_DEVICE_CALLBACK_MEMBER(hexion_state::scanline)
MACHINE_CONFIG_START(hexion_state::hexion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */
- MCFG_CPU_PROGRAM_MAP(hexion_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */
+ MCFG_DEVICE_PROGRAM_MAP(hexion_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hexion_state, scanline, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_DEVICE_ADD("k053252", K053252, XTAL(24'000'000)/2) /* K053252, X0-010(?) @8D, xtal verified, divider not verified */
- MCFG_K053252_INT1_ACK_CB(WRITELINE(hexion_state, irq_ack_w))
- MCFG_K053252_INT2_ACK_CB(WRITELINE(hexion_state, nmi_ack_w))
- MCFG_K053252_INT_TIME_CB(WRITE8(hexion_state, ccu_int_time_w))
+ MCFG_K053252_INT1_ACK_CB(WRITELINE(*this, hexion_state, irq_ack_w))
+ MCFG_K053252_INT2_ACK_CB(WRITELINE(*this, hexion_state, nmi_ack_w))
+ MCFG_K053252_INT_TIME_CB(WRITE8(*this, hexion_state, ccu_int_time_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -289,8 +289,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hexion_state::hexionb)
hexion(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hexionb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hexionb_map)
MCFG_DEVICE_REMOVE("k051649")
diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp
index ac251bead7b..1ced76fd304 100644
--- a/src/mame/drivers/hh_amis2k.cpp
+++ b/src/mame/drivers/hh_amis2k.cpp
@@ -316,12 +316,12 @@ static const u8 wildfire_7seg_table[0x10] =
MACHINE_CONFIG_START(wildfire_state::wildfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", AMI_S2152, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", AMI_S2152, MASTER_CLOCK)
MCFG_AMI_S2000_7SEG_DECODER(wildfire_7seg_table)
MCFG_AMI_S2000_READ_I_CB(IOPORT("IN1"))
- MCFG_AMI_S2000_WRITE_D_CB(WRITE8(wildfire_state, write_d))
- MCFG_AMI_S2000_WRITE_A_CB(WRITE16(wildfire_state, write_a))
- MCFG_AMI_S2152_FOUT_CB(WRITELINE(wildfire_state, write_f))
+ MCFG_AMI_S2000_WRITE_D_CB(WRITE8(*this, wildfire_state, write_d))
+ MCFG_AMI_S2000_WRITE_A_CB(WRITE16(*this, wildfire_state, write_a))
+ MCFG_AMI_S2152_FOUT_CB(WRITELINE(*this, wildfire_state, write_f))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", wildfire_state, display_decay_tick, attotime::from_msec(1))
MCFG_TIMER_DRIVER_ADD("a12_decay", wildfire_state, reset_q2)
@@ -332,7 +332,7 @@ MACHINE_CONFIG_START(wildfire_state::wildfire)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp
index 6e21b03bf47..1a37cfbd183 100644
--- a/src/mame/drivers/hh_cop400.cpp
+++ b/src/mame/drivers/hh_cop400.cpp
@@ -316,19 +316,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ctstein_state::ctstein)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_G_CB(WRITE8(ctstein_state, write_g))
- MCFG_COP400_WRITE_L_CB(WRITE8(ctstein_state, write_l))
- MCFG_COP400_WRITE_SK_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
- MCFG_COP400_READ_L_CB(READ8(ctstein_state, read_l))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, ctstein_state, write_g))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, ctstein_state, write_l))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, ctstein_state, read_l))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ctstein)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -458,20 +458,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(h2hbaskbc_state::h2hbaskbc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP420, 850000) // approximation - RC osc. R=43K, C=101pF
+ MCFG_DEVICE_ADD("maincpu", COP420, 850000) // approximation - RC osc. R=43K, C=101pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_8, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(h2hbaskbc_state, write_d))
- MCFG_COP400_WRITE_G_CB(WRITE8(h2hbaskbc_state, write_g))
- MCFG_COP400_WRITE_L_CB(WRITE8(h2hbaskbc_state, write_l))
- MCFG_COP400_READ_IN_CB(READ8(h2hbaskbc_state, read_in))
- MCFG_COP400_WRITE_SO_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, h2hbaskbc_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, h2hbaskbc_state, write_g))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, h2hbaskbc_state, write_l))
+ MCFG_COP400_READ_IN_CB(READ8(*this, h2hbaskbc_state, read_in))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_h2hbaskbc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -584,14 +584,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(einvaderc_state::einvaderc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP444L, 850000) // approximation - RC osc. R=47K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", COP444L, 850000) // approximation - RC osc. R=47K, C=100pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
MCFG_COP400_READ_IN_CB(IOPORT("IN.0"))
- MCFG_COP400_WRITE_D_CB(WRITE8(einvaderc_state, write_d))
- MCFG_COP400_WRITE_G_CB(WRITE8(einvaderc_state, write_g))
- MCFG_COP400_WRITE_SK_CB(WRITELINE(einvaderc_state, write_sk))
- MCFG_COP400_WRITE_SO_CB(WRITELINE(einvaderc_state, write_so))
- MCFG_COP400_WRITE_L_CB(WRITE8(einvaderc_state, write_l))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, einvaderc_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, einvaderc_state, write_g))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, einvaderc_state, write_sk))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, einvaderc_state, write_so))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, einvaderc_state, write_l))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -603,7 +603,7 @@ MACHINE_CONFIG_START(einvaderc_state::einvaderc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -713,21 +713,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(unkeinv_state::unkeinv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP421, 850000) // frequency guessed
+ MCFG_DEVICE_ADD("maincpu", COP421, 850000) // frequency guessed
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_G_CB(WRITE8(unkeinv_state, write_g))
- MCFG_COP400_WRITE_D_CB(WRITE8(unkeinv_state, write_d))
- MCFG_COP400_WRITE_L_CB(WRITE8(unkeinv_state, write_l))
- MCFG_COP400_READ_L_CB(READ8(unkeinv_state, read_l))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, unkeinv_state, write_g))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, unkeinv_state, write_d))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, unkeinv_state, write_l))
+ MCFG_COP400_READ_L_CB(READ8(*this, unkeinv_state, read_l))
MCFG_COP400_READ_L_TRISTATE_CB(CONSTANT(0xff))
- MCFG_COP400_WRITE_SO_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_unkeinv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -869,14 +869,14 @@ void lchicken_state::machine_start()
MACHINE_CONFIG_START(lchicken_state::lchicken)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_L_CB(WRITE8(lchicken_state, write_l))
- MCFG_COP400_WRITE_D_CB(WRITE8(lchicken_state, write_d))
- MCFG_COP400_WRITE_G_CB(WRITE8(lchicken_state, write_g))
- MCFG_COP400_READ_G_CB(READ8(lchicken_state, read_g))
- MCFG_COP400_WRITE_SO_CB(WRITELINE(lchicken_state, write_so))
- MCFG_COP400_READ_SI_CB(READLINE(lchicken_state, read_si))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, lchicken_state, write_l))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, lchicken_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, lchicken_state, write_g))
+ MCFG_COP400_READ_G_CB(READ8(*this, lchicken_state, read_g))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, lchicken_state, write_so))
+ MCFG_COP400_READ_SI_CB(READLINE(*this, lchicken_state, read_si))
MCFG_TIMER_DRIVER_ADD_PERIODIC("chicken_motor", lchicken_state, motor_sim_tick, attotime::from_msec(6000/0x100)) // ~6sec for a full rotation
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
@@ -884,7 +884,7 @@ MACHINE_CONFIG_START(lchicken_state::lchicken)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -979,20 +979,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(funjacks_state::funjacks)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=47K, C=56pF
+ MCFG_DEVICE_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=47K, C=56pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_8, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(funjacks_state, write_d))
- MCFG_COP400_WRITE_L_CB(WRITE8(funjacks_state, write_l))
- MCFG_COP400_WRITE_G_CB(WRITE8(funjacks_state, write_g))
- MCFG_COP400_READ_L_CB(READ8(funjacks_state, read_l))
- MCFG_COP400_READ_G_CB(READ8(funjacks_state, read_g))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, funjacks_state, write_d))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, funjacks_state, write_l))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, funjacks_state, write_g))
+ MCFG_COP400_READ_L_CB(READ8(*this, funjacks_state, read_l))
+ MCFG_COP400_READ_G_CB(READ8(*this, funjacks_state, read_g))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_funjacks)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1074,12 +1074,12 @@ INPUT_CHANGED_MEMBER(funrlgl_state::reset_button)
MACHINE_CONFIG_START(funrlgl_state::funrlgl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=91pF
+ MCFG_DEVICE_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=91pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_8, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(funrlgl_state, write_d))
- MCFG_COP400_WRITE_L_CB(WRITE8(funrlgl_state, write_l))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, funrlgl_state, write_d))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, funrlgl_state, write_l))
MCFG_COP400_READ_L_TRISTATE_CB(CONSTANT(0xff))
- MCFG_COP400_WRITE_G_CB(WRITE8(funrlgl_state, write_g))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, funrlgl_state, write_g))
MCFG_COP400_READ_G_CB(IOPORT("IN.0"))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
@@ -1087,7 +1087,7 @@ MACHINE_CONFIG_START(funrlgl_state::funrlgl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1210,20 +1210,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mdallas_state::mdallas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP444L, 1000000) // approximation - RC osc. R=57K, C=101pF
+ MCFG_DEVICE_ADD("maincpu", COP444L, 1000000) // approximation - RC osc. R=57K, C=101pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_L_CB(WRITE8(mdallas_state, write_l))
- MCFG_COP400_WRITE_D_CB(WRITE8(mdallas_state, write_d))
- MCFG_COP400_WRITE_G_CB(WRITE8(mdallas_state, write_g))
- MCFG_COP400_READ_IN_CB(READ8(mdallas_state, read_in))
- MCFG_COP400_WRITE_SO_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, mdallas_state, write_l))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, mdallas_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, mdallas_state, write_g))
+ MCFG_COP400_READ_IN_CB(READ8(*this, mdallas_state, read_in))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mdallas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1294,18 +1294,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(plus1_state::plus1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=100pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(plus1_state, write_d))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, plus1_state, write_d))
MCFG_COP400_READ_G_CB(IOPORT("IN.0"))
- MCFG_COP400_WRITE_L_CB(WRITE8(plus1_state, write_l))
- MCFG_COP400_READ_L_CB(READ8(plus1_state, read_l))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, plus1_state, write_l))
+ MCFG_COP400_READ_L_CB(READ8(*this, plus1_state, read_l))
/* no visual feedback! */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1422,20 +1422,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(lightfgt_state::lightfgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP421, 950000) // approximation - RC osc. R=82K, C=56pF
+ MCFG_DEVICE_ADD("maincpu", COP421, 950000) // approximation - RC osc. R=82K, C=56pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_SO_CB(WRITELINE(lightfgt_state, write_so))
- MCFG_COP400_WRITE_D_CB(WRITE8(lightfgt_state, write_d))
- MCFG_COP400_WRITE_L_CB(WRITE8(lightfgt_state, write_l))
- MCFG_COP400_WRITE_SK_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
- MCFG_COP400_READ_G_CB(READ8(lightfgt_state, read_g))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, lightfgt_state, write_so))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, lightfgt_state, write_d))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, lightfgt_state, write_l))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_COP400_READ_G_CB(READ8(*this, lightfgt_state, read_g))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_lightfgt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1576,13 +1576,13 @@ base pulled high with 4.7K resistor, connects directly to G3, 1K resistor to G2,
MACHINE_CONFIG_START(bship82_state::bship82)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP420, 750000) // approximation - RC osc. R=14K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", COP420, 750000) // approximation - RC osc. R=14K, C=100pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(bship82_state, write_d))
- MCFG_COP400_WRITE_G_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_COP400_READ_L_CB(READ8(bship82_state, read_l))
- MCFG_COP400_READ_IN_CB(READ8(bship82_state, read_in))
- MCFG_COP400_WRITE_SO_CB(WRITELINE(bship82_state, write_so))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, bship82_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_COP400_READ_L_CB(READ8(*this, bship82_state, read_l))
+ MCFG_COP400_READ_IN_CB(READ8(*this, bship82_state, read_in))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, bship82_state, write_so))
MCFG_COP400_READ_SI_CB(IOPORT("IN.4"))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
@@ -1590,7 +1590,7 @@ MACHINE_CONFIG_START(bship82_state::bship82)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac", DAC_4BIT_BINARY_WEIGHTED_SIGN_MAGNITUDE, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.125) // see above
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_BINARY_WEIGHTED_SIGN_MAGNITUDE, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.125) // see above
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1708,13 +1708,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(qkracer_state::qkracer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP420, 1000000) // approximation - RC osc. R=47K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", COP420, 1000000) // approximation - RC osc. R=47K, C=100pF
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_32, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(qkracer_state, write_d))
- MCFG_COP400_WRITE_G_CB(WRITE8(qkracer_state, write_g))
- MCFG_COP400_WRITE_L_CB(WRITE8(qkracer_state, write_l))
- MCFG_COP400_READ_IN_CB(READ8(qkracer_state, read_in))
- MCFG_COP400_WRITE_SK_CB(WRITELINE(qkracer_state, write_sk))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, qkracer_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, qkracer_state, write_g))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, qkracer_state, write_l))
+ MCFG_COP400_READ_IN_CB(READ8(*this, qkracer_state, read_in))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, qkracer_state, write_sk))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_qkracer)
@@ -1799,20 +1799,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vidchal_state::vidchal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", COP420, 900000) // approximation
+ MCFG_DEVICE_ADD("maincpu", COP420, 900000) // approximation
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_D_CB(WRITE8(vidchal_state, write_d))
- MCFG_COP400_WRITE_G_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_COP400_WRITE_L_CB(WRITE8(vidchal_state, write_l))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, vidchal_state, write_d))
+ MCFG_COP400_WRITE_G_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, vidchal_state, write_l))
MCFG_COP400_READ_IN_CB(IOPORT("IN.0"))
- MCFG_COP400_WRITE_SK_CB(WRITELINE(vidchal_state, write_sk))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, vidchal_state, write_sk))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_vidchal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac", DAC_4BIT_BINARY_WEIGHTED_SIGN_MAGNITUDE, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.125) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_BINARY_WEIGHTED_SIGN_MAGNITUDE, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.125) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index 0350b92353a..9e05aa3c9f4 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -433,12 +433,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bambball_state::bambball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation
- MCFG_HMCS40_READ_R_CB(0, READ8(bambball_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bambball_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bambball_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bambball_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bambball_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38750, 400000) // approximation
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, bambball_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bambball_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bambball_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bambball_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bambball_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -450,7 +450,7 @@ MACHINE_CONFIG_START(bambball_state::bambball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -569,12 +569,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bmboxing_state::bmboxing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation
- MCFG_HMCS40_READ_R_CB(0, READ8(bmboxing_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bmboxing_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bmboxing_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bmboxing_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bmboxing_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38750, 400000) // approximation
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, bmboxing_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bmboxing_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bmboxing_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bmboxing_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bmboxing_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.4"))
/* video hardware */
@@ -587,7 +587,7 @@ MACHINE_CONFIG_START(bmboxing_state::bmboxing)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -694,12 +694,12 @@ INPUT_CHANGED_MEMBER(bfriskyt_state::input_changed)
MACHINE_CONFIG_START(bfriskyt_state::bfriskyt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bfriskyt_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bfriskyt_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bfriskyt_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bfriskyt_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bfriskyt_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, bfriskyt_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bfriskyt_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bfriskyt_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bfriskyt_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bfriskyt_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -711,7 +711,7 @@ MACHINE_CONFIG_START(bfriskyt_state::bfriskyt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -804,13 +804,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(packmon_state::packmon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(packmon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(packmon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(packmon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(packmon_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(packmon_state, grid_w))
- MCFG_HMCS40_READ_D_CB(READ16(packmon_state, input_r))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, packmon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, packmon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, packmon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, packmon_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, packmon_state, grid_w))
+ MCFG_HMCS40_READ_D_CB(READ16(*this, packmon_state, input_r))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -822,7 +822,7 @@ MACHINE_CONFIG_START(packmon_state::packmon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -939,12 +939,12 @@ INPUT_CHANGED_MEMBER(msthawk_state::input_changed)
MACHINE_CONFIG_START(msthawk_state::msthawk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(msthawk_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(msthawk_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(msthawk_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(msthawk_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(msthawk_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, msthawk_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, msthawk_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, msthawk_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, msthawk_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, msthawk_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -956,7 +956,7 @@ MACHINE_CONFIG_START(msthawk_state::msthawk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1060,12 +1060,12 @@ INPUT_CHANGED_MEMBER(bzaxxon_state::input_changed)
MACHINE_CONFIG_START(bzaxxon_state::bzaxxon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bzaxxon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bzaxxon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bzaxxon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bzaxxon_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bzaxxon_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 450000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, bzaxxon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bzaxxon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bzaxxon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bzaxxon_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bzaxxon_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.5"))
/* video hardware */
@@ -1078,7 +1078,7 @@ MACHINE_CONFIG_START(bzaxxon_state::bzaxxon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1176,15 +1176,15 @@ INPUT_CHANGED_MEMBER(zackman_state::input_changed)
MACHINE_CONFIG_START(zackman_state::zackman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(zackman_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(zackman_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, zackman_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, zackman_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1196,7 +1196,7 @@ MACHINE_CONFIG_START(zackman_state::zackman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1303,15 +1303,15 @@ INPUT_CHANGED_MEMBER(bpengo_state::input_changed)
MACHINE_CONFIG_START(bpengo_state::bpengo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(bpengo_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bpengo_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, bpengo_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bpengo_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.5"))
/* video hardware */
@@ -1324,7 +1324,7 @@ MACHINE_CONFIG_START(bpengo_state::bpengo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1428,15 +1428,15 @@ INPUT_CHANGED_MEMBER(bbtime_state::input_changed)
MACHINE_CONFIG_START(bbtime_state::bbtime)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(bbtime_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bbtime_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, bbtime_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bbtime_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1448,7 +1448,7 @@ MACHINE_CONFIG_START(bbtime_state::bbtime)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1528,13 +1528,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bdoramon_state::bdoramon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bdoramon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bdoramon_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bdoramon_state, plate_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, bdoramon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bdoramon_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bdoramon_state, plate_w))
MCFG_HMCS40_READ_R_CB(2, IOPORT("IN.3"))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bdoramon_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bdoramon_state, grid_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bdoramon_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bdoramon_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.2"))
/* video hardware */
@@ -1547,7 +1547,7 @@ MACHINE_CONFIG_START(bdoramon_state::bdoramon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1621,12 +1621,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bultrman_state::bultrman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 350000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bultrman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bultrman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bultrman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(bultrman_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(bultrman_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 350000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, bultrman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, bultrman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, bultrman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, bultrman_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, bultrman_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.1"))
/* video hardware */
@@ -1639,7 +1639,7 @@ MACHINE_CONFIG_START(bultrman_state::bultrman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1710,13 +1710,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(machiman_state::machiman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(machiman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(machiman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(machiman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(machiman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(machiman_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(machiman_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, machiman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, machiman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, machiman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, machiman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, machiman_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, machiman_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.1"))
/* video hardware */
@@ -1729,7 +1729,7 @@ MACHINE_CONFIG_START(machiman_state::machiman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1858,20 +1858,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(pairmtch_state::pairmtch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(pairmtch_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(pairmtch_state, plate_w))
- MCFG_HMCS40_READ_R_CB(4, READ8(pairmtch_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(pairmtch_state, sound_w))
- MCFG_HMCS40_READ_R_CB(5, DEVREAD8("soundlatch2", generic_latch_8_device, read))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(pairmtch_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(pairmtch_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, pairmtch_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, pairmtch_state, plate_w))
+ MCFG_HMCS40_READ_R_CB(4, READ8(*this, pairmtch_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, pairmtch_state, sound_w))
+ MCFG_HMCS40_READ_R_CB(5, READ8("soundlatch2", generic_latch_8_device, read))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, pairmtch_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, pairmtch_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.2"))
- MCFG_CPU_ADD("audiocpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(pairmtch_state, sound2_w))
- MCFG_HMCS40_READ_R_CB(2, DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(pairmtch_state, speaker_w))
+ MCFG_DEVICE_ADD("audiocpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, pairmtch_state, sound2_w))
+ MCFG_HMCS40_READ_R_CB(2, READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, pairmtch_state, speaker_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1884,7 +1884,7 @@ MACHINE_CONFIG_START(pairmtch_state::pairmtch)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1980,13 +1980,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(alnattck_state::alnattck)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(alnattck_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(alnattck_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(alnattck_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(alnattck_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(alnattck_state, grid_w))
- MCFG_HMCS40_READ_D_CB(READ16(alnattck_state, input_r))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, alnattck_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, alnattck_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, alnattck_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, alnattck_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, alnattck_state, grid_w))
+ MCFG_HMCS40_READ_D_CB(READ16(*this, alnattck_state, input_r))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1998,7 +1998,7 @@ MACHINE_CONFIG_START(alnattck_state::alnattck)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2107,15 +2107,15 @@ void cdkong_state::machine_start()
MACHINE_CONFIG_START(cdkong_state::cdkong)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(cdkong_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(cdkong_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, cdkong_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, cdkong_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.1"))
/* video hardware */
@@ -2128,7 +2128,7 @@ MACHINE_CONFIG_START(cdkong_state::cdkong)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_TIMER_DRIVER_ADD_PERIODIC("speaker_decay", cdkong_state, speaker_decay_sim, attotime::from_msec(1))
MACHINE_CONFIG_END
@@ -2240,12 +2240,12 @@ INPUT_CHANGED_MEMBER(cgalaxn_state::player_switch)
MACHINE_CONFIG_START(cgalaxn_state::cgalaxn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_READ_R_CB(0, READ8(cgalaxn_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(cgalaxn_state, grid_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(cgalaxn_state, grid_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(cgalaxn_state, grid_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(cgalaxn_state, plate_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, cgalaxn_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, cgalaxn_state, grid_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, cgalaxn_state, grid_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, cgalaxn_state, grid_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, cgalaxn_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2257,7 +2257,7 @@ MACHINE_CONFIG_START(cgalaxn_state::cgalaxn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2359,15 +2359,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cpacman_state::cpacman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_READ_R_CB(0, READ8(cpacman_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(cpacman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(cpacman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(cpacman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(cpacman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(cpacman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(cpacman_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(cpacman_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, cpacman_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, cpacman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, cpacman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, cpacman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, cpacman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, cpacman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, cpacman_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, cpacman_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2379,7 +2379,7 @@ MACHINE_CONFIG_START(cpacman_state::cpacman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2476,15 +2476,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cmspacmn_state::cmspacmn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_READ_R_CB(0, READ8(cmspacmn_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(cmspacmn_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(cmspacmn_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(cmspacmn_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(cmspacmn_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(cmspacmn_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(cmspacmn_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(cmspacmn_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, cmspacmn_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, cmspacmn_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, cmspacmn_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, cmspacmn_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, cmspacmn_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, cmspacmn_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, cmspacmn_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, cmspacmn_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2496,7 +2496,7 @@ MACHINE_CONFIG_START(cmspacmn_state::cmspacmn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2623,20 +2623,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sag_state::sag)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(sag_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(sag_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(sag_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(sag_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(sag_state, grid_w))
- MCFG_HMCS40_READ_D_CB(READ16(sag_state, input_r))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 450000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, sag_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, sag_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, sag_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, sag_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, sag_state, grid_w))
+ MCFG_HMCS40_READ_D_CB(READ16(*this, sag_state, input_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_sag)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2738,15 +2738,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(egalaxn2_state::egalaxn2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_READ_R_CB(0, READ8(egalaxn2_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(egalaxn2_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(egalaxn2_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(egalaxn2_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(egalaxn2_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(egalaxn2_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(egalaxn2_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(egalaxn2_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, egalaxn2_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, egalaxn2_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, egalaxn2_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, egalaxn2_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, egalaxn2_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, egalaxn2_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, egalaxn2_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, egalaxn2_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2758,7 +2758,7 @@ MACHINE_CONFIG_START(egalaxn2_state::egalaxn2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2990,22 +2990,22 @@ void eturtles_state::machine_start()
MACHINE_CONFIG_START(eturtles_state::eturtles)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(eturtles_state, grid_w))
-
- MCFG_CPU_ADD("audiocpu", COP411, 215000) // approximation
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, eturtles_state, grid_w))
+
+ MCFG_DEVICE_ADD("audiocpu", COP411, 215000) // approximation
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_SK_CB(WRITELINE(eturtles_state, speaker_w))
- MCFG_COP400_WRITE_D_CB(WRITE8(eturtles_state, cop_irq_w))
- MCFG_COP400_READ_L_CB(READ8(eturtles_state, cop_latch_r))
- MCFG_COP400_READ_G_CB(READ8(eturtles_state, cop_ack_r))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, eturtles_state, speaker_w))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, eturtles_state, cop_irq_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, eturtles_state, cop_latch_r))
+ MCFG_COP400_READ_G_CB(READ8(*this, eturtles_state, cop_ack_r))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -3019,7 +3019,7 @@ MACHINE_CONFIG_START(eturtles_state::eturtles)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3100,21 +3100,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(estargte_state::estargte)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(eturtles_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(eturtles_state, grid_w))
-
- MCFG_CPU_ADD("audiocpu", COP411, 190000) // approximation
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, eturtles_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, eturtles_state, grid_w))
+
+ MCFG_DEVICE_ADD("audiocpu", COP411, 190000) // approximation
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_4, COP400_CKO_OSCILLATOR_OUTPUT, false) // guessed
- MCFG_COP400_WRITE_SK_CB(WRITELINE(eturtles_state, speaker_w))
- MCFG_COP400_WRITE_D_CB(WRITE8(eturtles_state, cop_irq_w))
- MCFG_COP400_READ_L_CB(READ8(estargte_state, cop_data_r))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, eturtles_state, speaker_w))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, eturtles_state, cop_irq_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, estargte_state, cop_data_r))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -3128,7 +3128,7 @@ MACHINE_CONFIG_START(estargte_state::estargte)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3226,13 +3226,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ghalien_state::ghalien)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(ghalien_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(ghalien_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(ghalien_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(ghalien_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(ghalien_state, grid_w))
- MCFG_HMCS40_READ_D_CB(READ16(ghalien_state, input_r))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, ghalien_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, ghalien_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, ghalien_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, ghalien_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, ghalien_state, grid_w))
+ MCFG_HMCS40_READ_D_CB(READ16(*this, ghalien_state, input_r))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -3244,7 +3244,7 @@ MACHINE_CONFIG_START(ghalien_state::ghalien)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3353,12 +3353,12 @@ INPUT_CHANGED_MEMBER(gckong_state::input_changed)
MACHINE_CONFIG_START(gckong_state::gckong)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(gckong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(gckong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(gckong_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(gckong_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(gckong_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, gckong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, gckong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, gckong_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, gckong_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, gckong_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.5"))
/* video hardware */
@@ -3371,7 +3371,7 @@ MACHINE_CONFIG_START(gckong_state::gckong)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3472,15 +3472,15 @@ INPUT_CHANGED_MEMBER(gdigdug_state::input_changed)
MACHINE_CONFIG_START(gdigdug_state::gdigdug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(gdigdug_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(gdigdug_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, gdigdug_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, gdigdug_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -3492,7 +3492,7 @@ MACHINE_CONFIG_START(gdigdug_state::gdigdug)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3634,14 +3634,14 @@ static const s16 mwcbaseb_speaker_levels[] = { 0, 0x3fff, -0x4000, 0, -0x4000, 0
MACHINE_CONFIG_START(mwcbaseb_state::mwcbaseb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(mwcbaseb_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(mwcbaseb_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(mwcbaseb_state, plate_w))
- MCFG_HMCS40_READ_R_CB(4, READ8(mwcbaseb_state, input_r))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(mwcbaseb_state, speaker_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(mwcbaseb_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(mwcbaseb_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, mwcbaseb_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, mwcbaseb_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, mwcbaseb_state, plate_w))
+ MCFG_HMCS40_READ_R_CB(4, READ8(*this, mwcbaseb_state, input_r))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, mwcbaseb_state, speaker_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, mwcbaseb_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, mwcbaseb_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -3653,7 +3653,7 @@ MACHINE_CONFIG_START(mwcbaseb_state::mwcbaseb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(8, mwcbaseb_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3722,15 +3722,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(pbqbert_state::pbqbert)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(4, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(5, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(6, WRITE8(pbqbert_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(pbqbert_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38820, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(4, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(5, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(6, WRITE8(*this, pbqbert_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, pbqbert_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.0"))
/* video hardware */
@@ -3743,7 +3743,7 @@ MACHINE_CONFIG_START(pbqbert_state::pbqbert)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3847,12 +3847,12 @@ INPUT_CHANGED_MEMBER(kingman_state::input_changed)
MACHINE_CONFIG_START(kingman_state::kingman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(kingman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(kingman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(kingman_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(kingman_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(kingman_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, kingman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, kingman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, kingman_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, kingman_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, kingman_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -3864,7 +3864,7 @@ MACHINE_CONFIG_START(kingman_state::kingman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3968,12 +3968,12 @@ INPUT_CHANGED_MEMBER(tmtron_state::input_changed)
MACHINE_CONFIG_START(tmtron_state::tmtron)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(tmtron_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(tmtron_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(tmtron_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(tmtron_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(tmtron_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, tmtron_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, tmtron_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, tmtron_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, tmtron_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, tmtron_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -3985,7 +3985,7 @@ MACHINE_CONFIG_START(tmtron_state::tmtron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4062,12 +4062,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vinvader_state::vinvader)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", HD38750, 400000) // approximation
MCFG_HMCS40_READ_R_CB(0, IOPORT("IN.0"))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(vinvader_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(vinvader_state, plate_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(vinvader_state, plate_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(vinvader_state, grid_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, vinvader_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, vinvader_state, plate_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, vinvader_state, plate_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, vinvader_state, grid_w))
MCFG_HMCS40_READ_D_CB(IOPORT("IN.1"))
/* video hardware */
@@ -4080,7 +4080,7 @@ MACHINE_CONFIG_START(vinvader_state::vinvader)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp
index cb38f144dac..d92a921b566 100644
--- a/src/mame/drivers/hh_melps4.cpp
+++ b/src/mame/drivers/hh_melps4.cpp
@@ -298,13 +298,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cfrogger_state::cfrogger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M58846, 600_kHz_XTAL)
- MCFG_MELPS4_READ_K_CB(READ16(cfrogger_state, input_r))
- MCFG_MELPS4_WRITE_S_CB(WRITE8(cfrogger_state, plate_w))
- MCFG_MELPS4_WRITE_F_CB(WRITE8(cfrogger_state, plate_w))
- MCFG_MELPS4_WRITE_G_CB(WRITE8(cfrogger_state, plate_w))
- MCFG_MELPS4_WRITE_D_CB(WRITE16(cfrogger_state, grid_w))
- MCFG_MELPS4_WRITE_T_CB(WRITELINE(cfrogger_state, speaker_w))
+ MCFG_DEVICE_ADD("maincpu", M58846, 600_kHz_XTAL)
+ MCFG_MELPS4_READ_K_CB(READ16(*this, cfrogger_state, input_r))
+ MCFG_MELPS4_WRITE_S_CB(WRITE8(*this, cfrogger_state, plate_w))
+ MCFG_MELPS4_WRITE_F_CB(WRITE8(*this, cfrogger_state, plate_w))
+ MCFG_MELPS4_WRITE_G_CB(WRITE8(*this, cfrogger_state, plate_w))
+ MCFG_MELPS4_WRITE_D_CB(WRITE16(*this, cfrogger_state, grid_w))
+ MCFG_MELPS4_WRITE_T_CB(WRITELINE(*this, cfrogger_state, speaker_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -316,7 +316,7 @@ MACHINE_CONFIG_START(cfrogger_state::cfrogger)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -414,14 +414,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gjungler_state::gjungler)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M58846, 600_kHz_XTAL)
- MCFG_MELPS4_READ_K_CB(READ16(gjungler_state, input_r))
- MCFG_MELPS4_WRITE_S_CB(WRITE8(gjungler_state, plate_w))
- MCFG_MELPS4_WRITE_F_CB(WRITE8(gjungler_state, plate_w))
- MCFG_MELPS4_WRITE_G_CB(WRITE8(gjungler_state, plate_w))
- MCFG_MELPS4_WRITE_U_CB(WRITE8(gjungler_state, plate_w))
- MCFG_MELPS4_WRITE_D_CB(WRITE16(gjungler_state, grid_w))
- MCFG_MELPS4_WRITE_T_CB(WRITELINE(gjungler_state, speaker_w))
+ MCFG_DEVICE_ADD("maincpu", M58846, 600_kHz_XTAL)
+ MCFG_MELPS4_READ_K_CB(READ16(*this, gjungler_state, input_r))
+ MCFG_MELPS4_WRITE_S_CB(WRITE8(*this, gjungler_state, plate_w))
+ MCFG_MELPS4_WRITE_F_CB(WRITE8(*this, gjungler_state, plate_w))
+ MCFG_MELPS4_WRITE_G_CB(WRITE8(*this, gjungler_state, plate_w))
+ MCFG_MELPS4_WRITE_U_CB(WRITE8(*this, gjungler_state, plate_w))
+ MCFG_MELPS4_WRITE_D_CB(WRITE16(*this, gjungler_state, grid_w))
+ MCFG_MELPS4_WRITE_T_CB(WRITELINE(*this, gjungler_state, speaker_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -433,7 +433,7 @@ MACHINE_CONFIG_START(gjungler_state::gjungler)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index 22123ce8a72..971a790398e 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -381,11 +381,11 @@ static const s16 touchme_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(touchme_state::touchme)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 300000) // approximation - RC osc. R=100K, C=47pF
- MCFG_PIC16C5x_READ_A_CB(READ8(touchme_state, read_a))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(touchme_state, write_b))
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 300000) // approximation - RC osc. R=100K, C=47pF
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, touchme_state, read_a))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, touchme_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(touchme_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, touchme_state, write_c))
MCFG_DEVICE_ADD("clock", CLOCK, 300000/4) // PIC CLKOUT, tied to RTCC
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC))
@@ -395,7 +395,7 @@ MACHINE_CONFIG_START(touchme_state::touchme)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, touchme_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -490,18 +490,18 @@ INPUT_CHANGED_MEMBER(pabball_state::reset_button)
MACHINE_CONFIG_START(pabball_state::pabball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 1200000) // approximation - RC osc. R=18K, C=27pF
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 1200000) // approximation - RC osc. R=18K, C=27pF
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.0"))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(pabball_state, write_b))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, pabball_state, write_b))
MCFG_PIC16C5x_READ_C_CB(IOPORT("IN.1"))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(pabball_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, pabball_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_pic16_test)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -605,18 +605,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(melodym_state::melodym)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 1000000) // approximation
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.5"))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(melodym_state, write_b))
- MCFG_PIC16C5x_READ_C_CB(READ8(melodym_state, read_c))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(melodym_state, write_c))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, melodym_state, write_b))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, melodym_state, read_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, melodym_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_melodym)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -705,17 +705,17 @@ static const s16 maniac_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(maniac_state::maniac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=~13.4K, C=470pF
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=~13.4K, C=470pF
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.0"))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(maniac_state, write_b))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(maniac_state, write_c))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, maniac_state, write_b))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, maniac_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_maniac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, maniac_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -854,18 +854,18 @@ void matchme_state::machine_reset()
MACHINE_CONFIG_START(matchme_state::matchme)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 1200000) // see set_clock
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 1200000) // see set_clock
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.3"))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(matchme_state, write_b))
- MCFG_PIC16C5x_READ_C_CB(READ8(matchme_state, read_c))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(matchme_state, write_c))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, matchme_state, write_b))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, matchme_state, read_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, matchme_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_matchme)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1010,18 +1010,18 @@ void leboom_state::machine_start()
MACHINE_CONFIG_START(leboom_state::leboom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation
- MCFG_PIC16C5x_READ_A_CB(READ8(leboom_state, read_a))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(leboom_state, write_b))
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 1000000) // approximation
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, leboom_state, read_a))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, leboom_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(leboom_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, leboom_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_leboom)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_TIMER_DRIVER_ADD_PERIODIC("speaker_decay", leboom_state, speaker_decay_sim, attotime::from_msec(25))
MACHINE_CONFIG_END
@@ -1120,18 +1120,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbaskb_state::tbaskb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=18K, C=47pF
- MCFG_PIC16C5x_READ_A_CB(READ8(tbaskb_state, read_a))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(tbaskb_state, write_b))
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=18K, C=47pF
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, tbaskb_state, read_a))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, tbaskb_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(tbaskb_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, tbaskb_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tbaskb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1229,15 +1229,15 @@ static const s16 rockpin_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(rockpin_state::rockpin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1650, 450000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", PIC1650, 450000) // approximation - RC osc. R=47K, C=47pF
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.0"))
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(rockpin_state, write_a))
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, rockpin_state, write_a))
MCFG_PIC16C5x_READ_B_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(rockpin_state, write_b))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, rockpin_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(rockpin_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, rockpin_state, write_c))
MCFG_PIC16C5x_READ_D_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_D_CB(WRITE8(rockpin_state, write_d))
+ MCFG_PIC16C5x_WRITE_D_CB(WRITE8(*this, rockpin_state, write_d))
MCFG_DEVICE_ADD("clock", CLOCK, 450000/4) // PIC CLKOUT, tied to RTCC
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC))
@@ -1247,7 +1247,7 @@ MACHINE_CONFIG_START(rockpin_state::rockpin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, rockpin_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1347,18 +1347,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(hccbaskb_state::hccbaskb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=15K, C=47pF
- MCFG_PIC16C5x_READ_A_CB(READ8(hccbaskb_state, read_a))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(hccbaskb_state, write_b))
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=15K, C=47pF
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, hccbaskb_state, read_a))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, hccbaskb_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(hccbaskb_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, hccbaskb_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hccbaskb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1499,18 +1499,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ttfball_state::ttfball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=27K(set 1) or 33K(set 2), C=68pF
- MCFG_PIC16C5x_READ_A_CB(READ8(ttfball_state, read_a))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(ttfball_state, write_b))
+ MCFG_DEVICE_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=27K(set 1) or 33K(set 2), C=68pF
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, ttfball_state, read_a))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, ttfball_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(ttfball_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, ttfball_state, write_c))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ttfball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1603,15 +1603,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(uspbball_state::uspbball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1650, 1000000) // approximation - RC osc. R=22K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", PIC1650, 1000000) // approximation - RC osc. R=22K, C=47pF
MCFG_PIC16C5x_READ_A_CB(IOPORT("IN.0"))
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(uspbball_state, write_a))
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, uspbball_state, write_a))
MCFG_PIC16C5x_READ_B_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(uspbball_state, write_b))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, uspbball_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(uspbball_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, uspbball_state, write_c))
MCFG_PIC16C5x_READ_D_CB(IOPORT("IN.1"))
- MCFG_PIC16C5x_WRITE_D_CB(WRITE8(uspbball_state, write_d))
+ MCFG_PIC16C5x_WRITE_D_CB(WRITE8(*this, uspbball_state, write_d))
MCFG_DEVICE_ADD("clock", CLOCK, 1000000/4) // PIC CLKOUT, tied to RTCC
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC))
@@ -1621,7 +1621,7 @@ MACHINE_CONFIG_START(uspbball_state::uspbball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1738,15 +1738,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(us2pfball_state::us2pfball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PIC1650, 800000) // approximation - RC osc. R=39K, C=75pF
- MCFG_PIC16C5x_READ_A_CB(READ8(us2pfball_state, read_a))
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(us2pfball_state, write_a))
+ MCFG_DEVICE_ADD("maincpu", PIC1650, 800000) // approximation - RC osc. R=39K, C=75pF
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, us2pfball_state, read_a))
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, us2pfball_state, write_a))
MCFG_PIC16C5x_READ_B_CB(IOPORT("IN.5"))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(us2pfball_state, write_b))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, us2pfball_state, write_b))
MCFG_PIC16C5x_READ_C_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(us2pfball_state, write_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, us2pfball_state, write_c))
MCFG_PIC16C5x_READ_D_CB(CONSTANT(0xff))
- MCFG_PIC16C5x_WRITE_D_CB(WRITE8(us2pfball_state, write_d))
+ MCFG_PIC16C5x_WRITE_D_CB(WRITE8(*this, us2pfball_state, write_d))
MCFG_DEVICE_ADD("clock", CLOCK, 800000/4) // PIC CLKOUT, tied to RTCC
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC))
@@ -1756,7 +1756,7 @@ MACHINE_CONFIG_START(us2pfball_state::us2pfball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index 16aea9b09d8..e20896a681f 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -264,12 +264,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kdribble_state::kdribble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(kdribble_state::kdribble)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -337,12 +337,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ktopgun_state::ktopgun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -355,7 +355,7 @@ MACHINE_CONFIG_START(ktopgun_state::ktopgun)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -412,11 +412,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kcontra_state::kcontra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -429,7 +429,7 @@ MACHINE_CONFIG_START(kcontra_state::kcontra)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -485,11 +485,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ktmnt_state::ktmnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -502,7 +502,7 @@ MACHINE_CONFIG_START(ktmnt_state::ktmnt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -555,11 +555,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kgradius_state::kgradius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -572,7 +572,7 @@ MACHINE_CONFIG_START(kgradius_state::kgradius)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -623,11 +623,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kloneran_state::kloneran)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -640,7 +640,7 @@ MACHINE_CONFIG_START(kloneran_state::kloneran)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -695,11 +695,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kblades_state::kblades)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -711,7 +711,7 @@ MACHINE_CONFIG_START(kblades_state::kblades)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -768,11 +768,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(knfl_state::knfl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -784,7 +784,7 @@ MACHINE_CONFIG_START(knfl_state::knfl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -840,11 +840,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kbilly_state::kbilly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -856,7 +856,7 @@ MACHINE_CONFIG_START(kbilly_state::kbilly)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -906,11 +906,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kbucky_state::kbucky)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -922,7 +922,7 @@ MACHINE_CONFIG_START(kbucky_state::kbucky)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -976,11 +976,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kgarfld_state::kgarfld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -992,7 +992,7 @@ MACHINE_CONFIG_START(kgarfld_state::kgarfld)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1069,11 +1069,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM5A, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM5A, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // ?
- MCFG_SM500_WRITE_O_CB(WRITE8(hh_sm510_state, sm500_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_input_w))
+ MCFG_SM500_WRITE_O_CB(WRITE8(*this, hh_sm510_state, sm500_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_input_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
/* video hardware */
@@ -1087,7 +1087,7 @@ MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1104,11 +1104,11 @@ MACHINE_CONFIG_START(gnw_mmouse_state::nupogodi)
gnw_mmouse(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", KB1013VK12, 32.768_kHz_XTAL)
+ MCFG_DEVICE_REPLACE("maincpu", KB1013VK12, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM500_WRITE_O_CB(WRITE8(hh_sm510_state, sm500_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_input_w))
+ MCFG_SM500_WRITE_O_CB(WRITE8(*this, hh_sm510_state, sm500_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_input_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
/* video hardware */
@@ -1178,12 +1178,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r2_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r2_w))
MCFG_SM510_READ_B_CB(IOPORT("B"))
/* video hardware */
@@ -1202,7 +1202,7 @@ MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1262,12 +1262,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_B_CB(IOPORT("B"))
/* video hardware */
@@ -1286,7 +1286,7 @@ MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1347,12 +1347,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mario_state::gnw_mario)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1372,7 +1372,7 @@ MACHINE_CONFIG_START(gnw_mario_state::gnw_mario)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1439,12 +1439,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1459,7 +1459,7 @@ MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1521,12 +1521,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1541,7 +1541,7 @@ MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1606,11 +1606,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_smb_state::gnw_smb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_B_CB(IOPORT("B"))
/* video hardware */
@@ -1624,7 +1624,7 @@ MACHINE_CONFIG_START(gnw_smb_state::gnw_smb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1708,11 +1708,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1727,7 +1727,7 @@ MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1818,12 +1818,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgaunt_state::tgaunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(tgaunt_state::tgaunt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1921,12 +1921,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tddragon_state::tddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -1941,7 +1941,7 @@ MACHINE_CONFIG_START(tddragon_state::tddragon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2016,12 +2016,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tkarnov_state::tkarnov)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2036,7 +2036,7 @@ MACHINE_CONFIG_START(tkarnov_state::tkarnov)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2110,12 +2110,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tvindictr_state::tvindictr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2130,7 +2130,7 @@ MACHINE_CONFIG_START(tvindictr_state::tvindictr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2227,12 +2227,12 @@ void tgaiden_state::machine_start()
MACHINE_CONFIG_START(tgaiden_state::tgaiden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(tgaiden_state, write_r))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, tgaiden_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2247,7 +2247,7 @@ MACHINE_CONFIG_START(tgaiden_state::tgaiden)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2317,12 +2317,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbatman_state::tbatman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2337,7 +2337,7 @@ MACHINE_CONFIG_START(tbatman_state::tbatman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2411,12 +2411,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsharr2_state::tsharr2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2431,7 +2431,7 @@ MACHINE_CONFIG_START(tsharr2_state::tsharr2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2502,12 +2502,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tstrider_state::tstrider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2522,7 +2522,7 @@ MACHINE_CONFIG_START(tstrider_state::tstrider)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2597,12 +2597,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2617,7 +2617,7 @@ MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2692,12 +2692,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(trobocop2_state::trobocop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2712,7 +2712,7 @@ MACHINE_CONFIG_START(trobocop2_state::trobocop2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2791,12 +2791,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(taltbeast_state::taltbeast)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2811,7 +2811,7 @@ MACHINE_CONFIG_START(taltbeast_state::taltbeast)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2886,12 +2886,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsf2010_state::tsf2010)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2906,7 +2906,7 @@ MACHINE_CONFIG_START(tsf2010_state::tsf2010)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2977,12 +2977,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tswampt_state::tswampt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -2997,7 +2997,7 @@ MACHINE_CONFIG_START(tswampt_state::tswampt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3072,12 +3072,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tspidman_state::tspidman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3092,7 +3092,7 @@ MACHINE_CONFIG_START(tspidman_state::tspidman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3167,12 +3167,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tddragon3_state::tddragon3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3187,7 +3187,7 @@ MACHINE_CONFIG_START(tddragon3_state::tddragon3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3262,12 +3262,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tflash_state::tflash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3282,7 +3282,7 @@ MACHINE_CONFIG_START(tflash_state::tflash)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3358,11 +3358,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmchammer_state::tmchammer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3377,7 +3377,7 @@ MACHINE_CONFIG_START(tmchammer_state::tmchammer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3452,12 +3452,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbtoads_state::tbtoads)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3472,7 +3472,7 @@ MACHINE_CONFIG_START(tbtoads_state::tbtoads)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3547,12 +3547,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(thook_state::thook)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3567,7 +3567,7 @@ MACHINE_CONFIG_START(thook_state::thook)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3641,12 +3641,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbttf_state::tbttf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3661,7 +3661,7 @@ MACHINE_CONFIG_START(tbttf_state::tbttf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3738,12 +3738,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(taddams_state::taddams)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3758,7 +3758,7 @@ MACHINE_CONFIG_START(taddams_state::taddams)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3833,12 +3833,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(thalone_state::thalone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3853,7 +3853,7 @@ MACHINE_CONFIG_START(thalone_state::thalone)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3924,12 +3924,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(txmenpx_state::txmenpx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -3944,7 +3944,7 @@ MACHINE_CONFIG_START(txmenpx_state::txmenpx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4019,12 +4019,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(thalone2_state::thalone2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4039,7 +4039,7 @@ MACHINE_CONFIG_START(thalone2_state::thalone2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4138,11 +4138,11 @@ static const s16 tsonic_speaker_levels[] = { 0, 0x7fff/3*1, 0x7fff/3*2, 0x7fff }
MACHINE_CONFIG_START(tsonic_state::tsonic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(tsonic_state, write_s))
- MCFG_SM510_WRITE_R_CB(WRITE8(tsonic_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, tsonic_state, write_s))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, tsonic_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4156,7 +4156,7 @@ MACHINE_CONFIG_START(tsonic_state::tsonic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, tsonic_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4232,12 +4232,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(trobocop3_state::trobocop3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4252,7 +4252,7 @@ MACHINE_CONFIG_START(trobocop3_state::trobocop3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4323,12 +4323,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tdummies_state::tdummies)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4343,7 +4343,7 @@ MACHINE_CONFIG_START(tdummies_state::tdummies)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4418,12 +4418,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsfight2_state::tsfight2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4438,7 +4438,7 @@ MACHINE_CONFIG_START(tsfight2_state::tsfight2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4509,12 +4509,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tjpark_state::tjpark)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4529,7 +4529,7 @@ MACHINE_CONFIG_START(tjpark_state::tjpark)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4628,11 +4628,11 @@ static const s16 tsonic2_speaker_levels[] = { 0, 0x7fff/3*1, 0x7fff/3*2, 0x7fff
MACHINE_CONFIG_START(tsonic2_state::tsonic2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(tsonic2_state, write_s))
- MCFG_SM510_WRITE_R_CB(WRITE8(tsonic2_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, tsonic2_state, write_s))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, tsonic2_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4646,7 +4646,7 @@ MACHINE_CONFIG_START(tsonic2_state::tsonic2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, tsonic2_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4727,12 +4727,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsddragon_state::tsddragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4747,7 +4747,7 @@ MACHINE_CONFIG_START(tsddragon_state::tsddragon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4823,12 +4823,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tdennis_state::tdennis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4843,7 +4843,7 @@ MACHINE_CONFIG_START(tdennis_state::tdennis)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4922,12 +4922,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tnmarebc_state::tnmarebc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(tnmarebc_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, tnmarebc_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -4942,7 +4942,7 @@ MACHINE_CONFIG_START(tnmarebc_state::tnmarebc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5017,12 +5017,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ttransf2_state::ttransf2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5037,7 +5037,7 @@ MACHINE_CONFIG_START(ttransf2_state::ttransf2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5113,12 +5113,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmkombat_state::tmkombat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5133,7 +5133,7 @@ MACHINE_CONFIG_START(tmkombat_state::tmkombat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5208,12 +5208,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tshadow_state::tshadow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5228,7 +5228,7 @@ MACHINE_CONFIG_START(tshadow_state::tshadow)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5303,12 +5303,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tskelwarr_state::tskelwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5323,7 +5323,7 @@ MACHINE_CONFIG_START(tskelwarr_state::tskelwarr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5399,12 +5399,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tbatfor_state::tbatfor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5419,7 +5419,7 @@ MACHINE_CONFIG_START(tbatfor_state::tbatfor)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5495,12 +5495,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tjdredd_state::tjdredd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5515,7 +5515,7 @@ MACHINE_CONFIG_START(tjdredd_state::tjdredd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5591,12 +5591,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tapollo13_state::tapollo13)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5611,7 +5611,7 @@ MACHINE_CONFIG_START(tapollo13_state::tapollo13)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5687,12 +5687,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgoldeye_state::tgoldeye)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5707,7 +5707,7 @@ MACHINE_CONFIG_START(tgoldeye_state::tgoldeye)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5778,12 +5778,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tinday_state::tinday)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5798,7 +5798,7 @@ MACHINE_CONFIG_START(tinday_state::tinday)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5869,12 +5869,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsjam_state::tsjam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL) // no external XTAL
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL) // no external XTAL
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
MCFG_SM510_READ_B_CB(IOPORT("B"))
@@ -5889,7 +5889,7 @@ MACHINE_CONFIG_START(tsjam_state::tsjam)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5974,12 +5974,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tigarden_state::tigarden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL)
MCFG_SM510_R_MASK_OPTION(2) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -5992,7 +5992,7 @@ MACHINE_CONFIG_START(tigarden_state::tigarden)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -6075,11 +6075,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nummunch_state::nummunch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM511, 32.768_kHz_XTAL)
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
- MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
+ MCFG_DEVICE_ADD("maincpu", SM511, 32.768_kHz_XTAL)
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, hh_sm510_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, hh_sm510_state, input_w))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, hh_sm510_state, piezo_r1_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -6092,7 +6092,7 @@ MACHINE_CONFIG_START(nummunch_state::nummunch)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 8c6557a9c7f..db66f46d661 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -533,17 +533,17 @@ static const s16 matchnum_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(matchnum_state::matchnum)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(matchnum_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(matchnum_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(matchnum_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, matchnum_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, matchnum_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, matchnum_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_matchnum)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, matchnum_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -633,17 +633,17 @@ static const s16 arrball_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(arrball_state::arrball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(arrball_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(arrball_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(arrball_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, arrball_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, arrball_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, arrball_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_arrball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, arrball_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -813,11 +813,11 @@ static const u16 mathmagi_output_pla[0x20] =
MACHINE_CONFIG_START(mathmagi_state::mathmagi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 175000) // approximation - RC osc. R=68K, C=82pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 175000) // approximation - RC osc. R=68K, C=82pF
MCFG_TMS1XXX_OUTPUT_PLA(mathmagi_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(mathmagi_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(mathmagi_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(mathmagi_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, mathmagi_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, mathmagi_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mathmagi_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mathmagi)
@@ -919,10 +919,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bcheetah_state::bcheetah)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 100000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(bcheetah_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(bcheetah_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(bcheetah_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 100000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, bcheetah_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, bcheetah_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bcheetah_state, write_o))
MCFG_DEFAULT_LAYOUT(layout_bcheetah)
@@ -1046,17 +1046,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(amaztron_state::amaztron)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=33K?, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(amaztron_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(amaztron_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(amaztron_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=33K?, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, amaztron_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, amaztron_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, amaztron_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_amaztron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1223,18 +1223,18 @@ static const u16 zodiac_output_pla[0x20] =
MACHINE_CONFIG_START(zodiac_state::zodiac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 500000) // approximation - RC osc. R=18K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 500000) // approximation - RC osc. R=18K, C=100pF
MCFG_TMS1XXX_OUTPUT_PLA(zodiac_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(zodiac_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(zodiac_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(zodiac_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, zodiac_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, zodiac_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, zodiac_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_zodiac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1339,17 +1339,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cqback_state::cqback)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=33K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(cqback_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cqback_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cqback_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=33K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cqback_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cqback_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cqback_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cqback)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1457,17 +1457,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(h2hfootb_state::h2hfootb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=39K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(h2hfootb_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(h2hfootb_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(h2hfootb_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=39K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, h2hfootb_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, h2hfootb_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hfootb_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_h2hfootb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1598,10 +1598,10 @@ void h2hhockey_state::machine_start()
MACHINE_CONFIG_START(h2hhockey_state::h2hhockey)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=43K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(h2hhockey_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(h2hhockey_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(h2hhockey_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=43K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, h2hhockey_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, h2hhockey_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hhockey_state, write_o))
MCFG_TIMER_DRIVER_ADD("cap_empty", h2hhockey_state, cap_empty_callback)
@@ -1610,7 +1610,7 @@ MACHINE_CONFIG_START(h2hhockey_state::h2hhockey)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1739,17 +1739,17 @@ void h2hbaseb_state::machine_reset()
MACHINE_CONFIG_START(h2hbaseb_state::h2hbaseb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1170, 350000) // see set_clock
- MCFG_TMS1XXX_READ_K_CB(READ8(h2hbaseb_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(h2hbaseb_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(h2hbaseb_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1170, 350000) // see set_clock
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, h2hbaseb_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, h2hbaseb_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hbaseb_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_h2hbaseb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1851,17 +1851,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(h2hboxing_state::h2hboxing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=39K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(h2hboxing_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(h2hboxing_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(h2hboxing_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=39K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, h2hboxing_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, h2hboxing_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hboxing_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_h2hboxing)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2022,17 +2022,17 @@ void quizwizc_state::machine_start()
MACHINE_CONFIG_START(quizwizc_state::quizwizc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(quizwizc_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(quizwizc_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(quizwizc_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, quizwizc_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, quizwizc_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, quizwizc_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_quizwizc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cartridge */
@@ -2198,17 +2198,17 @@ void tc4_state::machine_start()
MACHINE_CONFIG_START(tc4_state::tc4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=27.3K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(tc4_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tc4_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tc4_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=27.3K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tc4_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tc4_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tc4_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tc4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cartridge */
@@ -2313,17 +2313,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cnbaskb_state::cnbaskb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(cnbaskb_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cnbaskb_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cnbaskb_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cnbaskb_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cnbaskb_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnbaskb_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cnbaskb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2426,17 +2426,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cmsport_state::cmsport)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(cmsport_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cmsport_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cmsport_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cmsport_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cmsport_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cmsport_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cmsport)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2552,17 +2552,17 @@ static const s16 cnfball_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(cnfball_state::cnfball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(cnfball_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cnfball_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cnfball_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cnfball_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cnfball_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnfball_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cnfball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, cnfball_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2678,18 +2678,18 @@ static const u16 cnfball2_output_pla[0x20] =
MACHINE_CONFIG_START(cnfball2_state::cnfball2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
MCFG_TMS1XXX_OUTPUT_PLA(cnfball2_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(cnfball2_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cnfball2_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cnfball2_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cnfball2_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cnfball2_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnfball2_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cnfball2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2820,17 +2820,17 @@ INPUT_CHANGED_MEMBER(eleciq_state::reset_button)
MACHINE_CONFIG_START(eleciq_state::eleciq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=50pF
- MCFG_TMS1XXX_READ_K_CB(READ8(eleciq_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(eleciq_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(eleciq_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=50pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, eleciq_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, eleciq_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, eleciq_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_eleciq)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2925,17 +2925,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(esoccer_state::esoccer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=33pF
- MCFG_TMS1XXX_READ_K_CB(READ8(esoccer_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(esoccer_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(esoccer_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=33pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, esoccer_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, esoccer_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, esoccer_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_esoccer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3059,17 +3059,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ebball_state::ebball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=43K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(ebball_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ebball_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ebball_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=43K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ebball_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ebball_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebball_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ebball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3182,17 +3182,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ebball2_state::ebball2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(ebball2_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ebball2_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ebball2_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ebball2_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ebball2_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebball2_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ebball2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3362,17 +3362,17 @@ void ebball3_state::machine_reset()
MACHINE_CONFIG_START(ebball3_state::ebball3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 340000) // see set_clock
- MCFG_TMS1XXX_READ_K_CB(READ8(ebball3_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ebball3_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ebball3_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 340000) // see set_clock
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ebball3_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ebball3_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebball3_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ebball3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3473,17 +3473,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(esbattle_state::esbattle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 425000) // approximation - RC osc. R=47K, C=33pF
- MCFG_TMS1XXX_READ_K_CB(READ8(esbattle_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(esbattle_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(esbattle_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 425000) // approximation - RC osc. R=47K, C=33pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, esbattle_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, esbattle_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, esbattle_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_esbattle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3582,10 +3582,10 @@ void einvader_state::machine_reset()
MACHINE_CONFIG_START(einvader_state::einvader)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 320000) // see set_clock
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 320000) // see set_clock
MCFG_TMS1XXX_READ_K_CB(IOPORT("IN.0"))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(einvader_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(einvader_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, einvader_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, einvader_state, write_o))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -3597,7 +3597,7 @@ MACHINE_CONFIG_START(einvader_state::einvader)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3702,17 +3702,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(efootb4_state::efootb4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1670, 475000) // approximation - RC osc. R=42K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(efootb4_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(efootb4_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(efootb4_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1670, 475000) // approximation - RC osc. R=42K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, efootb4_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, efootb4_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, efootb4_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_efootb4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3823,17 +3823,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ebaskb2_state::ebaskb2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 360000) // approximation - RC osc. R=33K, C=82pF
- MCFG_TMS1XXX_READ_K_CB(READ8(ebaskb2_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ebaskb2_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ebaskb2_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 360000) // approximation - RC osc. R=33K, C=82pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ebaskb2_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ebaskb2_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebaskb2_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ebaskb2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -3962,17 +3962,17 @@ void raisedvl_state::machine_reset()
MACHINE_CONFIG_START(raisedvl_state::raisedvl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 350000) // see set_clock
- MCFG_TMS1XXX_READ_K_CB(READ8(raisedvl_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(raisedvl_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(raisedvl_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 350000) // see set_clock
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, raisedvl_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, raisedvl_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, raisedvl_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_raisedvl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4093,17 +4093,17 @@ INPUT_CHANGED_MEMBER(f2pbball_state::reset_button)
MACHINE_CONFIG_START(f2pbball_state::f2pbball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=51K, C=39pF
- MCFG_TMS1XXX_READ_K_CB(READ8(f2pbball_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(f2pbball_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(f2pbball_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=51K, C=39pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, f2pbball_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, f2pbball_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, f2pbball_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_f2pbball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4230,17 +4230,17 @@ void f3in1_state::machine_reset()
MACHINE_CONFIG_START(f3in1_state::f3in1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 300000) // see set_clock
- MCFG_TMS1XXX_READ_K_CB(READ8(f3in1_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(f3in1_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(f3in1_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 300000) // see set_clock
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, f3in1_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, f3in1_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, f3in1_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_f3in1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4375,17 +4375,17 @@ void gpoker_state::machine_reset()
MACHINE_CONFIG_START(gpoker_state::gpoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1370, 350000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(gpoker_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(gpoker_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(gpoker_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1370, 350000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, gpoker_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, gpoker_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, gpoker_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_gpoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2405) // astable multivibrator - C1 and C2 are 0.003uF, R1 and R4 are 1K, R2 and R3 are 100K
+ MCFG_DEVICE_ADD("beeper", BEEP, 2405) // astable multivibrator - C1 and C2 are 0.003uF, R1 and R4 are 1K, R2 and R3 are 100K
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4488,17 +4488,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gjackpot_state::gjackpot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1670, 450000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(gpoker_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(gjackpot_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(gpoker_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1670, 450000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, gpoker_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, gjackpot_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, gpoker_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_gjackpot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2405) // see gpoker
+ MCFG_DEVICE_ADD("beeper", BEEP, 2405) // see gpoker
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4593,10 +4593,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ginv1000_state::ginv1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1370, 340000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(ginv1000_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ginv1000_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ginv1000_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1370, 340000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ginv1000_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ginv1000_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ginv1000_state, write_o))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -4608,7 +4608,7 @@ MACHINE_CONFIG_START(ginv1000_state::ginv1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4723,16 +4723,16 @@ void ginv2000_state::machine_reset()
MACHINE_CONFIG_START(ginv2000_state::ginv2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1370, 425000) // approximation - RC osc. R=36K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(ginv2000_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ginv2000_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ginv2000_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1370, 425000) // approximation - RC osc. R=36K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ginv2000_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ginv2000_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ginv2000_state, write_o))
MCFG_DEVICE_ADD("expander", TMS1024, 0)
- MCFG_TMS1025_WRITE_PORT_CB(PORT4, WRITE8(ginv2000_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT5, WRITE8(ginv2000_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT6, WRITE8(ginv2000_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT7, WRITE8(ginv2000_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT4, WRITE8(*this, ginv2000_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT5, WRITE8(*this, ginv2000_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT6, WRITE8(*this, ginv2000_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT7, WRITE8(*this, ginv2000_state, expander_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -4744,7 +4744,7 @@ MACHINE_CONFIG_START(ginv2000_state::ginv2000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4872,17 +4872,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(fxmcr165_state::fxmcr165)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 400_kHz_XTAL)
- MCFG_TMS1XXX_READ_K_CB(READ8(fxmcr165_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(fxmcr165_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(fxmcr165_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 400_kHz_XTAL)
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, fxmcr165_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, fxmcr165_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, fxmcr165_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_fxmcr165)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5000,18 +5000,18 @@ static const s16 elecdet_speaker_levels[4] = { 0, 0x3fff, 0x3fff, 0x7fff };
MACHINE_CONFIG_START(elecdet_state::elecdet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0980, 425000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(elecdet_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(elecdet_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(elecdet_state, write_o))
- MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(hh_tms1k_state, auto_power_off))
+ MCFG_DEVICE_ADD("maincpu", TMS0980, 425000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, elecdet_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, elecdet_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, elecdet_state, write_o))
+ MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_elecdet)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, elecdet_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5128,17 +5128,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(starwbc_state::starwbc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 325000) // approximation - RC osc. R=51K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(starwbc_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(starwbc_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(starwbc_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 325000) // approximation - RC osc. R=51K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, starwbc_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, starwbc_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, starwbc_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_starwbc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5255,10 +5255,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(astro_state::astro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1470, 450000) // approximation - RC osc. R=4.7K, C=33pF
- MCFG_TMS1XXX_READ_K_CB(READ8(astro_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(astro_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(astro_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1470, 450000) // approximation - RC osc. R=4.7K, C=33pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, astro_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, astro_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, astro_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_astro)
@@ -5420,18 +5420,18 @@ static const u16 elecbowl_output_pla[0x20] =
MACHINE_CONFIG_START(elecbowl_state::elecbowl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF
MCFG_TMS1XXX_OUTPUT_PLA(elecbowl_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(elecbowl_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(elecbowl_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(elecbowl_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, elecbowl_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, elecbowl_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, elecbowl_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_elecbowl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5577,13 +5577,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(horseran_state::horseran)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=56K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(horseran_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(horseran_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=56K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, horseran_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, horseran_state, write_r))
/* video hardware */
MCFG_DEVICE_ADD("lcd", HLCD0569, 1100) // C=0.022uF
- MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(horseran_state, lcd_output_w))
+ MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(*this, horseran_state, lcd_output_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_horseran)
@@ -5756,17 +5756,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mdndclab_state::mdndclab)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 475000) // approximation - RC osc. R=27K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(mdndclab_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(mdndclab_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(mdndclab_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 475000) // approximation - RC osc. R=27K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, mdndclab_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, mdndclab_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mdndclab_state, write_o))
/* no visual feedback! */
MCFG_DEFAULT_LAYOUT(layout_mdndclab) // playing board
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -5860,10 +5860,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(comp4_state::comp4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(comp4_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(comp4_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(comp4_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS0970, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, comp4_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, comp4_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, comp4_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_comp4)
@@ -6010,10 +6010,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bship_state::bship)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(bship_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(bship_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(bship_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, bship_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, bship_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bship_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_bship)
@@ -6113,17 +6113,17 @@ READ8_MEMBER(bshipb_state::read_k)
MACHINE_CONFIG_START(bshipb_state::bshipb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(bshipb_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(bshipb_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(bshipb_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, bshipb_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, bshipb_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bshipb_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_bship)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76477", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(100), CAP_P(47)) // R18, R17, C8
MCFG_SN76477_DECAY_RES(RES_M(3.3)) // R16
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.47), RES_K(15)) // C7, R20
@@ -6231,16 +6231,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(simon_state::simon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=33K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(simon_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(simon_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=33K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, simon_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, simon_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_simon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -6372,16 +6372,16 @@ void ssimon_state::machine_reset()
MACHINE_CONFIG_START(ssimon_state::ssimon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 275000) // see set_clock
- MCFG_TMS1XXX_READ_K_CB(READ8(ssimon_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ssimon_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 275000) // see set_clock
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ssimon_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ssimon_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ssimon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -6552,10 +6552,10 @@ static const s16 bigtrak_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2
MACHINE_CONFIG_START(bigtrak_state::bigtrak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=83K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(bigtrak_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(bigtrak_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(bigtrak_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=83K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, bigtrak_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, bigtrak_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bigtrak_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("gearbox", bigtrak_state, gearbox_sim_tick, attotime::from_msec(1))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
@@ -6563,7 +6563,7 @@ MACHINE_CONFIG_START(bigtrak_state::bigtrak)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(8, bigtrak_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -6785,10 +6785,10 @@ void mbdtower_state::machine_start()
MACHINE_CONFIG_START(mbdtower_state::mbdtower)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=43K, C=56pF
- MCFG_TMS1XXX_READ_K_CB(READ8(mbdtower_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(mbdtower_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(mbdtower_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=43K, C=56pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, mbdtower_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, mbdtower_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mbdtower_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("tower_motor", mbdtower_state, motor_sim_tick, attotime::from_msec(3500/0x80)) // ~3.5sec for a full rotation
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
@@ -6796,7 +6796,7 @@ MACHINE_CONFIG_START(mbdtower_state::mbdtower)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -6896,17 +6896,17 @@ static const s16 arcmania_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*
MACHINE_CONFIG_START(arcmania_state::arcmania)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 250000) // approximation - RC osc. R=56K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(arcmania_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(arcmania_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(arcmania_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 250000) // approximation - RC osc. R=56K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, arcmania_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, arcmania_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, arcmania_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_arcmania)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(8, arcmania_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7015,10 +7015,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cnsector_state::cnsector)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(cnsector_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cnsector_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cnsector_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS0970, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cnsector_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cnsector_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnsector_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cnsector)
@@ -7129,17 +7129,17 @@ static const s16 merlin_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2,
MACHINE_CONFIG_START(merlin_state::merlin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(merlin_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(merlin_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(merlin_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, merlin_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, merlin_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, merlin_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_merlin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(8, merlin_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7194,17 +7194,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mmerlin_state::mmerlin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=30K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(mmerlin_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(mmerlin_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(mmerlin_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=30K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, mmerlin_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, mmerlin_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mmerlin_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mmerlin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(8, merlin_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7309,18 +7309,18 @@ static const s16 stopthief_speaker_levels[7] = { 0, 0x7fff/6, 0x7fff/5, 0x7fff/4
MACHINE_CONFIG_START(stopthief_state::stopthief)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0980, 425000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(stopthief_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(stopthief_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(stopthief_state, write_o))
- MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(hh_tms1k_state, auto_power_off))
+ MCFG_DEVICE_ADD("maincpu", TMS0980, 425000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, stopthief_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, stopthief_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, stopthief_state, write_o))
+ MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_stopthief)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(7, stopthief_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7423,17 +7423,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bankshot_state::bankshot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(bankshot_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(bankshot_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(bankshot_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, bankshot_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, bankshot_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bankshot_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_bankshot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7540,17 +7540,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(splitsec_state::splitsec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF
- MCFG_TMS1XXX_READ_K_CB(READ8(splitsec_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(splitsec_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(splitsec_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, splitsec_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, splitsec_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, splitsec_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_splitsec)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7658,17 +7658,17 @@ static const s16 lostreas_speaker_levels[16] =
MACHINE_CONFIG_START(lostreas_state::lostreas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 425000) // approximation - RC osc. R=39K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(lostreas_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(lostreas_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(lostreas_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 425000) // approximation - RC osc. R=39K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, lostreas_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, lostreas_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, lostreas_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_lostreas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(16, lostreas_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7779,11 +7779,11 @@ static const u16 alphie_output_pla[0x20] =
MACHINE_CONFIG_START(alphie_state::alphie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 350000) // approximation
MCFG_TMS1XXX_OUTPUT_PLA(alphie_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(alphie_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(alphie_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(alphie_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, alphie_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, alphie_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, alphie_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("arm_position", alphie_state, show_arm_position, attotime::from_msec(50))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
@@ -7791,7 +7791,7 @@ MACHINE_CONFIG_START(alphie_state::alphie)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7890,17 +7890,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tcfball_state::tcfball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=56K, C=24pF
- MCFG_TMS1XXX_READ_K_CB(READ8(tcfball_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tcfball_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tcfball_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=56K, C=24pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tcfball_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tcfball_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tcfball_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tcfball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -7955,18 +7955,18 @@ static const u16 tcfballa_output_pla[0x20] =
MACHINE_CONFIG_START(tcfballa_state::tcfballa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=50pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=50pF
MCFG_TMS1XXX_OUTPUT_PLA(tcfballa_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(tcfballa_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tcfballa_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tcfballa_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tcfballa_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tcfballa_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tcfballa_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tcfballa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -8119,18 +8119,18 @@ static const u16 tandy12_output_pla[0x20] =
MACHINE_CONFIG_START(tandy12_state::tandy12)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 400000) // approximation - RC osc. R=39K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 400000) // approximation - RC osc. R=39K, C=47pF
MCFG_TMS1XXX_OUTPUT_PLA(tandy12_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(tandy12_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tandy12_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tandy12_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tandy12_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tandy12_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tandy12_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tandy12)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -8228,17 +8228,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(monkeysee_state::monkeysee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 250000) // approximation - RC osc. R=68K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(monkeysee_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(monkeysee_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(monkeysee_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 250000) // approximation - RC osc. R=68K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, monkeysee_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, monkeysee_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, monkeysee_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_monkeysee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -8377,17 +8377,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(speechp_state::speechp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(speechp_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(speechp_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(speechp_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, speechp_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, speechp_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, speechp_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_speechp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speech", S14001A, 25000) // approximation
+ MCFG_DEVICE_ADD("speech", S14001A, 25000) // approximation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -8459,10 +8459,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(timaze_state::timaze)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=80K, C=27pF
- MCFG_TMS1XXX_READ_K_CB(READ8(timaze_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(timaze_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(timaze_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=80K, C=27pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, timaze_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, timaze_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, timaze_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_timaze)
@@ -8561,17 +8561,17 @@ static const s16 copycat_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(copycat_state::copycat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 320000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(copycat_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(copycat_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(copycat_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 320000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, copycat_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, copycat_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, copycat_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_copycat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, copycat_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -8637,17 +8637,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(copycatm2_state::copycatm2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF
MCFG_TMS1XXX_READ_K_CB(IOPORT("IN.0"))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(copycatm2_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(copycatm2_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, copycatm2_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, copycatm2_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_copycatm2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, copycat_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -8708,17 +8708,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ditto_state::ditto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF
MCFG_TMS1XXX_READ_K_CB(IOPORT("IN.0"))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ditto_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ditto_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ditto_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ditto_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ditto)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, copycat_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -8824,17 +8824,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ss7in1_state::ss7in1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(ss7in1_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ss7in1_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ss7in1_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ss7in1_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ss7in1_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ss7in1_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_7in1ss)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -9017,26 +9017,26 @@ void tbreakup_state::machine_start()
MACHINE_CONFIG_START(tbreakup_state::tbreakup)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1040, 325000) // see set_clock
- MCFG_TMS1XXX_READ_K_CB(READ8(tbreakup_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tbreakup_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tbreakup_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1040, 325000) // see set_clock
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tbreakup_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tbreakup_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tbreakup_state, write_o))
MCFG_DEVICE_ADD("expander", TMS1025, 0)
- MCFG_TMS1025_WRITE_PORT_CB(PORT1, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT2, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT3, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT4, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT5, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT6, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(PORT7, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT1, WRITE8(*this, tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT2, WRITE8(*this, tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT3, WRITE8(*this, tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT4, WRITE8(*this, tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT5, WRITE8(*this, tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT6, WRITE8(*this, tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT7, WRITE8(*this, tbreakup_state, expander_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tbreakup)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -9150,17 +9150,17 @@ INPUT_CHANGED_MEMBER(phpball_state::flipper_button)
MACHINE_CONFIG_START(phpball_state::phpball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(phpball_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(phpball_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(phpball_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, phpball_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, phpball_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, phpball_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_hh_tms1k_test)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -9285,18 +9285,18 @@ static const u16 ssports4_output_pla[0x20] =
MACHINE_CONFIG_START(ssports4_state::ssports4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
+ MCFG_DEVICE_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
MCFG_TMS1XXX_OUTPUT_PLA(ssports4_output_pla)
- MCFG_TMS1XXX_READ_K_CB(READ8(ssports4_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ssports4_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ssports4_state, write_o))
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ssports4_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ssports4_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ssports4_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ssports4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -9455,17 +9455,17 @@ void xl25_state::machine_reset()
MACHINE_CONFIG_START(xl25_state::xl25)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000C, 300000) // approximation - RC osc. R=5.6K, C=47pF
- MCFG_TMS1XXX_READ_K_CB(READ8(xl25_state, read_k))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(xl25_state, write_r))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(xl25_state, write_o))
+ MCFG_DEVICE_ADD("maincpu", TMS1000C, 300000) // approximation - RC osc. R=5.6K, C=47pF
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, xl25_state, read_k))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, xl25_state, write_r))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, xl25_state, write_o))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_xl25)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index b58706acff3..cf5fb92957b 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -332,16 +332,16 @@ static const s16 ufombs_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(ufombs_state::ufombs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(ufombs_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(ufombs_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(ufombs_state, speaker_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(ufombs_state, grid_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(ufombs_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(ufombs_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(ufombs_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, ufombs_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, ufombs_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, ufombs_state, speaker_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, ufombs_state, grid_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, ufombs_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, ufombs_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, ufombs_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -353,7 +353,7 @@ MACHINE_CONFIG_START(ufombs_state::ufombs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, ufombs_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -479,16 +479,16 @@ static const s16 ssfball_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(ssfball_state::ssfball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.3"))
- MCFG_UCOM4_READ_B_CB(READ8(ssfball_state, input_b_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(ssfball_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(ssfball_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(ssfball_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(ssfball_state, plate_w))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, ssfball_state, input_b_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, ssfball_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, ssfball_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, ssfball_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, ssfball_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -500,7 +500,7 @@ MACHINE_CONFIG_START(ssfball_state::ssfball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, ssfball_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -607,16 +607,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bmsoccer_state::bmsoccer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
- MCFG_UCOM4_READ_A_CB(READ8(bmsoccer_state, input_a_r))
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_UCOM4_READ_A_CB(READ8(*this, bmsoccer_state, input_a_r))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.2"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(bmsoccer_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(bmsoccer_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(bmsoccer_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, bmsoccer_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, bmsoccer_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, bmsoccer_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, bmsoccer_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -628,7 +628,7 @@ MACHINE_CONFIG_START(bmsoccer_state::bmsoccer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -715,15 +715,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bmsafari_state::bmsafari)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(bmsafari_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(bmsafari_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(bmsafari_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(bmsafari_state, speaker_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(bmsafari_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(bmsafari_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, bmsafari_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, bmsafari_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, bmsafari_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, bmsafari_state, speaker_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, bmsafari_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, bmsafari_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -735,7 +735,7 @@ MACHINE_CONFIG_START(bmsafari_state::bmsafari)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -865,16 +865,16 @@ static const s16 splasfgt_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
MACHINE_CONFIG_START(splasfgt_state::splasfgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.4"))
- MCFG_UCOM4_READ_B_CB(READ8(splasfgt_state, input_b_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(splasfgt_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(splasfgt_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(splasfgt_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(splasfgt_state, grid_w))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, splasfgt_state, input_b_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, splasfgt_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, splasfgt_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, splasfgt_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, splasfgt_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -886,7 +886,7 @@ MACHINE_CONFIG_START(splasfgt_state::splasfgt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, splasfgt_speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -969,16 +969,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(bcclimbr_state::bcclimbr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(bcclimbr_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(bcclimbr_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(bcclimbr_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, bcclimbr_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, bcclimbr_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, bcclimbr_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -990,7 +990,7 @@ MACHINE_CONFIG_START(bcclimbr_state::bcclimbr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1092,20 +1092,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tactix_state::tactix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D557L, 400000) // approximation
- MCFG_UCOM4_READ_A_CB(READ8(tactix_state, input_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tactix_state, input_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tactix_state, leds_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tactix_state, input_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tactix_state, leds_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tactix_state, speaker_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D557L, 400000) // approximation
+ MCFG_UCOM4_READ_A_CB(READ8(*this, tactix_state, input_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tactix_state, input_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tactix_state, leds_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tactix_state, input_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tactix_state, leds_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tactix_state, speaker_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tactix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1186,16 +1186,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(invspace_state::invspace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(invspace_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(invspace_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(invspace_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(invspace_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, invspace_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, invspace_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, invspace_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, invspace_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1207,7 +1207,7 @@ MACHINE_CONFIG_START(invspace_state::invspace)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1302,23 +1302,23 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(efball_state::efball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
MCFG_UCOM4_READ_C_CB(IOPORT("IN.2"))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(efball_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(efball_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(efball_state, grid_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(efball_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(efball_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(efball_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, efball_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, efball_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, efball_state, grid_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, efball_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, efball_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, efball_state, plate_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_efball)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1402,16 +1402,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(galaxy2_state::galaxy2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(galaxy2_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(galaxy2_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(galaxy2_state, grid_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(galaxy2_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(galaxy2_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(galaxy2_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, galaxy2_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, galaxy2_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, galaxy2_state, grid_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, galaxy2_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, galaxy2_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1423,7 +1423,7 @@ MACHINE_CONFIG_START(galaxy2_state::galaxy2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1521,16 +1521,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(astrocmd_state::astrocmd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(astrocmd_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(astrocmd_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(astrocmd_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, astrocmd_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, astrocmd_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, astrocmd_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, astrocmd_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1542,7 +1542,7 @@ MACHINE_CONFIG_START(astrocmd_state::astrocmd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1617,16 +1617,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(edracula_state::edracula)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(edracula_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(edracula_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(edracula_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, edracula_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, edracula_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, edracula_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, edracula_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -1638,7 +1638,7 @@ MACHINE_CONFIG_START(edracula_state::edracula)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1705,14 +1705,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mcompgin_state::mcompgin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D650, 400_kHz_XTAL) // TDK FCR400K
+ MCFG_DEVICE_ADD("maincpu", NEC_D650, 400_kHz_XTAL) // TDK FCR400K
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(mcompgin_state, lcd_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, mcompgin_state, lcd_w))
/* video hardware */
MCFG_DEVICE_ADD("lcd", HLCD0530, 500) // C=0.01uF
- MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(mcompgin_state, lcd_output_w))
+ MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(*this, mcompgin_state, lcd_output_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mcompgin)
@@ -1802,23 +1802,23 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mvbfree_state::mvbfree)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(mvbfree_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(mvbfree_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(mvbfree_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(mvbfree_state, speaker_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, mvbfree_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, mvbfree_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, mvbfree_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, mvbfree_state, speaker_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mvbfree)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1921,19 +1921,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(grobot9_state::grobot9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D557L, 160000) // approximation
- MCFG_UCOM4_READ_A_CB(READ8(grobot9_state, input_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(grobot9_state, input_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(grobot9_state, lamps_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(grobot9_state, lamps_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(grobot9_state, lamps_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D557L, 160000) // approximation
+ MCFG_UCOM4_READ_A_CB(READ8(*this, grobot9_state, input_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, grobot9_state, input_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, grobot9_state, lamps_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, grobot9_state, lamps_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, grobot9_state, lamps_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_grobot9)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2011,15 +2011,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tccombat_state::tccombat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 400000) // approximation
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tccombat_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tccombat_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tccombat_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tccombat_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tccombat_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tccombat_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tccombat_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tccombat_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2031,7 +2031,7 @@ MACHINE_CONFIG_START(tccombat_state::tccombat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2168,16 +2168,16 @@ void tmtennis_state::machine_reset()
MACHINE_CONFIG_START(tmtennis_state::tmtennis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D552, 360000) // see set_clock
- MCFG_UCOM4_READ_A_CB(READ8(tmtennis_state, input_r))
- MCFG_UCOM4_READ_B_CB(READ8(tmtennis_state, input_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tmtennis_state, plate_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tmtennis_state, plate_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tmtennis_state, port_e_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tmtennis_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tmtennis_state, grid_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tmtennis_state, grid_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tmtennis_state, grid_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D552, 360000) // see set_clock
+ MCFG_UCOM4_READ_A_CB(READ8(*this, tmtennis_state, input_r))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, tmtennis_state, input_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tmtennis_state, plate_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tmtennis_state, plate_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tmtennis_state, port_e_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tmtennis_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tmtennis_state, grid_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tmtennis_state, grid_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tmtennis_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2189,7 +2189,7 @@ MACHINE_CONFIG_START(tmtennis_state::tmtennis)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2277,16 +2277,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmpacman_state::tmpacman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 430_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 430_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tmpacman_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tmpacman_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tmpacman_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tmpacman_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tmpacman_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tmpacman_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tmpacman_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2298,7 +2298,7 @@ MACHINE_CONFIG_START(tmpacman_state::tmpacman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2380,16 +2380,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tmscramb_state::tmscramb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.1"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tmscramb_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tmscramb_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tmscramb_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tmscramb_state, grid_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tmscramb_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tmscramb_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tmscramb_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tmscramb_state, grid_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2401,7 +2401,7 @@ MACHINE_CONFIG_START(tmscramb_state::tmscramb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2480,15 +2480,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tcaveman_state::tcaveman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
MCFG_UCOM4_READ_A_CB(IOPORT("IN.0"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tcaveman_state, grid_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tcaveman_state, grid_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tcaveman_state, plate_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tcaveman_state, grid_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tcaveman_state, grid_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tcaveman_state, plate_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tcaveman_state, plate_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2500,7 +2500,7 @@ MACHINE_CONFIG_START(tcaveman_state::tcaveman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2612,16 +2612,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(alnchase_state::alnchase)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
- MCFG_UCOM4_READ_A_CB(READ8(alnchase_state, input_r))
+ MCFG_DEVICE_ADD("maincpu", NEC_D553, 400_kHz_XTAL)
+ MCFG_UCOM4_READ_A_CB(READ8(*this, alnchase_state, input_r))
MCFG_UCOM4_READ_B_CB(IOPORT("IN.2"))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(alnchase_state, output_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, alnchase_state, output_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, alnchase_state, output_w))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -2633,7 +2633,7 @@ MACHINE_CONFIG_START(alnchase_state::alnchase)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp
index 62794511dfd..3e271480426 100644
--- a/src/mame/drivers/hideseek.cpp
+++ b/src/mame/drivers/hideseek.cpp
@@ -102,8 +102,8 @@ PALETTE_INIT_MEMBER(hideseek_state, hideseek)
MACHINE_CONFIG_START(hideseek_state::hideseek)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2, 7372800 * 4 )
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", SH2, 7372800 * 4 )
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
// MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hideseek_state, hideseek_scanline, "screen", 0, 1)
/* video hardware */
diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp
index db38f9cfad0..7410352453e 100644
--- a/src/mame/drivers/higemaru.cpp
+++ b/src/mame/drivers/higemaru.cpp
@@ -166,8 +166,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(higemaru_state::higemaru)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
- MCFG_CPU_PROGRAM_MAP(higemaru_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
+ MCFG_DEVICE_PROGRAM_MAP(higemaru_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", higemaru_state, higemaru_scanline, "screen", 0, 1)
/* video hardware */
@@ -188,10 +188,10 @@ MACHINE_CONFIG_START(higemaru_state::higemaru)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index 980400b3075..bef90059f0e 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -1164,10 +1164,10 @@ void highvdeo_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(highvdeo_state::tv_vcf)
- MCFG_CPU_ADD("maincpu", V30, XTAL(12'000'000)/2 ) // ?
- MCFG_CPU_PROGRAM_MAP(tv_vcf_map)
- MCFG_CPU_IO_MAP(tv_vcf_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", V30, XTAL(12'000'000)/2 ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(tv_vcf_map)
+ MCFG_DEVICE_IO_MAP(tv_vcf_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1187,7 +1187,7 @@ MACHINE_CONFIG_START(highvdeo_state::tv_vcf)
MCFG_SPEAKER_STANDARD_MONO("mono")
//OkiM6376
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives approx. same sample rate as previous emulation
+ MCFG_DEVICE_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives approx. same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1195,27 +1195,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::tv_ncf)
tv_vcf(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tv_ncf_map)
- MCFG_CPU_IO_MAP(tv_ncf_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tv_ncf_map)
+ MCFG_DEVICE_IO_MAP(tv_ncf_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::nyjoker)
tv_vcf(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nyjoker_map)
- MCFG_CPU_IO_MAP(nyjoker_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nyjoker_map)
+ MCFG_DEVICE_IO_MAP(nyjoker_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::tv_tcf)
tv_vcf(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tv_tcf_map)
- MCFG_CPU_IO_MAP(tv_tcf_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tv_tcf_map)
+ MCFG_DEVICE_IO_MAP(tv_tcf_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 400-1, 0, 300-1)
@@ -1227,9 +1227,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::newmcard)
tv_tcf(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(newmcard_map)
- MCFG_CPU_IO_MAP(newmcard_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(newmcard_map)
+ MCFG_DEVICE_IO_MAP(newmcard_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 200-1)
@@ -1240,17 +1240,17 @@ MACHINE_CONFIG_START(highvdeo_state::ciclone)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", I80186, 20000000 ) // ?
- MCFG_CPU_PROGRAM_MAP(tv_tcf_map)
- MCFG_CPU_IO_MAP(tv_tcf_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
+ MCFG_DEVICE_ADD("maincpu", I80186, 20000000 ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(tv_tcf_map)
+ MCFG_DEVICE_IO_MAP(tv_tcf_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::brasil)
- MCFG_CPU_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz
- MCFG_CPU_PROGRAM_MAP(brasil_map)
- MCFG_CPU_IO_MAP(brasil_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
+ MCFG_DEVICE_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(brasil_map)
+ MCFG_DEVICE_IO_MAP(brasil_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1268,15 +1268,15 @@ MACHINE_CONFIG_START(highvdeo_state::brasil)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
+ MCFG_DEVICE_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::grancapi)
- MCFG_CPU_ADD("maincpu", I80186, 20000000 )
- MCFG_CPU_PROGRAM_MAP(brasil_map)
- MCFG_CPU_IO_MAP(grancapi_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
+ MCFG_DEVICE_ADD("maincpu", I80186, 20000000 )
+ MCFG_DEVICE_PROGRAM_MAP(brasil_map)
+ MCFG_DEVICE_IO_MAP(grancapi_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1294,15 +1294,15 @@ MACHINE_CONFIG_START(highvdeo_state::grancapi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
+ MCFG_DEVICE_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(highvdeo_state::magicbom)
- MCFG_CPU_ADD("maincpu", I80186, 20000000 )
- MCFG_CPU_PROGRAM_MAP(brasil_map)
- MCFG_CPU_IO_MAP(magicbom_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
+ MCFG_DEVICE_ADD("maincpu", I80186, 20000000 )
+ MCFG_DEVICE_PROGRAM_MAP(brasil_map)
+ MCFG_DEVICE_IO_MAP(magicbom_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1320,7 +1320,7 @@ MACHINE_CONFIG_START(highvdeo_state::magicbom)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
+ MCFG_DEVICE_ADD("oki", OKIM6376, XTAL(12'000'000)/2/2/20)//Guess, gives same sample rate as previous emulation
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp
index e4631a199b6..861eb0e167c 100644
--- a/src/mame/drivers/hikaru.cpp
+++ b/src/mame/drivers/hikaru.cpp
@@ -488,7 +488,7 @@ void hikaru_state::hikaru_map_slave(address_map &map)
MACHINE_CONFIG_START(hikaru_state::hikaru)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", SH4LE, CPU_CLOCK)
// MCFG_SH4_MD0(1)
// MCFG_SH4_MD1(0)
// MCFG_SH4_MD2(1)
@@ -499,13 +499,13 @@ MACHINE_CONFIG_START(hikaru_state::hikaru)
// MCFG_SH4_MD7(1)
// MCFG_SH4_MD8(0)
// MCFG_SH4_CLOCK(CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(hikaru_map)
-// MCFG_CPU_IO_MAP(hikaru_port)
+ MCFG_DEVICE_PROGRAM_MAP(hikaru_map)
+// MCFG_DEVICE_IO_MAP(hikaru_port)
MCFG_CPU_FORCE_NO_DRC()
// MCFG_CPU_VBLANK_INT("screen", hikaru,vblank)
- MCFG_CPU_ADD("slave", SH4LE, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(hikaru_map_slave)
+ MCFG_DEVICE_ADD("slave", SH4LE, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(hikaru_map_slave)
MCFG_CPU_FORCE_NO_DRC()
@@ -526,7 +526,7 @@ MACHINE_CONFIG_START(hikaru_state::hikaru)
// MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-// MCFG_SOUND_ADD("aica", AICA, 0)
+// MCFG_DEVICE_ADD("aica", AICA, 0)
// MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
// MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp
index 7f48f971b7e..aadcaf1114e 100644
--- a/src/mame/drivers/himesiki.cpp
+++ b/src/mame/drivers/himesiki.cpp
@@ -429,14 +429,14 @@ void himesiki_state::machine_reset()
MACHINE_CONFIG_START(himesiki_state::himesiki)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CLK2) /* it's a 6.000 MHz rated part, but near the 8 Mhz XTAL?? - Android skips lots of frames at 6, crashes at 4 */
- MCFG_CPU_PROGRAM_MAP(himesiki_prm0)
- MCFG_CPU_IO_MAP(himesiki_iom0)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", himesiki_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, CLK2) /* it's a 6.000 MHz rated part, but near the 8 Mhz XTAL?? - Android skips lots of frames at 6, crashes at 4 */
+ MCFG_DEVICE_PROGRAM_MAP(himesiki_prm0)
+ MCFG_DEVICE_IO_MAP(himesiki_iom0)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", himesiki_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, CLK2/2) /* 4.000 MHz (4Mhz rated part, near the 8 Mhz XTAL) */
- MCFG_CPU_PROGRAM_MAP(himesiki_prm1)
- MCFG_CPU_IO_MAP(himesiki_iom1)
+ MCFG_DEVICE_ADD("sub", Z80, CLK2/2) /* 4.000 MHz (4Mhz rated part, near the 8 Mhz XTAL) */
+ MCFG_DEVICE_PROGRAM_MAP(himesiki_prm1)
+ MCFG_DEVICE_IO_MAP(himesiki_iom1)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("1P"))
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(himesiki_state::himesiki)
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(himesiki_state, himesiki_rombank_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, himesiki_state, himesiki_rombank_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -467,7 +467,7 @@ MACHINE_CONFIG_START(himesiki_state::himesiki)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym2203", YM2203, CLK2/4) // ??
+ MCFG_DEVICE_ADD("ym2203", YM2203, CLK2/4) // ??
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp
index 00c49441e0a..b14eeff4d05 100644
--- a/src/mame/drivers/hitme.cpp
+++ b/src/mame/drivers/hitme.cpp
@@ -316,9 +316,9 @@ void hitme_state::machine_reset()
MACHINE_CONFIG_START(hitme_state::hitme)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(hitme_map)
- MCFG_CPU_IO_MAP(hitme_portmap)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(hitme_map)
+ MCFG_DEVICE_IO_MAP(hitme_portmap)
/* video hardware */
@@ -336,7 +336,7 @@ MACHINE_CONFIG_START(hitme_state::hitme)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(hitme)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp
index 9ba5328f65d..ef003267224 100644
--- a/src/mame/drivers/hitpoker.cpp
+++ b/src/mame/drivers/hitpoker.cpp
@@ -459,9 +459,9 @@ static GFXDECODE_START( hitpoker )
GFXDECODE_END
MACHINE_CONFIG_START(hitpoker_state::hitpoker)
- MCFG_CPU_ADD("maincpu", MC68HC11,1000000)
- MCFG_CPU_PROGRAM_MAP(hitpoker_map)
- MCFG_CPU_IO_MAP(hitpoker_io)
+ MCFG_DEVICE_ADD("maincpu", MC68HC11,1000000)
+ MCFG_DEVICE_PROGRAM_MAP(hitpoker_map)
+ MCFG_DEVICE_IO_MAP(hitpoker_io)
MCFG_MC68HC11_CONFIG(0, 0x100, 0x01)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -478,14 +478,14 @@ MACHINE_CONFIG_START(hitpoker_state::hitpoker)
MCFG_MC6845_ADD("crtc", H46505, "screen", CRTC_CLOCK/2) /* hand tuned to get ~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(hitpoker_state, hitpoker_irq))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, hitpoker_state, hitpoker_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hitpoker)
MCFG_PALETTE_ADD("palette", 0x800)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, 1500000)
+ MCFG_DEVICE_ADD("aysnd", YM2149, 1500000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp
index e1839b66567..66c16445ab8 100644
--- a/src/mame/drivers/hk68v10.cpp
+++ b/src/mame/drivers/hk68v10.cpp
@@ -339,20 +339,20 @@ static void hk68_vme_cards(device_slot_interface &device)
*/
MACHINE_CONFIG_START(hk68v10_state::hk68v10)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68010, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP (hk68v10_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68010, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP (hk68v10_mem)
MCFG_DEVICE_ADD("cio", Z8536, SCC_CLOCK)
/* Terminal Port config */
MCFG_SCC8530_ADD("scc", SCC_CLOCK, 0, 0, 0, 0 )
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_dtr))
- MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_rts))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE("rs232trm", rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_DTRA_CB(WRITELINE("rs232trm", rs232_port_device, write_dtr))
+ MCFG_Z80SCC_OUT_RTSA_CB(WRITELINE("rs232trm", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc8530_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc8530_device, ctsa_w))
+ MCFG_DEVICE_ADD ("rs232trm", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("scc", scc8530_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("scc", scc8530_device, ctsa_w))
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, hk68_vme_cards, nullptr)
diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp
index 683f18df4ff..3c34b7ce1e2 100644
--- a/src/mame/drivers/hnayayoi.cpp
+++ b/src/mame/drivers/hnayayoi.cpp
@@ -546,20 +546,20 @@ void hnayayoi_state::machine_reset()
MACHINE_CONFIG_START(hnayayoi_state::hnayayoi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(hnayayoi_map)
- MCFG_CPU_IO_MAP(hnayayoi_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(hnayayoi_map)
+ MCFG_DEVICE_IO_MAP(hnayayoi_io_map)
MCFG_DEVICE_ADD("nmiclock", CLOCK, 8000)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(hnayayoi_state, nmi_clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, hnayayoi_state, nmi_clock_w))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(hnayayoi_state, coin_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("msm", msm5205_device, reset_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("msm", msm5205_device, vclk_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(hnayayoi_state, nmi_enable_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, hnayayoi_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("msm", msm5205_device, reset_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("msm", msm5205_device, vclk_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, hnayayoi_state, nmi_enable_w)) MCFG_DEVCB_INVERT
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -578,8 +578,8 @@ MACHINE_CONFIG_START(hnayayoi_state::hnayayoi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 20000000/8)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(hnayayoi_state, irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 20000000/8)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, hnayayoi_state, irqhandler))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -587,31 +587,31 @@ MACHINE_CONFIG_START(hnayayoi_state::hnayayoi)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hnayayoi_state::hnfubuki)
hnayayoi(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hnfubuki_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hnfubuki_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO)
MCFG_DEVICE_MODIFY("mainlatch") // D5
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(hnayayoi_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, hnayayoi_state, nmi_enable_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hnayayoi_state::untoucha)
hnayayoi(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(untoucha_map)
- MCFG_CPU_IO_MAP(untoucha_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(untoucha_map)
+ MCFG_DEVICE_IO_MAP(untoucha_io_map)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("msm", msm5205_device, vclk_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(hnayayoi_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("msm", msm5205_device, reset_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("msm", msm5205_device, vclk_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, hnayayoi_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("msm", msm5205_device, reset_w)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // ?
MCFG_DEVICE_MODIFY("crtc")
diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp
index ec75d5aaaaa..407b6c28596 100644
--- a/src/mame/drivers/hng64.cpp
+++ b/src/mame/drivers/hng64.cpp
@@ -1534,10 +1534,10 @@ void hng64_state::machine_reset()
MACHINE_CONFIG_START(hng64_state::hng64)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", VR4300BE, HNG64_MASTER_CLOCK) // actually R4300
+ MCFG_DEVICE_ADD("maincpu", VR4300BE, HNG64_MASTER_CLOCK) // actually R4300
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_CPU_PROGRAM_MAP(hng_map)
+ MCFG_DEVICE_PROGRAM_MAP(hng_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hng64_state, hng64_irq, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1549,7 +1549,7 @@ MACHINE_CONFIG_START(hng64_state::hng64)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(hng64_state, screen_update_hng64)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hng64_state, screen_vblank_hng64))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hng64_state, screen_vblank_hng64))
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_PALETTE_FORMAT(XRGB)
@@ -1557,7 +1557,7 @@ MACHINE_CONFIG_START(hng64_state::hng64)
hng64_audio(config);
hng64_network(config);
- MCFG_CPU_ADD("iomcu", TMP87PH40AN, 8000000)
+ MCFG_DEVICE_ADD("iomcu", TMP87PH40AN, 8000000)
MCFG_DEVICE_DISABLE() // work in progress
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp
index f46d7a659a1..38bc5016ee2 100644
--- a/src/mame/drivers/holeland.cpp
+++ b/src/mame/drivers/holeland.cpp
@@ -277,16 +277,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(holeland_state::holeland)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3355700) /* measured 298ns on PCB */
- MCFG_CPU_PROGRAM_MAP(holeland_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", holeland_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3355700) /* measured 298ns on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(holeland_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", holeland_state, irq0_line_hold)
MCFG_DEVICE_ADD("latch", LS259, 0) // 3J
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(holeland_state, pal_offs_w)) MCFG_DEVCB_MASK(0x03)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(holeland_state, coin_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(holeland_state, flipscreen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(holeland_state, flipscreen_y_w))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, holeland_state, pal_offs_w)) MCFG_DEVCB_MASK(0x03)
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, holeland_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, holeland_state, flipscreen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, holeland_state, flipscreen_y_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -306,17 +306,17 @@ MACHINE_CONFIG_START(holeland_state::holeland)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 20000000/32) /* verified on PCB */
+ MCFG_DEVICE_ADD("ay1", AY8910, 20000000/32) /* verified on PCB */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 20000000/16) /* verified on PCB */
+ MCFG_DEVICE_ADD("ay2", AY8910, 20000000/16) /* verified on PCB */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speech", SP0256, 3355700) /* measured 298ns on PCB */
+ MCFG_DEVICE_ADD("speech", SP0256, 3355700) /* measured 298ns on PCB */
MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -358,16 +358,16 @@ Notes:
MACHINE_CONFIG_START(holeland_state::crzrally)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */
- MCFG_CPU_PROGRAM_MAP(crzrally_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", holeland_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(crzrally_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", holeland_state, irq0_line_hold)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_DEVICE_ADD("latch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(holeland_state, pal_offs_w)) MCFG_DEVCB_MASK(0x03)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(holeland_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, holeland_state, pal_offs_w)) MCFG_DEVCB_MASK(0x03)
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, holeland_state, coin_counter_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -387,12 +387,12 @@ MACHINE_CONFIG_START(holeland_state::crzrally)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 20000000/16)
+ MCFG_DEVICE_ADD("ay1", AY8910, 20000000/16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 20000000/16)
+ MCFG_DEVICE_ADD("ay2", AY8910, 20000000/16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp
index 15a3e914722..9880db51314 100644
--- a/src/mame/drivers/homedata.cpp
+++ b/src/mame/drivers/homedata.cpp
@@ -1221,13 +1221,13 @@ MACHINE_RESET_MEMBER(homedata_state,reikaids)
MACHINE_CONFIG_START(homedata_state::mrokumei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 16000000/4) /* 4MHz ? */
- MCFG_CPU_PROGRAM_MAP(mrokumei_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homedata_state, homedata_irq) /* also triggered by the blitter */
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 16000000/4) /* 4MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(mrokumei_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homedata_state, homedata_irq) /* also triggered by the blitter */
- MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4MHz ? */
- MCFG_CPU_PROGRAM_MAP(mrokumei_sound_map)
- MCFG_CPU_IO_MAP(mrokumei_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16000000/4) /* 4MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(mrokumei_sound_map)
+ MCFG_DEVICE_IO_MAP(mrokumei_sound_io_map)
MCFG_MACHINE_START_OVERRIDE(homedata_state,homedata)
MCFG_MACHINE_RESET_OVERRIDE(homedata_state,homedata)
@@ -1240,7 +1240,7 @@ MACHINE_CONFIG_START(homedata_state::mrokumei)
// visible area can be changed at runtime
MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(homedata_state, screen_update_mrokumei)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(homedata_state, screen_vblank_homedata))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, homedata_state, screen_vblank_homedata))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mrokumei)
@@ -1254,10 +1254,10 @@ MACHINE_CONFIG_START(homedata_state::mrokumei)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
+ MCFG_DEVICE_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1268,18 +1268,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homedata_state::reikaids)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 16000000/4) /* 4MHz ? */
- MCFG_CPU_PROGRAM_MAP(reikaids_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homedata_state, homedata_irq) /* also triggered by the blitter */
-
- MCFG_CPU_ADD("audiocpu", UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */
- MCFG_CPU_PROGRAM_MAP(reikaids_upd7807_map)
- MCFG_UPD7807_PORTA_READ_CB(READ8(homedata_state, reikaids_upd7807_porta_r))
- MCFG_UPD7807_PORTA_WRITE_CB(WRITE8(homedata_state, reikaids_upd7807_porta_w))
- MCFG_UPD7807_PORTB_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_UPD7807_PORTC_WRITE_CB(WRITE8(homedata_state, reikaids_upd7807_portc_w))
- MCFG_UPD7807_PORTT_READ_CB(READ8(homedata_state, reikaids_snd_command_r))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homedata_state, upd7807_irq)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 16000000/4) /* 4MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(reikaids_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homedata_state, homedata_irq) /* also triggered by the blitter */
+
+ MCFG_DEVICE_ADD("audiocpu", UPD7807, 8000000) /* ??? MHz (max speed for the 7807 is 12MHz) */
+ MCFG_DEVICE_PROGRAM_MAP(reikaids_upd7807_map)
+ MCFG_UPD7807_PORTA_READ_CB(READ8(*this, homedata_state, reikaids_upd7807_porta_r))
+ MCFG_UPD7807_PORTA_WRITE_CB(WRITE8(*this, homedata_state, reikaids_upd7807_porta_w))
+ MCFG_UPD7807_PORTB_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_UPD7807_PORTC_WRITE_CB(WRITE8(*this, homedata_state, reikaids_upd7807_portc_w))
+ MCFG_UPD7807_PORTT_READ_CB(READ8(*this, homedata_state, reikaids_snd_command_r))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homedata_state, upd7807_irq)
MCFG_QUANTUM_TIME(attotime::from_hz(30000)) // very high interleave required to sync for startup tests
@@ -1293,7 +1293,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 256-1-16)
MCFG_SCREEN_UPDATE_DRIVER(homedata_state, screen_update_reikaids)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(homedata_state, screen_vblank_homedata))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, homedata_state, screen_vblank_homedata))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", reikaids)
@@ -1305,7 +1305,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "speaker", 0.25)
@@ -1313,7 +1313,7 @@ MACHINE_CONFIG_START(homedata_state::reikaids)
MCFG_SOUND_ROUTE(2, "speaker", 0.25)
MCFG_SOUND_ROUTE(3, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1324,19 +1324,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homedata_state::pteacher)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 16000000/4) /* 4MHz ? */
- MCFG_CPU_PROGRAM_MAP(pteacher_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homedata_state, homedata_irq) /* also triggered by the blitter */
-
- MCFG_CPU_ADD("audiocpu", UPD7807, 9000000) /* 9MHz ? */
- MCFG_CPU_PROGRAM_MAP(pteacher_upd7807_map)
- MCFG_UPD7807_PORTA_READ_CB(READ8(homedata_state, pteacher_upd7807_porta_r))
- MCFG_UPD7807_PORTA_WRITE_CB(WRITE8(homedata_state, pteacher_upd7807_porta_w))
- MCFG_UPD7807_PORTB_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 16000000/4) /* 4MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(pteacher_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homedata_state, homedata_irq) /* also triggered by the blitter */
+
+ MCFG_DEVICE_ADD("audiocpu", UPD7807, 9000000) /* 9MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(pteacher_upd7807_map)
+ MCFG_UPD7807_PORTA_READ_CB(READ8(*this, homedata_state, pteacher_upd7807_porta_r))
+ MCFG_UPD7807_PORTA_WRITE_CB(WRITE8(*this, homedata_state, pteacher_upd7807_porta_w))
+ MCFG_UPD7807_PORTB_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
MCFG_UPD7807_PORTC_READ_CB(IOPORT("COIN"))
- MCFG_UPD7807_PORTC_WRITE_CB(WRITE8(homedata_state, pteacher_upd7807_portc_w))
- MCFG_UPD7807_PORTT_READ_CB(READ8(homedata_state, pteacher_keyboard_r))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homedata_state, upd7807_irq)
+ MCFG_UPD7807_PORTC_WRITE_CB(WRITE8(*this, homedata_state, pteacher_upd7807_portc_w))
+ MCFG_UPD7807_PORTT_READ_CB(READ8(*this, homedata_state, pteacher_keyboard_r))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homedata_state, upd7807_irq)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // should be enough
@@ -1351,7 +1351,7 @@ MACHINE_CONFIG_START(homedata_state::pteacher)
// visible area can be changed at runtime
MCFG_SCREEN_VISIBLE_AREA(0*8, 54*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(homedata_state, screen_update_pteacher)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(homedata_state, screen_vblank_homedata))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, homedata_state, screen_vblank_homedata))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pteacher)
@@ -1363,10 +1363,10 @@ MACHINE_CONFIG_START(homedata_state::pteacher)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
+ MCFG_DEVICE_ADD("snsnd", SN76489A, 16000000/4) // SN76489AN actually
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1374,8 +1374,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homedata_state::mjkinjas)
pteacher(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK(11000000) /* 11MHz ? */
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_CLOCK(11000000) /* 11MHz ? */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(homedata_state::lemnangl)
@@ -1497,17 +1497,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(homedata_state::mirderby)
- MCFG_CPU_ADD("maincpu", MC6809E, 16000000/8) /* 2 Mhz */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 16000000/8) /* 2 Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu0", Z80, 16000000/4) /* 4 Mhz */
+ MCFG_DEVICE_ADD("cpu0", Z80, 16000000/4) /* 4 Mhz */
MCFG_DEVICE_DISABLE()
- MCFG_CPU_PROGRAM_MAP(cpu0_map)
+ MCFG_DEVICE_PROGRAM_MAP(cpu0_map)
- MCFG_CPU_ADD("cpu1", MC6809E, 16000000/8) /* 2 Mhz */
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_ADD("cpu1", MC6809E, 16000000/8) /* 2 Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
MCFG_DEVICE_DISABLE()
//MCFG_CPU_VBLANK_INT("screen", mirderby_irq)
@@ -1532,7 +1532,7 @@ MACHINE_CONFIG_START(homedata_state::mirderby)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ymsnd", YM2203, 2000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 2000000)
MCFG_SOUND_ROUTE(0, "speaker", 0.25)
MCFG_SOUND_ROUTE(1, "speaker", 0.25)
MCFG_SOUND_ROUTE(2, "speaker", 0.25)
diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp
index e501a8eb9d8..1705af6be80 100644
--- a/src/mame/drivers/homelab.cpp
+++ b/src/mame/drivers/homelab.cpp
@@ -747,9 +747,9 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab)
/* Machine driver */
MACHINE_CONFIG_START(homelab_state::homelab)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(homelab2_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homelab_state, homelab_frame)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(homelab2_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homelab_state, homelab_frame)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -766,7 +766,7 @@ MACHINE_CONFIG_START(homelab_state::homelab)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -779,9 +779,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homelab_state::homelab3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(homelab3_mem)
- MCFG_CPU_IO_MAP(homelab3_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(homelab3_mem)
+ MCFG_DEVICE_IO_MAP(homelab3_io)
MCFG_MACHINE_RESET_OVERRIDE(homelab_state,homelab3)
/* video hardware */
@@ -799,7 +799,7 @@ MACHINE_CONFIG_START(homelab_state::homelab3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -812,9 +812,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(homelab_state::brailab4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(brailab4_mem)
- MCFG_CPU_IO_MAP(brailab4_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(brailab4_mem)
+ MCFG_DEVICE_IO_MAP(brailab4_io)
MCFG_MACHINE_RESET_OVERRIDE(homelab_state,brailab4)
/* video hardware */
@@ -832,14 +832,14 @@ MACHINE_CONFIG_START(homelab_state::brailab4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("mea8000", MEA8000, 3840000)
+ MCFG_DEVICE_ADD("mea8000", MEA8000, 3840000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp
index 37232f5a3df..a1538963dbc 100644
--- a/src/mame/drivers/homerun.cpp
+++ b/src/mame/drivers/homerun.cpp
@@ -353,15 +353,15 @@ void homerun_state::machine_reset()
MACHINE_CONFIG_START(homerun_state::dynashot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(homerun_memmap)
- MCFG_CPU_IO_MAP(homerun_iomap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", homerun_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(20'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(homerun_memmap)
+ MCFG_DEVICE_IO_MAP(homerun_iomap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", homerun_state, irq0_line_hold)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(homerun_state, homerun_scrollhi_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(homerun_state, homerun_scrolly_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(homerun_state, homerun_scrollx_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, homerun_state, homerun_scrollhi_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, homerun_state, homerun_scrolly_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, homerun_state, homerun_scrollx_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -378,9 +378,9 @@ MACHINE_CONFIG_START(homerun_state::dynashot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(20'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(20'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(homerun_state, homerun_banking_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, homerun_state, homerun_banking_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -388,10 +388,10 @@ MACHINE_CONFIG_START(homerun_state::homerun)
dynashot(config);
/* sound hardware */
- MCFG_SOUND_ADD("d7756", UPD7756, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("d7756", UPD7756)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(homerun_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -401,11 +401,11 @@ MACHINE_CONFIG_START(homerun_state::ganjaja)
dynashot(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(homerun_state, irq0_line_hold, 4*60) // ?
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(homerun_state, irq0_line_hold, 4*60) // ?
/* sound hardware */
- MCFG_SOUND_ADD("d7756", UPD7756, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("d7756", UPD7756)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp
index 78198a6486c..0c450857623 100644
--- a/src/mame/drivers/homez80.cpp
+++ b/src/mame/drivers/homez80.cpp
@@ -285,10 +285,10 @@ INTERRUPT_GEN_MEMBER(homez80_state::homez80_interrupt)
MACHINE_CONFIG_START(homez80_state::homez80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(homez80_mem)
- MCFG_CPU_IO_MAP(homez80_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(homez80_state, homez80_interrupt, 50)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(homez80_mem)
+ MCFG_DEVICE_IO_MAP(homez80_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(homez80_state, homez80_interrupt, 50)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp
index d46932a7509..a4f5360a73e 100644
--- a/src/mame/drivers/horizon.cpp
+++ b/src/mame/drivers/horizon.cpp
@@ -179,29 +179,29 @@ static void horizon_s100_cards(device_slot_interface &device)
MACHINE_CONFIG_START(horizon_state::horizon)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(horizon_mem)
- MCFG_CPU_IO_MAP(horizon_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(horizon_mem)
+ MCFG_DEVICE_IO_MAP(horizon_io)
// devices
MCFG_DEVICE_ADD(I8251_L_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_L_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_L_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_L_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_L_TAG, i8251_device, write_dsr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD(I8251_R_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_R_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_R_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_R_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_R_TAG, i8251_device, write_dsr))
// S-100
MCFG_DEVICE_ADD("s100", S100_BUS, XTAL(8'000'000) / 4)
@@ -225,8 +225,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(horizon_state::horizon2mhz)
horizon(config);
- MCFG_CPU_MODIFY("z80")
- MCFG_CPU_CLOCK(XTAL(4'000'000) / 2)
+ MCFG_DEVICE_MODIFY("z80")
+ MCFG_DEVICE_CLOCK(XTAL(4'000'000) / 2)
MCFG_DEVICE_MODIFY("s100")
MCFG_DEVICE_CLOCK(XTAL(4'000'000) / 2)
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index ee20c3712f4..f60931ffabd 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -1022,16 +1022,16 @@ ADC12138_IPT_CONVERT_CB(hornet_state::adc12138_input_callback)
MACHINE_CONFIG_START(hornet_state::hornet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
- MCFG_CPU_PROGRAM_MAP(hornet_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(hornet_state, irq1_line_assert, 1000)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hornet_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hornet_state, irq1_line_assert, 1000)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc0_map)
+ MCFG_DEVICE_DATA_MAP(sharc0_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1045,7 +1045,7 @@ MACHINE_CONFIG_START(hornet_state::hornet)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_0))
MCFG_DEVICE_ADD("k033906_1", K033906, 0)
MCFG_K033906_VOODOO("voodoo0")
@@ -1084,9 +1084,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hornet_state::hornet_2board)
hornet(config);
- MCFG_CPU_ADD("dsp2", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp2", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc1_map)
+ MCFG_DEVICE_DATA_MAP(sharc1_map)
MCFG_DEVICE_REMOVE("k037122_1")
@@ -1103,14 +1103,14 @@ MACHINE_CONFIG_START(hornet_state::hornet_2board)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_0))
MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("rscreen")
MCFG_VOODOO_CPU_TAG("dsp2")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_1))
MCFG_DEVICE_ADD("k033906_2", K033906, 0)
MCFG_K033906_VOODOO("voodoo1")
@@ -1142,8 +1142,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hornet_state::terabrst)
hornet(config);
- MCFG_CPU_ADD("gn680", M68000, XTAL(32'000'000)/2) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(gn680_memmap)
+ MCFG_DEVICE_ADD("gn680", M68000, XTAL(32'000'000)/2) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gn680_memmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hornet_state::hornet_2board_v2)
@@ -1154,7 +1154,7 @@ MACHINE_CONFIG_START(hornet_state::hornet_2board_v2)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_0))
MCFG_DEVICE_REMOVE("voodoo1")
MCFG_DEVICE_ADD("voodoo1", VOODOO_2, STD_VOODOO_2_CLOCK)
@@ -1162,7 +1162,7 @@ MACHINE_CONFIG_START(hornet_state::hornet_2board_v2)
MCFG_VOODOO_TMUMEM(4,0)
MCFG_VOODOO_SCREEN_TAG("rscreen")
MCFG_VOODOO_CPU_TAG("dsp2")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(hornet_state,voodoo_vblank_1))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_1))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hornet_state::sscope2)
diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp
index 372b6367197..5e267bb7c7d 100644
--- a/src/mame/drivers/hotblock.cpp
+++ b/src/mame/drivers/hotblock.cpp
@@ -209,9 +209,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(hotblock_state::hotblock)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, 10000000)
- MCFG_CPU_PROGRAM_MAP(hotblock_map)
- MCFG_CPU_IO_MAP(hotblock_io)
+ MCFG_DEVICE_ADD("maincpu", I8088, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(hotblock_map)
+ MCFG_DEVICE_IO_MAP(hotblock_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -226,7 +226,7 @@ MACHINE_CONFIG_START(hotblock_state::hotblock)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, 1000000)
+ MCFG_DEVICE_ADD("aysnd", YM2149, 1000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp
index f72ad405f58..aeb560221c5 100644
--- a/src/mame/drivers/hotstuff.cpp
+++ b/src/mame/drivers/hotstuff.cpp
@@ -100,8 +100,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(hotstuff_state::hotstuff)
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(hotstuff_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(hotstuff_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp
index 3759412aa67..b7d03a4c4f9 100644
--- a/src/mame/drivers/hp16500.cpp
+++ b/src/mame/drivers/hp16500.cpp
@@ -413,8 +413,8 @@ uint32_t hp16500_state::screen_update_hp16500(screen_device &screen, bitmap_rgb3
MACHINE_CONFIG_START(hp16500_state::hp1650)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(hp1650_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp1650_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(25000000, 0x330, 0, 0x250, 0x198, 0, 0x180 )
@@ -424,7 +424,7 @@ MACHINE_CONFIG_START(hp16500_state::hp1650)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(hp16500_state, crtc_update_row_1650)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(hp16500_state, vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, hp16500_state, vsync_changed))
MCFG_DEVICE_ADD("epci", MC2661, 5000000)
@@ -433,8 +433,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp16500_state::hp1651)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(hp1651_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp1651_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(25000000, 0x330, 0, 0x250, 0x198, 0, 0x180 )
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(hp16500_state::hp1651)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(hp16500_state, crtc_update_row_1650)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(hp16500_state, vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, hp16500_state, vsync_changed))
MCFG_DEVICE_ADD("epci", MC2661, 5000000)
@@ -453,8 +453,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp16500_state::hp16500a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(hp16500a_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp16500a_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(25000000, 0x320, 0, 0x240, 0x19c, 0, 0x170 )
@@ -464,28 +464,28 @@ MACHINE_CONFIG_START(hp16500_state::hp16500a)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(hp16500_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(hp16500_state, vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, hp16500_state, vsync_changed))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp16500_state::hp16500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC030, 25000000)
- MCFG_CPU_PROGRAM_MAP(hp16500_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp16500_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(hp16500_state, screen_update_hp16500)
MCFG_SCREEN_SIZE(576,384)
MCFG_SCREEN_VISIBLE_AREA(0, 576-1, 0, 384-1)
MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hp16500_state, vsync_changed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hp16500_state, vsync_changed))
// FIXME: Where is the AP line connected to? The MLC documentation recommends
// connecting it to VBLANK
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mlc", hp_hil_mlc_device, ap_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mlc", hp_hil_mlc_device, ap_w))
MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL(15'920'000)/2)
- MCFG_HP_HIL_INT_CALLBACK(WRITELINE(hp16500_state, irq_2))
+ MCFG_HP_HIL_INT_CALLBACK(WRITELINE(*this, hp16500_state, irq_2))
// TODO: for now hook up the ipc hil keyboard - this might be replaced
// later with a 16500b specific keyboard implementation
diff --git a/src/mame/drivers/hp2620.cpp b/src/mame/drivers/hp2620.cpp
index 02fbda31b8a..b05c59d7b76 100644
--- a/src/mame/drivers/hp2620.cpp
+++ b/src/mame/drivers/hp2620.cpp
@@ -97,9 +97,9 @@ static INPUT_PORTS_START( hp2622 )
INPUT_PORTS_END
MACHINE_CONFIG_START(hp2620_state::hp2622)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(25'771'500) / 7) // 3.68 MHz
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(25'771'500) / 7) // 3.68 MHz
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 5101 (A7 tied to GND) + battery (+ wait states)
diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp
index 2a90ab1d338..659fda3f0e4 100644
--- a/src/mame/drivers/hp2640.cpp
+++ b/src/mame/drivers/hp2640.cpp
@@ -963,10 +963,10 @@ void hp2645_state::cpu_io_map(address_map &map)
}
MACHINE_CONFIG_START(hp2645_state::hp2645)
- MCFG_CPU_ADD("cpu" , I8080A , SYS_CLOCK / 2)
- MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
- MCFG_CPU_IO_MAP(cpu_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp2645_state , irq_callback)
+ MCFG_DEVICE_ADD("cpu" , I8080A , SYS_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mem_map)
+ MCFG_DEVICE_IO_MAP(cpu_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(hp2645_state , irq_callback)
MCFG_TIMER_DRIVER_ADD("timer_10ms" , hp2645_state , timer_10ms_exp)
MCFG_TIMER_DRIVER_ADD("timer_cursor_blink_inh" , hp2645_state , timer_cursor_blink_inh)
@@ -984,18 +984,18 @@ MACHINE_CONFIG_START(hp2645_state::hp2645)
MCFG_DEFAULT_LAYOUT(layout_hp2640)
// RS232
- MCFG_RS232_PORT_ADD("rs232" , default_rs232_devices , nullptr)
+ MCFG_DEVICE_ADD("rs232" , RS232_PORT, default_rs232_devices , nullptr)
// UART (TR1602B)
MCFG_DEVICE_ADD("uart", AY51013, 0)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232" , rs232_port_device , rxd_r))
- MCFG_AY51013_WRITE_SO_CB(WRITELINE(hp2645_state , async_txd_w))
- MCFG_AY51013_WRITE_DAV_CB(WRITELINE(hp2645_state , async_dav_w))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232" , rs232_port_device , rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE(*this, hp2645_state , async_txd_w))
+ MCFG_AY51013_WRITE_DAV_CB(WRITELINE(*this, hp2645_state , async_dav_w))
MCFG_AY51013_AUTO_RDAV(true)
// Beep
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep" , BEEP , BEEP_FREQUENCY)
+ MCFG_DEVICE_ADD("beep" , BEEP , BEEP_FREQUENCY)
MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
MCFG_TIMER_DRIVER_ADD("timer_beep" , hp2645_state , timer_beep_exp)
diff --git a/src/mame/drivers/hp48.cpp b/src/mame/drivers/hp48.cpp
index 3baa6731cc9..5afa55d38ff 100644
--- a/src/mame/drivers/hp48.cpp
+++ b/src/mame/drivers/hp48.cpp
@@ -1261,12 +1261,12 @@ void hp48_state::hp48(address_map &map)
MACHINE_CONFIG_START(hp48_state::hp48_common)
/* cpu */
- MCFG_CPU_ADD ( "maincpu", SATURN, 3937007 ) /* almost 4 MHz */
- MCFG_CPU_PROGRAM_MAP ( hp48)
- MCFG_SATURN_CONFIG( WRITE32(hp48_state, reg_out), READ32(hp48_state, reg_in),
- WRITELINE(hp48_state, mem_reset), WRITE32(hp48_state, mem_config),
- WRITE32(hp48_state, mem_unconfig), READ32(hp48_state, mem_id),
- WRITE32(hp48_state, mem_crc), WRITELINE(hp48_state, rsi) )
+ MCFG_DEVICE_ADD ( "maincpu", SATURN, 3937007 ) /* almost 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP ( hp48)
+ MCFG_SATURN_CONFIG( WRITE32(*this, hp48_state, reg_out), READ32(*this, hp48_state, reg_in),
+ WRITELINE(*this, hp48_state, mem_reset), WRITE32(*this, hp48_state, mem_config),
+ WRITE32(*this, hp48_state, mem_unconfig), READ32(*this, hp48_state, mem_id),
+ WRITE32(*this, hp48_state, mem_crc), WRITELINE(*this, hp48_state, rsi) )
/* memory */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1285,7 +1285,7 @@ MACHINE_CONFIG_START(hp48_state::hp48_common)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -1325,8 +1325,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp48_state::hp48sx)
hp48_common(config);
- MCFG_CPU_MODIFY ( "maincpu" )
- MCFG_CPU_CLOCK ( 2000000 )
+ MCFG_DEVICE_MODIFY ( "maincpu" )
+ MCFG_DEVICE_CLOCK ( 2000000 )
MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48sx )
/* expansion ports */
@@ -1339,8 +1339,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp48_state::hp48s)
hp48_common(config);
- MCFG_CPU_MODIFY ( "maincpu" )
- MCFG_CPU_CLOCK ( 2000000 )
+ MCFG_DEVICE_MODIFY ( "maincpu" )
+ MCFG_DEVICE_CLOCK ( 2000000 )
MCFG_MACHINE_START_OVERRIDE (hp48_state, hp48s )
/* serial I/O */
@@ -1349,7 +1349,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp48_state::hp49g)
hp48_common(config);
- MCFG_CPU_MODIFY ( "maincpu" )
+ MCFG_DEVICE_MODIFY ( "maincpu" )
MCFG_MACHINE_START_OVERRIDE (hp48_state, hp49g )
/* serial I/O */
diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp
index 78cde349949..d39518bf2ba 100644
--- a/src/mame/drivers/hp49gp.cpp
+++ b/src/mame/drivers/hp49gp.cpp
@@ -280,8 +280,8 @@ DRIVER_INIT_MEMBER(hp49gp_state,hp49gp)
}
MACHINE_CONFIG_START(hp49gp_state::hp49gp)
- MCFG_CPU_ADD("maincpu", ARM9, 400000000)
- MCFG_CPU_PROGRAM_MAP(hp49gp_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 400000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp49gp_map)
MCFG_PALETTE_ADD("palette", 32768)
@@ -298,8 +298,8 @@ MACHINE_CONFIG_START(hp49gp_state::hp49gp)
MCFG_DEVICE_ADD("s3c2410", S3C2410, 12000000)
MCFG_S3C2410_PALETTE("palette")
MCFG_S3C2410_SCREEN("screen")
- MCFG_S3C2410_GPIO_PORT_R_CB(READ32(hp49gp_state, s3c2410_gpio_port_r))
- MCFG_S3C2410_GPIO_PORT_W_CB(WRITE32(hp49gp_state, s3c2410_gpio_port_w))
+ MCFG_S3C2410_GPIO_PORT_R_CB(READ32(*this, hp49gp_state, s3c2410_gpio_port_r))
+ MCFG_S3C2410_GPIO_PORT_W_CB(WRITE32(*this, hp49gp_state, s3c2410_gpio_port_w))
MCFG_S3C2410_LCD_FLAGS(S3C24XX_INTERFACE_LCD_REVERSE)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index ba2da530261..9119c627ebf 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -1382,10 +1382,10 @@ static void hp64k_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(hp64k_state::hp64k)
- MCFG_CPU_ADD("cpu" , HP_5061_3011 , 6250000)
- MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
- MCFG_CPU_IO_MAP(cpu_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp64k_state , hp64k_irq_callback)
+ MCFG_DEVICE_ADD("cpu" , HP_5061_3011 , 6250000)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mem_map)
+ MCFG_DEVICE_IO_MAP(cpu_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(hp64k_state , hp64k_irq_callback)
MCFG_QUANTUM_TIME(attotime::from_hz(100))
// Actual keyboard refresh rate should be between 1 and 2 kHz
@@ -1399,8 +1399,8 @@ MACHINE_CONFIG_START(hp64k_state::hp64k)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_I8275_CHARACTER_WIDTH(9)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(hp64k_state , crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w))
- MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(*this, hp64k_state , hp64k_crtc_drq_w))
+ MCFG_I8275_VRTC_CALLBACK(WRITELINE(*this, hp64k_state , hp64k_crtc_vrtc_w))
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update)
@@ -1410,8 +1410,8 @@ MACHINE_CONFIG_START(hp64k_state::hp64k)
MCFG_FD1791_ADD("fdc" , XTAL(4'000'000) / 4)
MCFG_WD_FDC_FORCE_READY
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, hp64k_state , hp64k_flp_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, hp64k_state , hp64k_flp_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
MCFG_SLOT_FIXED(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
@@ -1424,7 +1424,7 @@ MACHINE_CONFIG_START(hp64k_state::hp64k)
MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
MCFG_TTL74123_B_PIN_VALUE(1)
MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(hp64k_state , hp64k_floppy0_rdy));
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, hp64k_state , hp64k_floppy0_rdy));
MCFG_DEVICE_ADD("fdc_rdy1" , TTL74123 , 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
@@ -1432,52 +1432,52 @@ MACHINE_CONFIG_START(hp64k_state::hp64k)
MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
MCFG_TTL74123_B_PIN_VALUE(1)
MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(hp64k_state , hp64k_floppy1_rdy));
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, hp64k_state , hp64k_floppy1_rdy));
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper" , BEEP , 2500)
+ MCFG_DEVICE_ADD("beeper" , BEEP , 2500)
MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
MCFG_TIMER_DRIVER_ADD("beep_timer" , hp64k_state , hp64k_beeper_off);
MCFG_DEVICE_ADD("baud_rate" , COM8116 , XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(hp64k_state , hp64k_baud_clk_w));
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, hp64k_state , hp64k_baud_clk_w));
MCFG_DEVICE_ADD("uart" , I8251 , 0)
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(hp64k_state , hp64k_rxrdy_w));
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(hp64k_state , hp64k_txrdy_w));
- MCFG_I8251_TXD_HANDLER(WRITELINE(hp64k_state , hp64k_txd_w));
- MCFG_I8251_DTR_HANDLER(WRITELINE(hp64k_state , hp64k_dtr_w));
- MCFG_I8251_RTS_HANDLER(WRITELINE(hp64k_state , hp64k_rts_w));
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, hp64k_state , hp64k_rxrdy_w));
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, hp64k_state , hp64k_txrdy_w));
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, hp64k_state , hp64k_txd_w));
+ MCFG_I8251_DTR_HANDLER(WRITELINE(*this, hp64k_state , hp64k_dtr_w));
+ MCFG_I8251_RTS_HANDLER(WRITELINE(*this, hp64k_state , hp64k_rts_w));
- MCFG_RS232_PORT_ADD("rs232" , default_rs232_devices , nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_rxd_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_dcd_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_cts_w))
+ MCFG_DEVICE_ADD("rs232" , RS232_PORT, default_rs232_devices , nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, hp64k_state , hp64k_rs232_rxd_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, hp64k_state , hp64k_rs232_dcd_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, hp64k_state , hp64k_rs232_cts_w))
MCFG_DEVICE_ADD("phi" , PHI , 0)
- MCFG_PHI_INT_WRITE_CB(WRITELINE(hp64k_state , hp64k_phi_int_w))
- MCFG_PHI_DMARQ_WRITE_CB(DEVWRITELINE("cpu" , hp_5061_3011_cpu_device , halt_w))
- MCFG_PHI_SYS_CNTRL_READ_CB(READLINE(hp64k_state , hp64k_phi_sys_ctrl_r))
- MCFG_PHI_DIO_READWRITE_CB(DEVREAD8(IEEE488_TAG , ieee488_device , dio_r) , DEVWRITE8(IEEE488_TAG , ieee488_device , dio_w))
- MCFG_PHI_EOI_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , eoi_w))
- MCFG_PHI_DAV_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , dav_w))
- MCFG_PHI_NRFD_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , nrfd_w))
- MCFG_PHI_NDAC_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , ndac_w))
- MCFG_PHI_IFC_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , ifc_w))
- MCFG_PHI_SRQ_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , srq_w))
- MCFG_PHI_ATN_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , atn_w))
- MCFG_PHI_REN_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , ren_w))
+ MCFG_PHI_INT_WRITE_CB(WRITELINE(*this, hp64k_state , hp64k_phi_int_w))
+ MCFG_PHI_DMARQ_WRITE_CB(WRITELINE("cpu" , hp_5061_3011_cpu_device , halt_w))
+ MCFG_PHI_SYS_CNTRL_READ_CB(READLINE(*this, hp64k_state , hp64k_phi_sys_ctrl_r))
+ MCFG_PHI_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , dio_w))
+ MCFG_PHI_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , eoi_w))
+ MCFG_PHI_DAV_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , dav_w))
+ MCFG_PHI_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , nrfd_w))
+ MCFG_PHI_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ndac_w))
+ MCFG_PHI_IFC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ifc_w))
+ MCFG_PHI_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , srq_w))
+ MCFG_PHI_ATN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , atn_w))
+ MCFG_PHI_REN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ren_w))
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE("phi" , phi_device , eoi_w))
- MCFG_IEEE488_DAV_CALLBACK(DEVWRITELINE("phi" , phi_device , dav_w))
- MCFG_IEEE488_NRFD_CALLBACK(DEVWRITELINE("phi" , phi_device , nrfd_w))
- MCFG_IEEE488_NDAC_CALLBACK(DEVWRITELINE("phi" , phi_device , ndac_w))
- MCFG_IEEE488_IFC_CALLBACK(DEVWRITELINE("phi" , phi_device , ifc_w))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE("phi" , phi_device , srq_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE("phi" , phi_device , atn_w))
- MCFG_IEEE488_REN_CALLBACK(DEVWRITELINE("phi" , phi_device , ren_w))
- MCFG_IEEE488_DIO_CALLBACK(DEVWRITE8("phi" , phi_device , bus_dio_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE("phi" , phi_device , eoi_w))
+ MCFG_IEEE488_DAV_CALLBACK(WRITELINE("phi" , phi_device , dav_w))
+ MCFG_IEEE488_NRFD_CALLBACK(WRITELINE("phi" , phi_device , nrfd_w))
+ MCFG_IEEE488_NDAC_CALLBACK(WRITELINE("phi" , phi_device , ndac_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE("phi" , phi_device , ifc_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE("phi" , phi_device , srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE("phi" , phi_device , atn_w))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE("phi" , phi_device , ren_w))
+ MCFG_IEEE488_DIO_CALLBACK(WRITE8("phi" , phi_device , bus_dio_w))
MCFG_IEEE488_SLOT_ADD("ieee_rem" , 0 , remote488_devices , nullptr)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hp700.cpp b/src/mame/drivers/hp700.cpp
index be368053a34..f5f6c891c88 100644
--- a/src/mame/drivers/hp700.cpp
+++ b/src/mame/drivers/hp700.cpp
@@ -53,9 +53,9 @@ static INPUT_PORTS_START( hp700_92 )
INPUT_PORTS_END
MACHINE_CONFIG_START(hp700_state::hp700_92)
- MCFG_CPU_ADD("maincpu", V20, XTAL(29'491'200) / 3) // divider not verified
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", V20, XTAL(29'491'200) / 3) // divider not verified
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp
index 94f18b34397..7278f2e382a 100644
--- a/src/mame/drivers/hp80.cpp
+++ b/src/mame/drivers/hp80.cpp
@@ -1329,9 +1329,9 @@ void hp85_state::rombank_mem_map(address_map &map)
}
MACHINE_CONFIG_START(hp85_state::hp85)
- MCFG_CPU_ADD("cpu" , HP_CAPRICORN , MASTER_CLOCK / 16)
- MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp85_state , irq_callback)
+ MCFG_DEVICE_ADD("cpu" , HP_CAPRICORN , MASTER_CLOCK / 16)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_mem_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(hp85_state , irq_callback)
MCFG_DEVICE_ADD("rombank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(rombank_mem_map)
@@ -1343,7 +1343,7 @@ MACHINE_CONFIG_START(hp85_state::hp85)
MCFG_SCREEN_ADD("screen" , RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK / 2 , 312 , 0 , 256 , 256 , 0 , 192)
MCFG_SCREEN_UPDATE_DRIVER(hp85_state , screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hp85_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hp85_state, vblank_w))
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_TIMER_DRIVER_ADD("vm_timer", hp85_state, vm_timer)
@@ -1357,12 +1357,12 @@ MACHINE_CONFIG_START(hp85_state::hp85)
// Beeper
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac" , DAC_1BIT , 0)
+ MCFG_DEVICE_ADD("dac" , DAC_1BIT , 0)
MCFG_MIXER_ROUTE(ALL_OUTPUTS , "mono" , 0.5 , 0)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0)
MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
- MCFG_SOUND_ADD("beeper" , BEEP , MASTER_CLOCK / 8192)
+ MCFG_DEVICE_ADD("beeper" , BEEP , MASTER_CLOCK / 8192)
MCFG_MIXER_ROUTE(ALL_OUTPUTS , "mono" , 0.5 , 0)
// Tape drive
@@ -1384,17 +1384,17 @@ MACHINE_CONFIG_START(hp85_state::hp85)
// I/O slots
MCFG_HP80_IO_SLOT_ADD("slot1" , 0)
- MCFG_HP80_IO_IRL_CB(WRITE8(hp85_state , irl_w))
- MCFG_HP80_IO_HALT_CB(WRITE8(hp85_state , halt_w))
+ MCFG_HP80_IO_IRL_CB(WRITE8(*this, hp85_state , irl_w))
+ MCFG_HP80_IO_HALT_CB(WRITE8(*this, hp85_state , halt_w))
MCFG_HP80_IO_SLOT_ADD("slot2" , 1)
- MCFG_HP80_IO_IRL_CB(WRITE8(hp85_state , irl_w))
- MCFG_HP80_IO_HALT_CB(WRITE8(hp85_state , halt_w))
+ MCFG_HP80_IO_IRL_CB(WRITE8(*this, hp85_state , irl_w))
+ MCFG_HP80_IO_HALT_CB(WRITE8(*this, hp85_state , halt_w))
MCFG_HP80_IO_SLOT_ADD("slot3" , 2)
- MCFG_HP80_IO_IRL_CB(WRITE8(hp85_state , irl_w))
- MCFG_HP80_IO_HALT_CB(WRITE8(hp85_state , halt_w))
+ MCFG_HP80_IO_IRL_CB(WRITE8(*this, hp85_state , irl_w))
+ MCFG_HP80_IO_HALT_CB(WRITE8(*this, hp85_state , halt_w))
MCFG_HP80_IO_SLOT_ADD("slot4" , 3)
- MCFG_HP80_IO_IRL_CB(WRITE8(hp85_state , irl_w))
- MCFG_HP80_IO_HALT_CB(WRITE8(hp85_state , halt_w))
+ MCFG_HP80_IO_IRL_CB(WRITE8(*this, hp85_state , irl_w))
+ MCFG_HP80_IO_HALT_CB(WRITE8(*this, hp85_state , halt_w))
// Printer output
MCFG_DEVICE_ADD("prt_graphic", BITBANGER, 0)
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index ffc02ded5d4..a7b5f3a2cc8 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -3641,8 +3641,8 @@ const uint8_t hp9845t_state::m_back_arrow_shape[] = {
};
MACHINE_CONFIG_START(hp9845_state::hp9845a)
- //MCFG_CPU_ADD("lpu", HP_5061_3010, XTAL(11'400'000))
- //MCFG_CPU_ADD("ppu", HP_5061_3011, XTAL(11'400'000))
+ //MCFG_DEVICE_ADD("lpu", HP_5061_3010, XTAL(11'400'000))
+ //MCFG_DEVICE_ADD("ppu", HP_5061_3011, XTAL(11'400'000))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3656,8 +3656,8 @@ MACHINE_CONFIG_START(hp9845_state::hp9845a)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9845_state::hp9835a)
- //MCFG_CPU_ADD("lpu", HP_5061_3001, XTAL(11'400'000))
- //MCFG_CPU_ADD("ppu", HP_5061_3001, XTAL(11'400'000))
+ //MCFG_DEVICE_ADD("lpu", HP_5061_3001, XTAL(11'400'000))
+ //MCFG_DEVICE_ADD("ppu", HP_5061_3001, XTAL(11'400'000))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3732,15 +3732,15 @@ void hp9845_base_state::ppu_io_map(address_map &map)
}
MACHINE_CONFIG_START(hp9845_base_state::hp9845_base)
- MCFG_CPU_ADD("lpu", HP_5061_3001, 5700000)
- MCFG_CPU_PROGRAM_MAP(global_mem_map)
+ MCFG_DEVICE_ADD("lpu", HP_5061_3001, 5700000)
+ MCFG_DEVICE_PROGRAM_MAP(global_mem_map)
MCFG_HPHYBRID_SET_9845_BOOT(true)
- MCFG_CPU_ADD("ppu", HP_5061_3001, 5700000)
- MCFG_CPU_PROGRAM_MAP(global_mem_map)
- MCFG_CPU_IO_MAP(ppu_io_map)
+ MCFG_DEVICE_ADD("ppu", HP_5061_3001, 5700000)
+ MCFG_DEVICE_PROGRAM_MAP(global_mem_map)
+ MCFG_DEVICE_IO_MAP(ppu_io_map)
MCFG_HPHYBRID_SET_9845_BOOT(true)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp9845_base_state , irq_callback)
- MCFG_HPHYBRID_PA_CHANGED(WRITE8(hp9845_base_state , pa_w))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(hp9845_base_state , irq_callback)
+ MCFG_HPHYBRID_PA_CHANGED(WRITE8(*this, hp9845_base_state , pa_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3752,20 +3752,20 @@ MACHINE_CONFIG_START(hp9845_base_state::hp9845_base)
// Beeper
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper" , BEEP , KEY_SCAN_OSCILLATOR / 512)
+ MCFG_DEVICE_ADD("beeper" , BEEP , KEY_SCAN_OSCILLATOR / 512)
MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 0.50)
MCFG_TIMER_DRIVER_ADD("beep_timer" , hp9845_base_state , beeper_off);
// Tape controller
MCFG_DEVICE_ADD("t15" , HP_TACO , 4000000)
- MCFG_TACO_IRQ_HANDLER(WRITELINE(hp9845_base_state , t15_irq_w))
- MCFG_TACO_FLG_HANDLER(WRITELINE(hp9845_base_state , t15_flg_w))
- MCFG_TACO_STS_HANDLER(WRITELINE(hp9845_base_state , t15_sts_w))
+ MCFG_TACO_IRQ_HANDLER(WRITELINE(*this, hp9845_base_state , t15_irq_w))
+ MCFG_TACO_FLG_HANDLER(WRITELINE(*this, hp9845_base_state , t15_flg_w))
+ MCFG_TACO_STS_HANDLER(WRITELINE(*this, hp9845_base_state , t15_sts_w))
MCFG_DEVICE_ADD("t14" , HP_TACO , 4000000)
- MCFG_TACO_IRQ_HANDLER(WRITELINE(hp9845_base_state , t14_irq_w))
- MCFG_TACO_FLG_HANDLER(WRITELINE(hp9845_base_state , t14_flg_w))
- MCFG_TACO_STS_HANDLER(WRITELINE(hp9845_base_state , t14_sts_w))
+ MCFG_TACO_IRQ_HANDLER(WRITELINE(*this, hp9845_base_state , t14_irq_w))
+ MCFG_TACO_FLG_HANDLER(WRITELINE(*this, hp9845_base_state , t14_flg_w))
+ MCFG_TACO_STS_HANDLER(WRITELINE(*this, hp9845_base_state , t14_sts_w))
// In real machine there were 8 slots for LPU ROMs and 8 slots for PPU ROMs in
// right-hand side and left-hand side drawers, respectively.
@@ -3790,21 +3790,21 @@ MACHINE_CONFIG_START(hp9845_base_state::hp9845_base)
// I/O slots
MCFG_HP9845_IO_SLOT_ADD("slot0")
- MCFG_HP9845_IO_IRQ_CB(WRITE8(hp9845_base_state , irq_w))
- MCFG_HP9845_IO_STS_CB(WRITE8(hp9845_base_state , sts_w))
- MCFG_HP9845_IO_FLG_CB(WRITE8(hp9845_base_state , flg_w))
+ MCFG_HP9845_IO_IRQ_CB(WRITE8(*this, hp9845_base_state , irq_w))
+ MCFG_HP9845_IO_STS_CB(WRITE8(*this, hp9845_base_state , sts_w))
+ MCFG_HP9845_IO_FLG_CB(WRITE8(*this, hp9845_base_state , flg_w))
MCFG_HP9845_IO_SLOT_ADD("slot1")
- MCFG_HP9845_IO_IRQ_CB(WRITE8(hp9845_base_state , irq_w))
- MCFG_HP9845_IO_STS_CB(WRITE8(hp9845_base_state , sts_w))
- MCFG_HP9845_IO_FLG_CB(WRITE8(hp9845_base_state , flg_w))
+ MCFG_HP9845_IO_IRQ_CB(WRITE8(*this, hp9845_base_state , irq_w))
+ MCFG_HP9845_IO_STS_CB(WRITE8(*this, hp9845_base_state , sts_w))
+ MCFG_HP9845_IO_FLG_CB(WRITE8(*this, hp9845_base_state , flg_w))
MCFG_HP9845_IO_SLOT_ADD("slot2")
- MCFG_HP9845_IO_IRQ_CB(WRITE8(hp9845_base_state , irq_w))
- MCFG_HP9845_IO_STS_CB(WRITE8(hp9845_base_state , sts_w))
- MCFG_HP9845_IO_FLG_CB(WRITE8(hp9845_base_state , flg_w))
+ MCFG_HP9845_IO_IRQ_CB(WRITE8(*this, hp9845_base_state , irq_w))
+ MCFG_HP9845_IO_STS_CB(WRITE8(*this, hp9845_base_state , sts_w))
+ MCFG_HP9845_IO_FLG_CB(WRITE8(*this, hp9845_base_state , flg_w))
MCFG_HP9845_IO_SLOT_ADD("slot3")
- MCFG_HP9845_IO_IRQ_CB(WRITE8(hp9845_base_state , irq_w))
- MCFG_HP9845_IO_STS_CB(WRITE8(hp9845_base_state , sts_w))
- MCFG_HP9845_IO_FLG_CB(WRITE8(hp9845_base_state , flg_w))
+ MCFG_HP9845_IO_IRQ_CB(WRITE8(*this, hp9845_base_state , irq_w))
+ MCFG_HP9845_IO_STS_CB(WRITE8(*this, hp9845_base_state , sts_w))
+ MCFG_HP9845_IO_FLG_CB(WRITE8(*this, hp9845_base_state , flg_w))
// LPU memory options
MCFG_RAM_ADD(RAM_TAG)
@@ -3813,9 +3813,9 @@ MACHINE_CONFIG_START(hp9845_base_state::hp9845_base)
// Internal printer
MCFG_DEVICE_ADD("printer" , HP9845_PRINTER , 0)
- MCFG_9845PRT_IRL_HANDLER(WRITELINE(hp9845_base_state , prt_irl_w))
- MCFG_9845PRT_FLG_HANDLER(WRITELINE(hp9845_base_state , prt_flg_w))
- MCFG_9845PRT_STS_HANDLER(WRITELINE(hp9845_base_state , prt_sts_w))
+ MCFG_9845PRT_IRL_HANDLER(WRITELINE(*this, hp9845_base_state , prt_irl_w))
+ MCFG_9845PRT_FLG_HANDLER(WRITELINE(*this, hp9845_base_state , prt_flg_w))
+ MCFG_9845PRT_STS_HANDLER(WRITELINE(*this, hp9845_base_state , prt_sts_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9845b_state::hp9845b)
@@ -3823,7 +3823,7 @@ MACHINE_CONFIG_START(hp9845b_state::hp9845b)
// video hardware
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(hp9845b_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hp9845b_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hp9845b_state, vblank_w))
MCFG_SCREEN_COLOR(rgb_t::green())
// These parameters are for alpha video
MCFG_SCREEN_RAW_PARAMS(VIDEO_PIXEL_CLOCK , VIDEO_HTOTAL , 0 , VIDEO_HBSTART , VIDEO_VTOTAL , 0 , VIDEO_ACTIVE_SCANLINES)
@@ -3841,7 +3841,7 @@ MACHINE_CONFIG_START(hp9845c_state::hp9845c)
// video hardware
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(hp9845c_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hp9845c_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hp9845c_state, vblank_w))
MCFG_SCREEN_RAW_PARAMS(VIDEO_770_PIXEL_CLOCK , VIDEO_770_HTOTAL , VIDEO_770_HBEND , VIDEO_770_HBSTART , VIDEO_770_VTOTAL , VIDEO_770_VBEND , VIDEO_770_VBSTART)
MCFG_PALETTE_ADD("palette", 24)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hp9845c_state, scanline_timer, "screen", 0, 1)
@@ -3855,7 +3855,7 @@ MACHINE_CONFIG_START(hp9845t_state::hp9845t)
// video hardware
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(hp9845t_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hp9845t_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hp9845t_state, vblank_w))
MCFG_SCREEN_COLOR(rgb_t::green())
MCFG_SCREEN_RAW_PARAMS(VIDEO_780_PIXEL_CLOCK , VIDEO_780_HTOTAL , VIDEO_780_HBEND , VIDEO_780_HBSTART , VIDEO_780_VTOTAL , VIDEO_780_VBEND , VIDEO_780_VBSTART)
MCFG_PALETTE_ADD("palette", 5)
diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp
index 87d9560a691..bb838ccfa92 100644
--- a/src/mame/drivers/hp9k.cpp
+++ b/src/mame/drivers/hp9k.cpp
@@ -397,8 +397,8 @@ WRITE8_MEMBER( hp9k_state::kbd_put )
MACHINE_CONFIG_START(hp9k_state::hp9k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(hp9k_mem)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hp9k_mem)
/* video hardware */
diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp
index 43b8dc1a280..f9c0118e659 100644
--- a/src/mame/drivers/hp9k_3xx.cpp
+++ b/src/mame/drivers/hp9k_3xx.cpp
@@ -438,15 +438,15 @@ static void dio16_cards(device_slot_interface &device)
MACHINE_CONFIG_START(hp9k3xx_state::hp9k310)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, M68010, 10000000)
- MCFG_CPU_PROGRAM_MAP(hp9k310_map)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, M68010, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k310_map)
- MCFG_CPU_ADD(IOCPU_TAG, I8042, 5000000)
- MCFG_CPU_PROGRAM_MAP(iocpu_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(hp9k3xx_state, iocpu_port1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(hp9k3xx_state, iocpu_port2_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(hp9k3xx_state, iocpu_port1_r))
- MCFG_MCS48_PORT_T0_IN_CB(READ8(hp9k3xx_state, iocpu_test0_r))
+ MCFG_DEVICE_ADD(IOCPU_TAG, I8042, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(iocpu_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, hp9k3xx_state, iocpu_port1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, hp9k3xx_state, iocpu_port2_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, hp9k3xx_state, iocpu_port1_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READ8(*this, hp9k3xx_state, iocpu_test0_r))
MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_SLOT_ADD(MLC_TAG, "hil1", hp_hil_devices, "hp_ipc_kbd")
@@ -455,7 +455,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k310)
MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76494_TAG, SN76494, SN76494_CLOCK)
+ MCFG_DEVICE_ADD(SN76494_TAG, SN76494, SN76494_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_DEVICE_ADD("diobus", DIO16, 0)
@@ -466,42 +466,42 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k310)
MCFG_DIO16_SLOT_ADD("diobus", "sl4", dio16_cards, nullptr, false)
MCFG_DEVICE_ADD("tms9914", TMS9914, XTAL(4000000))
- MCFG_TMS9914_INT_WRITE_CB(WRITELINE(hp9k3xx_state, gpib_irq));
- MCFG_TMS9914_DIO_READWRITE_CB(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_TMS9914_EOI_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_TMS9914_DAV_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_TMS9914_NRFD_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
- MCFG_TMS9914_NDAC_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_TMS9914_IFC_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_TMS9914_SRQ_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, srq_w))
- MCFG_TMS9914_ATN_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_TMS9914_REN_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp9k3xx_state, gpib_irq));
+ MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
+ MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w))
+ MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w))
MCFG_IEEE488_SLOT_ADD("ieee0", 0, hp_ieee488_devices, "hp9895")
MCFG_IEEE488_SLOT_ADD("ieee_rem", 0, remote488_devices, nullptr)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, eoi_w))
- MCFG_IEEE488_DAV_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, dav_w))
- MCFG_IEEE488_NRFD_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, nrfd_w))
- MCFG_IEEE488_NDAC_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ndac_w))
- MCFG_IEEE488_IFC_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ifc_w))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, srq_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, atn_w))
- MCFG_IEEE488_REN_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ren_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE("tms9914", tms9914_device, eoi_w))
+ MCFG_IEEE488_DAV_CALLBACK(WRITELINE("tms9914", tms9914_device, dav_w))
+ MCFG_IEEE488_NRFD_CALLBACK(WRITELINE("tms9914", tms9914_device, nrfd_w))
+ MCFG_IEEE488_NDAC_CALLBACK(WRITELINE("tms9914", tms9914_device, ndac_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE("tms9914", tms9914_device, ifc_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE("tms9914", tms9914_device, srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE("tms9914", tms9914_device, atn_w))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE("tms9914", tms9914_device, ren_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k320)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, M68020FPU, 16670000)
- MCFG_CPU_PROGRAM_MAP(hp9k320_map)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, M68020FPU, 16670000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k320_map)
- MCFG_CPU_ADD(IOCPU_TAG, I8042, 5000000)
- MCFG_CPU_PROGRAM_MAP(iocpu_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(hp9k3xx_state, iocpu_port1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(hp9k3xx_state, iocpu_port2_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(hp9k3xx_state, iocpu_port1_r))
- MCFG_MCS48_PORT_T0_IN_CB(READ8(hp9k3xx_state, iocpu_test0_r))
+ MCFG_DEVICE_ADD(IOCPU_TAG, I8042, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(iocpu_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, hp9k3xx_state, iocpu_port1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, hp9k3xx_state, iocpu_port2_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, hp9k3xx_state, iocpu_port1_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READ8(*this, hp9k3xx_state, iocpu_test0_r))
MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_SLOT_ADD(MLC_TAG, "hil1", hp_hil_devices, "hp_ipc_kbd")
@@ -510,7 +510,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k320)
MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76494_TAG, SN76494, SN76494_CLOCK)
+ MCFG_DEVICE_ADD(SN76494_TAG, SN76494, SN76494_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_DEVICE_ADD("diobus", DIO32, 0)
@@ -521,49 +521,49 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k320)
MCFG_DIO32_SLOT_ADD("diobus", "sl4", dio16_cards, nullptr, false)
MCFG_DEVICE_ADD("tms9914", TMS9914, XTAL(4000000))
- MCFG_TMS9914_INT_WRITE_CB(WRITELINE(hp9k3xx_state, gpib_irq));
- MCFG_TMS9914_DIO_READWRITE_CB(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_TMS9914_EOI_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_TMS9914_DAV_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_TMS9914_NRFD_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
- MCFG_TMS9914_NDAC_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_TMS9914_IFC_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_TMS9914_SRQ_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, srq_w))
- MCFG_TMS9914_ATN_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_TMS9914_REN_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp9k3xx_state, gpib_irq));
+ MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
+ MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w))
+ MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w))
MCFG_IEEE488_SLOT_ADD("ieee0", 0, hp_ieee488_devices, "hp9895")
MCFG_IEEE488_SLOT_ADD("ieee_rem", 0, remote488_devices, nullptr)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, eoi_w))
- MCFG_IEEE488_DAV_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, dav_w))
- MCFG_IEEE488_NRFD_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, nrfd_w))
- MCFG_IEEE488_NDAC_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ndac_w))
- MCFG_IEEE488_IFC_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ifc_w))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, srq_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, atn_w))
- MCFG_IEEE488_REN_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ren_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE("tms9914", tms9914_device, eoi_w))
+ MCFG_IEEE488_DAV_CALLBACK(WRITELINE("tms9914", tms9914_device, dav_w))
+ MCFG_IEEE488_NRFD_CALLBACK(WRITELINE("tms9914", tms9914_device, nrfd_w))
+ MCFG_IEEE488_NDAC_CALLBACK(WRITELINE("tms9914", tms9914_device, ndac_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE("tms9914", tms9914_device, ifc_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE("tms9914", tms9914_device, srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE("tms9914", tms9914_device, atn_w))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE("tms9914", tms9914_device, ren_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k330)
hp9k320(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE(MAINCPU_TAG, M68020PMMU, 16670000)
- MCFG_CPU_PROGRAM_MAP(hp9k330_map)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, M68020PMMU, 16670000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k330_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k332)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, M68020PMMU, 16670000)
- MCFG_CPU_PROGRAM_MAP(hp9k332_map)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, M68020PMMU, 16670000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k332_map)
- MCFG_CPU_ADD(IOCPU_TAG, I8042, 5000000)
- MCFG_CPU_PROGRAM_MAP(iocpu_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(hp9k3xx_state, iocpu_port1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(hp9k3xx_state, iocpu_port2_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(hp9k3xx_state, iocpu_port1_r))
- MCFG_MCS48_PORT_T0_IN_CB(READ8(hp9k3xx_state, iocpu_test0_r))
+ MCFG_DEVICE_ADD(IOCPU_TAG, I8042, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(iocpu_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, hp9k3xx_state, iocpu_port1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, hp9k3xx_state, iocpu_port2_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, hp9k3xx_state, iocpu_port1_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READ8(*this, hp9k3xx_state, iocpu_test0_r))
MCFG_DEVICE_ADD(MLC_TAG, HP_HIL_MLC, XTAL(15'920'000)/2)
MCFG_HP_HIL_SLOT_ADD(MLC_TAG, "hil1", hp_hil_devices, "hp_ipc_kbd")
@@ -572,7 +572,7 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k332)
MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76494_TAG, SN76494, SN76494_CLOCK)
+ MCFG_DEVICE_ADD(SN76494_TAG, SN76494, SN76494_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_SCREEN_ADD( "screen", RASTER)
@@ -582,57 +582,57 @@ MACHINE_CONFIG_START(hp9k3xx_state::hp9k332)
MCFG_SCREEN_REFRESH_RATE(70)
MCFG_DEVICE_ADD("tms9914", TMS9914, XTAL(4000000))
- MCFG_TMS9914_INT_WRITE_CB(WRITELINE(hp9k3xx_state, gpib_irq));
- MCFG_TMS9914_DIO_READWRITE_CB(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r), DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_TMS9914_EOI_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
- MCFG_TMS9914_DAV_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_TMS9914_NRFD_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
- MCFG_TMS9914_NDAC_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_TMS9914_IFC_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
- MCFG_TMS9914_SRQ_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, srq_w))
- MCFG_TMS9914_ATN_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, atn_w))
- MCFG_TMS9914_REN_WRITE_CB(DEVWRITELINE(IEEE488_TAG, ieee488_device, ren_w))
+ MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp9k3xx_state, gpib_irq));
+ MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG, ieee488_device, dio_r), WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, eoi_w))
+ MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, nrfd_w))
+ MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ifc_w))
+ MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, srq_w))
+ MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, atn_w))
+ MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG, ieee488_device, ren_w))
MCFG_IEEE488_SLOT_ADD("ieee0", 0, hp_ieee488_devices, "hp9895")
MCFG_IEEE488_SLOT_ADD("ieee_rem", 0, remote488_devices, nullptr)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, eoi_w))
- MCFG_IEEE488_DAV_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, dav_w))
- MCFG_IEEE488_NRFD_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, nrfd_w))
- MCFG_IEEE488_NDAC_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ndac_w))
- MCFG_IEEE488_IFC_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ifc_w))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, srq_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, atn_w))
- MCFG_IEEE488_REN_CALLBACK(DEVWRITELINE("tms9914", tms9914_device, ren_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE("tms9914", tms9914_device, eoi_w))
+ MCFG_IEEE488_DAV_CALLBACK(WRITELINE("tms9914", tms9914_device, dav_w))
+ MCFG_IEEE488_NRFD_CALLBACK(WRITELINE("tms9914", tms9914_device, nrfd_w))
+ MCFG_IEEE488_NDAC_CALLBACK(WRITELINE("tms9914", tms9914_device, ndac_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE("tms9914", tms9914_device, ifc_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE("tms9914", tms9914_device, srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE("tms9914", tms9914_device, atn_w))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE("tms9914", tms9914_device, ren_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k340)
hp9k320(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE(MAINCPU_TAG, M68030, 16670000)
- MCFG_CPU_PROGRAM_MAP(hp9k330_map)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, M68030, 16670000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k330_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k370)
hp9k320(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE(MAINCPU_TAG, M68030, 33000000)
- MCFG_CPU_PROGRAM_MAP(hp9k370_map)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, M68030, 33000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k370_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k380)
hp9k320(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE(MAINCPU_TAG, M68040, 25000000)
- MCFG_CPU_PROGRAM_MAP(hp9k380_map)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, M68040, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k380_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(hp9k3xx_state::hp9k382)
hp9k320(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE(MAINCPU_TAG, M68040, 25000000)
- MCFG_CPU_PROGRAM_MAP(hp9k382_map)
+ MCFG_DEVICE_REPLACE(MAINCPU_TAG, M68040, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(hp9k382_map)
MACHINE_CONFIG_END
ROM_START( hp9k310 )
diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp
index 4c5da74ce81..d7589c3d9ab 100644
--- a/src/mame/drivers/hp_ipc.cpp
+++ b/src/mame/drivers/hp_ipc.cpp
@@ -737,50 +737,50 @@ static void hp_ipc_floppies(device_slot_interface &device)
* 1 Real-time clock
*/
MACHINE_CONFIG_START(hp_ipc_state::hp_ipc_base)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(15'920'000) / 2)
- MCFG_CPU_PROGRAM_MAP(hp_ipc_mem_outer)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(15'920'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(hp_ipc_mem_outer)
MCFG_HP1LL3_ADD("gpu")
-// MCFG_HP1LL3_IRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_4))
+// MCFG_HP1LL3_IRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_4))
MCFG_VIDEO_SET_SCREEN("screen")
// XXX actual clock is 1MHz; remove this workaround (and change 2000 to 100 in hp_ipc_dsk.cpp)
// XXX when floppy code correctly handles 600 rpm drives.
MCFG_WD2797_ADD("fdc", XTAL(2'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_5))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_5))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", hp_ipc_floppies, "35dd", hp_ipc_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","hp_ipc")
MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_1))
-// MCFG_MM58167_STANDBY_IRQ_CALLBACK(WRITELINE(hp_ipc_state, irq_6))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_1))
+// MCFG_MM58167_STANDBY_IRQ_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_6))
MCFG_DEVICE_ADD("mlc", HP_HIL_MLC, XTAL(15'920'000)/2)
- MCFG_HP_HIL_INT_CALLBACK(WRITELINE(hp_ipc_state, irq_2))
- MCFG_HP_HIL_NMI_CALLBACK(WRITELINE(hp_ipc_state, irq_7))
+ MCFG_HP_HIL_INT_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_2))
+ MCFG_HP_HIL_NMI_CALLBACK(WRITELINE(*this, hp_ipc_state, irq_7))
MCFG_HP_HIL_SLOT_ADD("mlc", "hil1", hp_hil_devices, "hp_ipc_kbd")
MCFG_DEVICE_ADD("hpib" , TMS9914 , XTAL(4000000))
- MCFG_TMS9914_INT_WRITE_CB(WRITELINE(hp_ipc_state, irq_3))
- MCFG_TMS9914_DIO_READWRITE_CB(DEVREAD8(IEEE488_TAG , ieee488_device , dio_r) , DEVWRITE8(IEEE488_TAG , ieee488_device , dio_w))
- MCFG_TMS9914_EOI_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , eoi_w))
- MCFG_TMS9914_DAV_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , dav_w))
- MCFG_TMS9914_NRFD_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , nrfd_w))
- MCFG_TMS9914_NDAC_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , ndac_w))
- MCFG_TMS9914_IFC_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , ifc_w))
- MCFG_TMS9914_SRQ_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , srq_w))
- MCFG_TMS9914_ATN_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , atn_w))
- MCFG_TMS9914_REN_WRITE_CB(DEVWRITELINE(IEEE488_TAG , ieee488_device , ren_w))
+ MCFG_TMS9914_INT_WRITE_CB(WRITELINE(*this, hp_ipc_state, irq_3))
+ MCFG_TMS9914_DIO_READWRITE_CB(READ8(IEEE488_TAG , ieee488_device , dio_r) , WRITE8(IEEE488_TAG , ieee488_device , dio_w))
+ MCFG_TMS9914_EOI_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , eoi_w))
+ MCFG_TMS9914_DAV_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , dav_w))
+ MCFG_TMS9914_NRFD_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , nrfd_w))
+ MCFG_TMS9914_NDAC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ndac_w))
+ MCFG_TMS9914_IFC_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ifc_w))
+ MCFG_TMS9914_SRQ_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , srq_w))
+ MCFG_TMS9914_ATN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , atn_w))
+ MCFG_TMS9914_REN_WRITE_CB(WRITELINE(IEEE488_TAG , ieee488_device , ren_w))
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , eoi_w))
- MCFG_IEEE488_DAV_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , dav_w))
- MCFG_IEEE488_NRFD_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , nrfd_w))
- MCFG_IEEE488_NDAC_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , ndac_w))
- MCFG_IEEE488_IFC_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , ifc_w))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , srq_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , atn_w))
- MCFG_IEEE488_REN_CALLBACK(DEVWRITELINE("hpib" , tms9914_device , ren_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE("hpib" , tms9914_device , eoi_w))
+ MCFG_IEEE488_DAV_CALLBACK(WRITELINE("hpib" , tms9914_device , dav_w))
+ MCFG_IEEE488_NRFD_CALLBACK(WRITELINE("hpib" , tms9914_device , nrfd_w))
+ MCFG_IEEE488_NDAC_CALLBACK(WRITELINE("hpib" , tms9914_device , ndac_w))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE("hpib" , tms9914_device , ifc_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE("hpib" , tms9914_device , srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE("hpib" , tms9914_device , atn_w))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE("hpib" , tms9914_device , ren_w))
MCFG_IEEE488_SLOT_ADD("ieee_rem" , 0 , remote488_devices , nullptr)
MCFG_RAM_ADD(RAM_TAG)
@@ -804,7 +804,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(XTAL(6'000'000) * 2, 720, 0, 512, 278, 0, 256)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("mlc", hp_hil_mlc_device, ap_w)) // XXX actually it's driven by 555 (U59)
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("mlc", hp_hil_mlc_device, ap_w)) // XXX actually it's driven by 555 (U59)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_SCREEN_PALETTE("palette")
@@ -824,7 +824,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp9808a)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update)
MCFG_SCREEN_RAW_PARAMS(XTAL(6'000'000) * 2, 720, 0, 640, 480, 0, 400)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("mlc", hp_hil_mlc_device, ap_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("mlc", hp_hil_mlc_device, ap_w))
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_SCREEN_PALETTE("palette")
diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp
index 83ab4d4e01b..8983a712250 100644
--- a/src/mame/drivers/hprot1.cpp
+++ b/src/mame/drivers/hprot1.cpp
@@ -243,12 +243,12 @@ HD44780_PIXEL_UPDATE(hprot1_state::hprot1_pixel_update)
MACHINE_CONFIG_START(hprot1_state::hprot1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(i80c31_prg)
- MCFG_CPU_IO_MAP(i80c31_io)
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_prg)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
MCFG_MCS51_PORT_P1_IN_CB(IOPORT("inputs"))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(hprot1_state, henry_p1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(hprot1_state, henry_p3_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, hprot1_state, henry_p1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, hprot1_state, henry_p3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -275,13 +275,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hprot1_state::hprotr8a)
hprot1(config);
- MCFG_CPU_REPLACE("maincpu", I80C31, 11059200) // value of X1 cristal on the PCB
- MCFG_CPU_PROGRAM_MAP(i80c31_prg)
- MCFG_CPU_IO_MAP(i80c31_io)
+ MCFG_DEVICE_REPLACE("maincpu", I80C31, 11059200) // value of X1 cristal on the PCB
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_prg)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* TODO: add an RS232 interface (emulate MAX232N chip)
@@ -292,13 +292,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hprot1_state::hprot2r6)
hprot1(config);
- MCFG_CPU_REPLACE("maincpu", I80C31, 11059200) // value of X1 cristal on the PCB
- MCFG_CPU_PROGRAM_MAP(i80c31_prg)
- MCFG_CPU_IO_MAP(i80c31_io)
+ MCFG_DEVICE_REPLACE("maincpu", I80C31, 11059200) // value of X1 cristal on the PCB
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_prg)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* TODO: add an RS232 interface (emulate MAX232N chip) */
diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp
index d2125ebb6e6..61656b0d772 100644
--- a/src/mame/drivers/hpz80unk.cpp
+++ b/src/mame/drivers/hpz80unk.cpp
@@ -162,34 +162,34 @@ void hpz80unk_state::machine_reset()
MACHINE_CONFIG_START(hpz80unk_state::hpz80unk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(hpz80unk_mem)
- MCFG_CPU_IO_MAP(hpz80unk_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hpz80unk_mem)
+ MCFG_DEVICE_IO_MAP(hpz80unk_io)
/* video hardware */
MCFG_DEVICE_ADD("uart1", AY51013, 0) // COM2502
MCFG_AY51013_TX_CLOCK(153600)
MCFG_AY51013_RX_CLOCK(153600)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232a", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232a", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
MCFG_AY51013_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
MCFG_DEVICE_ADD("uart2", AY51013, 0) // COM2502
MCFG_AY51013_TX_CLOCK(153600)
MCFG_AY51013_RX_CLOCK(153600)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232b", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232b", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
MCFG_AY51013_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
MCFG_DEVICE_ADD("uart3", AY51013, 0) // COM2502
MCFG_AY51013_TX_CLOCK(153600)
MCFG_AY51013_RX_CLOCK(153600)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232c", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232c", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232c", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232c", rs232_port_device, write_txd))
MCFG_AY51013_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232c", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232c", RS232_PORT, default_rs232_devices, nullptr)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/ht6000.cpp b/src/mame/drivers/ht6000.cpp
index f7ee5e93058..558ab6f5b6b 100644
--- a/src/mame/drivers/ht6000.cpp
+++ b/src/mame/drivers/ht6000.cpp
@@ -314,11 +314,11 @@ void ht6000_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START( ht6000_state::ht6000 )
- MCFG_CPU_ADD("maincpu", UPD7810, 12_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(ht6000_state, port_a_w))
+ MCFG_DEVICE_ADD("maincpu", UPD7810, 12_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, ht6000_state, port_a_w))
- MCFG_CPU_ADD("keycpu", I8049, 10_MHz_XTAL)
+ MCFG_DEVICE_ADD("keycpu", I8049, 10_MHz_XTAL)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp
index 5bf051971de..ef693e57ba1 100644
--- a/src/mame/drivers/ht68k.cpp
+++ b/src/mame/drivers/ht68k.cpp
@@ -129,19 +129,19 @@ static void ht68k_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(ht68k_state::ht68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(ht68k_mem)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ht68k_mem)
/* video hardware */
MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL(8'000'000) / 2 )
MCFG_MC68681_SET_EXTERNAL_CLOCKS(500000, 500000, 1000000, 1000000)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(ht68k_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(ht68k_state, duart_txb))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(ht68k_state, duart_output))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, ht68k_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, ht68k_state, duart_txb))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, ht68k_state, duart_output))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681", mc68681_device, rx_a_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart68681", mc68681_device, rx_a_w))
MCFG_WD1770_ADD("wd1770", XTAL(8'000'000) )
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index c899f1b47e3..dab26f127fc 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -313,9 +313,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(amu880_state::amu880)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'000'000)/4) // U880D
- MCFG_CPU_PROGRAM_MAP(amu880_mem)
- MCFG_CPU_IO_MAP(amu880_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(10'000'000)/4) // U880D
+ MCFG_DEVICE_PROGRAM_MAP(amu880_mem)
+ MCFG_DEVICE_IO_MAP(amu880_io)
MCFG_Z80_DAISY_CHAIN(amu880_daisy_chain)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", amu880_state, keyboard_tick, attotime::from_hz(1500))
@@ -331,9 +331,9 @@ MACHINE_CONFIG_START(amu880_state::amu880)
/* devices */
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(10'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(amu880_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(amu880_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, amu880_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, amu880_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, XTAL(10'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(amu880_state::amu880)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(10'000'000)/4) // U856
- MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(amu880_state, cassette_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(*this, amu880_state, cassette_w))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CASSETTE_ADD("cassette")
diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp
index c82443a40be..cddeabc14b8 100644
--- a/src/mame/drivers/hunter2.cpp
+++ b/src/mame/drivers/hunter2.cpp
@@ -374,9 +374,9 @@ WRITE_LINE_MEMBER(hunter2_state::rxd_w)
MACHINE_CONFIG_START(hunter2_state::hunter2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NSC800, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(hunter2_mem)
- MCFG_CPU_IO_MAP(hunter2_io)
+ MCFG_DEVICE_ADD("maincpu", NSC800, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hunter2_mem)
+ MCFG_DEVICE_IO_MAP(hunter2_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -394,7 +394,7 @@ MACHINE_CONFIG_START(hunter2_state::hunter2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -404,16 +404,16 @@ MACHINE_CONFIG_START(hunter2_state::hunter2)
MCFG_MM58274C_DAY1(1) // monday
MCFG_NSC810_ADD("iotimer",XTAL(4'000'000),XTAL(4'000'000))
- MCFG_NSC810_PORTA_READ(READ8(hunter2_state,keyboard_r))
- MCFG_NSC810_PORTB_READ(READ8(hunter2_state,serial_dsr_r))
- MCFG_NSC810_PORTB_WRITE(WRITE8(hunter2_state,keyboard_w))
- MCFG_NSC810_PORTC_READ(READ8(hunter2_state,serial_rx_r))
- MCFG_NSC810_TIMER0_OUT(WRITELINE(hunter2_state,timer0_out))
- MCFG_NSC810_TIMER1_OUT(WRITELINE(hunter2_state,timer1_out))
-
- MCFG_RS232_PORT_ADD("serial",default_rs232_devices,nullptr)
- MCFG_RS232_CTS_HANDLER(WRITELINE(hunter2_state,cts_w))
- MCFG_RS232_RXD_HANDLER(WRITELINE(hunter2_state,rxd_w))
+ MCFG_NSC810_PORTA_READ(READ8(*this, hunter2_state,keyboard_r))
+ MCFG_NSC810_PORTB_READ(READ8(*this, hunter2_state,serial_dsr_r))
+ MCFG_NSC810_PORTB_WRITE(WRITE8(*this, hunter2_state,keyboard_w))
+ MCFG_NSC810_PORTC_READ(READ8(*this, hunter2_state,serial_rx_r))
+ MCFG_NSC810_TIMER0_OUT(WRITELINE(*this, hunter2_state,timer0_out))
+ MCFG_NSC810_TIMER1_OUT(WRITELINE(*this, hunter2_state,timer1_out))
+
+ MCFG_DEVICE_ADD("serial",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, hunter2_state,cts_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, hunter2_state,rxd_w))
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index 4b62abc8f0c..512a6fc56ac 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -617,30 +617,30 @@ TIMER_DEVICE_CALLBACK_MEMBER(hvyunit_state::scanline)
MACHINE_CONFIG_START(hvyunit_state::hvyunit)
- MCFG_CPU_ADD("master", Z80, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
- MCFG_CPU_PROGRAM_MAP(master_memory)
- MCFG_CPU_IO_MAP(master_io)
+ MCFG_DEVICE_ADD("master", Z80, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(master_memory)
+ MCFG_DEVICE_IO_MAP(master_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hvyunit_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", Z80, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
- MCFG_CPU_PROGRAM_MAP(slave_memory)
- MCFG_CPU_IO_MAP(slave_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", hvyunit_state, irq0_line_hold)
-
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
- MCFG_CPU_PROGRAM_MAP(sound_memory)
- MCFG_CPU_IO_MAP(sound_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", hvyunit_state, irq0_line_hold)
-
- MCFG_CPU_ADD("mermaid", I80C51, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
- MCFG_MCS51_PORT_P0_IN_CB(READ8(hvyunit_state, mermaid_p0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(hvyunit_state, mermaid_p0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(hvyunit_state, mermaid_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(hvyunit_state, mermaid_p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(hvyunit_state, mermaid_p2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(hvyunit_state, mermaid_p2_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(hvyunit_state, mermaid_p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(hvyunit_state, mermaid_p3_w))
+ MCFG_DEVICE_ADD("slave", Z80, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(slave_memory)
+ MCFG_DEVICE_IO_MAP(slave_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", hvyunit_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memory)
+ MCFG_DEVICE_IO_MAP(sound_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", hvyunit_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("mermaid", I80C51, XTAL(12'000'000)/2) /* 6MHz verified on PCB */
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, hvyunit_state, mermaid_p0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, hvyunit_state, mermaid_p0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, hvyunit_state, mermaid_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, hvyunit_state, mermaid_p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, hvyunit_state, mermaid_p2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, hvyunit_state, mermaid_p2_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, hvyunit_state, mermaid_p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, hvyunit_state, mermaid_p3_w))
MCFG_GENERIC_LATCH_8_ADD("mermaidlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("mermaid", INPUT_LINE_IRQ0))
@@ -655,7 +655,7 @@ MACHINE_CONFIG_START(hvyunit_state::hvyunit)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(hvyunit_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hvyunit_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hvyunit_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hvyunit)
@@ -671,7 +671,7 @@ MACHINE_CONFIG_START(hvyunit_state::hvyunit)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* 3MHz verified on PCB */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* 3MHz verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp
index 39fb919136e..d3591f6c70f 100644
--- a/src/mame/drivers/hx20.cpp
+++ b/src/mame/drivers/hx20.cpp
@@ -896,13 +896,13 @@ void hx20_state::machine_start()
MACHINE_CONFIG_START(hx20_state::hx20)
// basic machine hardware
- MCFG_CPU_ADD(HD6301V1_MAIN_TAG, HD63701, XTAL(2'457'600))
- MCFG_CPU_PROGRAM_MAP(hx20_mem)
- MCFG_CPU_IO_MAP(hx20_io)
+ MCFG_DEVICE_ADD(HD6301V1_MAIN_TAG, HD63701, XTAL(2'457'600))
+ MCFG_DEVICE_PROGRAM_MAP(hx20_mem)
+ MCFG_DEVICE_IO_MAP(hx20_io)
- MCFG_CPU_ADD(HD6301V1_SLAVE_TAG, HD63701, XTAL(2'457'600))
- MCFG_CPU_PROGRAM_MAP(hx20_sub_mem)
- MCFG_CPU_IO_MAP(hx20_sub_io)
+ MCFG_DEVICE_ADD(HD6301V1_SLAVE_TAG, HD63701, XTAL(2'457'600))
+ MCFG_DEVICE_PROGRAM_MAP(hx20_sub_mem)
+ MCFG_DEVICE_IO_MAP(hx20_sub_io)
// video hardware
MCFG_DEFAULT_LAYOUT(layout_lcd)
@@ -926,17 +926,17 @@ MACHINE_CONFIG_START(hx20_state::hx20)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_MC146818_ADD(MC146818_TAG, XTAL(4'194'304))
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(hx20_state, rtc_irq_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, hx20_state, rtc_irq_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
MCFG_CASSETTE_ADD(CASSETTE_TAG)
MCFG_EPSON_SIO_ADD("sio", "tf20")
- MCFG_EPSON_SIO_RX(WRITELINE(hx20_state, sio_rx_w))
- MCFG_EPSON_SIO_PIN(WRITELINE(hx20_state, sio_pin_w))
+ MCFG_EPSON_SIO_RX(WRITELINE(*this, hx20_state, sio_rx_w))
+ MCFG_EPSON_SIO_PIN(WRITELINE(*this, hx20_state, sio_pin_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -961,9 +961,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hx20_state::cm6000)
hx20(config);
// basic machine hardware
- MCFG_CPU_MODIFY(HD6301V1_MAIN_TAG)
- MCFG_CPU_PROGRAM_MAP(cm6000_mem)
- MCFG_CPU_IO_MAP(hx20_io)
+ MCFG_DEVICE_MODIFY(HD6301V1_MAIN_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(cm6000_mem)
+ MCFG_DEVICE_IO_MAP(hx20_io)
// optional rom
MCFG_DEVICE_REMOVE("optrom")
diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp
index a6cb3173179..dc784899893 100644
--- a/src/mame/drivers/hyhoo.cpp
+++ b/src/mame/drivers/hyhoo.cpp
@@ -229,10 +229,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(hyhoo_state::hyhoo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz ?? */
- MCFG_CPU_PROGRAM_MAP(hyhoo_map)
- MCFG_CPU_IO_MAP(hyhoo_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", hyhoo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 5.00 MHz ?? */
+ MCFG_DEVICE_PROGRAM_MAP(hyhoo_map)
+ MCFG_DEVICE_IO_MAP(hyhoo_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", hyhoo_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -251,12 +251,12 @@ MACHINE_CONFIG_START(hyhoo_state::hyhoo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp
index 7a57dbd2ccd..943a9a89cac 100644
--- a/src/mame/drivers/hyperscan.cpp
+++ b/src/mame/drivers/hyperscan.cpp
@@ -621,8 +621,8 @@ void hyperscan_state::machine_reset()
MACHINE_CONFIG_START(hyperscan_state::hyperscan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SCORE7, XTAL(27'000'000) * 4) // 108MHz S+core 7
- MCFG_CPU_PROGRAM_MAP(spg290_mem)
+ MCFG_DEVICE_ADD("maincpu", SCORE7, XTAL(27'000'000) * 4) // 108MHz S+core 7
+ MCFG_DEVICE_PROGRAM_MAP(spg290_mem)
MCFG_SOFTWARE_LIST_ADD("cd_list","hyperscan")
@@ -633,7 +633,7 @@ MACHINE_CONFIG_START(hyperscan_state::hyperscan)
MCFG_SCREEN_UPDATE_DRIVER(hyperscan_state, spg290_screen_update)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hyperscan_state, spg290_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hyperscan_state, spg290_vblank_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp
index 397eb4b0474..9ef8b96b59d 100644
--- a/src/mame/drivers/hyperspt.cpp
+++ b/src/mame/drivers/hyperspt.cpp
@@ -298,20 +298,20 @@ WRITE_LINE_MEMBER(hyperspt_state::vblank_irq)
MACHINE_CONFIG_START(hyperspt_state::hyperspt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(hyperspt_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(hyperspt_map)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(14'318'181)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(hyperspt_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(14'318'181)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(hyperspt_sound_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // F2
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(hyperspt_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("trackfld_audio", trackfld_audio_device, sh_irqtrigger_w)) // SOUND ON
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, hyperspt_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("trackfld_audio", trackfld_audio_device, sh_irqtrigger_w)) // SOUND ON
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // END
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(hyperspt_state, coin_counter_1_w)) // COIN 1
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(hyperspt_state, coin_counter_2_w)) // COIN 2
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, hyperspt_state, coin_counter_1_w)) // COIN 1
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, hyperspt_state, coin_counter_2_w)) // COIN 2
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // SA
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(hyperspt_state, irq_mask_w)) // INT
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, hyperspt_state, irq_mask_w)) // INT
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -325,7 +325,7 @@ MACHINE_CONFIG_START(hyperspt_state::hyperspt)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(hyperspt_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hyperspt_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hyperspt_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hyperspt)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -337,16 +337,16 @@ MACHINE_CONFIG_START(hyperspt_state::hyperspt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_DEVICE_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76496, XTAL(14'318'181)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("snsnd", SN76496, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -378,18 +378,18 @@ MACHINE_CONFIG_START(hyperspt_state::hypersptb)
hyperspt(config);
MCFG_DEVICE_REMOVE("vlm")
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(soundb_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(soundb_map)
- MCFG_CPU_ADD("adpcm", M6802, XTAL(14'318'181)/8) /* unknown clock */
- MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
+ MCFG_DEVICE_ADD("adpcm", M6802, XTAL(14'318'181)/8) /* unknown clock */
+ MCFG_DEVICE_PROGRAM_MAP(hyprolyb_adpcm_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
+ MCFG_DEVICE_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(DEVWRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -398,13 +398,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hyperspt_state::roadf)
hyperspt(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(roadf_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(roadf_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", roadf)
MCFG_VIDEO_START_OVERRIDE(hyperspt_state,roadf)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(roadf_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(roadf_sound_map)
MCFG_DEVICE_REMOVE("vlm")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp
index 76eb5a7ea06..10109399250 100644
--- a/src/mame/drivers/hyprduel.cpp
+++ b/src/mame/drivers/hyprduel.cpp
@@ -476,7 +476,7 @@ MACHINE_START_MEMBER(hyprduel_state,hyprduel)
MACHINE_CONFIG_START(hyprduel_state::i4220_config)
MCFG_DEVICE_ADD("vdp", I4220, XTAL(26'666'000))
MCFG_I4100_GFXDECODE("gfxdecode")
- MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(hyprduel_state,vdp_blit_end_w))
+ MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(*this, hyprduel_state,vdp_blit_end_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
@@ -493,12 +493,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hyprduel_state::hyprduel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
- MCFG_CPU_PROGRAM_MAP(hyprduel_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hyprduel_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hyprduel_state, interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
- MCFG_CPU_PROGRAM_MAP(hyprduel_map2)
+ MCFG_DEVICE_ADD("sub", M68000,20000000/2) /* 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hyprduel_map2)
MCFG_MACHINE_START_OVERRIDE(hyprduel_state,hyprduel)
@@ -520,13 +520,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(hyprduel_state::magerror)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
- MCFG_CPU_PROGRAM_MAP(magerror_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magerror_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hyprduel_state, interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000,20000000/2) /* 10MHz */
- MCFG_CPU_PROGRAM_MAP(magerror_map2)
- MCFG_CPU_PERIODIC_INT_DRIVER(hyprduel_state, irq1_line_hold, 968) /* tempo? */
+ MCFG_DEVICE_ADD("sub", M68000,20000000/2) /* 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magerror_map2)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(hyprduel_state, irq1_line_hold, 968) /* tempo? */
MCFG_MACHINE_START_OVERRIDE(hyprduel_state,hyprduel)
@@ -536,7 +536,7 @@ MACHINE_CONFIG_START(hyprduel_state::magerror)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, PIN7_HIGH) // clock frequency & pin 7 not verified
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index 428905e6505..ec99129872d 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -340,9 +340,9 @@ MC6845_ON_UPDATE_ADDR_CHANGED(i7000_state::crtc_addr)
MACHINE_CONFIG_START(i7000_state::i7000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NSC800, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(i7000_mem)
- MCFG_CPU_IO_MAP(i7000_io)
+ MCFG_DEVICE_ADD("maincpu", NSC800, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(i7000_mem)
+ MCFG_DEVICE_IO_MAP(i7000_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -364,22 +364,22 @@ MACHINE_CONFIG_START(i7000_state::i7000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Programmable timer */
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
// MCFG_PIT8253_CLK0(XTAL(4'000'000) / 2) /* TODO: verify on PCB */
-// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(i7000_state,i7000_pit_out0))
+// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, i7000_state,i7000_pit_out0))
// MCFG_PIT8253_CLK1(XTAL(4'000'000) / 2) /* TODO: verify on PCB */
-// MCFG_PIT8253_OUT1_HANDLER(WRITELINE(i7000_state,i7000_pit_out1))
+// MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, i7000_state,i7000_pit_out1))
MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2) /* TODO: verify on PCB */
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w))
/* Keyboard interface */
MCFG_DEVICE_ADD("i8279", I8279, 4000000) /* guessed value. TODO: verify on PCB */
- MCFG_I8279_OUT_SL_CB(WRITE8(i7000_state, i7000_scanlines_w)) // scan SL lines
- MCFG_I8279_IN_RL_CB(READ8(i7000_state, i7000_kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, i7000_state, i7000_scanlines_w)) // scan SL lines
+ MCFG_I8279_IN_RL_CB(READ8(*this, i7000_state, i7000_kbd_r)) // kbd RL lines
MCFG_I8279_IN_SHIFT_CB(VCC) // TODO: Shift key
MCFG_I8279_IN_CTRL_CB(VCC) // TODO: Ctrl key
diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp
index 19e55749d31..cf0a9983aef 100644
--- a/src/mame/drivers/ibm3153.cpp
+++ b/src/mame/drivers/ibm3153.cpp
@@ -100,9 +100,9 @@ void ibm3153_state::machine_reset()
MACHINE_CONFIG_START(ibm3153_state::ibm3153)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, XTAL(16'000'000)) // no idea of clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I80C32, XTAL(16'000'000)) // no idea of clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp
index 042f08d5810..c860349db9f 100644
--- a/src/mame/drivers/ibm6580.cpp
+++ b/src/mame/drivers/ibm6580.cpp
@@ -881,10 +881,10 @@ static void dw_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(ibm6580_state::ibm6580)
- MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600)/3)
- MCFG_CPU_PROGRAM_MAP(ibm6580_mem)
- MCFG_CPU_IO_MAP(ibm6580_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(14'745'600)/3)
+ MCFG_DEVICE_PROGRAM_MAP(ibm6580_mem)
+ MCFG_DEVICE_IO_MAP(ibm6580_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("128K")
@@ -894,7 +894,7 @@ MACHINE_CONFIG_START(ibm6580_state::ibm6580)
MCFG_SCREEN_RAW_PARAMS(XTAL(25'000'000)/2, 833, 0, 640, 428, 0, 400)
MCFG_SCREEN_UPDATE_DRIVER(ibm6580_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ibm6580_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ibm6580_state, vblank_w))
MCFG_DEFAULT_LAYOUT(layout_ibm6580)
MCFG_PALETTE_ADD("palette", 3)
@@ -904,57 +904,57 @@ MACHINE_CONFIG_START(ibm6580_state::ibm6580)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(ibm6580_state, ppi_a_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ibm6580_state, led_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ibm6580_state, ppi_c_w))
- MCFG_I8255_IN_PORTC_CB(READ8(ibm6580_state, ppi_c_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, ibm6580_state, ppi_a_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ibm6580_state, led_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ibm6580_state, ppi_c_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ibm6580_state, ppi_c_r))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_DEVICE_ADD("kbd", DW_KEYBOARD, 0)
- MCFG_DW_KEYBOARD_OUT_DATA_HANDLER(WRITELINE(ibm6580_state, kb_data_w))
- MCFG_DW_KEYBOARD_OUT_CLOCK_HANDLER(WRITELINE(ibm6580_state, kb_clock_w))
- MCFG_DW_KEYBOARD_OUT_STROBE_HANDLER(WRITELINE(ibm6580_state, kb_strobe_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ppi8255", i8255_device, pc4_w))
+ MCFG_DW_KEYBOARD_OUT_DATA_HANDLER(WRITELINE(*this, ibm6580_state, kb_data_w))
+ MCFG_DW_KEYBOARD_OUT_CLOCK_HANDLER(WRITELINE(*this, ibm6580_state, kb_clock_w))
+ MCFG_DW_KEYBOARD_OUT_STROBE_HANDLER(WRITELINE(*this, ibm6580_state, kb_strobe_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ppi8255", i8255_device, pc4_w))
MCFG_DEVICE_ADD("dma8257", I8257, XTAL(14'745'600)/3)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(ibm6580_state, hrq_w))
- MCFG_I8257_OUT_TC_CB(DEVWRITELINE(UPD765_TAG, upd765a_device, tc_line_w))
- MCFG_I8257_IN_MEMR_CB(READ8(ibm6580_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(ibm6580_state, memory_write_byte))
- MCFG_I8257_IN_IOR_0_CB(DEVREAD8(UPD765_TAG, upd765a_device, mdma_r))
- MCFG_I8257_OUT_IOW_0_CB(DEVWRITE8(UPD765_TAG, upd765a_device, mdma_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, ibm6580_state, hrq_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE(UPD765_TAG, upd765a_device, tc_line_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, ibm6580_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, ibm6580_state, memory_write_byte))
+ MCFG_I8257_IN_IOR_0_CB(READ8(UPD765_TAG, upd765a_device, mdma_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8(UPD765_TAG, upd765a_device, mdma_w))
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(ibm6580_state, floppy_intrq))
-// MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, ibm6580_state, floppy_intrq))
+// MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma8257", i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", dw_floppies, "8sssd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", dw_floppies, "8sssd", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD( "upd8251a", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd8251a", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("upd8251a", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("upd8251a", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("upd8251a", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("upd8251a", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("upd8251a", i8251_device, write_cts))
MCFG_DEVICE_ADD( "upd8251b", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd8251b", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("upd8251b", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("upd8251b", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir2_w))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("upd8251b", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("upd8251b", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("upd8251b", i8251_device, write_cts))
MCFG_SOFTWARE_LIST_ADD("flop_list", "ibm6580")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp
index 3ebdfc1a8ff..b71c0a81e91 100644
--- a/src/mame/drivers/ibmpc.cpp
+++ b/src/mame/drivers/ibmpc.cpp
@@ -295,19 +295,19 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(ibmpc_state::ibm5150)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
- MCFG_CPU_PROGRAM_MAP(pc8_map)
- MCFG_CPU_IO_MAP(pc8_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3)
+ MCFG_DEVICE_PROGRAM_MAP(pc8_map)
+ MCFG_DEVICE_IO_MAP(pc8_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_IBM5150_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(cga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "hdc", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270)
@@ -333,22 +333,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ibmpc_state::ibm5160)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
- MCFG_CPU_PROGRAM_MAP(pc8_map)
- MCFG_CPU_IO_MAP(pc8_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3)
+ MCFG_DEVICE_PROGRAM_MAP(pc8_map)
+ MCFG_DEVICE_IO_MAP(pc8_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(cga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "hdc", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa8", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "hdc", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa7", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa8", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp
index b03932bbf6f..f136f4b8a3d 100644
--- a/src/mame/drivers/ibmpcjr.cpp
+++ b/src/mame/drivers/ibmpcjr.cpp
@@ -589,10 +589,10 @@ void pcjr_state::ibmpcjx_io(address_map &map)
MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, 4900000)
- MCFG_CPU_PROGRAM_MAP(ibmpcjr_map)
- MCFG_CPU_IO_MAP(ibmpcjr_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 4900000)
+ MCFG_DEVICE_PROGRAM_MAP(ibmpcjr_map)
+ MCFG_DEVICE_IO_MAP(ibmpcjr_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/*
On the PC Jr the input for clock 1 seems to be selectable
@@ -601,31 +601,31 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
*/
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(14'318'181)/12)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(14'318'181)/12)
MCFG_PIT8253_CLK2(XTAL(14'318'181)/12)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pcjr_state, out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, pcjr_state, out2_changed))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(pcjr_state, pic8259_set_int_line))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, pcjr_state, pic8259_set_int_line))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_I8255_IN_PORTA_CB(CONSTANT(0xff))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pcjr_state, pcjr_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pcjr_state, pcjr_ppi_portc_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pcjr_state, pcjr_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pcjr_state, pcjr_ppi_portc_r))
MCFG_DEVICE_ADD( "ins8250", INS8250, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
-
- MCFG_RS232_PORT_ADD( "serport", pcjr_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ins8250", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+
+ MCFG_DEVICE_ADD( "serport", RS232_PORT, pcjr_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ins8250", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ins8250", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ins8250", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("ins8250", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ins8250", ins8250_uart_device, cts_w))
/* video hardware */
MCFG_PCVIDEO_PCJR_ADD("pcvideo_pcjr")
@@ -635,14 +635,14 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn76496", SN76496, XTAL(14'318'181)/4)
+ MCFG_DEVICE_ADD("sn76496", SN76496, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* printer */
MCFG_DEVICE_ADD("lpt_0", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE("pic8259", pic8259_device, ir7_w))
MCFG_PC_JOY_ADD("pc_joy")
@@ -655,7 +655,7 @@ MACHINE_CONFIG_START(pcjr_state::ibmpcjr)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcjr_floppies, "525dd", isa8_fdc_device::floppy_formats)
MCFG_SLOT_FIXED(true)
- MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE(pcjr_state, keyb_interrupt))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE(*this, pcjr_state, keyb_interrupt))
/* cartridge */
MCFG_GENERIC_CARTSLOT_ADD("cartslot1", generic_plain_slot, "ibmpcjr_cart")
@@ -684,9 +684,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(pcjr_state::ibmpcjx)
ibmpcjr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ibmpcjx_map)
- MCFG_CPU_IO_MAP(ibmpcjx_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ibmpcjx_map)
+ MCFG_DEVICE_IO_MAP(ibmpcjx_io)
MCFG_DEVICE_REMOVE("fdc:0");
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcjr_floppies, "35dd", isa8_fdc_device::floppy_formats)
diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp
index 9986fcd1ceb..1dad658581d 100644
--- a/src/mame/drivers/icatel.cpp
+++ b/src/mame/drivers/icatel.cpp
@@ -251,14 +251,14 @@ HD44780_PIXEL_UPDATE(icatel_state::icatel_pixel_update)
MACHINE_CONFIG_START(icatel_state::icatel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(2'097'152))
- MCFG_CPU_PROGRAM_MAP(i80c31_prg)
- MCFG_CPU_DATA_MAP(i80c31_data)
- MCFG_CPU_IO_MAP(i80c31_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(icatel_state, i80c31_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(icatel_state, i80c31_p1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(icatel_state, i80c31_p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(icatel_state, i80c31_p3_w))
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(2'097'152))
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_prg)
+ MCFG_DEVICE_DATA_MAP(i80c31_data)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, icatel_state, i80c31_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, icatel_state, i80c31_p1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, icatel_state, i80c31_p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, icatel_state, i80c31_p3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp
index bd98d25953a..3ad4202427c 100644
--- a/src/mame/drivers/ice_bozopail.cpp
+++ b/src/mame/drivers/ice_bozopail.cpp
@@ -59,8 +59,8 @@ void ice_bozopail_state::machine_reset()
MACHINE_CONFIG_START(ice_bozopail_state::ice_bozo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC68HC11, 8000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(ice_bozo_map)
+ MCFG_DEVICE_ADD("maincpu", MC68HC11, 8000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(ice_bozo_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/ice_tbd.cpp b/src/mame/drivers/ice_tbd.cpp
index e0a07177a9a..ef263e80112 100644
--- a/src/mame/drivers/ice_tbd.cpp
+++ b/src/mame/drivers/ice_tbd.cpp
@@ -67,9 +67,9 @@ void ice_tbd_state::machine_reset()
MACHINE_CONFIG_START(ice_tbd_state::ice_tbd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(ice_tbd_map)
- MCFG_CPU_IO_MAP(ice_tbd_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ice_tbd_map)
+ MCFG_DEVICE_IO_MAP(ice_tbd_io_map)
MCFG_DEVICE_ADD("ppi", I8255, 0)
MCFG_I8255_OUT_PORTA_CB(NOOP) // ?
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index 90965fc1c67..e76517b57bd 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -362,8 +362,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_motors_timer)
MACHINE_CONFIG_START(icecold_state::icecold)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(6'000'000)/4) // 68A09E
- MCFG_CPU_PROGRAM_MAP(icecold_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(6'000'000)/4) // 68A09E
+ MCFG_DEVICE_PROGRAM_MAP(icecold_map)
MCFG_DEVICE_ADD( "pia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("JOY"))
@@ -372,9 +372,9 @@ MACHINE_CONFIG_START(icecold_state::icecold)
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD( "pia1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(icecold_state, ay_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(icecold_state, ay_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(icecold_state, snd_ctrl_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, icecold_state, ay_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, icecold_state, ay_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, icecold_state, snd_ctrl_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
@@ -383,10 +383,10 @@ MACHINE_CONFIG_START(icecold_state::icecold)
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("i8279", I8279, XTAL(6'000'000)/4)
- MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("pia0", pia6821_device, cb1_w)) // irq
- MCFG_I8279_OUT_SL_CB(WRITE8(icecold_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(icecold_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(icecold_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_IRQ_CB(WRITELINE("pia0", pia6821_device, cb1_w)) // irq
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, icecold_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, icecold_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, icecold_state, kbd_r)) // kbd RL lines
// 30Hz signal from CH-C of ay0
MCFG_TIMER_DRIVER_ADD_PERIODIC("sint_timer", icecold_state, icecold_sint_timer, attotime::from_hz(30))
@@ -399,14 +399,14 @@ MACHINE_CONFIG_START(icecold_state::icecold)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay0", AY8910, XTAL(6'000'000)/4)
+ MCFG_DEVICE_ADD("ay0", AY8910, XTAL(6'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW4"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(icecold_state, ay8910_0_b_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, icecold_state, ay8910_0_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(icecold_state, ay8910_1_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(icecold_state, ay8910_1_b_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(6'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, icecold_state, ay8910_1_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, icecold_state, ay8910_1_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp
index 0db563f90c9..8382e19094c 100644
--- a/src/mame/drivers/ichiban.cpp
+++ b/src/mame/drivers/ichiban.cpp
@@ -123,9 +123,9 @@ void ichibanjyan_state::machine_reset()
MACHINE_CONFIG_START(ichibanjyan_state::ichibanjyan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(ichibanjyan_map)
- MCFG_CPU_IO_MAP(ichibanjyan_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(ichibanjyan_map)
+ MCFG_DEVICE_IO_MAP(ichibanjyan_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -142,10 +142,10 @@ MACHINE_CONFIG_START(ichibanjyan_state::ichibanjyan)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, MAIN_CLOCK/12)
+ MCFG_DEVICE_ADD("aysnd", YM2149, MAIN_CLOCK/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ymsnd", YM2413, MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, MAIN_CLOCK/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp
index 20e5df76c14..e888a06e5df 100644
--- a/src/mame/drivers/idsa.cpp
+++ b/src/mame/drivers/idsa.cpp
@@ -332,12 +332,12 @@ void idsa_state::machine_reset()
MACHINE_CONFIG_START(idsa_state::idsa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
MCFG_DEVICE_ADD("irqclk", CLOCK, XTAL(8'000'000) / 4 )
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(idsa_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, idsa_state, clock_w))
/* video hardware */
//MCFG_DEFAULT_LAYOUT()
@@ -345,34 +345,34 @@ MACHINE_CONFIG_START(idsa_state::idsa)
/* sound hardware */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("speech", SP0256, 3120000) // unknown variant
+ MCFG_DEVICE_ADD("speech", SP0256, 3120000) // unknown variant
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.5)
- MCFG_SOUND_ADD("aysnd1", AY8910, 2000000) // 2Mhz according to pinmame, schematic omits the clock line
+ MCFG_DEVICE_ADD("aysnd1", AY8910, 2000000) // 2Mhz according to pinmame, schematic omits the clock line
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MCFG_SOUND_ADD("aysnd2", AY8910, 2000000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(idsa_state, ay1_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(idsa_state, ay1_b_w))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(idsa_state, ay2_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(idsa_state, ay2_b_w))
+ MCFG_DEVICE_ADD("aysnd2", AY8910, 2000000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, idsa_state, ay1_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, idsa_state, ay1_b_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, idsa_state, ay2_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, idsa_state, ay2_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(idsa_state::bsktbllp)
idsa(config);
MCFG_DEVICE_MODIFY("aysnd1")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(idsa_state, ppi_control_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(idsa_state, ppi_data_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, idsa_state, ppi_control_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, idsa_state, ppi_data_w))
MCFG_DEVICE_ADD("ppi1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(idsa_state, ppi1_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(idsa_state, ppi1_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(idsa_state, ppi1_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, idsa_state, ppi1_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, idsa_state, ppi1_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, idsa_state, ppi1_c_w))
MCFG_DEVICE_ADD("ppi2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(idsa_state, ppi2_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(idsa_state, ppi2_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(idsa_state, ppi2_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, idsa_state, ppi2_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, idsa_state, ppi2_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, idsa_state, ppi2_c_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp
index 181b39e7a70..4aab7d2fd2e 100644
--- a/src/mame/drivers/if800.cpp
+++ b/src/mame/drivers/if800.cpp
@@ -89,9 +89,9 @@ void if800_state::upd7220_map(address_map &map)
MACHINE_CONFIG_START(if800_state::if800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 8000000)
- MCFG_CPU_PROGRAM_MAP(if800_map)
- MCFG_CPU_IO_MAP(if800_io)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(if800_map)
+ MCFG_DEVICE_IO_MAP(if800_io)
// MCFG_PIC8259_ADD( "pic8259", if800_pic8259_config )
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index 570fcf06232..1d5e934f6b6 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -818,21 +818,21 @@ WRITE_LINE_MEMBER(igs009_state::vblank_irq)
MACHINE_CONFIG_START(igs009_state::jingbell)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 2) /* HD64180RP8, 8 MHz? */
- MCFG_CPU_PROGRAM_MAP(jingbell_map)
- MCFG_CPU_IO_MAP(jingbell_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(jingbell_map)
+ MCFG_DEVICE_IO_MAP(jingbell_portmap)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(igs009_state, nmi_and_coins_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, igs009_state, nmi_and_coins_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SERVICE"))
MCFG_I8255_IN_PORTC_CB(IOPORT("COINS"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("BUTTONS1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(igs009_state, video_and_leds_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(igs009_state, leds_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, igs009_state, video_and_leds_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, igs009_state, leds_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -842,7 +842,7 @@ MACHINE_CONFIG_START(igs009_state::jingbell)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(igs009_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(igs009_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igs009_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jingbell)
MCFG_PALETTE_ADD("palette", 0x400)
@@ -850,7 +850,7 @@ MACHINE_CONFIG_START(igs009_state::jingbell)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(12'000'000) / 12, PIN7_HIGH)
@@ -861,8 +861,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs009_state::gp98)
jingbell(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(gp98_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(gp98_portmap)
MCFG_GFXDECODE_MODIFY("gfxdecode", gp98)
diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp
index cc848668c56..7d32c219a3b 100644
--- a/src/mame/drivers/igs011.cpp
+++ b/src/mame/drivers/igs011.cpp
@@ -4172,7 +4172,7 @@ GFXDECODE_END
#endif
MACHINE_CONFIG_START(igs011_state::igs011_base)
- MCFG_CPU_ADD("maincpu",M68000, XTAL(22'000'000)/3)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(22'000'000)/3)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -4203,19 +4203,19 @@ TIMER_DEVICE_CALLBACK_MEMBER( igs011_state::lev5_timer_irq_cb )
MACHINE_CONFIG_START(igs011_state::drgnwrld)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(drgnwrld)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(drgnwrld)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev5_timer_irq_cb, attotime::from_hz(240)) // lev5 frequency drives the music tempo
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs011_state::drgnwrld_igs012)
drgnwrld(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(drgnwrld_igs012)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(drgnwrld_igs012)
MACHINE_CONFIG_END
@@ -4238,9 +4238,9 @@ TIMER_DEVICE_CALLBACK_MEMBER( igs011_state::lhb_timer_irq_cb )
MACHINE_CONFIG_START(igs011_state::lhb)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lhb)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, lhb_vblank_irq)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lhb)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, lhb_vblank_irq)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lhb_timer_irq_cb, attotime::from_hz(240)) // lev5 frequency drives the music tempo
// irq 3 points to an apparently unneeded routine
MACHINE_CONFIG_END
@@ -4255,9 +4255,9 @@ TIMER_DEVICE_CALLBACK_MEMBER( igs011_state::lev3_timer_irq_cb )
MACHINE_CONFIG_START(igs011_state::wlcc)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wlcc)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wlcc)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev3_timer_irq_cb, attotime::from_hz(240)) // lev3 frequency drives the music tempo
MACHINE_CONFIG_END
@@ -4265,9 +4265,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs011_state::xymg)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(xymg)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(xymg)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev3_timer_irq_cb, attotime::from_hz(240)) // lev3 frequency drives the music tempo
MACHINE_CONFIG_END
@@ -4275,14 +4275,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs011_state::lhb2)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lhb2)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lhb2)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev5_timer_irq_cb, attotime::from_hz(240)) // lev5 frequency drives the music tempo
// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -4290,16 +4290,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs011_state::nkishusp)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nkishusp)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nkishusp)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev3_timer_irq_cb, attotime::from_hz(240)) // lev3 frequency drives the music tempo
// VSync 60.0052Hz, HSync 15.620kHz
// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -4312,27 +4312,27 @@ WRITE_LINE_MEMBER(igs011_state::sound_irq)
MACHINE_CONFIG_START(igs011_state::vbowl)
igs011_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vbowl)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vbowl)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igs011_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", igs011_state, lev3_timer_irq_cb, attotime::from_hz(240)) // lev3 frequency drives the music tempo
// irq 5 points to a debug function (all routines are clearly patched out)
// irq 4 points to an apparently unneeded routine
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(igs011_state, screen_vblank_vbowl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igs011_state, screen_vblank_vbowl))
// MCFG_GFXDECODE_ADD("gfxdecode", "palette", igs011_hi)
MCFG_DEVICE_REMOVE("oki")
MCFG_ICS2115_ADD("ics", 0)
- MCFG_ICS2115_IRQ_CB(WRITELINE(igs011_state, sound_irq))
+ MCFG_ICS2115_IRQ_CB(WRITELINE(*this, igs011_state, sound_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs011_state::vbowlhk)
vbowl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vbowlhk)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vbowlhk)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index ac643d6d7c8..1322962a3d6 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -3573,9 +3573,9 @@ MACHINE_RESET_MEMBER(igs017_state,iqblocka)
}
MACHINE_CONFIG_START(igs017_state::iqblocka)
- MCFG_CPU_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(iqblocka_map)
- MCFG_CPU_IO_MAP(iqblocka_io)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(iqblocka_map)
+ MCFG_DEVICE_IO_MAP(iqblocka_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka)
@@ -3591,7 +3591,7 @@ MACHINE_CONFIG_START(igs017_state::iqblocka)
MCFG_IGS_BITSWAP_IN_PORTA_CB(IOPORT("PLAYER1"))
MCFG_IGS_BITSWAP_IN_PORTB_CB(IOPORT("PLAYER2"))
MCFG_IGS_BITSWAP_IN_PORTC_CB(IOPORT("COINS"))
- MCFG_IGS_BITSWAP_OUT_PORTA_CB(WRITE8(igs017_state, iqblocka_keyin_w))
+ MCFG_IGS_BITSWAP_OUT_PORTA_CB(WRITE8(*this, igs017_state, iqblocka_keyin_w))
MCFG_IGS_BITSWAP_VAL_XOR(0x15d6)
MCFG_IGS_BITSWAP_MF_BITS(3, 5, 9, 11)
MCFG_IGS_BITSWAP_M3_0_BITS(~5, 8, ~10, ~15)
@@ -3618,7 +3618,7 @@ MACHINE_CONFIG_START(igs017_state::iqblocka)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH)
@@ -3628,7 +3628,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs017_state::iqblockf)
iqblocka(config);
MCFG_DEVICE_MODIFY("igs_bitswap") // tweaked protection bitswap
- MCFG_IGS_BITSWAP_OUT_PORTB_CB(WRITE8(igs017_state, iqblockf_keyout_w))
+ MCFG_IGS_BITSWAP_OUT_PORTB_CB(WRITE8(*this, igs017_state, iqblockf_keyout_w))
MCFG_IGS_BITSWAP_MF_BITS(0, 5, 9, 13)
MACHINE_CONFIG_END
@@ -3645,7 +3645,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs017_state::starzan)
iqblocka(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -3671,8 +3671,8 @@ MACHINE_RESET_MEMBER(igs017_state,mgcs)
}
MACHINE_CONFIG_START(igs017_state::mgcs)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mgcs)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mgcs)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs)
@@ -3680,7 +3680,7 @@ MACHINE_CONFIG_START(igs017_state::mgcs)
// i/o
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("COINS"))
- MCFG_I8255_IN_PORTB_CB(READ8(igs017_state, mgcs_keys_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, igs017_state, mgcs_keys_r))
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW )
@@ -3710,8 +3710,8 @@ MACHINE_CONFIG_END
// lhzb2
MACHINE_CONFIG_START(igs017_state::lhzb2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(lhzb2)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(lhzb2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs)
@@ -3760,8 +3760,8 @@ MACHINE_RESET_MEMBER(igs017_state,lhzb2a)
}
MACHINE_CONFIG_START(igs017_state::lhzb2a)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(lhzb2a)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(lhzb2a)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,lhzb2a)
@@ -3806,8 +3806,8 @@ MACHINE_CONFIG_END
// slqz2
MACHINE_CONFIG_START(igs017_state::slqz2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(slqz2)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(slqz2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs)
@@ -3850,8 +3850,8 @@ MACHINE_CONFIG_END
// sdmg2
MACHINE_CONFIG_START(igs017_state::sdmg2)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(sdmg2)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(sdmg2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs)
@@ -3897,8 +3897,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::mgdh_interrupt)
}
MACHINE_CONFIG_START(igs017_state::mgdha)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mgdha_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mgdha_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgdh_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs)
@@ -3932,9 +3932,9 @@ MACHINE_CONFIG_END
// tjsb
MACHINE_CONFIG_START(igs017_state::tjsb)
- MCFG_CPU_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(tjsb_map)
- MCFG_CPU_IO_MAP(tjsb_io)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tjsb_map)
+ MCFG_DEVICE_IO_MAP(tjsb_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka)
@@ -3963,7 +3963,7 @@ MACHINE_CONFIG_START(igs017_state::tjsb)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH)
@@ -3974,9 +3974,9 @@ MACHINE_CONFIG_END
// spkrform
MACHINE_CONFIG_START(igs017_state::spkrform)
- MCFG_CPU_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(spkrform_map)
- MCFG_CPU_IO_MAP(spkrform_io)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(spkrform_map)
+ MCFG_DEVICE_IO_MAP(spkrform_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka)
@@ -4004,7 +4004,7 @@ MACHINE_CONFIG_START(igs017_state::spkrform)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH)
diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp
index 9eda32e95a8..49fbb8d263b 100644
--- a/src/mame/drivers/igs_fear.cpp
+++ b/src/mame/drivers/igs_fear.cpp
@@ -79,8 +79,8 @@ WRITE_LINE_MEMBER(igs_fear_state::sound_irq)
MACHINE_CONFIG_START(igs_fear_state::igs_fear)
- MCFG_CPU_ADD("maincpu",ARM7, 50000000/2)
- MCFG_CPU_PROGRAM_MAP(igs_igs_fear_map)
+ MCFG_DEVICE_ADD("maincpu",ARM7, 50000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(igs_igs_fear_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -99,7 +99,7 @@ MACHINE_CONFIG_START(igs_fear_state::igs_fear)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_ICS2115_ADD("ics", 0)
- MCFG_ICS2115_IRQ_CB(WRITELINE(igs_fear_state, sound_irq))
+ MCFG_ICS2115_IRQ_CB(WRITELINE(*this, igs_fear_state, sound_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp
index 2a00ecafd97..a6f87cc608b 100644
--- a/src/mame/drivers/igs_m027.cpp
+++ b/src/mame/drivers/igs_m027.cpp
@@ -327,8 +327,8 @@ WRITE_LINE_MEMBER(igs_m027_state::vblank_irq)
MACHINE_CONFIG_START(igs_m027_state::igs_majhong)
- MCFG_CPU_ADD("maincpu", ARM7, 20000000)
- MCFG_CPU_PROGRAM_MAP(igs_majhong_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(igs_majhong_map)
//MCFG_NVRAM_ADD_0FILL("nvram")
@@ -340,7 +340,7 @@ MACHINE_CONFIG_START(igs_m027_state::igs_majhong)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(igs_m027_state, screen_update_igs_majhong)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(igs_m027_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igs_m027_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 0x200)
// MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB)
@@ -360,8 +360,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs_m027_state::amazonia)
- MCFG_CPU_ADD("maincpu", ARM7, 20000000)
- MCFG_CPU_PROGRAM_MAP(igs_majhong_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(igs_majhong_map)
//MCFG_NVRAM_ADD_0FILL("nvram")
@@ -374,7 +374,7 @@ MACHINE_CONFIG_START(igs_m027_state::amazonia)
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(igs_m027_state, screen_update_igs_majhong)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(igs_m027_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, igs_m027_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 0x200)
// MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB)
diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp
index 01e386773ef..87dffe58f0a 100644
--- a/src/mame/drivers/igs_m036.cpp
+++ b/src/mame/drivers/igs_m036.cpp
@@ -250,9 +250,9 @@ void igs_m036_state::pgm_create_dummy_internal_arm_region(void)
#define IGS036_CPU ARM7
MACHINE_CONFIG_START(igs_m036_state::igs_m036)
- MCFG_CPU_ADD("maincpu",IGS036_CPU, 20000000)
+ MCFG_DEVICE_ADD("maincpu",IGS036_CPU, 20000000)
- MCFG_CPU_PROGRAM_MAP(igs_m036_map)
+ MCFG_DEVICE_PROGRAM_MAP(igs_m036_map)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -269,9 +269,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igs_m036_state::igs_m036_tt)
- MCFG_CPU_ADD("maincpu",IGS036_CPU, 20000000)
+ MCFG_DEVICE_ADD("maincpu",IGS036_CPU, 20000000)
- MCFG_CPU_PROGRAM_MAP(igs_m036_map)
+ MCFG_DEVICE_PROGRAM_MAP(igs_m036_map)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/igspc.cpp b/src/mame/drivers/igspc.cpp
index 02ba80bc615..b798652a045 100644
--- a/src/mame/drivers/igspc.cpp
+++ b/src/mame/drivers/igspc.cpp
@@ -82,9 +82,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(speeddrv_state::speeddrv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I486, 40000000 ) // ?? at least a pentium
- MCFG_CPU_PROGRAM_MAP(speeddrv_map)
- MCFG_CPU_IO_MAP(speeddrv_io)
+ MCFG_DEVICE_ADD("maincpu", I486, 40000000 ) // ?? at least a pentium
+ MCFG_DEVICE_PROGRAM_MAP(speeddrv_map)
+ MCFG_DEVICE_IO_MAP(speeddrv_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index a31923ea74f..5790ab9d7e9 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -1910,13 +1910,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(igspoker_state::igspoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(igspoker_prg_map)
- MCFG_CPU_IO_MAP(igspoker_io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(igspoker_prg_map)
+ MCFG_DEVICE_IO_MAP(igspoker_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igspoker_state, igs_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(igspoker_state, igs_nmi_and_coins_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, igspoker_state, igs_nmi_and_coins_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SERVICE"))
MCFG_I8255_IN_PORTC_CB(IOPORT("COINS"))
@@ -1935,7 +1935,7 @@ MACHINE_CONFIG_START(igspoker_state::igspoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1957,8 +1957,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igspoker_state::number10)
igspoker(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(number10_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(number10_io_map)
MCFG_DEVICE_REMOVE("ppi")
@@ -1972,8 +1972,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igspoker_state::cpokerpk)
number10(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(cpokerpk_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(cpokerpk_io_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", cpokerpk)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp
index d82236395b0..e1fb9d8cf01 100644
--- a/src/mame/drivers/ikki.cpp
+++ b/src/mame/drivers/ikki.cpp
@@ -243,13 +243,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(ikki_state::ikki_irq)
MACHINE_CONFIG_START(ikki_state::ikki)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MCFG_CPU_PROGRAM_MAP(ikki_cpu1)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ikki_cpu1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ikki_state, ikki_irq, "screen", 0, 1)
- MCFG_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MCFG_CPU_PROGRAM_MAP(ikki_cpu2)
- MCFG_CPU_PERIODIC_INT_DRIVER(ikki_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2) /* 4.000MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ikki_cpu2)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ikki_state, irq0_line_hold, 2*60)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -272,10 +272,10 @@ MACHINE_CONFIG_START(ikki_state::ikki)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, 8000000/4)
+ MCFG_DEVICE_ADD("sn1", SN76496, 8000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_SOUND_ADD("sn2", SN76496, 8000000/2)
+ MCFG_DEVICE_ADD("sn2", SN76496, 8000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/imds.cpp b/src/mame/drivers/imds.cpp
index a94357c67d7..1d24381b5ef 100644
--- a/src/mame/drivers/imds.cpp
+++ b/src/mame/drivers/imds.cpp
@@ -99,9 +99,9 @@ void imds_state::machine_reset()
MACHINE_CONFIG_START(imds_state::imds)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 4_MHz_XTAL) // no idea of clock.
- MCFG_CPU_PROGRAM_MAP(imds_mem)
- MCFG_CPU_IO_MAP(imds_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, 4_MHz_XTAL) // no idea of clock.
+ MCFG_DEVICE_PROGRAM_MAP(imds_mem)
+ MCFG_DEVICE_IO_MAP(imds_io)
// MCFG_INS8250_ADD( "ins8250", imds_com_interface )
diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp
index 8d220318034..e93542570ee 100644
--- a/src/mame/drivers/imds2.cpp
+++ b/src/mame/drivers/imds2.cpp
@@ -759,53 +759,53 @@ static void imds2_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(imds2_state::imds2)
- MCFG_CPU_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(ipc_mem_map)
- MCFG_CPU_IO_MAP(ipc_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ipcsyspic" , pic8259_device , inta_cb)
+ MCFG_DEVICE_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(ipc_mem_map)
+ MCFG_DEVICE_IO_MAP(ipc_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("ipcsyspic" , pic8259_device , inta_cb)
MCFG_QUANTUM_TIME(attotime::from_hz(100))
MCFG_DEVICE_ADD("ipcsyspic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(imds2_state, imds2_ipc_intr))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, imds2_state, imds2_ipc_intr))
MCFG_PIC8259_IN_SP_CB(VCC)
MCFG_DEVICE_ADD("ipclocpic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("ipcsyspic", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("ipcsyspic", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(VCC) // ???
MCFG_DEVICE_ADD("ipctimer" , PIT8253 , 0)
MCFG_PIT8253_CLK0(IPC_XTAL_Y1 / 16)
MCFG_PIT8253_CLK1(IPC_XTAL_Y1 / 16)
MCFG_PIT8253_CLK2(IPC_XTAL_Y1 / 16)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(imds2_state , imds2_baud_clk_0_w))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(imds2_state , imds2_baud_clk_1_w))
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir4_w))
-
- MCFG_DEVICE_ADD("ipcusart0" , I8251 , 0)
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("ipcusart0" , i8251_device , write_cts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir0_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir1_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("serial0" , rs232_port_device , write_txd))
-
- MCFG_DEVICE_ADD("ipcusart1" , I8251 , 0)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir2_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("ipclocpic" , pic8259_device , ir3_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("serial1" , rs232_port_device , write_txd))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("serial1" , rs232_port_device , write_rts))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("serial1" , rs232_port_device , write_dtr))
-
- MCFG_RS232_PORT_ADD("serial0" , default_rs232_devices , nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ipcusart0" , i8251_device , write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ipcusart0" , i8251_device , write_dsr))
-
- MCFG_RS232_PORT_ADD("serial1" , default_rs232_devices , nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ipcusart1" , i8251_device , write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ipcusart1" , i8251_device , write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ipcusart1" , i8251_device , write_dsr))
-
- MCFG_CPU_ADD("ioccpu" , I8080A , IOC_XTAL_Y2 / 18) // 2.448 MHz but running at 50% (due to wait states & DMA usage of bus)
- MCFG_CPU_PROGRAM_MAP(ioc_mem_map)
- MCFG_CPU_IO_MAP(ioc_io_map)
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, imds2_state , imds2_baud_clk_0_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, imds2_state , imds2_baud_clk_1_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir4_w))
+
+ MCFG_DEVICE_ADD("ipcusart0" , I8251 , 0)
+ MCFG_I8251_RTS_HANDLER(WRITELINE("ipcusart0" , i8251_device , write_cts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir0_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir1_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("serial0" , rs232_port_device , write_txd))
+
+ MCFG_DEVICE_ADD("ipcusart1" , I8251 , 0)
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir2_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("ipclocpic" , pic8259_device , ir3_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("serial1" , rs232_port_device , write_txd))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("serial1" , rs232_port_device , write_rts))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("serial1" , rs232_port_device , write_dtr))
+
+ MCFG_DEVICE_ADD("serial0" , RS232_PORT, default_rs232_devices , nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ipcusart0" , i8251_device , write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ipcusart0" , i8251_device , write_dsr))
+
+ MCFG_DEVICE_ADD("serial1" , RS232_PORT, default_rs232_devices , nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ipcusart1" , i8251_device , write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ipcusart1" , i8251_device , write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ipcusart1" , i8251_device , write_dsr))
+
+ MCFG_DEVICE_ADD("ioccpu" , I8080A , IOC_XTAL_Y2 / 18) // 2.448 MHz but running at 50% (due to wait states & DMA usage of bus)
+ MCFG_DEVICE_PROGRAM_MAP(ioc_mem_map)
+ MCFG_DEVICE_IO_MAP(ioc_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(100))
// The IOC CRT hw is a bit complex, as the character clock (CCLK) to i8275
@@ -834,7 +834,7 @@ MACHINE_CONFIG_START(imds2_state::imds2)
MCFG_DEVICE_ADD("ioccrtc" , I8275 , 22853600 / 14)
MCFG_I8275_CHARACTER_WIDTH(14)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(imds2_state , crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("iocdma" , i8257_device , dreq2_w))
MCFG_I8275_IRQ_CALLBACK(INPUTLINE("ioccpu" , I8085_INTR_LINE))
MCFG_VIDEO_SET_SCREEN("screen")
@@ -845,45 +845,45 @@ MACHINE_CONFIG_START(imds2_state::imds2)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("iocbeep" , BEEP , IOC_BEEP_FREQ)
+ MCFG_DEVICE_ADD("iocbeep" , BEEP , IOC_BEEP_FREQ)
MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
MCFG_DEVICE_ADD("iocdma" , I8257 , IOC_XTAL_Y2 / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(imds2_state, imds2_hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(imds2_state , imds2_ioc_mem_r))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(imds2_state , imds2_ioc_mem_w))
- MCFG_I8257_IN_IOR_1_CB(DEVREAD8("iocfdc" , i8271_device , data_r))
- MCFG_I8257_OUT_IOW_1_CB(DEVWRITE8("iocfdc" , i8271_device , data_w))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("ioccrtc" , i8275_device , dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, imds2_state, imds2_hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, imds2_state , imds2_ioc_mem_r))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, imds2_state , imds2_ioc_mem_w))
+ MCFG_I8257_IN_IOR_1_CB(READ8("iocfdc" , i8271_device , data_r))
+ MCFG_I8257_OUT_IOW_1_CB(WRITE8("iocfdc" , i8271_device , data_w))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("ioccrtc" , i8275_device , dack_w))
MCFG_DEVICE_ADD("ioctimer" , PIT8253 , 0)
MCFG_PIT8253_CLK0(IOC_XTAL_Y1 / 4)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("ioctimer" , pit8253_device , write_clk2));
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(imds2_state , imds2_beep_timer_w));
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("ioctimer" , pit8253_device , write_clk2));
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, imds2_state , imds2_beep_timer_w));
MCFG_DEVICE_ADD("iocfdc" , I8271 , IOC_XTAL_Y1 / 2)
- MCFG_I8271_DRQ_CALLBACK(DEVWRITELINE("iocdma" , i8257_device , dreq1_w))
+ MCFG_I8271_DRQ_CALLBACK(WRITELINE("iocdma" , i8257_device , dreq1_w))
MCFG_FLOPPY_DRIVE_ADD("iocfdc:0", imds2_floppies, "8sssd", floppy_image_device::default_floppy_formats)
MCFG_SLOT_FIXED(true)
- MCFG_CPU_ADD("iocpio" , I8041 , IOC_XTAL_Y3)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(imds2_state, imds2_pio_port_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(imds2_state, imds2_pio_port_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(imds2_state, imds2_pio_port_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(imds2_state, imds2_pio_port_p2_w))
+ MCFG_DEVICE_ADD("iocpio" , I8041 , IOC_XTAL_Y3)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, imds2_state, imds2_pio_port_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, imds2_state, imds2_pio_port_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, imds2_state, imds2_pio_port_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, imds2_state, imds2_pio_port_p2_w))
MCFG_QUANTUM_TIME(attotime::from_hz(100))
- MCFG_CPU_ADD("kbcpu", I8741, XTAL(3'579'545)) /* 3.579545 MHz */
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(imds2_state, imds2_kb_port_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(imds2_state, imds2_kb_port_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(imds2_state, imds2_kb_port_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(imds2_state, imds2_kb_port_t1_r))
+ MCFG_DEVICE_ADD("kbcpu", I8741, XTAL(3'579'545)) /* 3.579545 MHz */
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, imds2_state, imds2_kb_port_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, imds2_state, imds2_kb_port_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, imds2_state, imds2_kb_port_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, imds2_state, imds2_kb_port_t1_r))
MCFG_QUANTUM_TIME(attotime::from_hz(100))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(imds2_state , imds2_pio_lpt_ack_w))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(imds2_state , imds2_pio_lpt_busy_w))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(imds2_state , imds2_pio_lpt_select_w))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_ack_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_busy_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, imds2_state , imds2_pio_lpt_select_w))
MACHINE_CONFIG_END
ROM_START(imds2)
diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp
index 4eb84d4f0d1..1eacf20a214 100644
--- a/src/mame/drivers/imolagp.cpp
+++ b/src/mame/drivers/imolagp.cpp
@@ -508,14 +508,14 @@ void imolagp_state::machine_reset()
MACHINE_CONFIG_START(imolagp_state::imolagp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3000000) // ? (assume slower than slave)
- MCFG_CPU_PROGRAM_MAP(imolagp_master_map)
- MCFG_CPU_IO_MAP(imolagp_master_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3000000) // ? (assume slower than slave)
+ MCFG_DEVICE_PROGRAM_MAP(imolagp_master_map)
+ MCFG_DEVICE_IO_MAP(imolagp_master_io)
MCFG_TIMER_DRIVER_ADD("pot", imolagp_state, imolagp_pot_callback) // maincpu nmi
- MCFG_CPU_ADD("slave", Z80, 4000000) // ?
- MCFG_CPU_PROGRAM_MAP(imolagp_slave_map)
- MCFG_CPU_IO_MAP(imolagp_slave_io)
+ MCFG_DEVICE_ADD("slave", Z80, 4000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(imolagp_slave_map)
+ MCFG_DEVICE_IO_MAP(imolagp_slave_io)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -535,14 +535,14 @@ MACHINE_CONFIG_START(imolagp_state::imolagp)
MCFG_SCREEN_UPDATE_DRIVER(imolagp_state, screen_update_imolagp)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(imolagp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, imolagp_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 0x20)
MCFG_PALETTE_INIT_OWNER(imolagp_state, imolagp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000) // ?
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp
index c45c0f41fb4..a3ffb6841ce 100644
--- a/src/mame/drivers/imsai.cpp
+++ b/src/mame/drivers/imsai.cpp
@@ -107,9 +107,9 @@ void imsai_state::machine_reset()
MACHINE_CONFIG_START(imsai_state::imsai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(imsai_mem)
- MCFG_CPU_IO_MAP(imsai_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(imsai_mem)
+ MCFG_DEVICE_IO_MAP(imsai_io)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
@@ -120,8 +120,8 @@ MACHINE_CONFIG_START(imsai_state::imsai)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(6'000'000) / 3) /* Timer 0: baud rate gen for 8251 */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_PIT8253_CLK1(XTAL(6'000'000) / 3) /* Timer 1: user */
MCFG_PIT8253_CLK2(XTAL(6'000'000) / 3) /* Timer 2: user */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index 73f036f2f58..1587fe9c6ca 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -1356,9 +1356,9 @@ DRIVER_INIT_MEMBER( inder_state, inder1 )
MACHINE_CONFIG_START(inder_state::brvteam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(brvteam_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(brvteam_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1368,15 +1368,15 @@ MACHINE_CONFIG_START(inder_state::brvteam)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("snvol")
- MCFG_SOUND_ADD("sn", SN76489, XTAL(8'000'000) / 2) // jumper choice of 2 or 4 MHz
+ MCFG_DEVICE_ADD("sn", SN76489, XTAL(8'000'000) / 2) // jumper choice of 2 or 4 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "snvol", 2.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(inder_state::canasta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(canasta_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(canasta_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1386,18 +1386,18 @@ MACHINE_CONFIG_START(inder_state::canasta)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay", AY8910, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_ADD("ay", AY8910, XTAL(4'000'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(inder_state::lapbylap)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(lapbylap_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(lapbylap_sub_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE555
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(lapbylap_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(lapbylap_sub_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE555
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1407,21 +1407,21 @@ MACHINE_CONFIG_START(inder_state::lapbylap)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(2'000'000)) // same xtal that drives subcpu
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(2'000'000)) // same xtal that drives subcpu
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(2'000'000)) // same xtal that drives subcpu
- MCFG_AY8910_PORT_A_READ_CB(READ8(inder_state, sndcmd_r))
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(2'000'000)) // same xtal that drives subcpu
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, inder_state, sndcmd_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(inder_state::inder)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(inder_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(inder_sub_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE555
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(inder_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE556
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(inder_sub_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(inder_state, irq0_line_hold, 250) // NE555
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1431,65 +1431,65 @@ MACHINE_CONFIG_START(inder_state::inder)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("msmvol")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("9a", ttl7474_device, clock_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("9b", ttl7474_device, clock_w)) // order of writes is sensitive
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE("9a", ttl7474_device, clock_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("9b", ttl7474_device, clock_w)) // order of writes is sensitive
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmvol", 1.0)
/* Devices */
MCFG_DEVICE_ADD("ppi60", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(inder_state, ppi60a_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(inder_state, ppi60a_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(inder_state, ppi60b_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(inder_state, ppi60b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(inder_state, sw_r))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(inder_state, ppi60c_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, inder_state, ppi60a_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, inder_state, ppi60a_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, inder_state, ppi60b_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, inder_state, ppi60b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, inder_state, sw_r))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, inder_state, ppi60c_w))
MCFG_DEVICE_ADD("ppi64", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(inder_state, ppi64a_r))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(inder_state, ppi64a_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(inder_state, ppi64b_r))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(inder_state, ppi64b_w))
- //MCFG_I8255_IN_PORTC_CB(READ8(inder_state, ppi64c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(inder_state, ppi64c_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, inder_state, ppi64a_r))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, inder_state, ppi64a_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, inder_state, ppi64b_r))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, inder_state, ppi64b_w))
+ //MCFG_I8255_IN_PORTC_CB(READ8(*this, inder_state, ppi64c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, inder_state, ppi64c_w))
MCFG_DEVICE_ADD("ppi68", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(inder_state, ppi68a_r))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(inder_state, ppi68a_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(inder_state, ppi68b_r))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(inder_state, ppi68b_w))
- //MCFG_I8255_IN_PORTC_CB(READ8(inder_state, ppi68c_r))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(inder_state, ppi68c_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, inder_state, ppi68a_r))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, inder_state, ppi68a_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, inder_state, ppi68b_r))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, inder_state, ppi68b_w))
+ //MCFG_I8255_IN_PORTC_CB(READ8(*this, inder_state, ppi68c_r))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, inder_state, ppi68c_w))
MCFG_DEVICE_ADD("ppi6c", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(inder_state, ppi6ca_r))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(inder_state, ppi6ca_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(inder_state, ppi6cb_r))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(inder_state, ppi6cb_w))
- //MCFG_I8255_IN_PORTC_CB(READ8(inder_state, ppi6cc_r))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(inder_state, ppi6cc_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, inder_state, ppi6ca_r))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, inder_state, ppi6ca_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, inder_state, ppi6cb_r))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, inder_state, ppi6cb_w))
+ //MCFG_I8255_IN_PORTC_CB(READ8(*this, inder_state, ppi6cc_r))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, inder_state, ppi6cc_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(inder_state, ppia_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(inder_state, ppia_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(inder_state, ppib_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(inder_state, ppib_w))
- MCFG_I8255_IN_PORTC_CB(READ8(inder_state, ppic_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(inder_state, ppic_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, inder_state, ppia_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, inder_state, ppia_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, inder_state, ppib_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, inder_state, ppib_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, inder_state, ppic_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, inder_state, ppic_w))
MCFG_DEVICE_ADD("7a", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(inder_state, qc7a_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, inder_state, qc7a_w))
MCFG_DEVICE_ADD("9a", TTL7474, 0) // HCT74
- MCFG_7474_OUTPUT_CB(WRITELINE(inder_state, q9a_w))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, inder_state, q9a_w))
MCFG_DEVICE_ADD("9b", TTL7474, 0) // HCT74
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(inder_state, qc9b_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, inder_state, qc9b_w))
MCFG_DEVICE_ADD("13", HCT157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp
index 31401d617c0..15bd0d2886d 100644
--- a/src/mame/drivers/inderp.cpp
+++ b/src/mame/drivers/inderp.cpp
@@ -197,11 +197,11 @@ WRITE_LINE_MEMBER( inderp_state::clock_tick )
MACHINE_CONFIG_START(inderp_state::inderp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6504, 434000) // possible calculation of frequency-derived time constant 100k res and 10pf cap
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6504, 434000) // possible calculation of frequency-derived time constant 100k res and 10pf cap
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
MCFG_DEVICE_ADD("cpoint_clock", CLOCK, 200) // crosspoint detector
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(inderp_state, clock_tick))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, inderp_state, clock_tick))
/* video hardware */
//MCFG_DEFAULT_LAYOUT()
diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp
index a2ce808c564..25836c85cd2 100644
--- a/src/mame/drivers/indiana.cpp
+++ b/src/mame/drivers/indiana.cpp
@@ -92,25 +92,26 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(indiana_state::indiana)
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68030, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(indiana_mem)
+ MCFG_DEVICE_ADD(M68K_TAG, M68030, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(indiana_mem)
+ // FIXME: determine ISA bus clock
MCFG_DEVICE_ADD(ISABUS_TAG, ISA16, 0)
MCFG_ISA16_CPU(M68K_TAG)
MCFG_ISA16_BUS_CUSTOM_SPACES()
- MCFG_ISA16_SLOT_ADD(ISABUS_TAG, "isa1", indiana_isa_cards, "vga", false)
- MCFG_ISA16_SLOT_ADD(ISABUS_TAG, "isa2", indiana_isa_cards, "fdc_at", false)
- MCFG_ISA16_SLOT_ADD(ISABUS_TAG, "isa3", indiana_isa_cards, "comat", false)
- MCFG_ISA16_SLOT_ADD(ISABUS_TAG, "isa4", indiana_isa_cards, "ide", false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, ISABUS_TAG, indiana_isa_cards, "vga", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, ISABUS_TAG, indiana_isa_cards, "fdc_at", false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, ISABUS_TAG, indiana_isa_cards, "comat", false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, ISABUS_TAG, indiana_isa_cards, "ide", false)
MCFG_DEVICE_ADD(MFP_TAG, MC68901, XTAL(16'000'000)/4)
MCFG_MC68901_TIMER_CLOCK(XTAL(16'000'000)/4)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE("keyboard", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("keyboard", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MFP_TAG, mc68901_device, write_rx))
+ MCFG_DEVICE_ADD("keyboard", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MFP_TAG, mc68901_device, write_rx))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", keyboard)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp
index 8b4e5805f92..8034147d940 100644
--- a/src/mame/drivers/indigo.cpp
+++ b/src/mame/drivers/indigo.cpp
@@ -584,9 +584,9 @@ void indigo_state::cdrom_config(device_t *device)
}
MACHINE_CONFIG_START(indigo_state::indigo3k)
- MCFG_CPU_ADD("maincpu", R3041, 33000000)
+ MCFG_DEVICE_ADD("maincpu", R3041, 33000000)
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_CPU_PROGRAM_MAP(indigo3k_map)
+ MCFG_DEVICE_PROGRAM_MAP(indigo3k_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -609,17 +609,17 @@ MACHINE_CONFIG_START(indigo_state::indigo3k)
MCFG_DEVICE_ADD("wd33c93", WD33C93, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_WD33C93_IRQ_CB(WRITELINE(indigo_state, scsi_irq)) /* command completion IRQ */
+ MCFG_WD33C93_IRQ_CB(WRITELINE(*this, indigo_state, scsi_irq)) /* command completion IRQ */
MCFG_EEPROM_SERIAL_93C56_ADD("eeprom")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(indigo_state::indigo4k)
indigo3k(config);
- MCFG_CPU_REPLACE("maincpu", R4600BE, 150000000) // Should be R4400
+ MCFG_DEVICE_REPLACE("maincpu", R4600BE, 150000000) // Should be R4400
MCFG_MIPS3_ICACHE_SIZE(32768)
MCFG_MIPS3_DCACHE_SIZE(32768)
- MCFG_CPU_PROGRAM_MAP(indigo4k_map)
+ MCFG_DEVICE_PROGRAM_MAP(indigo4k_map)
MCFG_DEVICE_ADD("sgi_mc", SGI_MC, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index b816f0415c8..5317e66ffba 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -207,10 +207,10 @@ void ip22_state::cdrom_config(device_t *device)
}
MACHINE_CONFIG_START(ip22_state::ip225015)
- MCFG_CPU_ADD("maincpu", R5000BE, 50000000*3)
+ MCFG_DEVICE_ADD("maincpu", R5000BE, 50000000*3)
//MCFG_MIPS3_ICACHE_SIZE(32768)
//MCFG_MIPS3_DCACHE_SIZE(32768)
- MCFG_CPU_PROGRAM_MAP(ip225015_map)
+ MCFG_DEVICE_PROGRAM_MAP(ip225015_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -228,7 +228,7 @@ MACHINE_CONFIG_START(ip22_state::ip225015)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(ip22_state::ip225015)
MCFG_DEVICE_ADD("wd33c93", WD33C93, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_WD33C93_IRQ_CB(DEVWRITELINE(HPC3_TAG, hpc3_device, scsi_irq))
+ MCFG_WD33C93_IRQ_CB(WRITELINE(HPC3_TAG, hpc3_device, scsi_irq))
MCFG_SGI_HAL2_ADD(HAL2_TAG)
@@ -256,18 +256,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ip22_state::ip224613)
ip225015(config);
- MCFG_CPU_REPLACE("maincpu", R4600BE, 133333333)
+ MCFG_DEVICE_REPLACE("maincpu", R4600BE, 133333333)
//MCFG_MIPS3_ICACHE_SIZE(32768)
//MCFG_MIPS3_DCACHE_SIZE(32768)
- MCFG_CPU_PROGRAM_MAP( ip225015_map)
+ MCFG_DEVICE_PROGRAM_MAP( ip225015_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ip22_state::ip244415)
ip225015(config);
- MCFG_CPU_REPLACE("maincpu", R4600BE, 150000000)
+ MCFG_DEVICE_REPLACE("maincpu", R4600BE, 150000000)
//MCFG_MIPS3_ICACHE_SIZE(32768)
//MCFG_MIPS3_DCACHE_SIZE(32768)
- MCFG_CPU_PROGRAM_MAP(ip225015_map)
+ MCFG_DEVICE_PROGRAM_MAP(ip225015_map)
MACHINE_CONFIG_END
/* SCC init ip225015
diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp
index 8cfc745594d..46fcdaef4bf 100644
--- a/src/mame/drivers/instantm.cpp
+++ b/src/mame/drivers/instantm.cpp
@@ -126,19 +126,19 @@ void instantm_state::machine_reset()
MACHINE_CONFIG_START(instantm_state::instantm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_IO_MAP(sub_io)
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_IO_MAP(sub_io)
// all guesswork
MCFG_DEVICE_ADD("voice_clock", CLOCK, 24000)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(instantm_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, instantm_state, clock_w))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp
index 780c3f0476e..044f5d67b5e 100644
--- a/src/mame/drivers/instruct.cpp
+++ b/src/mame/drivers/instruct.cpp
@@ -420,13 +420,13 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct )
MACHINE_CONFIG_START(instruct_state::instruct)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL(3'579'545) / 4)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_DATA_MAP(data_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(instruct_state, t2l_int, 120)
- MCFG_S2650_SENSE_INPUT(READLINE(instruct_state, sense_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(instruct_state, flag_w))
+ MCFG_DEVICE_ADD("maincpu",S2650, XTAL(3'579'545) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_DATA_MAP(data_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(instruct_state, t2l_int, 120)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, instruct_state, sense_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, instruct_state, flag_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_instruct)
diff --git a/src/mame/drivers/inteladv.cpp b/src/mame/drivers/inteladv.cpp
index 98988c8bfe0..de0dd2d6f86 100644
--- a/src/mame/drivers/inteladv.cpp
+++ b/src/mame/drivers/inteladv.cpp
@@ -81,8 +81,8 @@ void inteladv_state::machine_reset()
MACHINE_CONFIG_START(inteladv_state::inteladv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, XTAL(1'000'000) )
- MCFG_CPU_PROGRAM_MAP(inteladv_main)
+ MCFG_DEVICE_ADD("maincpu", R65C02, XTAL(1'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(inteladv_main)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp
index daae3191a46..b9815b3e440 100644
--- a/src/mame/drivers/intellec4.cpp
+++ b/src/mame/drivers/intellec4.cpp
@@ -818,47 +818,47 @@ DEVICE_INPUT_DEFAULTS_START(tty)
DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(intellec4_state::intellec4)
- MCFG_DEVICE_ADD("prgbank", ADDRESS_MAP_BANK, 0)
+ MCFG_DEVICE_ADD(m_program_banks, ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(intellec4_program_banks)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(14)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
- MCFG_DEVICE_ADD("rpbank", ADDRESS_MAP_BANK, 0)
+ MCFG_DEVICE_ADD(m_rom_port_banks, ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(intellec4_rom_port_banks)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
MCFG_ADDRESS_MAP_BANK_DATA_WIDTH(8)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(14)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
- MCFG_DEVICE_ADD("promprg", INTEL_IMM6_76, 0)
+ MCFG_DEVICE_ADD(m_prom_programmer, INTEL_IMM6_76, 0)
- MCFG_RS232_PORT_ADD("tty", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD(m_tty, RS232_PORT, default_rs232_devices, "terminal")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", tty)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("null_modem", tty)
- MCFG_DEVICE_ADD("bus", INTELLEC4_UNIV_BUS, 518000. / 7)
- MCFG_INTELLEC4_UNIV_BUS_ROM_SPACE("prgbank", AS_PROGRAM)
- MCFG_INTELLEC4_UNIV_BUS_ROM_PORTS_SPACE("rpbank", AS_PROGRAM)
- MCFG_INTELLEC4_UNIV_BUS_MEMORY_SPACE("maincpu", mcs40_cpu_device_base::AS_RAM_MEMORY)
- MCFG_INTELLEC4_UNIV_BUS_STATUS_SPACE("maincpu", mcs40_cpu_device_base::AS_RAM_STATUS)
- MCFG_INTELLEC4_UNIV_BUS_RAM_PORTS_SPACE("maincpu", mcs40_cpu_device_base::AS_RAM_PORTS)
- MCFG_INTELLEC4_UNIV_BUS_RESET_4002_CB(WRITELINE(intellec4_state, bus_reset_4002))
- MCFG_INTELLEC4_UNIV_BUS_USER_RESET_CB(WRITELINE(intellec4_state, bus_user_reset))
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j7", 5.185_MHz_XTAL / 7, intellec4_univ_cards, "imm4_90")
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j8", 5.185_MHz_XTAL / 7, intellec4_univ_cards, "imm6_26")
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j9", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j10", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j11", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j12", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j13", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j14", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j15", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j16", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j17", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j18", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
- MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j19", 5.185_MHz_XTAL / 7, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD(m_bus, INTELLEC4_UNIV_BUS, 518000. / 7)
+ MCFG_INTELLEC4_UNIV_BUS_ROM_SPACE(m_program_banks, AS_PROGRAM)
+ MCFG_INTELLEC4_UNIV_BUS_ROM_PORTS_SPACE(m_rom_port_banks, AS_PROGRAM)
+ MCFG_INTELLEC4_UNIV_BUS_MEMORY_SPACE(m_cpu, mcs40_cpu_device_base::AS_RAM_MEMORY)
+ MCFG_INTELLEC4_UNIV_BUS_STATUS_SPACE(m_cpu, mcs40_cpu_device_base::AS_RAM_STATUS)
+ MCFG_INTELLEC4_UNIV_BUS_RAM_PORTS_SPACE(m_cpu, mcs40_cpu_device_base::AS_RAM_PORTS)
+ MCFG_INTELLEC4_UNIV_BUS_RESET_4002_CB(WRITELINE(*this, intellec4_state, bus_reset_4002))
+ MCFG_INTELLEC4_UNIV_BUS_USER_RESET_CB(WRITELINE(*this, intellec4_state, bus_user_reset))
+ MCFG_DEVICE_ADD("j7", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, "imm4_90")
+ MCFG_DEVICE_ADD("j8", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, "imm6_26")
+ MCFG_DEVICE_ADD("j9", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j10", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j11", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j12", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j13", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j14", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j15", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j16", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j17", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j18", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
+ MCFG_DEVICE_ADD("j19", INTELLEC4_UNIV_SLOT, 5.185_MHz_XTAL / 7, m_bus, intellec4_univ_cards, nullptr)
MACHINE_CONFIG_END
@@ -1123,7 +1123,7 @@ INPUT_CHANGED_MEMBER(mod4_state::sw_one_shot)
MACHINE_CONFIG_START(mod4_state::mod4)
intellec4(config);
- MCFG_CPU_ADD("maincpu", I4004, 5.185_MHz_XTAL / 7)
+ MCFG_DEVICE_ADD(m_cpu, I4004, 5.185_MHz_XTAL / 7)
MCFG_I4004_ROM_MAP(intellec4_rom)
MCFG_I4004_RAM_MEMORY_MAP(intellec4_ram_memory)
MCFG_I4004_ROM_PORTS_MAP(intellec4_rom_ports)
@@ -1131,10 +1131,10 @@ MACHINE_CONFIG_START(mod4_state::mod4)
MCFG_I4004_RAM_PORTS_MAP(intellec4_ram_ports)
MCFG_I4004_PROGRAM_MEMORY_MAP(intellec4_program_memory)
MCFG_I4004_BUS_CYCLE_CB(BUSCYCLE(mod4_state, bus_cycle));
- MCFG_I4004_SYNC_CB(DEVWRITELINE("bus", bus::intellec4::univ_bus_device, sync_in))
+ MCFG_I4004_SYNC_CB(WRITELINE(m_bus, bus::intellec4::univ_bus_device, sync_in))
MCFG_DEVICE_MODIFY("bus")
- MCFG_INTELLEC4_UNIV_BUS_TEST_CB(WRITELINE(mod4_state, bus_test))
+ MCFG_INTELLEC4_UNIV_BUS_TEST_CB(WRITELINE(*this, mod4_state, bus_test))
MCFG_DEFAULT_LAYOUT(layout_intlc44)
MACHINE_CONFIG_END
@@ -1348,7 +1348,7 @@ INPUT_CHANGED_MEMBER(mod40_state::sw_single_step)
MACHINE_CONFIG_START(mod40_state::mod40)
intellec4(config);
- MCFG_CPU_ADD("maincpu", I4040, 5.185_MHz_XTAL / 7)
+ MCFG_DEVICE_ADD(m_cpu, I4040, 5.185_MHz_XTAL / 7)
MCFG_I4040_ROM_MAP(intellec4_rom)
MCFG_I4040_RAM_MEMORY_MAP(intellec4_ram_memory)
MCFG_I4040_ROM_PORTS_MAP(intellec4_rom_ports)
@@ -1356,12 +1356,12 @@ MACHINE_CONFIG_START(mod40_state::mod40)
MCFG_I4040_RAM_PORTS_MAP(intellec4_ram_ports)
MCFG_I4040_PROGRAM_MEMORY_MAP(intellec4_program_memory)
MCFG_I4040_BUS_CYCLE_CB(BUSCYCLE(mod40_state, bus_cycle));
- MCFG_I4040_SYNC_CB(DEVWRITELINE("bus", bus::intellec4::univ_bus_device, sync_in))
- MCFG_I4040_STP_ACK_CB(WRITELINE(mod40_state, stp_ack))
+ MCFG_I4040_SYNC_CB(WRITELINE(m_bus, bus::intellec4::univ_bus_device, sync_in))
+ MCFG_I4040_STP_ACK_CB(WRITELINE(*this, mod40_state, stp_ack))
MCFG_DEVICE_MODIFY("bus")
- MCFG_INTELLEC4_UNIV_BUS_STOP_CB(WRITELINE(mod40_state, bus_stop))
- MCFG_INTELLEC4_UNIV_BUS_TEST_CB(WRITELINE(mod40_state, bus_test))
+ MCFG_INTELLEC4_UNIV_BUS_STOP_CB(WRITELINE(*this, mod40_state, bus_stop))
+ MCFG_INTELLEC4_UNIV_BUS_TEST_CB(WRITELINE(*this, mod40_state, bus_test))
MCFG_DEFAULT_LAYOUT(layout_intlc440)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp
index 6d77e61fcca..431b1c95029 100644
--- a/src/mame/drivers/interact.cpp
+++ b/src/mame/drivers/interact.cpp
@@ -127,9 +127,9 @@ uint32_t interact_state::screen_update_interact(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(interact_state::interact)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(interact_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(interact_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/
MCFG_MACHINE_RESET_OVERRIDE(interact_state,interact)
MCFG_MACHINE_START_OVERRIDE(interact_state,interact)
@@ -164,9 +164,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(interact_state::hector1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(interact_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(interact_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(interact_state, irq0_line_hold, 50) /* put on the I8080 irq in Hz*/
MCFG_MACHINE_RESET_OVERRIDE(interact_state,interact)
MCFG_MACHINE_START_OVERRIDE(interact_state,interact)
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index 9449f6001b2..e7ec02ef531 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -479,37 +479,37 @@ static void interpro_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(interpro_state::interpro_scc1)
MCFG_DEVICE_MODIFY(INTERPRO_SCC1_TAG)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT1_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT2_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_INT_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w))
- MCFG_Z80SCC_OUT_WREQA_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial1))
- MCFG_Z80SCC_OUT_WREQB_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial2))
-
- MCFG_RS232_PORT_ADD(INTERPRO_SERIAL_PORT1_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD(INTERPRO_SERIAL_PORT2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INTERPRO_SCC1_TAG, z80scc_device, ctsb_w))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(INTERPRO_SERIAL_PORT1_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(INTERPRO_SERIAL_PORT2_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w))
+ MCFG_Z80SCC_OUT_WREQA_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial1))
+ MCFG_Z80SCC_OUT_WREQB_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial2))
+
+ MCFG_DEVICE_ADD(INTERPRO_SERIAL_PORT1_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INTERPRO_SCC1_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INTERPRO_SCC1_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INTERPRO_SCC1_TAG, z80scc_device, ctsa_w))
+
+ MCFG_DEVICE_ADD(INTERPRO_SERIAL_PORT2_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INTERPRO_SCC1_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INTERPRO_SCC1_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INTERPRO_SCC1_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(interpro_state::interpro_scc2)
MCFG_DEVICE_MODIFY(INTERPRO_SCC2_TAG)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(INTERPRO_SERIAL_PORT0_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_INT_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w))
- MCFG_Z80SCC_OUT_WREQB_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial0))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(INTERPRO_SERIAL_PORT0_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir11_w))
+ MCFG_Z80SCC_OUT_WREQB_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_serial0))
MCFG_INTERPRO_KEYBOARD_PORT_ADD(INTERPRO_KEYBOARD_PORT_TAG, interpro_keyboard_devices, "hle_en_us")
- MCFG_INTERPRO_KEYBOARD_RXD_HANDLER(DEVWRITELINE(INTERPRO_SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_INTERPRO_KEYBOARD_RXD_HANDLER(WRITELINE(INTERPRO_SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_PORT_ADD(INTERPRO_SERIAL_PORT0_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INTERPRO_SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INTERPRO_SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INTERPRO_SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(INTERPRO_SERIAL_PORT0_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INTERPRO_SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INTERPRO_SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INTERPRO_SCC2_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
static void interpro_scsi_devices(device_slot_interface &device)
@@ -533,28 +533,28 @@ void interpro_state::interpro_scsi_adapter(device_t *device)
devcb_base *devcb;
(void)devcb;
MCFG_DEVICE_CLOCK(XTAL(24'000'000))
- MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, ir0_w))
- MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, drq_scsi))
+ MCFG_NCR5390_IRQ_HANDLER(WRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, ir0_w))
+ MCFG_NCR5390_DRQ_HANDLER(WRITELINE(":" INTERPRO_IOGA_TAG, interpro_ioga_device, drq_scsi))
}
MACHINE_CONFIG_START(interpro_state::ioga)
MCFG_DEVICE_MODIFY(INTERPRO_IOGA_TAG)
MCFG_INTERPRO_IOGA_NMI_CB(INPUTLINE(INTERPRO_CPU_TAG, INPUT_LINE_NMI))
MCFG_INTERPRO_IOGA_IRQ_CB(INPUTLINE(INTERPRO_CPU_TAG, INPUT_LINE_IRQ0))
- MCFG_INTERPRO_IOGA_IVEC_CB(DEVWRITE8(INTERPRO_CPU_TAG, clipper_device, set_ivec))
+ MCFG_INTERPRO_IOGA_IVEC_CB(WRITE8(INTERPRO_CPU_TAG, clipper_device, set_ivec))
// ioga dma and serial dma channels
// TODO: check serial dma channels - scc2chanA (keyboard) has no dma
//MCFG_INTERPRO_IOGA_DMA_CB(0, unknown) // plotter
- MCFG_INTERPRO_IOGA_DMA_CB(1, DEVREAD8(INTERPRO_SCSI_DEVICE_TAG, ncr53c90a_device, mdma_r), DEVWRITE8(INTERPRO_SCSI_DEVICE_TAG, ncr53c90a_device, mdma_w))
- MCFG_INTERPRO_IOGA_DMA_CB(2, DEVREAD8(INTERPRO_FDC_TAG, upd765_family_device, mdma_r), DEVWRITE8(INTERPRO_FDC_TAG, upd765_family_device, mdma_w))
- MCFG_INTERPRO_IOGA_SERIAL_DMA_CB(0, DEVREAD8(INTERPRO_SCC2_TAG, z80scc_device, db_r), DEVWRITE8(INTERPRO_SCC2_TAG, z80scc_device, db_w))
- MCFG_INTERPRO_IOGA_SERIAL_DMA_CB(1, DEVREAD8(INTERPRO_SCC1_TAG, z80scc_device, da_r), DEVWRITE8(INTERPRO_SCC1_TAG, z80scc_device, da_w))
- MCFG_INTERPRO_IOGA_SERIAL_DMA_CB(2, DEVREAD8(INTERPRO_SCC1_TAG, z80scc_device, db_r), DEVWRITE8(INTERPRO_SCC1_TAG, z80scc_device, db_w))
+ MCFG_INTERPRO_IOGA_DMA_CB(1, READ8(INTERPRO_SCSI_DEVICE_TAG, ncr53c90a_device, mdma_r), WRITE8(INTERPRO_SCSI_DEVICE_TAG, ncr53c90a_device, mdma_w))
+ MCFG_INTERPRO_IOGA_DMA_CB(2, READ8(INTERPRO_FDC_TAG, upd765_family_device, mdma_r), WRITE8(INTERPRO_FDC_TAG, upd765_family_device, mdma_w))
+ MCFG_INTERPRO_IOGA_SERIAL_DMA_CB(0, READ8(INTERPRO_SCC2_TAG, z80scc_device, db_r), WRITE8(INTERPRO_SCC2_TAG, z80scc_device, db_w))
+ MCFG_INTERPRO_IOGA_SERIAL_DMA_CB(1, READ8(INTERPRO_SCC1_TAG, z80scc_device, da_r), WRITE8(INTERPRO_SCC1_TAG, z80scc_device, da_w))
+ MCFG_INTERPRO_IOGA_SERIAL_DMA_CB(2, READ8(INTERPRO_SCC1_TAG, z80scc_device, db_r), WRITE8(INTERPRO_SCC1_TAG, z80scc_device, db_w))
// ioga floppy terminal count, ethernet channel attention
- MCFG_INTERPRO_IOGA_FDCTC_CB(DEVWRITELINE(INTERPRO_FDC_TAG, upd765_family_device, tc_line_w))
- MCFG_INTERPRO_IOGA_ETH_CA_CB(DEVWRITELINE(INTERPRO_ETH_TAG, i82586_base_device, ca))
+ MCFG_INTERPRO_IOGA_FDCTC_CB(WRITELINE(INTERPRO_FDC_TAG, upd765_family_device, tc_line_w))
+ MCFG_INTERPRO_IOGA_ETH_CA_CB(WRITELINE(INTERPRO_ETH_TAG, i82586_base_device, ca))
MACHINE_CONFIG_END
static INPUT_PORTS_START(interpro)
@@ -569,7 +569,7 @@ MACHINE_CONFIG_START(interpro_state::interpro)
// srx gate array
MCFG_DEVICE_ADD(INTERPRO_SGA_TAG, INTERPRO_SGA, 0)
- MCFG_INTERPRO_SGA_BERR_CB(DEVWRITE32(INTERPRO_IOGA_TAG, interpro_ioga_device, bus_error))
+ MCFG_INTERPRO_SGA_BERR_CB(WRITE32(INTERPRO_IOGA_TAG, interpro_ioga_device, bus_error))
// floppy
@@ -578,7 +578,7 @@ MACHINE_CONFIG_START(interpro_state::interpro)
// real-time clock/non-volatile memory
MCFG_MC146818_ADD(INTERPRO_RTC_TAG, XTAL(32'768))
MCFG_MC146818_UTC(true)
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir9_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir9_w))
// scsi
MCFG_NSCSI_BUS_ADD(INTERPRO_SCSI_TAG)
@@ -596,7 +596,7 @@ MACHINE_CONFIG_START(interpro_state::interpro)
// sr bus and slots
MCFG_DEVICE_ADD(INTERPRO_SRBUS_TAG, SR, 0)
- MCFG_SR_OUT_IRQ0_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir6_w))
+ MCFG_SR_OUT_IRQ0_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir6_w))
MCFG_SR_SLOT_ADD(INTERPRO_SRBUS_TAG, INTERPRO_SRBUS_TAG ":0", sr_cards, "mpcb963", false)
MCFG_SR_SLOT_ADD(INTERPRO_SRBUS_TAG, INTERPRO_SRBUS_TAG ":1", sr_cards, nullptr, false)
@@ -609,17 +609,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(turquoise_state::turquoise)
interpro(config);
- MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C300, XTAL(12'500'000))
+ MCFG_DEVICE_ADD(INTERPRO_CPU_TAG, CLIPPER_C300, XTAL(12'500'000))
MCFG_DEVICE_ADDRESS_MAP(0, turquoise_main_map)
MCFG_DEVICE_ADDRESS_MAP(1, turquoise_io_map)
MCFG_DEVICE_ADDRESS_MAP(2, interpro_boot_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, acknowledge_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, acknowledge_interrupt)
MCFG_DEVICE_ADD(INTERPRO_MMU_TAG "_i", CAMMU_C3, 0)
- MCFG_CAMMU_EXCEPTION_CB(DEVWRITE16(INTERPRO_CPU_TAG, clipper_device, set_exception))
+ MCFG_CAMMU_EXCEPTION_CB(WRITE16(INTERPRO_CPU_TAG, clipper_device, set_exception))
MCFG_DEVICE_ADD(INTERPRO_MMU_TAG "_d", CAMMU_C3, 0)
- MCFG_CAMMU_EXCEPTION_CB(DEVWRITE16(INTERPRO_CPU_TAG, clipper_device, set_exception))
+ MCFG_CAMMU_EXCEPTION_CB(WRITE16(INTERPRO_CPU_TAG, clipper_device, set_exception))
MCFG_CAMMU_LINK(INTERPRO_MMU_TAG "_i")
// boot fails memory test without this
@@ -631,8 +631,8 @@ MACHINE_CONFIG_START(turquoise_state::turquoise)
// floppy controller
MCFG_I82072_ADD(INTERPRO_FDC_TAG, false)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir1_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_floppy))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir1_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_floppy))
// connect a 3.5" drive at id 3
MCFG_DEVICE_ADD("fdc:0", FLOPPY_CONNECTOR, 0)
@@ -653,7 +653,7 @@ MACHINE_CONFIG_START(turquoise_state::turquoise)
// ethernet controller
MCFG_DEVICE_ADD(INTERPRO_ETH_TAG, I82586, 0)
- MCFG_I82586_IRQ_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir12_w))
+ MCFG_I82586_IRQ_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir12_w))
MCFG_DEVICE_ADDRESS_MAP(0, interpro_82586_map)
// i/o gate array
@@ -667,23 +667,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sapphire_state::sapphire)
interpro(config);
- MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL(12'500'000))
+ MCFG_DEVICE_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL(12'500'000))
MCFG_DEVICE_ADDRESS_MAP(0, sapphire_main_map)
MCFG_DEVICE_ADDRESS_MAP(1, sapphire_io_map)
MCFG_DEVICE_ADDRESS_MAP(2, interpro_boot_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, acknowledge_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(INTERPRO_IOGA_TAG, interpro_ioga_device, acknowledge_interrupt)
// FIXME: 2400/6400 should be C4T cammu?
MCFG_DEVICE_ADD(INTERPRO_MMU_TAG, CAMMU_C4I, 0)
- MCFG_CAMMU_EXCEPTION_CB(DEVWRITE16(INTERPRO_CPU_TAG, clipper_device, set_exception))
+ MCFG_CAMMU_EXCEPTION_CB(WRITE16(INTERPRO_CPU_TAG, clipper_device, set_exception))
// memory control gate array
MCFG_DEVICE_ADD(INTERPRO_MCGA_TAG, INTERPRO_FMCC, 0)
// floppy controller
MCFG_N82077AA_ADD(INTERPRO_FDC_TAG, n82077aa_device::MODE_PS2)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir1_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_floppy))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir1_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, drq_floppy))
// connect a 3.5" drive at id 1
MCFG_DEVICE_ADD("fdc:0", FLOPPY_CONNECTOR, 0)
@@ -705,7 +705,7 @@ MACHINE_CONFIG_START(sapphire_state::sapphire)
// ethernet controller
MCFG_DEVICE_ADD(INTERPRO_ETH_TAG, I82596_LE16, XTAL(20'000'000))
- MCFG_I82586_IRQ_CB(DEVWRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir12_w))
+ MCFG_I82586_IRQ_CB(WRITELINE(INTERPRO_IOGA_TAG, interpro_ioga_device, ir12_w))
MCFG_DEVICE_ADDRESS_MAP(0, interpro_82596_map)
// i/o gate array
diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp
index 114ca28d652..e60a04edbae 100644
--- a/src/mame/drivers/intrscti.cpp
+++ b/src/mame/drivers/intrscti.cpp
@@ -188,14 +188,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(intrscti_state::intrscti)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(intrscti_map)
- MCFG_CPU_IO_MAP(intrscti_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", intrscti_state, irq0_line_hold)
-
- MCFG_CPU_ADD("subcpu", Z80, 4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(intrscti_sub_map)
- MCFG_CPU_IO_MAP(intrscti_sub_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(intrscti_map)
+ MCFG_DEVICE_IO_MAP(intrscti_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", intrscti_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("subcpu", Z80, 4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(intrscti_sub_map)
+ MCFG_DEVICE_IO_MAP(intrscti_sub_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index a4693cd3806..f519f5d70f8 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -463,9 +463,9 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt2)
MACHINE_CONFIG_START(intv_state::intv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CP1610, XTAL(3'579'545)/4) /* Colorburst/4 */
- MCFG_CPU_PROGRAM_MAP(intv_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", intv_state, intv_interrupt)
+ MCFG_DEVICE_ADD("maincpu", CP1610, XTAL(3'579'545)/4) /* Colorburst/4 */
+ MCFG_DEVICE_PROGRAM_MAP(intv_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", intv_state, intv_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -489,9 +489,9 @@ MACHINE_CONFIG_START(intv_state::intv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8914", AY8914, XTAL(3'579'545)/2)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("iopt_right_ctrl", intv_control_port_device, ctrl_r))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("iopt_left_ctrl", intv_control_port_device, ctrl_r))
+ MCFG_DEVICE_ADD("ay8914", AY8914, XTAL(3'579'545)/2)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("iopt_right_ctrl", intv_control_port_device, ctrl_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("iopt_left_ctrl", intv_control_port_device, ctrl_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
/* cartridge */
@@ -504,14 +504,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(intv_state::intv2)
intv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(intv2_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(intv2_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(intv_state::intvoice)
intv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(intvoice_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(intvoice_mem)
MCFG_DEVICE_REMOVE("cartslot")
MCFG_DEVICE_ADD("voice", INTV_ROM_VOICE, 0)
@@ -519,13 +519,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(intv_state::intvecs)
intv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(intvecs_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(intvecs_mem)
MCFG_DEVICE_REMOVE("cartslot")
MCFG_DEVICE_ADD("ecs", INTV_ROM_ECS, 0)
- MCFG_SOUND_ADD("speech", SP0256, 3120000)
+ MCFG_DEVICE_ADD("speech", SP0256, 3120000)
/* The Intellivoice uses a speaker with its own volume control so the relative volumes to use are subjective */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -541,12 +541,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(intv_state::intvkbd)
intv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(intvkbd_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(intvkbd_mem)
- MCFG_CPU_ADD("keyboard", M6502, XTAL(7'159'090)/8)
- MCFG_CPU_PROGRAM_MAP(intvkbd2_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", intv_state, intv_interrupt2)
+ MCFG_DEVICE_ADD("keyboard", M6502, XTAL(7'159'090)/8)
+ MCFG_DEVICE_PROGRAM_MAP(intvkbd2_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", intv_state, intv_interrupt2)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp
index 6c54d051d58..2164066c408 100644
--- a/src/mame/drivers/inufuku.cpp
+++ b/src/mame/drivers/inufuku.cpp
@@ -336,13 +336,13 @@ void inufuku_state::machine_reset()
MACHINE_CONFIG_START(inufuku_state::inufuku)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */
- MCFG_CPU_PROGRAM_MAP(inufuku_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", inufuku_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(inufuku_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", inufuku_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 32000000/4) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(inufuku_sound_map)
- MCFG_CPU_IO_MAP(inufuku_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 32000000/4) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(inufuku_sound_map)
+ MCFG_DEVICE_IO_MAP(inufuku_sound_io_map)
/* IRQs are triggered by the YM2610 */
@@ -355,7 +355,7 @@ MACHINE_CONFIG_START(inufuku_state::inufuku)
MCFG_SCREEN_SIZE(2048, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 223)
MCFG_SCREEN_UPDATE_DRIVER(inufuku_state, screen_update_inufuku)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(inufuku_state, screen_vblank_inufuku))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, inufuku_state, screen_vblank_inufuku))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("vsystem_spr", VSYSTEM_SPR, 0)
@@ -376,7 +376,7 @@ MACHINE_CONFIG_START(inufuku_state::inufuku)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 32000000/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 32000000/4)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.75)
diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp
index 8963056e2d2..77526b7c3b1 100644
--- a/src/mame/drivers/invqix.cpp
+++ b/src/mame/drivers/invqix.cpp
@@ -333,11 +333,11 @@ static INPUT_PORTS_START( invqix )
INPUT_PORTS_END
MACHINE_CONFIG_START(invqix_state::invqix)
- MCFG_CPU_ADD("maincpu", H8S2394, XTAL(20'000'000))
- MCFG_CPU_PROGRAM_MAP(invqix_prg_map)
- MCFG_CPU_IO_MAP(invqix_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", invqix_state, irq1_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(invqix_state, irq0_line_hold, 60)
+ MCFG_DEVICE_ADD("maincpu", H8S2394, XTAL(20'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(invqix_prg_map)
+ MCFG_DEVICE_IO_MAP(invqix_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", invqix_state, irq1_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(invqix_state, irq0_line_hold, 60)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ipc.cpp b/src/mame/drivers/ipc.cpp
index 5cdbba11c52..6ad9a61c257 100644
--- a/src/mame/drivers/ipc.cpp
+++ b/src/mame/drivers/ipc.cpp
@@ -94,38 +94,38 @@ void ipc_state::machine_reset()
MACHINE_CONFIG_START(ipc_state::ipc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(19'660'800) / 4)
- MCFG_CPU_PROGRAM_MAP(ipc_mem)
- MCFG_CPU_IO_MAP(ipc_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(19'660'800) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ipc_mem)
+ MCFG_DEVICE_IO_MAP(ipc_io)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(19'660'800) / 16)
MCFG_PIT8253_CLK1(XTAL(19'660'800) / 16)
MCFG_PIT8253_CLK2(XTAL(19'660'800) / 16)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart2", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart2", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0) // 8 data bits, no parity, 1 stop bit, 9600 baud
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
MCFG_DEVICE_ADD("uart2", I8251, 0) // 8 data bits, no parity, 2 stop bits, 2400 baud
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", i8251_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp
index 8bf683f9f93..d5180742f27 100644
--- a/src/mame/drivers/ipds.cpp
+++ b/src/mame/drivers/ipds.cpp
@@ -133,9 +133,9 @@ void ipds_state::kbd_put(u8 data)
MACHINE_CONFIG_START(ipds_state::ipds)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(19'660'800) / 4)
- MCFG_CPU_PROGRAM_MAP(ipds_mem)
- MCFG_CPU_IO_MAP(ipds_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(19'660'800) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ipds_mem)
+ MCFG_DEVICE_IO_MAP(ipds_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp
index fc54ccb1a1e..84261b41dfc 100644
--- a/src/mame/drivers/iq151.cpp
+++ b/src/mame/drivers/iq151.cpp
@@ -389,11 +389,11 @@ static void iq151_cart(device_slot_interface &device)
MACHINE_CONFIG_START(iq151_state::iq151)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(iq151_mem)
- MCFG_CPU_IO_MAP(iq151_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", iq151_state, iq151_vblank_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(iq151_mem)
+ MCFG_DEVICE_IO_MAP(iq151_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", iq151_state, iq151_vblank_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -408,17 +408,17 @@ MACHINE_CONFIG_START(iq151_state::iq151)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(iq151_state, keyboard_row_r))
- MCFG_I8255_IN_PORTB_CB(READ8(iq151_state, keyboard_column_r))
- MCFG_I8255_IN_PORTC_CB(READ8(iq151_state, ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(iq151_state, ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, iq151_state, keyboard_row_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, iq151_state, keyboard_column_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, iq151_state, ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, iq151_state, ppi_portc_w))
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED)
@@ -430,43 +430,43 @@ MACHINE_CONFIG_START(iq151_state::iq151)
MCFG_DEVICE_ADD("slot1", IQ151CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(iq151_cart, nullptr, false)
MCFG_IQ151CART_SLOT_SCREEN_TAG("screen")
- MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(WRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(WRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("slot2", IQ151CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(iq151_cart, nullptr, false)
MCFG_IQ151CART_SLOT_SCREEN_TAG("screen")
- MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(WRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(WRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("slot3", IQ151CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(iq151_cart, nullptr, false)
MCFG_IQ151CART_SLOT_SCREEN_TAG("screen")
- MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(WRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(WRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("slot4", IQ151CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(iq151_cart, nullptr, false)
MCFG_IQ151CART_SLOT_SCREEN_TAG("screen")
- MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(WRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(WRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("slot5", IQ151CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(iq151_cart, "video32", false)
MCFG_IQ151CART_SLOT_SCREEN_TAG("screen")
- MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ0_CB(WRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ1_CB(WRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_IQ151CART_SLOT_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
/* Software lists */
MCFG_SOFTWARE_LIST_ADD("cart_list", "iq151_cart")
diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp
index 7f051136f22..4e533819640 100644
--- a/src/mame/drivers/iqblock.cpp
+++ b/src/mame/drivers/iqblock.cpp
@@ -342,16 +342,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(iqblock_state::iqblock)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", iqblock_state, irq, "screen", 0, 1)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
MCFG_I8255_IN_PORTC_CB(IOPORT("EXTRA"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(iqblock_state, port_C_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, iqblock_state, port_C_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -369,7 +369,7 @@ MACHINE_CONFIG_START(iqblock_state::iqblock)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/iqunlim.cpp b/src/mame/drivers/iqunlim.cpp
index f4769320e5e..702f8742522 100644
--- a/src/mame/drivers/iqunlim.cpp
+++ b/src/mame/drivers/iqunlim.cpp
@@ -87,8 +87,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(iqunlim_state::iqunlim)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // DragonBall EZ (MC68EZ328) (68k core) (is the xtal correct? this was from the other hardware)
- MCFG_CPU_PROGRAM_MAP(iqunlim_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) // DragonBall EZ (MC68EZ328) (68k core) (is the xtal correct? this was from the other hardware)
+ MCFG_DEVICE_PROGRAM_MAP(iqunlim_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp
index 1839263c5e0..916a7ea4a14 100644
--- a/src/mame/drivers/iris3130.cpp
+++ b/src/mame/drivers/iris3130.cpp
@@ -423,20 +423,20 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sgi_ip2_state::sgi_ip2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020, 16000000)
- MCFG_CPU_PROGRAM_MAP(sgi_ip2_map)
+ MCFG_DEVICE_ADD("maincpu", M68020, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(sgi_ip2_map)
MCFG_DEVICE_ADD( "duart68681a", MC68681, XTAL(3'686'400) ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duarta_irq_handler))
- MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, sgi_ip2_state, duarta_irq_handler))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_DEVICE_ADD( "duart68681b", MC68681, XTAL(3'686'400) ) /* Y3 3.6864MHz Xtal ??? copy-over from dectalk */
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(sgi_ip2_state, duartb_irq_handler))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, sgi_ip2_state, duartb_irq_handler))
MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681a", mc68681_device, rx_b_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart68681a", mc68681_device, rx_b_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", ip2_terminal)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp
index eea8c80f2ca..252263d0a37 100644
--- a/src/mame/drivers/irisha.cpp
+++ b/src/mame/drivers/irisha.cpp
@@ -364,9 +364,9 @@ void irisha_state::machine_reset()
/* Machine driver */
MACHINE_CONFIG_START(irisha_state::irisha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
- MCFG_CPU_PROGRAM_MAP(irisha_mem)
- MCFG_CPU_IO_MAP(irisha_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(irisha_mem)
+ MCFG_DEVICE_IO_MAP(irisha_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(irisha_state::irisha)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -390,19 +390,19 @@ MACHINE_CONFIG_START(irisha_state::irisha)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000) / 9)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(16'000'000) / 9 / 8 / 8)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_PIT8253_CLK2(XTAL(16'000'000) / 9)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(irisha_state, speaker_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, irisha_state, speaker_w))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(irisha_state, irisha_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(irisha_state, irisha_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(irisha_state, irisha_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(irisha_state, irisha_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(irisha_state, irisha_8255_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, irisha_state, irisha_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, irisha_state, irisha_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, irisha_state, irisha_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, irisha_state, irisha_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, irisha_state, irisha_8255_portc_w))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp
index 2dda6455f46..a7b5c49e074 100644
--- a/src/mame/drivers/irobot.cpp
+++ b/src/mame/drivers/irobot.cpp
@@ -298,8 +298,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(irobot_state::irobot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(irobot_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(irobot_map)
MCFG_DEVICE_ADD("adc", ADC0809, MAIN_CLOCK / 16)
MCFG_ADC0808_IN0_CB(IOPORT("AN0"))
@@ -329,17 +329,17 @@ MACHINE_CONFIG_START(irobot_state::irobot)
/* FIXME: I-Robot has all channels of the quad-pokey tied together
* This needs to be taken into account in the design.
*/
- MCFG_SOUND_ADD("pokey1", POKEY, MAIN_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MAIN_CLOCK / 8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("pokey2", POKEY, MAIN_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MAIN_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("pokey3", POKEY, MAIN_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey3", POKEY, MAIN_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("pokey4", POKEY, MAIN_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey4", POKEY, MAIN_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp
index a01a00e63d6..2c816e9ebee 100644
--- a/src/mame/drivers/ironhors.cpp
+++ b/src/mame/drivers/ironhors.cpp
@@ -382,13 +382,13 @@ These clocks make the emulation run too fast.
MACHINE_CONFIG_START(ironhors_state::ironhors)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
- MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ironhors_state, irq, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(slave_map)
- MCFG_CPU_IO_MAP(slave_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_IO_MAP(slave_io_map)
/* video hardware */
@@ -410,15 +410,15 @@ MACHINE_CONFIG_START(ironhors_state::ironhors)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym2203", YM2203, 18432000/6)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ironhors_state, filter_w))
+ MCFG_DEVICE_ADD("ym2203", YM2203, 18432000/6)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ironhors_state, filter_w))
MCFG_SOUND_ROUTE(0, "disc_ih", 1.0, 0)
MCFG_SOUND_ROUTE(1, "disc_ih", 1.0, 1)
MCFG_SOUND_ROUTE(2, "disc_ih", 1.0, 2)
MCFG_SOUND_ROUTE(3, "disc_ih", 1.0, 3)
- MCFG_SOUND_ADD("disc_ih", DISCRETE, 0)
+ MCFG_DEVICE_ADD("disc_ih", DISCRETE)
MCFG_DISCRETE_INTF(ironhors)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -448,13 +448,13 @@ READ8_MEMBER(ironhors_state::farwest_soundlatch_r)
MACHINE_CONFIG_START(ironhors_state::farwest)
ironhors(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(farwest_master_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(farwest_master_map)
MCFG_DEVICE_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(ironhors_state, farwest_irq)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(farwest_slave_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(farwest_slave_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO)
MCFG_GFXDECODE_MODIFY("gfxdecode", farwest)
@@ -462,9 +462,9 @@ MACHINE_CONFIG_START(ironhors_state::farwest)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(ironhors_state, screen_update_farwest)
- MCFG_SOUND_MODIFY("ym2203")
- MCFG_AY8910_PORT_B_READ_CB(READ8(ironhors_state, farwest_soundlatch_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ironhors_state, filter_w))
+ MCFG_DEVICE_MODIFY("ym2203")
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, ironhors_state, farwest_soundlatch_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ironhors_state, filter_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index e71018506ca..490377e1b32 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -352,142 +352,142 @@ WRITE_LINE_MEMBER(isbc_state::megabyte_select_w)
MACHINE_CONFIG_START(isbc_state::isbc86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(isbc86_mem)
- MCFG_CPU_IO_MAP(isbc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(isbc86_mem)
+ MCFG_DEVICE_IO_MAP(isbc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic_0", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic_0", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(22'118'400)/18)
MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc86_tmr2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, isbc_state, isbc86_tmr2_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
MCFG_DEVICE_ADD("uart8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir6_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic_0", pic8259_device, ir6_w))
/* video hardware */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8251", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8251", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart8251", i8251_device, write_dsr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", isbc86_terminal)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::rpc86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(rpc86_mem)
- MCFG_CPU_IO_MAP(rpc86_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(rpc86_mem)
+ MCFG_DEVICE_IO_MAP(rpc86_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic_0", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir2_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic_0", pic8259_device, ir2_w))
MCFG_PIT8253_CLK1(XTAL(22'118'400)/144)
MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc86_tmr2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, isbc_state, isbc86_tmr2_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
MCFG_DEVICE_ADD("uart8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir6_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir7_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic_0", pic8259_device, ir6_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("pic_0", pic8259_device, ir7_w))
/* video hardware */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_rxd))
- //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart8251", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8251", i8251_device, write_rxd))
+ //MCFG_RS232_CTS_HANDLER(WRITELINE("uart8251", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart8251", i8251_device, write_dsr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", isbc286_terminal)
MCFG_ISBX_SLOT_ADD("sbx1", 0, isbx_cards, nullptr)
- //MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("pic_0", pic8259_device, ir3_w))
- //MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("pic_0", pic8259_device, ir4_w))
+ //MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE("pic_0", pic8259_device, ir3_w))
+ //MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE("pic_0", pic8259_device, ir4_w))
MCFG_ISBX_SLOT_ADD("sbx2", 0, isbx_cards, nullptr)
- //MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("pic_0", pic8259_device, ir5_w))
- //MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("pic_0", pic8259_device, ir6_w))
+ //MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE("pic_0", pic8259_device, ir5_w))
+ //MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE("pic_0", pic8259_device, ir6_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::isbc8605)
rpc86(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(isbc8605_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(isbc8605_io)
MCFG_DEVICE_ADD("isbc_208", ISBC_208, 0)
MCFG_ISBC_208_MAINCPU("maincpu")
- MCFG_ISBC_208_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w))
+ MCFG_ISBC_208_IRQ(WRITELINE("pic_0", pic8259_device, ir5_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::isbc8630)
rpc86(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(isbc8630_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(isbc8630_io)
MCFG_ISBC_215_ADD("isbc_215g", 0x100, "maincpu")
- MCFG_ISBC_215_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w))
+ MCFG_ISBC_215_IRQ(WRITELINE("pic_0", pic8259_device, ir5_w))
MCFG_DEVICE_ADD("statuslatch", LS259, 0) // U14
-// MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("pit", pit8253_device, write_gate0))
-// MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("pit", pit8253_device, write_gate1))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(isbc_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(isbc_state, override_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(isbc_state, bus_intr_out1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(isbc_state, bus_intr_out2_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(isbc_state, led_ds1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(isbc_state, led_ds3_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(isbc_state, megabyte_select_w))
+// MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("pit", pit8253_device, write_gate0))
+// MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("pit", pit8253_device, write_gate1))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, isbc_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, isbc_state, override_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, isbc_state, bus_intr_out1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, isbc_state, bus_intr_out2_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, isbc_state, led_ds1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, isbc_state, led_ds3_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, isbc_state, megabyte_select_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::isbc286)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(isbc286_mem)
- MCFG_CPU_IO_MAP(isbc286_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I80286, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(isbc286_mem)
+ MCFG_DEVICE_IO_MAP(isbc286_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic_0", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic_0", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(isbc_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, isbc_state, get_slave_ack))
MCFG_DEVICE_ADD("pic_1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic_0", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic_0", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(XTAL(22'118'400)/18)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic_0", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(22'118'400)/18)
-// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", z80dart_device, rxtxcb_w))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxtxcb_w))
+// MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart8274", z80dart_device, rxtxcb_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart8274", i8274_new_device, rxtxcb_w))
MCFG_PIT8253_CLK2(XTAL(22'118'400)/18)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc286_tmr2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, isbc_state, isbc286_tmr2_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("cent_status_in", input_buffer_device, read))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(isbc_state, ppi_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTB_CB(READ8("cent_status_in", input_buffer_device, read))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, isbc_state, ppi_c_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(isbc_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
- MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, isbc_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6))
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
@@ -495,63 +495,63 @@ MACHINE_CONFIG_START(isbc_state::isbc286)
#if 0
MCFG_DEVICE_ADD("uart8274", I8274, XTAL(16'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_INT_CB(WRITELINE(isbc_state, isbc_uart8274_irq))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, isbc_state, isbc_uart8274_irq))
#else
MCFG_DEVICE_ADD("uart8274", I8274_NEW, XTAL(16'000'000)/4)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
-// MCFG_Z80SIO_OUT_INT_CB(WRITELINE(isbc_state, isbc_uart8274_irq))
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic_0", pic8259_device, ir6_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
+// MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, isbc_state, isbc_uart8274_irq))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("pic_0", pic8259_device, ir6_w))
#endif
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
#if 0
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", z80dart_device, ctsa_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", z80dart_device, ctsa_w))
#else
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsa_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", i8274_new_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", i8274_new_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", i8274_new_device, ctsa_w))
#endif
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, "terminal")
#if 0
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", z80dart_device, ctsb_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", z80dart_device, ctsb_w))
#else
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsb_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart8274", i8274_new_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart8274", i8274_new_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart8274", i8274_new_device, ctsb_w))
#endif
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", isbc286_terminal)
MCFG_ISBX_SLOT_ADD("sbx1", 0, isbx_cards, nullptr)
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("pic_1", pic8259_device, ir3_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("pic_1", pic8259_device, ir4_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE("pic_1", pic8259_device, ir3_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE("pic_1", pic8259_device, ir4_w))
MCFG_ISBX_SLOT_ADD("sbx2", 0, isbx_cards, nullptr)
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("pic_1", pic8259_device, ir5_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("pic_1", pic8259_device, ir6_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE("pic_1", pic8259_device, ir5_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE("pic_1", pic8259_device, ir6_w))
MCFG_ISBC_215_ADD("isbc_215g", 0x100, "maincpu")
- MCFG_ISBC_215_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w))
+ MCFG_ISBC_215_IRQ(WRITELINE("pic_0", pic8259_device, ir5_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc_state::isbc2861)
isbc286(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(isbc2861_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(isbc2861_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp
index 7d97e86b944..4b6aa7233ad 100644
--- a/src/mame/drivers/isbc8010.cpp
+++ b/src/mame/drivers/isbc8010.cpp
@@ -172,26 +172,26 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(isbc8010_state::isbc8010)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'432'000)/9)
- MCFG_CPU_PROGRAM_MAP(isbc8010_mem)
- MCFG_CPU_IO_MAP(isbc8010_io)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'432'000)/9)
+ MCFG_DEVICE_PROGRAM_MAP(isbc8010_mem)
+ MCFG_DEVICE_IO_MAP(isbc8010_io)
MCFG_DEVICE_ADD(I8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_DEVICE_ADD(I8255A_1_TAG, I8255A, 0)
MCFG_DEVICE_ADD(I8255A_2_TAG, I8255A, 0)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(18'432'000)/60)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(isbc8010_state, usart_clock_tick))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, isbc8010_state, usart_clock_tick))
/* video hardware */
// 96364 crt controller
@@ -219,15 +219,15 @@ MACHINE_CONFIG_START(isbc8010_state::isbc8010)
// MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
// MCFG_AY31015_TX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
// MCFG_AY31015_RX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
-// MCFG_AY51013_READ_SI_CB(READ8(sdk80_state, nascom1_hd6402_si))
-// MCFG_AY51013_WRITE_SO_CB(WRITE8(sdk80_state, nascom1_hd6402_so))
+// MCFG_AY51013_READ_SI_CB(READ8(*this, sdk80_state, nascom1_hd6402_si))
+// MCFG_AY51013_WRITE_SO_CB(WRITE8(*this, sdk80_state, nascom1_hd6402_so))
/* Devices */
// MCFG_DEVICE_ADD("i8279", I8279, 3100000) // based on divider
// MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
-// MCFG_I8279_OUT_SL_CB(WRITE8(sdk80_state, scanlines_w)) // scan SL lines
-// MCFG_I8279_OUT_DISP_CB(WRITE8(sdk80_state, digit_w)) // display A&B
-// MCFG_I8279_IN_RL_CB(READ8(sdk80_state, kbd_r)) // kbd RL lines
+// MCFG_I8279_OUT_SL_CB(WRITE8(*this, sdk80_state, scanlines_w)) // scan SL lines
+// MCFG_I8279_OUT_DISP_CB(WRITE8(*this, sdk80_state, digit_w)) // display A&B
+// MCFG_I8279_IN_RL_CB(READ8(*this, sdk80_state, kbd_r)) // kbd RL lines
// MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
// MCFG_I8279_IN_CTRL_CB(VCC)
@@ -236,15 +236,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc8010_state::isbc8010a)
isbc8010(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(isbc8010a_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(isbc8010a_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(isbc8010_state::isbc8010b)
isbc8010(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(isbc8010b_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(isbc8010b_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/isbc8030.cpp b/src/mame/drivers/isbc8030.cpp
index 7e8707aab2e..307c6e020b5 100644
--- a/src/mame/drivers/isbc8030.cpp
+++ b/src/mame/drivers/isbc8030.cpp
@@ -92,32 +92,32 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(isbc8030_state::isbc8030)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(22'118'400) / 4)
- MCFG_CPU_PROGRAM_MAP(isbc8030_mem)
- MCFG_CPU_IO_MAP(isbc8030_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(22'118'400) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(isbc8030_mem)
+ MCFG_DEVICE_IO_MAP(isbc8030_io)
MCFG_DEVICE_ADD(I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(22'118'400) / 18)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259A_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(22'118'400) / 18)
MCFG_PIT8253_CLK2(XTAL(22'118'400) / 18)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251A_TAG, i8251_device, write_txc))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251A_TAG, i8251_device, write_txc))
MCFG_DEVICE_ADD(I8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/iskr103x.cpp b/src/mame/drivers/iskr103x.cpp
index c3e97c944c0..1241c8d9c11 100644
--- a/src/mame/drivers/iskr103x.cpp
+++ b/src/mame/drivers/iskr103x.cpp
@@ -68,20 +68,20 @@ DEVICE_INPUT_DEFAULTS_END
// XXX
MACHINE_CONFIG_START(iskr103x_state::iskr1030m)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 4772720)
- MCFG_CPU_PROGRAM_MAP(iskr1031_map)
- MCFG_CPU_IO_MAP(iskr1031_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 4772720)
+ MCFG_DEVICE_PROGRAM_MAP(iskr1031_map)
+ MCFG_DEVICE_IO_MAP(iskr1031_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(iskr1030m)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", iskr103x_isa8_cards, "cga_iskr1030m", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", iskr103x_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", iskr103x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", iskr103x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", iskr103x_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", iskr103x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", iskr103x_isa8_cards, "cga_iskr1030m", false) // FIXME: determine IS bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", iskr103x_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", iskr103x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", iskr103x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", iskr103x_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", iskr103x_isa8_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_EC_1841)
// MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_ISKR_1030)
diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp
index 1ae62ada191..3c9f455096a 100644
--- a/src/mame/drivers/istellar.cpp
+++ b/src/mame/drivers/istellar.cpp
@@ -274,19 +274,19 @@ WRITE_LINE_MEMBER(istellar_state::vblank_irq)
/* DRIVER */
MACHINE_CONFIG_START(istellar_state::istellar)
/* main cpu */
- MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
- MCFG_CPU_PROGRAM_MAP(z80_0_mem)
- MCFG_CPU_IO_MAP(z80_0_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, GUESSED_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(z80_0_mem)
+ MCFG_DEVICE_IO_MAP(z80_0_io)
/* sound cpu */
- MCFG_CPU_ADD("audiocpu", Z80, GUESSED_CLOCK)
- MCFG_CPU_PROGRAM_MAP(z80_1_mem)
- MCFG_CPU_IO_MAP(z80_1_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, GUESSED_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(z80_1_mem)
+ MCFG_DEVICE_IO_MAP(z80_1_io)
/* ldp comm cpu */
- MCFG_CPU_ADD("sub", Z80, GUESSED_CLOCK)
- MCFG_CPU_PROGRAM_MAP(z80_2_mem)
- MCFG_CPU_IO_MAP(z80_2_io)
+ MCFG_DEVICE_ADD("sub", Z80, GUESSED_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(z80_2_mem)
+ MCFG_DEVICE_IO_MAP(z80_2_io)
MCFG_GENERIC_LATCH_8_ADD("latch1")
@@ -300,7 +300,7 @@ MACHINE_CONFIG_START(istellar_state::istellar)
/* video hardware */
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(istellar_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, istellar_state, vblank_irq))
// Daphne says "TODO: get the real interstellar resistor values"
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(istellar_state::istellar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp
index 81e94205006..bf22a992a78 100644
--- a/src/mame/drivers/istrebiteli.cpp
+++ b/src/mame/drivers/istrebiteli.cpp
@@ -420,18 +420,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(istrebiteli_state::istreb)
/* basic machine hardware */
- MCFG_CPU_ADD(I8080_TAG, I8080, XTAL(8'000'000) / 4) // KR580VM80A
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD(I8080_TAG, I8080, XTAL(8'000'000) / 4) // KR580VM80A
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("ppi0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(istrebiteli_state, sound_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, istrebiteli_state, sound_w))
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(istrebiteli_state, spr0_ctrl_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(istrebiteli_state, spr1_ctrl_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, istrebiteli_state, spr0_ctrl_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, istrebiteli_state, spr1_ctrl_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
/* video hardware */
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(istrebiteli_state::istreb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", ISTREBITELI_SOUND, XTAL(8'000'000) / 2 / 256)
+ MCFG_DEVICE_ADD("custom", ISTREBITELI_SOUND, XTAL(8'000'000) / 2 / 256)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp
index bbbccaa0fa7..fc1c4e8aac9 100644
--- a/src/mame/drivers/iteagle.cpp
+++ b/src/mame/drivers/iteagle.cpp
@@ -164,7 +164,7 @@ void iteagle_state::machine_reset()
MACHINE_CONFIG_START(iteagle_state::iteagle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", VR4310LE, 166666666)
+ MCFG_DEVICE_ADD("maincpu", VR4310LE, 166666666)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(8192)
MCFG_MIPS3_SYSTEM_CLOCK(66666667)
@@ -186,7 +186,7 @@ MACHINE_CONFIG_START(iteagle_state::iteagle)
MCFG_VOODOO_PCI_ADD( PCI_ID_VIDEO, TYPE_VOODOO_3, ":maincpu")
MCFG_VOODOO_PCI_FBMEM(16)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
- MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(PCI_ID_FPGA, iteagle_fpga_device, vblank_update))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(PCI_ID_FPGA, iteagle_fpga_device, vblank_update))
MCFG_ITEAGLE_EEPROM_ADD( PCI_ID_EEPROM)
@@ -291,8 +291,8 @@ MACHINE_CONFIG_START(iteagle_state::virtpool)
iteagle(config);
// Not sure what the actual value should be
// Setting a lower frequency helps delay the tutorial screen premature cut-out
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(99999999)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(99999999)
MCFG_MIPS3_SYSTEM_CLOCK(33333333)
MCFG_DEVICE_REMOVE(PCI_ID_VIDEO)
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 4b147d8344d..023c031f7b2 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -1685,11 +1685,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(itech32_state::timekill)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(timekill_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(timekill_map)
- MCFG_CPU_ADD("soundcpu", MC6809, SOUND_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809, SOUND_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", itech32_state, nvram_init)
@@ -1707,12 +1707,12 @@ MACHINE_CONFIG_START(itech32_state::timekill)
// MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 508, 0, 384, 286, 0, 256) // sftm, wcbowl and shufshot configure it this way
MCFG_SCREEN_UPDATE_DRIVER(itech32_state, screen_update_itech32)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(itech32_state, generate_int1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, itech32_state, generate_int1))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, SOUND_CLOCK)
+ MCFG_DEVICE_ADD("ensoniq", ES5506, SOUND_CLOCK)
MCFG_ES5506_REGION0("ensoniq.0")
MCFG_ES5506_REGION1("ensoniq.1")
MCFG_ES5506_REGION2("ensoniq.2")
@@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(itech32_state::timekill)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, SOUND_CLOCK/8)
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(itech32_state,pia_portb_out))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, itech32_state,pia_portb_out))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MACHINE_CONFIG_END
@@ -1733,8 +1733,8 @@ MACHINE_CONFIG_START(itech32_state::bloodstm)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bloodstm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bloodstm_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1749,24 +1749,24 @@ MACHINE_CONFIG_START(itech32_state::drivedge)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
- MCFG_CPU_PROGRAM_MAP(drivedge_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(drivedge_map)
- MCFG_CPU_ADD("dsp1", TMS32031, TMS_CLOCK)
- MCFG_CPU_PROGRAM_MAP(drivedge_tms1_map)
+ MCFG_DEVICE_ADD("dsp1", TMS32031, TMS_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(drivedge_tms1_map)
- MCFG_CPU_ADD("dsp2", TMS32031, TMS_CLOCK)
- MCFG_CPU_PROGRAM_MAP(drivedge_tms2_map)
+ MCFG_DEVICE_ADD("dsp2", TMS32031, TMS_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(drivedge_tms2_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32768)
MCFG_PALETTE_FORMAT(XBGR)
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(itech32_state,drivedge_portb_out))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(itech32_state,drivedge_turbo_light))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, itech32_state,drivedge_portb_out))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, itech32_state,drivedge_turbo_light))
-// MCFG_CPU_ADD("comm", M6803, 8000000/4) -- network CPU
+// MCFG_DEVICE_ADD("comm", M6803, 8000000/4) -- network CPU
MCFG_MACHINE_RESET_OVERRIDE(itech32_state,drivedge)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1776,7 +1776,7 @@ MACHINE_CONFIG_START(itech32_state::drivedge)
MCFG_SPEAKER_STANDARD_STEREO("left_back", "right_back")
- MCFG_SOUND_MODIFY("ensoniq")
+ MCFG_DEVICE_MODIFY("ensoniq")
MCFG_ES5506_CHANNELS(2) /* channels */
MCFG_SOUND_ROUTE(2, "right_back", 0.1) /* swapped stereo */
MCFG_SOUND_ROUTE(3, "left_back", 0.1)
@@ -1788,12 +1788,12 @@ MACHINE_CONFIG_START(itech32_state::sftm)
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
- MCFG_CPU_PROGRAM_MAP(itech020_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC020, CPU020_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(itech020_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(sound_020_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(itech32_state, irq1_line_assert, 4*60)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(sound_020_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(itech32_state, irq1_line_assert, 4*60)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(32768)
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp
index 6fa68d51bf2..e32e63c948d 100644
--- a/src/mame/drivers/itech8.cpp
+++ b/src/mame/drivers/itech8.cpp
@@ -1688,8 +1688,8 @@ WRITE_LINE_MEMBER(itech8_state::generate_tms34061_interrupt)
MACHINE_CONFIG_START(itech8_state::itech8_core_lo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, CLOCK_8MHz)
- MCFG_CPU_PROGRAM_MAP(tmslo_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, CLOCK_8MHz)
+ MCFG_DEVICE_PROGRAM_MAP(tmslo_map)
MCFG_NVRAM_ADD_RANDOM_FILL("nvram")
@@ -1702,19 +1702,19 @@ MACHINE_CONFIG_START(itech8_state::itech8_core_lo)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_SIZE(512, 263)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(itech8_state, generate_nmi))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, itech8_state, generate_nmi))
MCFG_DEVICE_ADD("tms34061", TMS34061, 0)
MCFG_TMS34061_ROWSHIFT(8) /* VRAM address is (row << rowshift) | col */
MCFG_TMS34061_VRAM_SIZE(itech8_state::VRAM_SIZE)
- MCFG_TMS34061_INTERRUPT_CB(WRITELINE(itech8_state, generate_tms34061_interrupt)) /* interrupt gen callback */
+ MCFG_TMS34061_INTERRUPT_CB(WRITELINE(*this, itech8_state, generate_tms34061_interrupt)) /* interrupt gen callback */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, CLOCK_8MHz/4)
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(itech8_state, pia_portb_out))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, itech8_state, pia_portb_out))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MACHINE_CONFIG_END
@@ -1723,21 +1723,21 @@ MACHINE_CONFIG_START(itech8_state::itech8_core_hi)
itech8_core_lo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tmshi_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tmshi_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(itech8_state::itech8_sound_ym2203)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz)
- MCFG_CPU_PROGRAM_MAP(sound2203_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809, CLOCK_8MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sound2203_map)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, CLOCK_8MHz/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, CLOCK_8MHz/2)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(itech8_state, ym2203_portb_out))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, itech8_state, ym2203_portb_out))
MCFG_SOUND_ROUTE(0, "mono", 0.07)
MCFG_SOUND_ROUTE(1, "mono", 0.07)
MCFG_SOUND_ROUTE(2, "mono", 0.07)
@@ -1751,13 +1751,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(itech8_state::itech8_sound_ym2608b)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz)
- MCFG_CPU_PROGRAM_MAP(sound2608b_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809, CLOCK_8MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sound2608b_map)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2608, CLOCK_8MHz)
+ MCFG_DEVICE_ADD("ymsnd", YM2608, CLOCK_8MHz)
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(itech8_state, ym2203_portb_out))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, itech8_state, ym2203_portb_out))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -1765,16 +1765,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(itech8_state::itech8_sound_ym3812)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz)
- MCFG_CPU_PROGRAM_MAP(sound3812_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809, CLOCK_8MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sound3812_map)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(DEVREADLINE("ticket", ticket_dispenser_device, line_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(itech8_state, pia_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(itech8_state, pia_portb_out))
+ MCFG_PIA_READPB_HANDLER(READLINE("ticket", ticket_dispenser_device, line_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, itech8_state, pia_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, itech8_state, pia_portb_out))
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
@@ -1786,11 +1786,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(itech8_state::itech8_sound_ym3812_external)
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu", MC6809, CLOCK_8MHz)
- MCFG_CPU_PROGRAM_MAP(sound3812_external_map)
+ MCFG_DEVICE_ADD("soundcpu", MC6809, CLOCK_8MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sound3812_external_map)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, CLOCK_8MHz/2)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
@@ -1866,9 +1866,9 @@ MACHINE_CONFIG_START(itech8_state::slikshot_hi)
/* basic machine hardware */
itech8_sound_ym2203(config);
- MCFG_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
- MCFG_CPU_PROGRAM_MAP(slikz80_mem_map)
- MCFG_CPU_IO_MAP(slikz80_io_map)
+ MCFG_DEVICE_ADD("sub", Z80, CLOCK_8MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(slikz80_mem_map)
+ MCFG_DEVICE_IO_MAP(slikz80_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1884,9 +1884,9 @@ MACHINE_CONFIG_START(itech8_state::slikshot_lo)
/* basic machine hardware */
itech8_sound_ym2203(config);
- MCFG_CPU_ADD("sub", Z80, CLOCK_8MHz/2)
- MCFG_CPU_PROGRAM_MAP(slikz80_mem_map)
- MCFG_CPU_IO_MAP(slikz80_io_map)
+ MCFG_DEVICE_ADD("sub", Z80, CLOCK_8MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(slikz80_mem_map)
+ MCFG_DEVICE_IO_MAP(slikz80_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1950,8 +1950,8 @@ MACHINE_CONFIG_START(itech8_state::rimrockn)
/* basic machine hardware */
itech8_sound_ym3812_external(config);
- MCFG_CPU_REPLACE("maincpu", HD6309, CLOCK_12MHz)
- MCFG_CPU_PROGRAM_MAP(tmshi_map)
+ MCFG_DEVICE_REPLACE("maincpu", HD6309, CLOCK_12MHz)
+ MCFG_DEVICE_PROGRAM_MAP(tmshi_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1966,14 +1966,14 @@ MACHINE_CONFIG_START(itech8_state::ninclown)
/* basic machine hardware */
itech8_sound_ym3812_external(config);
- MCFG_CPU_REPLACE("maincpu", M68000, CLOCK_12MHz)
- MCFG_CPU_PROGRAM_MAP(ninclown_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, CLOCK_12MHz)
+ MCFG_DEVICE_PROGRAM_MAP(ninclown_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(64, 423, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(itech8_state, screen_update_2page_large)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(itech8_state, ninclown_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, itech8_state, ninclown_irq))
MACHINE_CONFIG_END
@@ -1983,8 +1983,8 @@ MACHINE_CONFIG_START(itech8_state::gtg2)
/* basic machine hardware */
itech8_sound_ym3812_external(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gtg2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gtg2_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp
index c2895d20603..dbffe859b31 100644
--- a/src/mame/drivers/itgambl2.cpp
+++ b/src/mame/drivers/itgambl2.cpp
@@ -276,8 +276,8 @@ PALETTE_INIT_MEMBER(itgambl2_state, itgambl2)
MACHINE_CONFIG_START(itgambl2_state::itgambl2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83337, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(itgambl2_map)
+ MCFG_DEVICE_ADD("maincpu", H83337, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(itgambl2_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -294,7 +294,7 @@ MACHINE_CONFIG_START(itgambl2_state::itgambl2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp
index c219b478a72..b78657d178b 100644
--- a/src/mame/drivers/itgambl3.cpp
+++ b/src/mame/drivers/itgambl3.cpp
@@ -264,8 +264,8 @@ PALETTE_INIT_MEMBER(itgambl3_state, itgambl3)
MACHINE_CONFIG_START(itgambl3_state::itgambl3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
- MCFG_CPU_PROGRAM_MAP(itgambl3_map)
+ MCFG_DEVICE_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
+ MCFG_DEVICE_PROGRAM_MAP(itgambl3_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp
index 70c84ace1b2..7c1a5fa3c47 100644
--- a/src/mame/drivers/itgamble.cpp
+++ b/src/mame/drivers/itgamble.cpp
@@ -215,8 +215,8 @@ void itgamble_state::machine_reset()
MACHINE_CONFIG_START(itgamble_state::itgamble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83048, MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(itgamble_map)
+ MCFG_DEVICE_ADD("maincpu", H83048, MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(itgamble_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -239,8 +239,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(itgamble_state::mnumber)
itgamble(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(MNUMBER_MAIN_CLOCK/2) /* probably the wrong CPU */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(MNUMBER_MAIN_CLOCK/2) /* probably the wrong CPU */
MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -251,8 +251,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( ejollyx5 )
itgamble(config);
/* wrong CPU. we need a Renesas M16/62A 16bit microcomputer core */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(EJOLLYX5_MAIN_CLOCK/2) /* up to 10MHz.*/
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(EJOLLYX5_MAIN_CLOCK/2) /* up to 10MHz.*/
MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp
index c5923b44a4e..eeeba00342f 100644
--- a/src/mame/drivers/itt3030.cpp
+++ b/src/mame/drivers/itt3030.cpp
@@ -696,20 +696,20 @@ void itt3030_state::machine_reset()
MACHINE_CONFIG_START(itt3030_state::itt3030)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(itt3030_map)
- MCFG_CPU_IO_MAP(itt3030_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(itt3030_map)
+ MCFG_DEVICE_IO_MAP(itt3030_io)
// Schematics + i8278 datasheet says:
// Port 1 goes to the keyboard matrix.
// bits 0-2 select bit to read back, bits 3-6 choose column to read from, bit 7 clocks the process (rising edge strobes the row, falling edge reads the data)
// T0 is the key matrix return
// pin 23 is the UPI-41 host IRQ line, it's unknown how it's connected to the Z80
- MCFG_CPU_ADD("kbdmcu", I8741, XTAL(6'000'000))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(itt3030_state, kbd_matrix_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(itt3030_state, kbd_matrix_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(itt3030_state, kbd_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(itt3030_state, kbd_port2_w))
+ MCFG_DEVICE_ADD("kbdmcu", I8741, XTAL(6'000'000))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, itt3030_state, kbd_matrix_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, itt3030_state, kbd_matrix_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, itt3030_state, kbd_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, itt3030_state, kbd_port2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -732,9 +732,9 @@ MACHINE_CONFIG_START(itt3030_state::itt3030)
MCFG_TMS9927_CHAR_WIDTH(8)
MCFG_FD1791_ADD("fdc", XTAL(20'000'000) / 20)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(itt3030_state, fdcirq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(itt3030_state, fdcdrq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(itt3030_state, fdchld_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, itt3030_state, fdcirq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, itt3030_state, fdcdrq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, itt3030_state, fdchld_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", itt3030_floppies, "525qd", itt3030_state::itt3030_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", itt3030_floppies, "525qd", itt3030_state::itt3030_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", itt3030_floppies, "525qd", itt3030_state::itt3030_floppy_formats)
@@ -750,7 +750,7 @@ MACHINE_CONFIG_START(itt3030_state::itt3030)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp
index 55cf03acf21..16c302060aa 100644
--- a/src/mame/drivers/jack.cpp
+++ b/src/mame/drivers/jack.cpp
@@ -913,14 +913,14 @@ MACHINE_RESET_MEMBER(jack_state,joinem)
MACHINE_CONFIG_START(jack_state::jack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(jack_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jack_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(jack_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jack_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jack_state, jack_sh_irq_ack)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(jack_state, jack_sh_irq_ack)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -942,16 +942,16 @@ MACHINE_CONFIG_START(jack_state::jack)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(ASSERTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'000'000)/12)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device,read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(jack_state, timer_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(18'000'000)/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device,read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, jack_state, timer_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(jack_state::treahunt)
jack(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -959,8 +959,8 @@ MACHINE_CONFIG_START(jack_state::striv)
jack(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(striv_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(striv_map)
MCFG_MACHINE_START_OVERRIDE(jack_state,striv)
MCFG_MACHINE_RESET_OVERRIDE(jack_state,striv)
@@ -983,10 +983,10 @@ MACHINE_CONFIG_START(jack_state::joinem)
jack(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(joinem_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jack_state, joinem_vblank_irq)
- MCFG_CPU_PERIODIC_INT_DRIVER(jack_state, irq0_line_hold, 250) // ??? controls game speed
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(joinem_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jack_state, joinem_vblank_irq)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(jack_state, irq0_line_hold, 250) // ??? controls game speed
MCFG_MACHINE_START_OVERRIDE(jack_state,joinem)
MCFG_MACHINE_RESET_OVERRIDE(jack_state,joinem)
@@ -1009,8 +1009,8 @@ MACHINE_CONFIG_START(jack_state::unclepoo)
joinem(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(unclepoo_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(unclepoo_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp
index 08c4f8c95df..b9a8f525608 100644
--- a/src/mame/drivers/jackal.cpp
+++ b/src/mame/drivers/jackal.cpp
@@ -360,11 +360,11 @@ void jackal_state::machine_reset()
MACHINE_CONFIG_START(jackal_state::jackal)
/* basic machine hardware */
- MCFG_CPU_ADD("master", MC6809E, MASTER_CLOCK/12) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_ADD("master", MC6809E, MASTER_CLOCK/12) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
- MCFG_CPU_ADD("slave", MC6809E, MASTER_CLOCK/12) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_ADD("slave", MC6809E, MASTER_CLOCK/12) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -378,7 +378,7 @@ MACHINE_CONFIG_START(jackal_state::jackal)
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(jackal_state, screen_update_jackal)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(jackal_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jackal_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jackal)
MCFG_PALETTE_ADD("palette", 0x300)
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 879c1e91ba3..f6caae0b90a 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -604,19 +604,19 @@ TIMER_DEVICE_CALLBACK_MEMBER(jackie_state::irq)
MACHINE_CONFIG_START(jackie_state::jackie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(jackie_prg_map)
- MCFG_CPU_IO_MAP(jackie_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(jackie_prg_map)
+ MCFG_DEVICE_IO_MAP(jackie_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", jackie_state, irq, "screen", 0, 1)
MCFG_DEVICE_ADD("ppi1", I8255A, 0) // D8255AC
- MCFG_I8255_OUT_PORTA_CB(WRITE8(jackie_state, nmi_and_coins_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, jackie_state, nmi_and_coins_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SERVICE"))
MCFG_I8255_IN_PORTC_CB(IOPORT("COINS"))
MCFG_DEVICE_ADD("ppi2", I8255A, 0) // D8255AC
MCFG_I8255_IN_PORTA_CB(IOPORT("BUTTONS1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(jackie_state, lamps_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jackie_state, lamps_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -633,7 +633,7 @@ MACHINE_CONFIG_START(jackie_state::jackie)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp
index 0f98e1e3564..6228baec8d2 100644
--- a/src/mame/drivers/jackpool.cpp
+++ b/src/mame/drivers/jackpool.cpp
@@ -227,9 +227,9 @@ INTERRUPT_GEN_MEMBER(jackpool_state::jackpool_interrupt)
MACHINE_CONFIG_START(jackpool_state::jackpool)
- MCFG_CPU_ADD("maincpu", M68000, 12000000) // ?
- MCFG_CPU_PROGRAM_MAP(jackpool_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jackpool_state, jackpool_interrupt) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(jackpool_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jackpool_state, jackpool_interrupt) // ?
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jackpool)
@@ -255,12 +255,12 @@ MACHINE_CONFIG_START(jackpool_state::jackpool)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // Coin counter
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // Ticket motor
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // Hopper motor
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(jackpool_state, map_vreg_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, jackpool_state, map_vreg_w))
MCFG_DEVICE_ADD("latch3", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/jade.cpp b/src/mame/drivers/jade.cpp
index fa0fe429e61..eecdef83df4 100644
--- a/src/mame/drivers/jade.cpp
+++ b/src/mame/drivers/jade.cpp
@@ -64,29 +64,29 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(jade_state::jade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(4'000'000))
MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(4'000'000))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
MCFG_DEVICE_ADD("trg0", CLOCK, XTAL(4'000'000) / 2)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc2", z80ctc_device, trg0))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc2", z80ctc_device, trg0))
/* Devices */
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // no evidence of a daisy chain because IM2 is not set
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index cf266c2a000..119c0219481 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -1815,24 +1815,24 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(jaguar_state::cojagr3k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3041, R3000_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", R3041, R3000_CLOCK)
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_CPU_PROGRAM_MAP(r3000_map)
+ MCFG_DEVICE_PROGRAM_MAP(r3000_map)
- MCFG_CPU_ADD("gpu", JAGUARGPU, COJAG_CLOCK/2)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, gpu_cpu_int))
- MCFG_CPU_PROGRAM_MAP(gpu_map)
+ MCFG_DEVICE_ADD("gpu", JAGUARGPU, COJAG_CLOCK/2)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, gpu_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(gpu_map)
- MCFG_CPU_ADD("dsp", JAGUARDSP, COJAG_CLOCK/2)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
- MCFG_CPU_PROGRAM_MAP(dsp_map)
+ MCFG_DEVICE_ADD("dsp", JAGUARDSP, COJAG_CLOCK/2)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, dsp_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(dsp_map)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_WATCHDOG_ADD("watchdog")
MCFG_VT83C461_ADD("ide", cojag_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(jaguar_state, external_int))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, jaguar_state, external_int))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1842,8 +1842,8 @@ MACHINE_CONFIG_START(jaguar_state::cojagr3k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1859,25 +1859,25 @@ MACHINE_CONFIG_START(jaguar_state::cojag68k)
cojagr3k(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(m68020_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68EC020, M68K_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(m68020_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(jaguar_state::jaguar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, JAGUAR_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(jaguar_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jaguar_state,jaguar_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, JAGUAR_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(jaguar_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(jaguar_state,jaguar_irq_callback)
- MCFG_CPU_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, gpu_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jag_gpu_map)
+ MCFG_DEVICE_ADD("gpu", JAGUARGPU, JAGUAR_CLOCK)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, gpu_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jag_gpu_map)
- MCFG_CPU_ADD("dsp", JAGUARDSP, JAGUAR_CLOCK)
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jag_dsp_map)
+ MCFG_DEVICE_ADD("dsp", JAGUARDSP, JAGUAR_CLOCK)
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, dsp_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jag_dsp_map)
// MCFG_NVRAM_HANDLER(jaguar)
@@ -1889,8 +1889,8 @@ MACHINE_CONFIG_START(jaguar_state::jaguar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1911,16 +1911,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jaguar_state::jaguarcd)
jaguar(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jaguarcd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jaguarcd_map)
- MCFG_CPU_MODIFY("gpu")
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, gpu_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jagcd_gpu_map)
+ MCFG_DEVICE_MODIFY("gpu")
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, gpu_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jagcd_gpu_map)
- MCFG_CPU_MODIFY("dsp")
- MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
- MCFG_CPU_PROGRAM_MAP(jagcd_dsp_map)
+ MCFG_DEVICE_MODIFY("dsp")
+ MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(*this, jaguar_state, dsp_cpu_int))
+ MCFG_DEVICE_PROGRAM_MAP(jagcd_dsp_map)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("jag_cdrom")
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index c492ed06f68..120ebac7aa1 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -264,9 +264,9 @@ void jailbrek_state::machine_reset()
MACHINE_CONFIG_START(jailbrek_state::jailbrek)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/12)
- MCFG_CPU_PROGRAM_MAP(jailbrek_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(jailbrek_state, interrupt_nmi, 500) /* ? */
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, MASTER_CLOCK/12)
+ MCFG_DEVICE_PROGRAM_MAP(jailbrek_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(jailbrek_state, interrupt_nmi, 500) /* ? */
MCFG_WATCHDOG_ADD("watchdog")
@@ -280,15 +280,15 @@ MACHINE_CONFIG_START(jailbrek_state::jailbrek)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 396, 8, 248, 256, 16, 240)
MCFG_SCREEN_UPDATE_DRIVER(jailbrek_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(jailbrek_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jailbrek_state, vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, MASTER_CLOCK/12)
+ MCFG_DEVICE_ADD("snsnd", SN76489A, MASTER_CLOCK/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, VOICE_CLOCK)
+ MCFG_DEVICE_ADD("vlm", VLM5030, VOICE_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index c4273e0bc02..f2f83091a26 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -1425,9 +1425,9 @@ void jalmah_state::machine_reset()
}
MACHINE_CONFIG_START(jalmah_state::jalmah)
- MCFG_CPU_ADD("maincpu" , M68000, 12000000) /* 68000-8 */
- MCFG_CPU_PROGRAM_MAP(jalmah)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jalmah_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu" , M68000, 12000000) /* 68000-8 */
+ MCFG_DEVICE_PROGRAM_MAP(jalmah)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jalmah_state, irq2_line_hold)
//M50747 MCU
@@ -1454,8 +1454,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jalmah_state::urashima)
jalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(urashima)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(urashima)
MCFG_GFXDECODE_MODIFY("gfxdecode", urashima)
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index b5ec0a0cb54..25d2751b802 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -869,14 +869,14 @@ MACHINE_RESET_MEMBER(jangou_state,jngolady)
MACHINE_CONFIG_START(jangou_state::jangou)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(cpu0_map)
- MCFG_CPU_IO_MAP(cpu0_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jangou_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("cpu0", Z80, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(cpu0_map)
+ MCFG_DEVICE_IO_MAP(cpu0_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jangou_state, irq0_line_hold)
- MCFG_CPU_ADD("cpu1", Z80, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_IO_MAP(cpu1_io)
+ MCFG_DEVICE_ADD("cpu1", Z80, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_IO_MAP(cpu1_io)
MCFG_JANGOU_BLITTER_ADD("blitter", MASTER_CLOCK/4)
@@ -894,12 +894,12 @@ MACHINE_CONFIG_START(jangou_state::jangou)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 16)
- MCFG_AY8910_PORT_A_READ_CB(READ8(jangou_state, input_mux_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(jangou_state, input_system_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK / 16)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, jangou_state, input_mux_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, jangou_state, input_system_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("cvsd", HC55516, MASTER_CLOCK / 1024)
+ MCFG_DEVICE_ADD("cvsd", HC55516, MASTER_CLOCK / 1024)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -908,15 +908,15 @@ MACHINE_CONFIG_START(jangou_state::jngolady)
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu0")
- MCFG_CPU_PROGRAM_MAP(jngolady_cpu0_map)
+ MCFG_DEVICE_MODIFY("cpu0")
+ MCFG_DEVICE_PROGRAM_MAP(jngolady_cpu0_map)
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(jngolady_cpu1_map)
- MCFG_CPU_IO_MAP(jngolady_cpu1_io)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(jngolady_cpu1_map)
+ MCFG_DEVICE_IO_MAP(jngolady_cpu1_io)
- MCFG_CPU_ADD("nsc", NSC8105, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_DEVICE_ADD("nsc", NSC8105, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(nsc_map)
MCFG_MACHINE_START_OVERRIDE(jangou_state,jngolady)
MCFG_MACHINE_RESET_OVERRIDE(jangou_state,jngolady)
@@ -924,8 +924,8 @@ MACHINE_CONFIG_START(jangou_state::jngolady)
/* sound hardware */
MCFG_DEVICE_REMOVE("cvsd")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(jangou_state, jngolady_vclk_cb))
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, jangou_state, jngolady_vclk_cb))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -935,9 +935,9 @@ MACHINE_CONFIG_START(jangou_state::cntrygrl)
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu0")
- MCFG_CPU_PROGRAM_MAP(cntrygrl_cpu0_map )
- MCFG_CPU_IO_MAP(cntrygrl_cpu0_io )
+ MCFG_DEVICE_MODIFY("cpu0")
+ MCFG_DEVICE_PROGRAM_MAP(cntrygrl_cpu0_map )
+ MCFG_DEVICE_IO_MAP(cntrygrl_cpu0_io )
MCFG_DEVICE_REMOVE("cpu1")
@@ -954,9 +954,9 @@ MACHINE_CONFIG_START(jangou_state::roylcrdn)
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu0")
- MCFG_CPU_PROGRAM_MAP(roylcrdn_cpu0_map )
- MCFG_CPU_IO_MAP(roylcrdn_cpu0_io )
+ MCFG_DEVICE_MODIFY("cpu0")
+ MCFG_DEVICE_PROGRAM_MAP(roylcrdn_cpu0_map )
+ MCFG_DEVICE_IO_MAP(roylcrdn_cpu0_io )
MCFG_DEVICE_REMOVE("cpu1")
diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp
index d01457c0c46..ff69614e452 100644
--- a/src/mame/drivers/jankenmn.cpp
+++ b/src/mame/drivers/jankenmn.cpp
@@ -386,22 +386,22 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(jankenmn_state::jankenmn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 2.5 MHz */
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* 2.5 MHz */
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(jankenmn_map)
- MCFG_CPU_IO_MAP(jankenmn_port_map)
+ MCFG_DEVICE_PROGRAM_MAP(jankenmn_map)
+ MCFG_DEVICE_IO_MAP(jankenmn_port_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
/* (10-13) Mode 0 - Ports A & B set as input, high C & low C as output. */
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(jankenmn_state, lamps3_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jankenmn_state, lamps3_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
/* (20-23) Mode 0 - Ports A, B, high C & low C set as output. */
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(jankenmn_state, lamps1_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(jankenmn_state, lamps2_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jankenmn_state, lamps1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jankenmn_state, lamps2_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -411,7 +411,7 @@ MACHINE_CONFIG_START(jankenmn_state::jankenmn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", AD7523, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", AD7523, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp
index 5295ffe35d7..dd9bbd5fbd7 100644
--- a/src/mame/drivers/jantotsu.cpp
+++ b/src/mame/drivers/jantotsu.cpp
@@ -502,9 +502,9 @@ void jantotsu_state::machine_reset()
MACHINE_CONFIG_START(jantotsu_state::jantotsu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(jantotsu_map)
- MCFG_CPU_IO_MAP(jantotsu_io)
+ MCFG_DEVICE_ADD("maincpu", Z80,MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(jantotsu_map)
+ MCFG_DEVICE_IO_MAP(jantotsu_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -521,14 +521,14 @@ MACHINE_CONFIG_START(jantotsu_state::jantotsu)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, MAIN_CLOCK/4)
+ MCFG_DEVICE_ADD("sn1", SN76489A, MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, MAIN_CLOCK/4)
+ MCFG_DEVICE_ADD("sn2", SN76489A, MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("adpcm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(jantotsu_state, jan_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("adpcm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, jantotsu_state, jan_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp
index fe5d985740d..22010964b2c 100644
--- a/src/mame/drivers/jchan.cpp
+++ b/src/mame/drivers/jchan.cpp
@@ -602,12 +602,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(jchan_state::jchan)
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(jchan_main)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(jchan_main)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", jchan_state, vblank, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(jchan_sub)
+ MCFG_DEVICE_ADD("sub", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(jchan_sub)
MCFG_WATCHDOG_ADD("watchdog")
@@ -639,7 +639,7 @@ MACHINE_CONFIG_START(jchan_state::jchan)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16000000)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index f3042d7be7d..fc493039b0a 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -1131,14 +1131,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(common_state::scanline_irq)
// Older hardware (ST-0020 + ST-0016)
MACHINE_CONFIG_START(jclub2o_state::jclub2o)
- MCFG_CPU_ADD("maincpu", M68EC020, 12000000)
- MCFG_CPU_PROGRAM_MAP(jclub2o_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(jclub2o_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu",ST0016_CPU, 8000000)
- MCFG_CPU_PROGRAM_MAP(st0016_mem)
- MCFG_CPU_IO_MAP(st0016_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jclub2o_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("soundcpu",ST0016_CPU, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(st0016_mem)
+ MCFG_DEVICE_IO_MAP(st0016_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jclub2o_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_EEPROM_SERIAL_S29290_ADD("eeprom") // S-29290 (16 bits)
@@ -1170,8 +1170,8 @@ MACHINE_CONFIG_END
// Newer hardware (ST-0032)
MACHINE_CONFIG_START(jclub2_state::jclub2)
- MCFG_CPU_ADD("maincpu", M68EC020, 12000000)
- MCFG_CPU_PROGRAM_MAP(jclub2_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(jclub2_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1205,8 +1205,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(darkhors_state::darkhors)
- MCFG_CPU_ADD("maincpu", M68EC020, 12000000) // 36MHz/3 ??
- MCFG_CPU_PROGRAM_MAP(darkhors_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 12000000) // 36MHz/3 ??
+ MCFG_DEVICE_PROGRAM_MAP(darkhors_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp
index 47e84ad847b..814226aa919 100644
--- a/src/mame/drivers/jedi.cpp
+++ b/src/mame/drivers/jedi.cpp
@@ -319,8 +319,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(jedi_state::jedi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_QUANTUM_TIME(attotime::from_hz(240))
@@ -333,13 +333,13 @@ MACHINE_CONFIG_START(jedi_state::jedi)
MCFG_ADC0808_IN3_CB(NOOP) // SPARE
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 14J
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(jedi_state, coin_counter_left_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jedi_state, coin_counter_right_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, jedi_state, coin_counter_left_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jedi_state, coin_counter_right_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // LED control - not used
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // LED control - not used
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(jedi_state, foreground_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(jedi_state, audio_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(jedi_state, video_off_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, jedi_state, foreground_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, jedi_state, audio_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, jedi_state, video_off_w))
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp
index 92b505ec236..b35dae967ce 100644
--- a/src/mame/drivers/jeutel.cpp
+++ b/src/mame/drivers/jeutel.cpp
@@ -198,13 +198,13 @@ DRIVER_INIT_MEMBER( jeutel_state, jeutel )
MACHINE_CONFIG_START(jeutel_state::jeutel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3300000)
- MCFG_CPU_PROGRAM_MAP(jeutel_map)
- MCFG_CPU_ADD("cpu2", Z80, 3300000)
- MCFG_CPU_PROGRAM_MAP(jeutel_cpu2)
- MCFG_CPU_ADD("cpu3", Z80, 3300000)
- MCFG_CPU_PROGRAM_MAP(jeutel_cpu3)
- MCFG_CPU_IO_MAP(jeutel_cpu3_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3300000)
+ MCFG_DEVICE_PROGRAM_MAP(jeutel_map)
+ MCFG_DEVICE_ADD("cpu2", Z80, 3300000)
+ MCFG_DEVICE_PROGRAM_MAP(jeutel_cpu2)
+ MCFG_DEVICE_ADD("cpu3", Z80, 3300000)
+ MCFG_DEVICE_PROGRAM_MAP(jeutel_cpu3)
+ MCFG_DEVICE_IO_MAP(jeutel_cpu3_io)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_jeutel)
@@ -215,40 +215,40 @@ MACHINE_CONFIG_START(jeutel_state::jeutel)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 639450)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(jeutel_state,porta_w))
- MCFG_AY8910_PORT_B_READ_CB(READ8(jeutel_state,portb_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 639450)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, jeutel_state,porta_w))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, jeutel_state,portb_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("tms", TMS5110A, 640000)
- //MCFG_TMS5110_M0_CB(DEVWRITELINE("tmsprom", tmsprom_device, m0_w))
- //MCFG_TMS5110_DATA_CB(DEVREADLINE("tmsprom", tmsprom_device, data_r))
+ MCFG_DEVICE_ADD("tms", TMS5110A, 640000)
+ //MCFG_TMS5110_M0_CB(WRITELINE("tmsprom", tmsprom_device, m0_w))
+ //MCFG_TMS5110_DATA_CB(READLINE("tmsprom", tmsprom_device, data_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* Devices */
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
//MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(jeutel_state, ppi0a_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, jeutel_state, ppi0a_w))
//MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(jeutel_state, ppi0b_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jeutel_state, ppi0b_w))
//MCFG_I8255_IN_PORTC_CB(IOPORT("EXTRA"))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(jeutel_state, ppi0c_w))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jeutel_state, ppi0c_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
//MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(jeutel_state, ppi1a_w))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, jeutel_state, ppi1a_w))
//MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(jeutel_state, ppi1b_w))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jeutel_state, ppi1b_w))
//MCFG_I8255_IN_PORTC_CB(IOPORT("EXTRA"))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(jeutel_state, ppi1c_w))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jeutel_state, ppi1c_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
//MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(jeutel_state, ppi2a_w))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, jeutel_state, ppi2a_w))
//MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(jeutel_state, ppi2b_w))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jeutel_state, ppi2b_w))
//MCFG_I8255_IN_PORTC_CB(IOPORT("EXTRA"))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(jeutel_state, ppi2c_w))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jeutel_state, ppi2c_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", jeutel_state, timer_a, attotime::from_hz(120))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp
index d2695472611..745bcb36c06 100644
--- a/src/mame/drivers/joctronic.cpp
+++ b/src/mame/drivers/joctronic.cpp
@@ -333,21 +333,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(joctronic_state::joctronic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) // 3 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(maincpu_map) // 139
- MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) // 3 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map) // 139
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(joctronic_sound_map)
- MCFG_CPU_IO_MAP(joctronic_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(joctronic_sound_map)
+ MCFG_DEVICE_IO_MAP(joctronic_sound_io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 5516
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC4 - exact type unknown
- //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(joctronic_state, display_select_w)) MCFG_DEVCB_MASK(0x07)
- //MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(4)
- //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(joctronic_state, display_reset_w))
+ //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, joctronic_state, display_select_w)) MCFG_DEVCB_MASK(0x07)
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITE8(*this, joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(4)
+ //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, joctronic_state, display_reset_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(12'000'000)/4) // 3 MHz
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -362,38 +362,38 @@ MACHINE_CONFIG_START(joctronic_state::joctronic)
MCFG_SPEAKER_STANDARD_MONO("mono")
// Datasheet suggests YM2203 as a possible replacement for this AY8910
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("r2r1", dac_8bit_r2r_device, write))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("r2r2", dac_8bit_r2r_device, write))
+ MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r1", dac_8bit_r2r_device, write))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("r2r2", dac_8bit_r2r_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("r2r1", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("r2r1", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("r2r2", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("r2r2", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(joctronic_state::slalom03)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32
- MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
- MCFG_CPU_PROGRAM_MAP(slalom03_sound_map)
- MCFG_CPU_IO_MAP(slalom03_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) // 6 MHz - uses WAIT
+ MCFG_DEVICE_PROGRAM_MAP(slalom03_sound_map)
+ MCFG_DEVICE_IO_MAP(slalom03_sound_io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 5516
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC6 - exact type unknown
- //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(joctronic_state, cont_w))
- //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(3) MCFG_DEVCB_MASK(0x38)
- //MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(joctronic_state, slalom03_reset_w))
+ //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, joctronic_state, cont_w))
+ //MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, joctronic_state, ls145_w)) MCFG_DEVCB_RSHIFT(3) MCFG_DEVCB_MASK(0x38)
+ //MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, joctronic_state, slalom03_reset_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(12'000'000)/2) // 6 MHz
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -409,31 +409,31 @@ MACHINE_CONFIG_START(joctronic_state::slalom03)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(joctronic_state, slalom03_oki_bank_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("adpcm_select", ls157_device, ba_w))
+ MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, joctronic_state, slalom03_oki_bank_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("adpcm_select", ls157_device, ba_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("r2r", dac_8bit_r2r_device, write))
+ MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(12'000'000)/8) // 1.5 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("r2r", dac_8bit_r2r_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("r2r", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("r2r", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("oki", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("oki", msm5205_device, data_w))
- MCFG_SOUND_ADD("oki", MSM5205, XTAL(12'000'000)/2/16) // 375 kHz
+ MCFG_DEVICE_ADD("oki", MSM5205, XTAL(12'000'000)/2/16) // 375 kHz
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) // frequency modifiable during operation
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(joctronic_state, vck_w))
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, joctronic_state, vck_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(joctronic_state::bldyrolr)
slalom03(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bldyrolr_maincpu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bldyrolr_maincpu_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 6016f207af1..db6a461b63a 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -408,16 +408,16 @@ WRITE8_MEMBER(jokrwild_state::testb_w)
MACHINE_CONFIG_START(jokrwild_state::jokrwild)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */
- MCFG_CPU_PROGRAM_MAP(jokrwild_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(jokrwild_map)
// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(jokrwild_state, testa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(jokrwild_state, testb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, jokrwild_state, testa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, jokrwild_state, testb_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp
index 956cece4492..9d2fc5cc42e 100644
--- a/src/mame/drivers/jollyjgr.cpp
+++ b/src/mame/drivers/jollyjgr.cpp
@@ -681,8 +681,8 @@ void jollyjgr_state::machine_reset()
MACHINE_CONFIG_START(jollyjgr_state::jollyjgr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'000'000)/6) /* 3MHz verified */
- MCFG_CPU_PROGRAM_MAP(jollyjgr_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'000'000)/6) /* 3MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(jollyjgr_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -691,7 +691,7 @@ MACHINE_CONFIG_START(jollyjgr_state::jollyjgr)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(jollyjgr_state, screen_update_jollyjgr)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(jollyjgr_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jollyjgr_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jollyjgr)
MCFG_PALETTE_ADD("palette", 32) // tilemap and sprites
@@ -701,14 +701,14 @@ MACHINE_CONFIG_START(jollyjgr_state::jollyjgr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545)/2) /* 1.7897725MHz verified */
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(3'579'545)/2) /* 1.7897725MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(jollyjgr_state::fspider)
jollyjgr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fspider_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fspider_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(jollyjgr_state, screen_update_fspider)
diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp
index 394d49e76c9..e0aa004de65 100644
--- a/src/mame/drivers/jongkyo.cpp
+++ b/src/mame/drivers/jongkyo.cpp
@@ -500,11 +500,11 @@ void jongkyo_state::machine_reset()
MACHINE_CONFIG_START(jongkyo_state::jongkyo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SEGA_315_5084,JONGKYO_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(jongkyo_memmap)
- MCFG_CPU_IO_MAP(jongkyo_portmap)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jongkyo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", SEGA_315_5084,JONGKYO_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(jongkyo_memmap)
+ MCFG_DEVICE_IO_MAP(jongkyo_portmap)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jongkyo_state, irq0_line_hold)
MCFG_SEGACRPT_SET_SIZE(0x6c00)
MCFG_SEGACRPT_SET_NUMBANKS(8)
MCFG_SEGACRPT_SET_BANKSIZE(0x400)
@@ -524,9 +524,9 @@ MACHINE_CONFIG_START(jongkyo_state::jongkyo)
MCFG_PALETTE_INIT_OWNER(jongkyo_state, jongkyo)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, JONGKYO_CLOCK/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(jongkyo_state, input_1p_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(jongkyo_state, input_2p_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, JONGKYO_CLOCK/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, jongkyo_state, input_1p_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, jongkyo_state, input_2p_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp
index 04ad56f56c2..53832b73eb7 100644
--- a/src/mame/drivers/jonos.cpp
+++ b/src/mame/drivers/jonos.cpp
@@ -174,8 +174,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(jonos_state::jonos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(jonos_mem)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(jonos_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index 213935179f1..1f09f8da3e0 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -585,15 +585,15 @@ INTERRUPT_GEN_MEMBER(joystand_state::joystand_interrupt)
MACHINE_CONFIG_START(joystand_state::joystand)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // !! TMP68301 !!
- MCFG_CPU_PROGRAM_MAP(joystand_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", joystand_state, joystand_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) // !! TMP68301 !!
+ MCFG_DEVICE_PROGRAM_MAP(joystand_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", joystand_state, joystand_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
- MCFG_TMP68301_IN_PARALLEL_CB(READ16(joystand_state, eeprom_r))
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(joystand_state, eeprom_w))
+ MCFG_TMP68301_IN_PARALLEL_CB(READ16(*this, joystand_state, eeprom_r))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, joystand_state, eeprom_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -611,7 +611,7 @@ MACHINE_CONFIG_START(joystand_state::joystand)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000) / 16, PIN7_HIGH) // pin 7 not verified
diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp
index 6b17237fc1f..e4fdbb6acc4 100644
--- a/src/mame/drivers/jp.cpp
+++ b/src/mame/drivers/jp.cpp
@@ -335,35 +335,35 @@ void jp_state::machine_reset()
MACHINE_CONFIG_START(jp_state::jp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(jp_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(jp_state, irq0_line_hold, 8_MHz_XTAL / 8192) // 4020 divider
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(jp_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(jp_state, irq0_line_hold, 8_MHz_XTAL / 8192) // 4020 divider
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("latch0", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, disp_data_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, disp_data_w)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("latch1", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, disp_clock_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, disp_clock_w)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("latch2", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, disp_strobe_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, disp_strobe_w)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("latch3", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, row_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, row_w))
MCFG_DEVICE_ADD("latch4", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, row_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, row_w))
MCFG_DEVICE_ADD("latch5", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, row_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, row_w))
MCFG_DEVICE_ADD("latch6", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, row_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, row_w))
MCFG_DEVICE_ADD("latch7", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jp_state, row_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jp_state, row_w))
MCFG_DEVICE_ADD("latch8", LS259, 0)
@@ -375,9 +375,9 @@ MACHINE_CONFIG_START(jp_state::jp)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay", AY8910, 8_MHz_XTAL / 4)
- MCFG_AY8910_PORT_A_READ_CB(READ8(jp_state, porta_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(jp_state, portb_r))
+ MCFG_DEVICE_ADD("ay", AY8910, 8_MHz_XTAL / 4)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, jp_state, porta_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, jp_state, portb_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 0.9)
MACHINE_CONFIG_END
@@ -410,16 +410,16 @@ IRQ_CALLBACK_MEMBER(jp_state::sound_int_cb)
MACHINE_CONFIG_START(jp_state::jps)
jp(config);
- MCFG_CPU_ADD("soundcpu", Z80, 8_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(jp_sound_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(jp_state, sound_int_cb)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 8_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(jp_sound_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(jp_state, sound_int_cb)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0) // not labeled in manual; might even be a CD4019
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
MCFG_SPEAKER_STANDARD_MONO("msmvol")
- MCFG_SOUND_ADD("msm", MSM5205, 384'000) // not labeled in manual; clock unknown
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(jp_state, vck_w))
+ MCFG_DEVICE_ADD("msm", MSM5205, 384'000) // not labeled in manual; clock unknown
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, jp_state, vck_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmvol", 1.0)
diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index f4fd86cef99..81b6f09a091 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -841,16 +841,16 @@ WRITE_LINE_MEMBER(jpmimpct_state::tms_irq)
*************************************/
MACHINE_CONFIG_START(jpmimpct_state::jpmimpct)
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(m68k_program_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(m68k_program_map)
- MCFG_CPU_ADD("dsp", TMS34010, 40000000)
- MCFG_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_DEVICE_ADD("dsp", TMS34010, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(tms_program_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(40000000/16) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(4) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(jpmimpct_state, scanline_update) /* scanline updater (rgb32) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(jpmimpct_state, tms_irq))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, jpmimpct_state, tms_irq))
MCFG_TMS340X0_TO_SHIFTREG_CB(jpmimpct_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(jpmimpct_state, from_shiftreg) /* read from shiftreg function */
@@ -867,7 +867,7 @@ MACHINE_CONFIG_START(jpmimpct_state::jpmimpct)
MCFG_PALETTE_ADD("palette", 256)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_VIDEO_START_OVERRIDE(jpmimpct_state,jpmimpct)
@@ -1313,8 +1313,8 @@ INPUT_PORTS_END
*************************************/
MACHINE_CONFIG_START(jpmimpct_state::impctawp)
- MCFG_CPU_ADD("maincpu",M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(awp68k_program_map)
+ MCFG_DEVICE_ADD("maincpu",M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(awp68k_program_map)
MCFG_QUANTUM_TIME(attotime::from_hz(30000))
MCFG_S16LF01_ADD("vfd",0)
@@ -1324,30 +1324,30 @@ MACHINE_CONFIG_START(jpmimpct_state::impctawp)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(jpmimpct_state, payen_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(jpmimpct_state, hopper_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(jpmimpct_state, hopper_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(jpmimpct_state, display_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, jpmimpct_state, payen_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, jpmimpct_state, hopper_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, jpmimpct_state, hopper_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jpmimpct_state, display_c_w))
MCFG_TIMER_DRIVER_ADD("duart_1_timer", jpmimpct_state, duart_1_timer_event)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd",UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEFAULT_LAYOUT(layout_jpmimpct)
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(jpmimpct_state, reel0_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel0_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(jpmimpct_state, reel1_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel1_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(jpmimpct_state, reel2_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel2_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(jpmimpct_state, reel3_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel3_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(jpmimpct_state, reel4_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel4_optic_cb))
MCFG_STARPOINT_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(jpmimpct_state, reel5_optic_cb))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel5_optic_cb))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(5)
diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp
index 62534b93047..c14253b53f5 100644
--- a/src/mame/drivers/jpmmps.cpp
+++ b/src/mame/drivers/jpmmps.cpp
@@ -259,17 +259,17 @@ MACHINE_CONFIG_START(jpmmps_state::jpmmps)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // bb
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // diagnostic led
- //MCFG_CPU_ADD("reelmcu", TMS7041, XTAL(5'000'000))
+ //MCFG_DEVICE_ADD("reelmcu", TMS7041, XTAL(5'000'000))
MCFG_DEVICE_ADD("ppi8255_ic26", I8255, 0)
// Port B 0 is coin lockout
- MCFG_I8255_OUT_PORTC_CB(WRITE8(jpmmps_state, jpmmps_meters_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jpmmps_state, jpmmps_meters_w))
MCFG_DEVICE_ADD("ppi8255_ic21", I8255, 0)
MCFG_DEVICE_ADD("ppi8255_ic22", I8255, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(jpmmps_state, jpmmps_psg_buf_w)) // SN chip data
- MCFG_I8255_OUT_PORTC_CB(WRITE8(jpmmps_state, jpmmps_ic22_portc_w)) // C3 is last meter, C2 latches in data
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, jpmmps_state, jpmmps_psg_buf_w)) // SN chip data
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, jpmmps_state, jpmmps_ic22_portc_w)) // C3 is last meter, C2 latches in data
MCFG_DEVICE_ADD("ppi8255_ic25", I8255, 0)
@@ -278,7 +278,7 @@ MACHINE_CONFIG_START(jpmmps_state::jpmmps)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn", SN76489, SOUND_CLOCK)
+ MCFG_DEVICE_ADD("sn", SN76489, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("meters", METERS, 0)
diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp
index 860eebad8b9..4c8b3fec9e0 100644
--- a/src/mame/drivers/jpms80.cpp
+++ b/src/mame/drivers/jpms80.cpp
@@ -148,14 +148,14 @@ MACHINE_CONFIG_START(jpms80_state::jpms80)
MCFG_DEVICE_ADD("outlatch9", LS259, 0) // I/O IC14
MCFG_DEVICE_ADD("outlatch10", LS259, 0) // I/O IC15
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(jpms80_state, int1_enable_w)) // 50 - INT1 enable (lv3)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jpms80_state, int2_enable_w)) // 51 - INT2 enable (lv4)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(jpms80_state, watchdog_w)) // 52 - Watchdog
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(jpms80_state, io_enable_w)) // 53 - I/O Enable
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, jpms80_state, int1_enable_w)) // 50 - INT1 enable (lv3)
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jpms80_state, int2_enable_w)) // 51 - INT2 enable (lv4)
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, jpms80_state, watchdog_w)) // 52 - Watchdog
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, jpms80_state, io_enable_w)) // 53 - I/O Enable
MCFG_DEVICE_ADD("tms9902duart", TMS9902, DUART_CLOCK)
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp
index 8742a7e249c..10d769364db 100644
--- a/src/mame/drivers/jpmsys5.cpp
+++ b/src/mame/drivers/jpmsys5.cpp
@@ -588,28 +588,28 @@ void jpmsys5v_state::machine_reset()
*************************************/
MACHINE_CONFIG_START(jpmsys5v_state::jpmsys5v)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(m68000_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(m68000_map)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5v_state, a0_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5v_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5v_state, a0_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5v_state, acia_irq))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5v_state, a1_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5v_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5v_state, a1_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5v_state, acia_irq))
MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5v_state, a2_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5v_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5v_state, a2_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5v_state, acia_irq))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 10000) // What are the correct ACIA clocks ?
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia6850_0", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_0", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_2", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia6850_0", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_0", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_2", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_2", acia6850_device, write_rxc))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -622,32 +622,32 @@ MACHINE_CONFIG_START(jpmsys5v_state::jpmsys5v)
MCFG_DEVICE_ADD("tms34061", TMS34061, 0)
MCFG_TMS34061_ROWSHIFT(8) /* VRAM address is (row << rowshift) | col */
MCFG_TMS34061_VRAM_SIZE(0x40000) /* size of video RAM */
- MCFG_TMS34061_INTERRUPT_CB(WRITELINE(jpmsys5v_state, generate_tms34061_interrupt)) /* interrupt gen callback */
+ MCFG_TMS34061_INTERRUPT_CB(WRITELINE(*this, jpmsys5v_state, generate_tms34061_interrupt)) /* interrupt gen callback */
MCFG_PALETTE_ADD("palette", 16)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd7759", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
/* Earlier revisions use an SAA1099, but no video card games seem to (?) */
- MCFG_SOUND_ADD("ym2413", YM2413, 4000000 ) /* Unconfirmed */
+ MCFG_DEVICE_ADD("ym2413", YM2413, 4000000 ) /* Unconfirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("6821pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(jpmsys5v_state, u29_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(jpmsys5v_state, u29_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(jpmsys5v_state, u29_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(jpmsys5v_state, u29_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(jpmsys5v_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(jpmsys5v_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, jpmsys5v_state, u29_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, jpmsys5v_state, u29_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, jpmsys5v_state, u29_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, jpmsys5v_state, u29_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, jpmsys5v_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, jpmsys5v_state, pia_irq))
/* 6840 PTM */
MCFG_DEVICE_ADD("6840ptm", PTM6840, 1000000)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(jpmsys5v_state, u26_o1_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(jpmsys5v_state, ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, jpmsys5v_state, u26_o1_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, jpmsys5v_state, ptm_irq))
MACHINE_CONFIG_END
READ16_MEMBER(jpmsys5_state::mux_awp_r)
@@ -807,55 +807,55 @@ void jpmsys5_state::machine_reset()
// later (incompatible with earlier revision) motherboards used a YM2413
MACHINE_CONFIG_START(jpmsys5_state::jpmsys5_ym)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(m68000_awp_map)
+ MCFG_DEVICE_PROGRAM_MAP(m68000_awp_map)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5_state, a0_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5_state, a0_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5_state, acia_irq))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5_state, a1_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5_state, a1_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5_state, acia_irq))
MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5_state, a2_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5_state, a2_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5_state, acia_irq))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 10000) // What are the correct ACIA clocks ?
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia6850_0", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_0", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_2", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia6850_0", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_0", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_2", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_2", acia6850_device, write_rxc))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_S16LF01_ADD("vfd",0)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd7759", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
/* Earlier revisions use an SAA1099 */
- MCFG_SOUND_ADD("ym2413", YM2413, 4000000 ) /* Unconfirmed */
+ MCFG_DEVICE_ADD("ym2413", YM2413, 4000000 ) /* Unconfirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("6821pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, jpmsys5_state, u29_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, jpmsys5_state, u29_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, jpmsys5_state, u29_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, jpmsys5_state, u29_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, jpmsys5_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, jpmsys5_state, pia_irq))
/* 6840 PTM */
MCFG_DEVICE_ADD("6840ptm", PTM6840, 1000000)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(jpmsys5_state, u26_o1_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(jpmsys5_state, ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, jpmsys5_state, u26_o1_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, jpmsys5_state, ptm_irq))
MCFG_DEFAULT_LAYOUT(layout_jpmsys5)
MCFG_DEVICE_ADD("meters", METERS, 0)
@@ -864,53 +864,53 @@ MACHINE_CONFIG_END
// the first rev PCB used an SAA1099
MACHINE_CONFIG_START(jpmsys5_state::jpmsys5)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(m68000_awp_map_saa)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(m68000_awp_map_saa)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5_state, a0_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5_state, a0_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5_state, acia_irq))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5_state, a1_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5_state, a1_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5_state, acia_irq))
MCFG_DEVICE_ADD("acia6850_2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(jpmsys5_state, a2_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(jpmsys5_state, acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, jpmsys5_state, a2_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, jpmsys5_state, acia_irq))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 10000) // What are the correct ACIA clocks ?
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia6850_0", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_0", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_1", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_2", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia6850_2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia6850_0", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_0", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_1", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_2", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia6850_2", acia6850_device, write_rxc))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_S16LF01_ADD("vfd",0)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("upd7759", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd7759", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SAA1099_ADD("saa", 4000000 /* guess */)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("6821pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(jpmsys5_state, u29_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(jpmsys5_state, u29_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(jpmsys5_state, u29_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(jpmsys5_state, u29_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(jpmsys5_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, jpmsys5_state, u29_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, jpmsys5_state, u29_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, jpmsys5_state, u29_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, jpmsys5_state, u29_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, jpmsys5_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, jpmsys5_state, pia_irq))
/* 6840 PTM */
MCFG_DEVICE_ADD("6840ptm", PTM6840, 1000000)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(jpmsys5_state, u26_o1_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(jpmsys5_state, ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, jpmsys5_state, u26_o1_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, jpmsys5_state, ptm_irq))
MCFG_DEFAULT_LAYOUT(layout_jpmsys5)
MCFG_DEVICE_ADD("meters", METERS, 0)
diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp
index 0613d14fa74..9e156e45ebc 100644
--- a/src/mame/drivers/jpmsys7.cpp
+++ b/src/mame/drivers/jpmsys7.cpp
@@ -56,8 +56,8 @@ static INPUT_PORTS_START( jpmsys7 )
INPUT_PORTS_END
MACHINE_CONFIG_START(jpmsys7_state::jpmsys7)
- MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) // seems to be a Coldfire of some kind
- MCFG_CPU_PROGRAM_MAP(jpmsys7_map)
+ MCFG_DEVICE_ADD("maincpu", MCF5206E, 40000000) // seems to be a Coldfire of some kind
+ MCFG_DEVICE_PROGRAM_MAP(jpmsys7_map)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index 189a4c689a0..6a248686882 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -371,8 +371,8 @@ QUICKLOAD_LOAD_MEMBER( jr100_state,jr100)
MACHINE_CONFIG_START(jr100_state::jr100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6802, XTAL(14'318'181) / 4) // clock devided internaly by 4
- MCFG_CPU_PROGRAM_MAP(jr100_mem)
+ MCFG_DEVICE_ADD("maincpu",M6802, XTAL(14'318'181) / 4) // clock devided internaly by 4
+ MCFG_DEVICE_PROGRAM_MAP(jr100_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -387,18 +387,18 @@ MACHINE_CONFIG_START(jr100_state::jr100)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("via", VIA6522, XTAL(14'318'181) / 16)
- MCFG_VIA6522_READPB_HANDLER(READ8(jr100_state,jr100_via_read_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(jr100_state,jr100_via_write_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(jr100_state,jr100_via_write_b))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(jr100_state, jr100_via_write_cb2))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, jr100_state,jr100_via_read_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, jr100_state,jr100_via_write_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, jr100_state,jr100_via_write_b))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, jr100_state, jr100_via_write_cb2))
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD("beeper", BEEP, 0)
+ MCFG_DEVICE_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp
index 41fcce12e8e..95124a12471 100644
--- a/src/mame/drivers/jr200.cpp
+++ b/src/mame/drivers/jr200.cpp
@@ -537,10 +537,10 @@ void jr200_state::machine_reset()
MACHINE_CONFIG_START(jr200_state::jr200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(14'318'181) / 4) /* MN1800A, ? Mhz assumption that it is same as JR-100*/
- MCFG_CPU_PROGRAM_MAP(jr200_mem)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(14'318'181) / 4) /* MN1800A, ? Mhz assumption that it is same as JR-100*/
+ MCFG_DEVICE_PROGRAM_MAP(jr200_mem)
-// MCFG_CPU_ADD("mn1544", MN1544, ?)
+// MCFG_DEVICE_ADD("mn1544", MN1544, ?)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -558,7 +558,7 @@ MACHINE_CONFIG_START(jr200_state::jr200)
// AY-8910 ?
- MCFG_SOUND_ADD("beeper", BEEP, 0)
+ MCFG_DEVICE_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp
index 753abfdf388..7d7152199e5 100644
--- a/src/mame/drivers/jrpacman.cpp
+++ b/src/mame/drivers/jrpacman.cpp
@@ -278,22 +278,22 @@ WRITE_LINE_MEMBER(jrpacman_state::vblank_irq)
MACHINE_CONFIG_START(jrpacman_state::jrpacman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(port_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(port_map)
MCFG_DEVICE_ADD("latch1", LS259, 0) // 5P
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(jrpacman_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(jrpacman_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(jrpacman_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, jrpacman_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, jrpacman_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, jrpacman_state, coin_counter_w))
MCFG_DEVICE_ADD("latch2", LS259, 0) // 1H
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(jrpacman_state, pengo_palettebank_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(jrpacman_state, pengo_colortablebank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(jrpacman_state, jrpacman_bgpriority_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(jrpacman_state, jrpacman_charbank_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(jrpacman_state, jrpacman_spritebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, jrpacman_state, pengo_palettebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, jrpacman_state, pengo_colortablebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, jrpacman_state, jrpacman_bgpriority_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, jrpacman_state, jrpacman_charbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, jrpacman_state, jrpacman_spritebank_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -305,7 +305,7 @@ MACHINE_CONFIG_START(jrpacman_state::jrpacman)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(jrpacman_state, screen_update_pacman)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(jrpacman_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, jrpacman_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jrpacman)
MCFG_PALETTE_ADD("palette", 128*4)
@@ -316,7 +316,7 @@ MACHINE_CONFIG_START(jrpacman_state::jrpacman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, 3072000/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, 3072000/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp
index d70e07ac9e4..d5ceb48fa28 100644
--- a/src/mame/drivers/jtc.cpp
+++ b/src/mame/drivers/jtc.cpp
@@ -727,15 +727,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(jtc_state::basic)
/* basic machine hardware */
- MCFG_CPU_ADD(UB8830D_TAG, UB8830D, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(jtc_mem)
- MCFG_Z8_PORT_P2_WRITE_CB(WRITE8(jtc_state, p2_w))
- MCFG_Z8_PORT_P3_READ_CB(READ8(jtc_state, p3_r))
- MCFG_Z8_PORT_P3_WRITE_CB(WRITE8(jtc_state, p3_w))
+ MCFG_DEVICE_ADD(UB8830D_TAG, UB8830D, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(jtc_mem)
+ MCFG_Z8_PORT_P2_WRITE_CB(WRITE8(*this, jtc_state, p2_w))
+ MCFG_Z8_PORT_P3_READ_CB(READ8(*this, jtc_state, p3_r))
+ MCFG_Z8_PORT_P3_WRITE_CB(WRITE8(*this, jtc_state, p3_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
@@ -747,7 +747,7 @@ MACHINE_CONFIG_START(jtc_state::basic)
/* printer */
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(jtc_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, jtc_state, write_centronics_busy))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(jtc_state::jtc)
@@ -771,8 +771,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jtces88_state::jtces88)
jtc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY(UB8830D_TAG)
- MCFG_CPU_PROGRAM_MAP(jtc_es1988_mem)
+ MCFG_DEVICE_MODIFY(UB8830D_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(jtc_es1988_mem)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -782,8 +782,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jtces23_state::jtces23)
basic(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY(UB8830D_TAG)
- MCFG_CPU_PROGRAM_MAP(jtc_es23_mem)
+ MCFG_DEVICE_MODIFY(UB8830D_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(jtc_es23_mem)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -805,8 +805,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jtces40_state::jtces40)
basic(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY(UB8830D_TAG)
- MCFG_CPU_PROGRAM_MAP(jtc_es40_mem)
+ MCFG_DEVICE_MODIFY(UB8830D_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(jtc_es40_mem)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index 678810b9050..6a68bb2bf40 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -665,7 +665,7 @@ MACHINE_CONFIG_START(jubilee_state::jubileep)
// Main CPU TMS9980A, no line connections.
MCFG_TMS99xx_ADD("maincpu", TMS9980A, CPU_CLOCK, jubileep_map, jubileep_cru_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jubilee_state, jubileep_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jubilee_state, jubileep_interrupt)
MCFG_NVRAM_ADD_0FILL("videoworkram")
diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp
index e8539384b24..a9dfd39fdde 100644
--- a/src/mame/drivers/juicebox.cpp
+++ b/src/mame/drivers/juicebox.cpp
@@ -305,8 +305,8 @@ DRIVER_INIT_MEMBER(juicebox_state,juicebox)
}
MACHINE_CONFIG_START(juicebox_state::juicebox)
- MCFG_CPU_ADD("maincpu", ARM7, 66000000)
- MCFG_CPU_PROGRAM_MAP(juicebox_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 66000000)
+ MCFG_DEVICE_PROGRAM_MAP(juicebox_map)
MCFG_PALETTE_ADD("palette", 32768)
@@ -320,14 +320,14 @@ MACHINE_CONFIG_START(juicebox_state::juicebox)
MCFG_SCREEN_UPDATE_DEVICE("s3c44b0", s3c44b0_device, video_update)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("s3c44b0", S3C44B0, 10000000)
- MCFG_S3C44B0_GPIO_PORT_R_CB(READ32(juicebox_state, s3c44b0_gpio_port_r))
- MCFG_S3C44B0_GPIO_PORT_W_CB(WRITE32(juicebox_state, s3c44b0_gpio_port_w))
- MCFG_S3C44B0_I2S_DATA_W_CB(DEVWRITE16("dac", dac_word_interface, write))
+ MCFG_S3C44B0_GPIO_PORT_R_CB(READ32(*this, juicebox_state, s3c44b0_gpio_port_r))
+ MCFG_S3C44B0_GPIO_PORT_W_CB(WRITE32(*this, juicebox_state, s3c44b0_gpio_port_w))
+ MCFG_S3C44B0_I2S_DATA_W_CB(WRITE16("dac", dac_word_interface, write))
MCFG_DEVICE_ADD("smartmedia", SMARTMEDIA, 0)
diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp
index 15b76fd896a..4af0af5a686 100644
--- a/src/mame/drivers/jungleyo.cpp
+++ b/src/mame/drivers/jungleyo.cpp
@@ -120,9 +120,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(jungleyo_state::jungleyo)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(jungleyo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", jungleyo_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(jungleyo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", jungleyo_state, irq1_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jungleyo)
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp
index 708b2af7790..3bc5057fe01 100644
--- a/src/mame/drivers/junior.cpp
+++ b/src/mame/drivers/junior.cpp
@@ -228,8 +228,8 @@ void junior_state::machine_reset()
MACHINE_CONFIG_START(junior_state::junior)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502, 1_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(junior_mem)
+ MCFG_DEVICE_ADD("maincpu",M6502, 1_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(junior_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
/* video hardware */
@@ -237,10 +237,10 @@ MACHINE_CONFIG_START(junior_state::junior)
/* Devices */
MCFG_DEVICE_ADD("riot", MOS6532_NEW, 1_MHz_XTAL)
- MCFG_MOS6530n_IN_PA_CB(READ8(junior_state, junior_riot_a_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(junior_state, junior_riot_a_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(junior_state, junior_riot_b_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(junior_state, junior_riot_b_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, junior_state, junior_riot_a_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, junior_state, junior_riot_a_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, junior_state, junior_riot_b_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, junior_state, junior_riot_b_w))
MCFG_MOS6530n_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", junior_state, junior_update_leds, attotime::from_hz(50))
diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp
index 705e10df256..b4cbbf952ff 100644
--- a/src/mame/drivers/junofrst.cpp
+++ b/src/mame/drivers/junofrst.cpp
@@ -102,23 +102,20 @@ class junofrst_state : public tutankhm_state
{
public:
junofrst_state(const machine_config &mconfig, device_type type, const char *tag)
- : tutankhm_state(mconfig, type, tag),
- m_audiocpu(*this, "audiocpu"),
- m_i8039(*this, "mcu"),
- m_filter_0_0(*this, "filter.0.0"),
- m_filter_0_1(*this, "filter.0.1"),
- m_filter_0_2(*this, "filter.0.2") { }
+ : tutankhm_state(mconfig, type, tag)
+ , m_audiocpu(*this, "audiocpu")
+ , m_i8039(*this, "mcu")
+ , m_filter_0_0(*this, "filter.0.0")
+ , m_filter_0_1(*this, "filter.0.1")
+ , m_filter_0_2(*this, "filter.0.2")
+ {
+ }
- required_device<cpu_device> m_audiocpu;
- required_device<cpu_device> m_i8039;
- required_device<filter_rc_device> m_filter_0_0;
- required_device<filter_rc_device> m_filter_0_1;
- required_device<filter_rc_device> m_filter_0_2;
+ DECLARE_DRIVER_INIT(junofrst);
- uint8_t m_blitterdata[4];
- int m_i8039_status;
- int m_last_irq;
+ void junofrst(machine_config &config);
+protected:
DECLARE_WRITE8_MEMBER(blitter_w);
DECLARE_WRITE8_MEMBER(bankselect_w);
DECLARE_WRITE8_MEMBER(sh_irqtrigger_w);
@@ -127,16 +124,25 @@ public:
DECLARE_READ8_MEMBER(portA_r);
DECLARE_WRITE8_MEMBER(portB_w);
- DECLARE_DRIVER_INIT(junofrst);
- DECLARE_MACHINE_START(junofrst);
- DECLARE_MACHINE_RESET(junofrst);
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
DECLARE_WRITE_LINE_MEMBER(_30hz_irq);
- void junofrst(machine_config &config);
void audio_map(address_map &map);
void main_map(address_map &map);
void mcu_io_map(address_map &map);
void mcu_map(address_map &map);
+
+private:
+ required_device<cpu_device> m_audiocpu;
+ required_device<cpu_device> m_i8039;
+ required_device<filter_rc_device> m_filter_0_0;
+ required_device<filter_rc_device> m_filter_0_1;
+ required_device<filter_rc_device> m_filter_0_2;
+
+ uint8_t m_blitterdata[4];
+ int m_i8039_status;
+ int m_last_irq;
};
@@ -364,8 +370,9 @@ static INPUT_PORTS_START( junofrst )
INPUT_PORTS_END
-MACHINE_START_MEMBER(junofrst_state,junofrst)
+void junofrst_state::machine_start()
{
+ // note that base class version is not called
save_item(NAME(m_i8039_status));
save_item(NAME(m_last_irq));
save_item(NAME(m_irq_toggle));
@@ -375,8 +382,9 @@ MACHINE_START_MEMBER(junofrst_state,junofrst)
save_item(NAME(m_blitterdata));
}
-MACHINE_RESET_MEMBER(junofrst_state,junofrst)
+void junofrst_state::machine_reset()
{
+ // note that base class version is not called
m_i8039_status = 0;
m_last_irq = 0;
m_blitterdata[0] = 0;
@@ -399,31 +407,28 @@ WRITE_LINE_MEMBER(junofrst_state::_30hz_irq)
MACHINE_CONFIG_START(junofrst_state::junofrst)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, 1500000) /* 1.5 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, 1500000) /* 1.5 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
- MCFG_CPU_ADD("mcu", I8039,8000000) /* 8MHz crystal */
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_IO_MAP(mcu_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(junofrst_state, i8039_irqen_and_status_w))
+ MCFG_DEVICE_ADD("mcu", I8039,8000000) /* 8MHz crystal */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, junofrst_state, i8039_irqen_and_status_w))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B3
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(junofrst_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(junofrst_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(junofrst_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, junofrst_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, junofrst_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, junofrst_state, coin_counter_1_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP)
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(junofrst_state, flip_screen_x_w)) // HFF
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(junofrst_state, flip_screen_y_w)) // VFLIP
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, junofrst_state, flip_screen_x_w)) // HFF
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, junofrst_state, flip_screen_y_w)) // VFLIP
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_MACHINE_START_OVERRIDE(junofrst_state,junofrst)
- MCFG_MACHINE_RESET_OVERRIDE(junofrst_state,junofrst)
-
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_FORMAT(BBGGGRRR)
@@ -434,7 +439,7 @@ MACHINE_CONFIG_START(junofrst_state::junofrst)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */
MCFG_SCREEN_UPDATE_DRIVER(junofrst_state, screen_update_tutankhm)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(junofrst_state, _30hz_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, junofrst_state, _30hz_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -442,22 +447,22 @@ MACHINE_CONFIG_START(junofrst_state::junofrst)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, 14318000/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(junofrst_state, portA_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(junofrst_state, portB_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 14318000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, junofrst_state, portA_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, junofrst_state, portB_w))
MCFG_SOUND_ROUTE(0, "filter.0.0", 0.30)
MCFG_SOUND_ROUTE(1, "filter.0.1", 0.30)
MCFG_SOUND_ROUTE(2, "filter.0.2", 0.30)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 100K (R56-63)/200K (R64-71) ladder network
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 100K (R56-63)/200K (R64-71) ladder network
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_FILTER_RC_ADD("filter.0.0", 0)
+ MCFG_DEVICE_ADD("filter.0.0", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_FILTER_RC_ADD("filter.0.1", 0)
+ MCFG_DEVICE_ADD("filter.0.1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_FILTER_RC_ADD("filter.0.2", 0)
+ MCFG_DEVICE_ADD("filter.0.2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index 34f0bcce793..cca90da4d3e 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -753,9 +753,9 @@ void ace_state::machine_start()
MACHINE_CONFIG_START(ace_state::ace)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(6'500'000)/2)
- MCFG_CPU_PROGRAM_MAP(ace_mem)
- MCFG_CPU_IO_MAP(ace_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(6'500'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(ace_mem)
+ MCFG_DEVICE_IO_MAP(ace_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
// video hardware
@@ -775,13 +775,13 @@ MACHINE_CONFIG_START(ace_state::ace)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(6'500'000)/2)
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, XTAL(6'500'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD(SP0256AL2_TAG, SP0256, XTAL(3'000'000))
+ MCFG_DEVICE_ADD(SP0256AL2_TAG, SP0256, XTAL(3'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
@@ -793,14 +793,14 @@ MACHINE_CONFIG_START(ace_state::ace)
MCFG_SNAPSHOT_ADD("snapshot", ace_state, ace, "ace", 1)
MCFG_DEVICE_ADD(I8255_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTB_CB(READ8(ace_state, sby_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(ace_state, ald_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ace_state, sby_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, ace_state, ald_w))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(6'500'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(ace_state, pio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(ace_state, pio_pa_w))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, ace_state, pio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, ace_state, pio_pa_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index f340242bca1..68ac8b75910 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -278,8 +278,8 @@ void jupiter3_state::machine_reset()
MACHINE_CONFIG_START(jupiter2_state::jupiter2)
// basic machine hardware
- MCFG_CPU_ADD(MCM6571AP_TAG, M6800, 2000000)
- MCFG_CPU_PROGRAM_MAP(jupiter2_mem)
+ MCFG_DEVICE_ADD(MCM6571AP_TAG, M6800, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(jupiter2_mem)
// devices
MCFG_DEVICE_ADD(INS1771N1_TAG, FD1771, 1000000)
@@ -287,20 +287,20 @@ MACHINE_CONFIG_START(jupiter2_state::jupiter2)
MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("acia0", ACIA6850, XTAL(2'000'000)) // unknown frequency
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial0", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial0", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial0", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial0", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("serial0", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("serial0", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia0", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia0", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia1", ACIA6850, XTAL(2'000'000)) // unknown frequency
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("serial1", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("serial1", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("serial1", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("serial1", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia1", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia1", acia6850_device, write_cts))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -314,9 +314,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jupiter3_state::jupiter3)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(jupiter3_mem)
- MCFG_CPU_IO_MAP(jupiter3_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(jupiter3_mem)
+ MCFG_DEVICE_IO_MAP(jupiter3_io)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp
index 39252100d41..f7b85cdde5b 100644
--- a/src/mame/drivers/jvh.cpp
+++ b/src/mame/drivers/jvh.cpp
@@ -123,8 +123,8 @@ MACHINE_CONFIG_START(jvh_state::jvh)
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, escape_io)
- MCFG_CPU_ADD("soundcpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(jvh_sub_map)
+ MCFG_DEVICE_ADD("soundcpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(jvh_sub_map)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4) // MC6802 E clock
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6802_IRQ_LINE))
@@ -134,8 +134,8 @@ MACHINE_CONFIG_START(jvh_state::jvh2)
// CPU TMS9980At; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, movmastr_io)
- MCFG_CPU_ADD("soundcpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(jvh_sub_map)
+ MCFG_DEVICE_ADD("soundcpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(jvh_sub_map)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("soundcpu", M6802_IRQ_LINE))
diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp
index ae683d5d0f7..b1ffdf14c99 100644
--- a/src/mame/drivers/k1003.cpp
+++ b/src/mame/drivers/k1003.cpp
@@ -147,9 +147,9 @@ void k1003_state::machine_reset()
MACHINE_CONFIG_START(k1003_state::k1003)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8008, 800000)
- MCFG_CPU_PROGRAM_MAP(k1003_mem)
- MCFG_CPU_IO_MAP(k1003_io)
+ MCFG_DEVICE_ADD("maincpu",I8008, 800000)
+ MCFG_DEVICE_PROGRAM_MAP(k1003_mem)
+ MCFG_DEVICE_IO_MAP(k1003_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_k1003)
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index aeec29d68f9..de0eac6383d 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -450,13 +450,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(k28_state::k28)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8021, 3.579545_MHz_XTAL)
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(k28_state, mcu_p0_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(k28_state, mcu_p1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(k28_state, mcu_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(k28_state, mcu_p2_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(k28_state, mcu_prog_w))
- MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("speech", votrax_sc01_device, request)) // SC-01 A/R pin
+ MCFG_DEVICE_ADD("maincpu", I8021, 3.579545_MHz_XTAL)
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, k28_state, mcu_p0_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, k28_state, mcu_p1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, k28_state, mcu_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, k28_state, mcu_p2_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(*this, k28_state, mcu_prog_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE("speech", votrax_sc01_device, request)) // SC-01 A/R pin
MCFG_DEVICE_ADD("tms6100", TMS6100, 3.579545_MHz_XTAL) // CLK tied to 8021 ALE pin
diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp
index 74c622803bb..cf85bd07d14 100644
--- a/src/mame/drivers/k8915.cpp
+++ b/src/mame/drivers/k8915.cpp
@@ -133,9 +133,9 @@ uint32_t k8915_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
MACHINE_CONFIG_START(k8915_state::k8915)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'915'200) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'915'200) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -149,20 +149,20 @@ MACHINE_CONFIG_START(k8915_state::k8915)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(4'915'200) / 2)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'915'200) / 2)
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'915'200) / 2)
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index fed104b9854..9c8b2f76663 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -1777,8 +1777,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(kaneko16_state::kaneko16_interrupt)
MACHINE_CONFIG_START(kaneko16_berlwall_state::berlwall)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12 */
- MCFG_CPU_PROGRAM_MAP(berlwall)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* MC68000P12 */
+ MCFG_DEVICE_PROGRAM_MAP(berlwall)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1815,12 +1815,12 @@ MACHINE_CONFIG_START(kaneko16_berlwall_state::berlwall)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym2149_1", YM2149, 1000000)
+ MCFG_DEVICE_ADD("ym2149_1", YM2149, 1000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("ym2149_2", YM2149, 1000000)
+ MCFG_DEVICE_ADD("ym2149_2", YM2149, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_OKIM6295_ADD("oki1", 12000000/6, PIN7_LOW)
@@ -1842,8 +1842,8 @@ void kaneko16_state::bakubrkr_oki1_map(address_map &map)
MACHINE_CONFIG_START(kaneko16_state::bakubrkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(bakubrkr)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(bakubrkr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(kaneko16_state,gtmr)
@@ -1887,12 +1887,12 @@ MACHINE_CONFIG_START(kaneko16_state::bakubrkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2149_1", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2149_1", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2149_2", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(READ8(kaneko16_state, eeprom_r)) /* inputs A: 0,EEPROM bit read */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
+ MCFG_DEVICE_ADD("ym2149_2", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, kaneko16_state, eeprom_r)) /* inputs A: 0,EEPROM bit read */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki1", XTAL(12'000'000)/6, PIN7_HIGH) /* verified on pcb */
@@ -1918,13 +1918,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_state::blazeon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */
- MCFG_CPU_PROGRAM_MAP(blazeon)
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */
+ MCFG_DEVICE_PROGRAM_MAP(blazeon)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80,4000000) /* D780C-2 (6 MHz) */
- MCFG_CPU_PROGRAM_MAP(blazeon_soundmem)
- MCFG_CPU_IO_MAP(blazeon_soundport)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000) /* D780C-2 (6 MHz) */
+ MCFG_DEVICE_PROGRAM_MAP(blazeon_soundmem)
+ MCFG_DEVICE_IO_MAP(blazeon_soundport)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1973,13 +1973,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_state::wingforc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* TMP68HC000N-16 */
- MCFG_CPU_PROGRAM_MAP(blazeon)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* TMP68HC000N-16 */
+ MCFG_DEVICE_PROGRAM_MAP(blazeon)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* D780C-2 (6 MHz) */
- MCFG_CPU_PROGRAM_MAP(blazeon_soundmem)
- MCFG_CPU_IO_MAP(wingforc_soundport)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* D780C-2 (6 MHz) */
+ MCFG_DEVICE_PROGRAM_MAP(blazeon_soundmem)
+ MCFG_DEVICE_IO_MAP(wingforc_soundport)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2052,8 +2052,8 @@ void kaneko16_state::gtmr_oki2_map(address_map &map)
MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(gtmr_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(gtmr_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(kaneko16_gtmr_state,gtmr)
@@ -2123,8 +2123,8 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::gtmr2)
gtmre(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gtmr2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gtmr2_map)
MACHINE_CONFIG_END
/***************************************************************************
@@ -2135,8 +2135,8 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::bloodwar)
gtmr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bloodwar)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bloodwar)
MCFG_MACHINE_RESET_OVERRIDE(kaneko16_gtmr_state, gtmr )
@@ -2157,8 +2157,8 @@ MACHINE_CONFIG_START(kaneko16_gtmr_state::bonkadv)
gtmr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bonkadv)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bonkadv)
MCFG_MACHINE_RESET_OVERRIDE(kaneko16_gtmr_state, gtmr )
@@ -2181,8 +2181,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaneko16_state::mgcrystl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb, TMP68HC000N-12 @U31 and X2 is 12MHz */
- MCFG_CPU_PROGRAM_MAP(mgcrystl)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb, TMP68HC000N-12 @U31 and X2 is 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mgcrystl)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_state, kaneko16_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(kaneko16_state,mgcrystl)
@@ -2225,12 +2225,12 @@ MACHINE_CONFIG_START(kaneko16_state::mgcrystl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym2149_1", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2149_1", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2149_2", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(READ8(kaneko16_state, eeprom_r)) /* inputs A: 0,EEPROM bit read */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
+ MCFG_DEVICE_ADD("ym2149_2", YM2149, XTAL(12'000'000)/6) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, kaneko16_state, eeprom_r)) /* inputs A: 0,EEPROM bit read */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki1", XTAL(12'000'000)/6, PIN7_HIGH) /* verified on pcb */
@@ -2301,8 +2301,8 @@ static const uint16_t shogwarr_default_eeprom[64] = {
MACHINE_CONFIG_START(kaneko16_shogwarr_state::shogwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(shogwarr)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(shogwarr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kaneko16_shogwarr_state, shogwarr_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(kaneko16_shogwarr_state,mgcrystl)
@@ -2378,7 +2378,7 @@ void kaneko16_shogwarr_state::brapboys_oki2_map(address_map &map)
MACHINE_CONFIG_START(kaneko16_shogwarr_state::brapboys)
shogwarr(config);
- MCFG_SOUND_MODIFY("oki2")
+ MCFG_DEVICE_MODIFY("oki2")
MCFG_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map)
MCFG_DEVICE_MODIFY("kan_hit")
diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp
index 09e737c92d0..3bde0eb7cb3 100644
--- a/src/mame/drivers/kangaroo.cpp
+++ b/src/mame/drivers/kangaroo.cpp
@@ -432,14 +432,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kangaroo_state::nomcu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kangaroo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kangaroo_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kangaroo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kangaroo_state, irq0_line_hold)
/* video hardware */
@@ -455,7 +455,7 @@ MACHINE_CONFIG_START(kangaroo_state::nomcu)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -465,7 +465,7 @@ MACHINE_CONFIG_START(kangaroo_state::mcu)
MCFG_MACHINE_START_OVERRIDE(kangaroo_state,kangaroo_mcu)
- MCFG_CPU_ADD("mcu", MB8841, MASTER_CLOCK/4/2)
+ MCFG_DEVICE_ADD("mcu", MB8841, MASTER_CLOCK/4/2)
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp
index 2ee1dc17258..511722a52c3 100644
--- a/src/mame/drivers/karnov.cpp
+++ b/src/mame/drivers/karnov.cpp
@@ -812,11 +812,11 @@ void karnov_state::machine_reset()
MACHINE_CONFIG_START(karnov_state::karnov)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(karnov_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(karnov_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
- MCFG_CPU_PROGRAM_MAP(karnov_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(karnov_sound_map)
/* video hardware */
@@ -829,7 +829,7 @@ MACHINE_CONFIG_START(karnov_state::karnov)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(karnov_state, screen_update_karnov)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(karnov_state, vbint_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, karnov_state, vbint_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", karnov)
MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting
@@ -846,10 +846,10 @@ MACHINE_CONFIG_START(karnov_state::karnov)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -860,10 +860,10 @@ MACHINE_CONFIG_START(karnov_state::karnovjbl)
Top board next to #9 is 20.000 MHz
Top board next to the microcontroller is 6.000 MHz
Bottom board next to the ribbon cable is 12.000 MHz*/
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(karnovjbl_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(karnovjbl_sound_map)
- MCFG_SOUND_REPLACE("ym2", YM3812, 3000000)
+ MCFG_DEVICE_REPLACE("ym2", YM3812, 3000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -877,12 +877,12 @@ void karnov_state::chelnovjbl_mcu_map(address_map &map)
MACHINE_CONFIG_START(karnov_state::chelnovjbl)
karnov(config);
- MCFG_CPU_ADD("mcu", I8031, 2000000) // ??mhz
- MCFG_CPU_PROGRAM_MAP(chelnovjbl_mcu_map)
-// MCFG_MCS51_PORT_P1_IN_CB(READ8(karnov_state, p1_r))
-// MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(karnov_state, p1_w))
-// MCFG_MCS51_PORT_P3_IN_CB(READ8(karnov_state, p3_r))
-// MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(karnov_state, p3_w))
+ MCFG_DEVICE_ADD("mcu", I8031, 2000000) // ??mhz
+ MCFG_DEVICE_PROGRAM_MAP(chelnovjbl_mcu_map)
+// MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, karnov_state, p1_r))
+// MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, karnov_state, p1_w))
+// MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, karnov_state, p3_r))
+// MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, karnov_state, p3_w))
MACHINE_CONFIG_END
@@ -890,11 +890,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(karnov_state::wndrplnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(karnov_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(karnov_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* Accurate */
- MCFG_CPU_PROGRAM_MAP(karnov_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* Accurate */
+ MCFG_DEVICE_PROGRAM_MAP(karnov_sound_map)
/* video hardware */
@@ -907,7 +907,7 @@ MACHINE_CONFIG_START(karnov_state::wndrplnt)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(karnov_state, screen_update_karnov)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(karnov_state, vbint_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, karnov_state, vbint_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", karnov)
MCFG_DECO_RMC3_ADD_PROMS("palette","proms",1024) // xxxxBBBBGGGGRRRR with custom weighting
@@ -924,10 +924,10 @@ MACHINE_CONFIG_START(karnov_state::wndrplnt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index d24a9941cb8..9cbdfab2f8e 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -765,14 +765,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kas89_state::kas89)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* Confirmed */
- MCFG_CPU_PROGRAM_MAP(kas89_map)
- MCFG_CPU_IO_MAP(kas89_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(kas89_map)
+ MCFG_DEVICE_IO_MAP(kas89_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("kas89_nmi", kas89_state, kas89_nmi_cb, attotime::from_hz(138))
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/6) /* Confirmed */
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_IO_MAP(audio_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK/6) /* Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_IO_MAP(audio_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("kas89_snmi", kas89_state, kas89_sound_nmi_cb, attotime::from_hz(138))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -787,7 +787,7 @@ MACHINE_CONFIG_START(kas89_state::kas89)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* Confirmed */
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/12) /* Confirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index 9059bd0486d..b4ea9fa8637 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -197,9 +197,9 @@ static void kaypro_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(kaypro_state::kayproii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 20_MHz_XTAL / 8)
- MCFG_CPU_PROGRAM_MAP(kaypro_map)
- MCFG_CPU_IO_MAP(kayproii_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 20_MHz_XTAL / 8)
+ MCFG_DEVICE_PROGRAM_MAP(kaypro_map)
+ MCFG_DEVICE_IO_MAP(kayproii_io)
MCFG_Z80_DAISY_CHAIN(kayproii_daisy_chain)
MCFG_MACHINE_START_OVERRIDE(kaypro_state, kayproii )
@@ -220,51 +220,51 @@ MACHINE_CONFIG_START(kaypro_state::kayproii)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) /* piezo-device needs to be measured */
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) /* piezo-device needs to be measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", 3)
MCFG_DEVICE_ADD("kbd", KAYPRO_10_KEYBOARD, 0)
- MCFG_KAYPRO10KBD_RXD_CB(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, syncb_w))
+ MCFG_KAYPRO10KBD_RXD_CB(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, syncb_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kaypro_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kaypro_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_RS232_PORT_ADD("serial", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, synca_w)) // TODO: confirm this is connected
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcda_w))
+ MCFG_DEVICE_ADD("serial", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, synca_w)) // TODO: confirm this is connected
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcda_w))
MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // WD1943, SMC8116
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("sio", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("z80pio_g", Z80PIO, 20_MHz_XTAL / 8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_DEVICE_ADD("z80pio_s", Z80PIO, 20_MHz_XTAL / 8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(kaypro_state, pio_system_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(kaypro_state, kayproii_pio_system_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, kaypro_state, pio_system_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kaypro_state, kayproii_pio_system_w))
MCFG_DEVICE_ADD("sio", Z80SIO, 20_MHz_XTAL / 8)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serial", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("serial", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("serial", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", kaypro_10_keyboard_device, txd_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("serial", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("serial", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("serial", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("kbd", kaypro_10_keyboard_device, txd_w))
MCFG_FD1793_ADD("fdc", 20_MHz_XTAL / 20)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -278,8 +278,8 @@ MACHINE_CONFIG_START(kaypro_state::kayproiv)
MCFG_DEVICE_REMOVE("z80pio_s")
MCFG_DEVICE_ADD("z80pio_s", Z80PIO, 2500000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(kaypro_state, pio_system_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(kaypro_state, kayproiv_pio_system_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, kaypro_state, pio_system_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kaypro_state, kayproiv_pio_system_w))
MCFG_DEVICE_REMOVE("fdc:0")
MCFG_DEVICE_REMOVE("fdc:1")
MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats)
@@ -289,9 +289,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kaypro_state::kaypro484)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16_MHz_XTAL / 4)
- MCFG_CPU_PROGRAM_MAP(kaypro_map)
- MCFG_CPU_IO_MAP(kaypro484_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16_MHz_XTAL / 4)
+ MCFG_DEVICE_PROGRAM_MAP(kaypro_map)
+ MCFG_DEVICE_IO_MAP(kaypro484_io)
MCFG_Z80_DAISY_CHAIN(kaypro484_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(kaypro_state, kaypro )
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) /* piezo-device needs to be measured */
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) /* piezo-device needs to be measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
@@ -323,48 +323,48 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484)
MCFG_QUICKLOAD_ADD("quickload", kaypro_state, kaypro, "com,cpm", 3)
MCFG_DEVICE_ADD("kbd", KAYPRO_10_KEYBOARD, 0)
- MCFG_KAYPRO10KBD_RXD_CB(DEVWRITELINE("sio_1", z80sio_device, rxb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_1", z80sio_device, syncb_w))
+ MCFG_KAYPRO10KBD_RXD_CB(WRITELINE("sio_1", z80sio_device, rxb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio_1", z80sio_device, syncb_w))
MCFG_CLOCK_ADD("kbdtxrxc", 4800)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio_1", z80sio_device, rxtxcb_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio_1", z80sio_device, rxtxcb_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kaypro_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kaypro_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
- MCFG_RS232_PORT_ADD("modem", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio_1", z80sio_device, rxa_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_1", z80sio_device, synca_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio_1", z80sio_device, ctsa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio_1", z80sio_device, dcda_w))
+ MCFG_DEVICE_ADD("modem", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio_1", z80sio_device, rxa_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio_1", z80sio_device, synca_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio_1", z80sio_device, ctsa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio_1", z80sio_device, dcda_w))
- MCFG_RS232_PORT_ADD("serprn", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio_2", z80sio_device, rxa_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_2", z80sio_device, synca_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio_2", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("serprn", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio_2", z80sio_device, rxa_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio_2", z80sio_device, synca_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio_2", z80sio_device, ctsa_w))
MCFG_DEVICE_ADD("sio_1", Z80SIO, 16_MHz_XTAL / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // FIXME: use a combiner
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("modem", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("modem", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("modem", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", kaypro_10_keyboard_device, txd_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("modem", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("modem", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("modem", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("kbd", kaypro_10_keyboard_device, txd_w))
MCFG_DEVICE_ADD("sio_2", Z80SIO, 16_MHz_XTAL / 4) /* extra sio for modem and printer */
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // FIXME: use a combiner
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serprn", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("serprn", rs232_port_device, write_txd))
MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // WD1943, SMC8116
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("sio_1", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_1", z80sio_device, txca_w))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("sio_2", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_2", z80sio_device, txca_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("sio_1", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio_1", z80sio_device, txca_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("sio_2", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio_2", z80sio_device, txca_w))
MCFG_FD1793_ADD("fdc", 16_MHz_XTAL / 16)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, kaypro_state, fdc_drq_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp
index 31fc08ab382..effb562b56d 100644
--- a/src/mame/drivers/kc.cpp
+++ b/src/mame/drivers/kc.cpp
@@ -98,26 +98,26 @@ void kc85_exp(device_slot_interface &device)
MACHINE_CONFIG_START(kc_state::kc85_3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, KC85_3_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kc85_3_mem)
- MCFG_CPU_IO_MAP(kc85_3_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, KC85_3_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kc85_3_mem)
+ MCFG_DEVICE_IO_MAP(kc85_3_io)
MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("z80pio", Z80PIO, KC85_3_CLOCK)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_Z80PIO_IN_PA_CB(READ8(kc_state, pio_porta_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(kc_state, pio_porta_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(kc_state, pio_ardy_cb))
- MCFG_Z80PIO_IN_PB_CB(READ8(kc_state, pio_portb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(kc_state, pio_portb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(kc_state, pio_brdy_cb))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, kc_state, pio_porta_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kc_state, pio_porta_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, kc_state, pio_ardy_cb))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, kc_state, pio_portb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, kc_state, pio_portb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, kc_state, pio_brdy_cb))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, KC85_3_CLOCK)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(kc_state, ctc_zc0_callback))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(kc_state, ctc_zc1_callback))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(kc_state, video_toggle_blink_state))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, kc_state, ctc_zc0_callback))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, kc_state, ctc_zc1_callback))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, kc_state, video_toggle_blink_state))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -130,13 +130,13 @@ MACHINE_CONFIG_START(kc_state::kc85_3)
MCFG_PALETTE_INIT_OWNER(kc_state, kc85 )
MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL(4'000'000))
- MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(kc_state, keyboard_cb))
+ MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(*this, kc_state, keyboard_cb))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
@@ -182,26 +182,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kc85_4_state::kc85_4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, KC85_4_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kc85_4_mem)
- MCFG_CPU_IO_MAP(kc85_4_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, KC85_4_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kc85_4_mem)
+ MCFG_DEVICE_IO_MAP(kc85_4_io)
MCFG_Z80_DAISY_CHAIN(kc85_daisy_chain)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("z80pio", Z80PIO, KC85_4_CLOCK)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_Z80PIO_IN_PA_CB(READ8(kc_state, pio_porta_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(kc_state, pio_porta_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(kc_state, pio_ardy_cb))
- MCFG_Z80PIO_IN_PB_CB(READ8(kc_state, pio_portb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(kc_state, pio_portb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(kc_state, pio_brdy_cb))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, kc_state, pio_porta_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kc_state, pio_porta_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, kc_state, pio_ardy_cb))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, kc_state, pio_portb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, kc_state, pio_portb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, kc_state, pio_brdy_cb))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, KC85_4_CLOCK)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", 0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(kc_state, ctc_zc0_callback))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(kc_state, ctc_zc1_callback))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(kc_state, video_toggle_blink_state))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, kc_state, ctc_zc0_callback))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, kc_state, ctc_zc1_callback))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, kc_state, video_toggle_blink_state))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -214,13 +214,13 @@ MACHINE_CONFIG_START(kc85_4_state::kc85_4)
MCFG_PALETTE_INIT_OWNER(kc85_4_state, kc85 )
MCFG_DEVICE_ADD("keyboard", KC_KEYBOARD, XTAL(4'000'000))
- MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(kc_state, keyboard_cb))
+ MCFG_KC_KEYBOARD_OUT_CALLBACK(WRITELINE(*this, kc_state, keyboard_cb))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index 07965a544d2..07ea164f6aa 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -406,20 +406,20 @@ void kchamp_state::machine_reset()
MACHINE_CONFIG_START(kchamp_state::kchampvs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kchampvs_map)
- MCFG_CPU_IO_MAP(kchampvs_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
-
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kchampvs_sound_map)
- MCFG_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kchampvs_map)
+ MCFG_DEVICE_IO_MAP(kchampvs_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kchampvs_sound_map)
+ MCFG_DEVICE_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */
/* nmi's from msm5205 */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 8C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(kchamp_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(kchamp_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(kchamp_state, sound_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, kchamp_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kchamp_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, kchamp_state, sound_reset_w))
MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchampvs)
@@ -431,7 +431,7 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kchamp_state, screen_update_kchampvs)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(kchamp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, kchamp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp)
MCFG_PALETTE_ADD("palette", 256)
@@ -444,17 +444,17 @@ MACHINE_CONFIG_START(kchamp_state::kchampvs)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0) // at 4C
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(kchamp_state, msmint)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, kchamp_state, msmint)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 = 3906.25Hz playback */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -466,20 +466,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kchamp_state::kchamp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kchamp_map)
- MCFG_CPU_IO_MAP(kchamp_io_map)
-
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kchamp_sound_map)
- MCFG_CPU_IO_MAP(kchamp_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(kchamp_state, sound_int, 125) /* Hz */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kchamp_map)
+ MCFG_DEVICE_IO_MAP(kchamp_io_map)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 12MHz / 4 = 3.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kchamp_sound_map)
+ MCFG_DEVICE_IO_MAP(kchamp_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kchamp_state, sound_int, 125) /* Hz */
/* irq's triggered from main cpu */
/* nmi's from 125 Hz clock */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC71
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(kchamp_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(kchamp_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, kchamp_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kchamp_state, nmi_enable_w))
MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchamp)
@@ -491,7 +491,7 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kchamp_state, screen_update_kchamp)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(kchamp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, kchamp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kchamp)
MCFG_PALETTE_ADD("palette", 256)
@@ -504,13 +504,13 @@ MACHINE_CONFIG_START(kchamp_state::kchamp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/12) /* Guess based on actual pcb recordings of karatedo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // IC11
+ MCFG_DEVICE_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // IC11
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp
index 0be9d8f4e9e..14cbb8daa8b 100644
--- a/src/mame/drivers/kdt6.cpp
+++ b/src/mame/drivers/kdt6.cpp
@@ -615,9 +615,9 @@ static const z80_daisy_config daisy_chain_intf[] =
};
MACHINE_CONFIG_START(kdt6_state::psi98)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(psi98_mem)
- MCFG_CPU_IO_MAP(psi98_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(psi98_mem)
+ MCFG_DEVICE_IO_MAP(psi98_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
// video hardware
@@ -632,74 +632,74 @@ MACHINE_CONFIG_START(kdt6_state::psi98)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(kdt6_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("ctc2", z80ctc_device, trg2))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE("ctc2", z80ctc_device, trg2))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1000) // frequency unknown
+ MCFG_DEVICE_ADD("beeper", BEEP, 1000) // frequency unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD("beep_timer", kdt6_state, beeper_off)
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(kdt6_state, busreq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, kdt6_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(kdt6_state, memory_r))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(kdt6_state, memory_w))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(kdt6_state, io_r))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(kdt6_state, io_w))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, kdt6_state, memory_r))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, kdt6_state, memory_w))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, kdt6_state, io_r))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, kdt6_state, io_w))
// jumper J3 allows selection of 16MHz / 8 instead
MCFG_CLOCK_ADD("uart_clk", XTAL(9'830'400) / 8)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc1", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc1", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, txca_w))
MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc2", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc2", z80ctc_device, trg3))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(16'000'000) / 4)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(kdt6_state, siob_tx_w))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcda_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("sio", z80sio_device, synca_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1)
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(kdt6_state, rs232b_rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("sio", z80sio_device, syncb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_XOR(1)
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(*this, kdt6_state, siob_tx_w))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcda_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("sio", z80sio_device, synca_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w)) MCFG_DEVCB_XOR(1)
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, kdt6_state, rs232b_rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio", z80sio_device, dcdb_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("sio", z80sio_device, syncb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_XOR(1)
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(kdt6_state, pio_porta_w))
- MCFG_Z80PIO_IN_PB_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kdt6_state, pio_porta_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8("cent_data_in", input_buffer_device, read))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("pio", z80pio_device, pa2_w))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("pio", z80pio_device, pa3_w))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("pio", z80pio_device, pa4_w))
- MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("pio", z80pio_device, pa5_w))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("pio", z80pio_device, pa2_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("pio", z80pio_device, pa3_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("pio", z80pio_device, pa4_w))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("pio", z80pio_device, pa5_w))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -707,16 +707,16 @@ MACHINE_CONFIG_START(kdt6_state::psi98)
MCFG_UPD1990A_ADD("rtc", XTAL(32'768), NOOP, NOOP)
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc1", z80ctc_device, trg0))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(kdt6_state, fdc_drq_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc1", z80ctc_device, trg0))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, kdt6_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", kdt6_floppies, "fd55f", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", kdt6_floppies, "fd55f", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("floppy_list", "psi98")
MCFG_PSI_KEYBOARD_INTERFACE_ADD("kbd", "hle")
- MCFG_PSI_KEYBOARD_RX_HANDLER(WRITELINE(kdt6_state, keyboard_rx_w))
- MCFG_PSI_KEYBOARD_KEY_STROBE_HANDLER(DEVWRITELINE("ctc2", z80ctc_device, trg1))
+ MCFG_PSI_KEYBOARD_RX_HANDLER(WRITELINE(*this, kdt6_state, keyboard_rx_w))
+ MCFG_PSI_KEYBOARD_KEY_STROBE_HANDLER(WRITELINE("ctc2", z80ctc_device, trg1))
// 6 ECB slots
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp
index 74e42a8cd68..26f6ad1b0a6 100644
--- a/src/mame/drivers/kenseim.cpp
+++ b/src/mame/drivers/kenseim.cpp
@@ -479,27 +479,27 @@ MACHINE_CONFIG_START(kenseim_state::kenseim)
cps1_12MHz(config);
/* basic machine hardware */
- MCFG_CPU_ADD("gamecpu", TMPZ84C011, XTAL(16'000'000)/2) // tmpz84c011-8
+ MCFG_DEVICE_ADD("gamecpu", TMPZ84C011, XTAL(16'000'000)/2) // tmpz84c011-8
MCFG_Z80_DAISY_CHAIN(daisy_chain_gamecpu)
- MCFG_CPU_PROGRAM_MAP(kenseim_map)
- MCFG_CPU_IO_MAP(kenseim_io_map)
- MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(kenseim_state, cpu_portc_w))
- MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(kenseim_state, cpu_portd_w))
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(kenseim_state, cpu_porte_w))
+ MCFG_DEVICE_PROGRAM_MAP(kenseim_map)
+ MCFG_DEVICE_IO_MAP(kenseim_io_map)
+ MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(*this, kenseim_state, cpu_portc_w))
+ MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(*this, kenseim_state, cpu_portd_w))
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, kenseim_state, cpu_porte_w))
MCFG_TMPZ84C011_PORTA_READ_CB(IOPORT("DSW1"))
MCFG_TMPZ84C011_PORTB_READ_CB(IOPORT("DSW2"))
MCFG_TMPZ84C011_PORTC_READ_CB(IOPORT("CAB-IN"))
- MCFG_TMPZ84C011_PORTD_READ_CB(READ8(kenseim_state, cpu_portd_r))
+ MCFG_TMPZ84C011_PORTD_READ_CB(READ8(*this, kenseim_state, cpu_portd_r))
MCFG_MB89363B_ADD("mb89363b")
// a,b,c always $80: all ports set as output
// d,e,f always $92: port D and E as input, port F as output
- MCFG_MB89363B_OUT_PORTA_CB(WRITE8(kenseim_state, mb8936_porta_w))
- MCFG_MB89363B_OUT_PORTB_CB(WRITE8(kenseim_state, mb8936_portb_w))
- MCFG_MB89363B_OUT_PORTC_CB(WRITE8(kenseim_state, mb8936_portc_w))
+ MCFG_MB89363B_OUT_PORTA_CB(WRITE8(*this, kenseim_state, mb8936_porta_w))
+ MCFG_MB89363B_OUT_PORTB_CB(WRITE8(*this, kenseim_state, mb8936_portb_w))
+ MCFG_MB89363B_OUT_PORTC_CB(WRITE8(*this, kenseim_state, mb8936_portc_w))
MCFG_MB89363B_IN_PORTD_CB(IOPORT("MOLEA"))
MCFG_MB89363B_IN_PORTE_CB(IOPORT("MOLEB"))
- MCFG_MB89363B_OUT_PORTF_CB(WRITE8(kenseim_state, mb8936_portf_w))
+ MCFG_MB89363B_OUT_PORTF_CB(WRITE8(*this, kenseim_state, mb8936_portf_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index 534a180de6e..c872f212a26 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -636,12 +636,12 @@ void kickgoal_state::oki_map(address_map &map)
MACHINE_CONFIG_START(kickgoal_state::kickgoal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(kickgoal_program_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kickgoal_state, irq6_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(kickgoal_state, kickgoal_interrupt, 240)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kickgoal_program_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kickgoal_state, irq6_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kickgoal_state, kickgoal_interrupt, 240)
- MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000/4) /* 3MHz ? */
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000/4) /* 3MHz ? */
MCFG_DEVICE_DISABLE() /* Disabled since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
@@ -676,11 +676,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kickgoal_state::actionhw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kickgoal_program_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kickgoal_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kickgoal_program_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kickgoal_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(12'000'000)/3) /* verified on pcb */
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(12'000'000)/3) /* verified on pcb */
MCFG_DEVICE_DISABLE() /* Disabled since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp
index 0a28240e011..fb444ec81a3 100644
--- a/src/mame/drivers/kim1.cpp
+++ b/src/mame/drivers/kim1.cpp
@@ -242,8 +242,8 @@ void kim1_state::machine_reset()
MACHINE_CONFIG_START(kim1_state::kim1)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz */
- MCFG_CPU_PROGRAM_MAP(kim1_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000) /* 1 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kim1_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
// video hardware
@@ -251,10 +251,10 @@ MACHINE_CONFIG_START(kim1_state::kim1)
// devices
MCFG_DEVICE_ADD("miot_u2", MOS6530, 1000000)
- MCFG_MOS6530_IN_PA_CB(READ8(kim1_state, kim1_u2_read_a))
- MCFG_MOS6530_OUT_PA_CB(WRITE8(kim1_state, kim1_u2_write_a))
- MCFG_MOS6530_IN_PB_CB(READ8(kim1_state, kim1_u2_read_b))
- MCFG_MOS6530_OUT_PB_CB(WRITE8(kim1_state, kim1_u2_write_b))
+ MCFG_MOS6530_IN_PA_CB(READ8(*this, kim1_state, kim1_u2_read_a))
+ MCFG_MOS6530_OUT_PA_CB(WRITE8(*this, kim1_state, kim1_u2_write_a))
+ MCFG_MOS6530_IN_PB_CB(READ8(*this, kim1_state, kim1_u2_read_b))
+ MCFG_MOS6530_OUT_PB_CB(WRITE8(*this, kim1_state, kim1_u2_write_b))
MCFG_DEVICE_ADD("miot_u3", MOS6530, 1000000)
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index acaf05d9cec..97592e0543c 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -958,20 +958,20 @@ PALETTE_INIT_MEMBER(kingdrby_state,kingdrbb)
}
MACHINE_CONFIG_START(kingdrby_state::kingdrby)
- MCFG_CPU_ADD("master", Z80, CLK_2)
- MCFG_CPU_PROGRAM_MAP(master_map)
- MCFG_CPU_IO_MAP(master_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kingdrby_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("master", Z80, CLK_2)
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_IO_MAP(master_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kingdrby_state, irq0_line_hold)
- MCFG_CPU_ADD("slave", Z80, CLK_2)
- MCFG_CPU_PROGRAM_MAP(slave_map)
- MCFG_CPU_IO_MAP(slave_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kingdrby_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("slave", Z80, CLK_2)
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_IO_MAP(slave_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kingdrby_state, irq0_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, CLK_2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(kingdrby_state, irq0_line_hold, 1000) /* guess, controls ay8910 tempo.*/
+ MCFG_DEVICE_ADD("soundcpu", Z80, CLK_2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kingdrby_state, irq0_line_hold, 1000) /* guess, controls ay8910 tempo.*/
MCFG_QUANTUM_PERFECT_CPU("master")
@@ -979,17 +979,17 @@ MACHINE_CONFIG_START(kingdrby_state::kingdrby)
// 5000-5003 PPI group modes 0/0 - A & B as input, C (all) as output.
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(kingdrby_state, hopper_io_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, kingdrby_state, hopper_io_r))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(kingdrby_state, hopper_io_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, kingdrby_state, hopper_io_w))
// 6000-6003 PPI group modes 0/0 - B & C (lower) as input, A & C (upper) as output.
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kingdrby_state, sound_cmd_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kingdrby_state, sound_cmd_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0x7f))
- MCFG_I8255_IN_PORTB_CB(READ8(kingdrby_state, key_matrix_r))
- MCFG_I8255_IN_PORTC_CB(READ8(kingdrby_state, input_mux_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(kingdrby_state, outport2_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, kingdrby_state, key_matrix_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, kingdrby_state, input_mux_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, kingdrby_state, outport2_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kingdrby)
MCFG_PALETTE_ADD("palette", 0x200)
@@ -1008,16 +1008,16 @@ MACHINE_CONFIG_START(kingdrby_state::kingdrby)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, CLK_1/8) /* guess */
- MCFG_AY8910_PORT_A_READ_CB(READ8(kingdrby_state, sound_cmd_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, CLK_1/8) /* guess */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, kingdrby_state, sound_cmd_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(kingdrby_state::kingdrbb)
kingdrby(config);
- MCFG_CPU_MODIFY("slave")
- MCFG_CPU_PROGRAM_MAP(slave_1986_map)
+ MCFG_DEVICE_MODIFY("slave")
+ MCFG_DEVICE_PROGRAM_MAP(slave_1986_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(kingdrby_state,kingdrbb)
@@ -1027,10 +1027,10 @@ MACHINE_CONFIG_START(kingdrby_state::kingdrbb)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
/* C as input, (all) as output */
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kingdrby_state, sound_cmd_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kingdrby_state, sound_cmd_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0x7f))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(kingdrby_state, outportb_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, kingdrby_state, outportb_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN1"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
@@ -1040,9 +1040,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kingdrby_state::cowrace)
kingdrbb(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(cowrace_sound_map)
- MCFG_CPU_IO_MAP(cowrace_sound_io)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(cowrace_sound_map)
+ MCFG_DEVICE_IO_MAP(cowrace_sound_io)
MCFG_GFXDECODE_MODIFY("gfxdecode", cowrace)
MCFG_PALETTE_MODIFY("palette")
@@ -1050,10 +1050,10 @@ MACHINE_CONFIG_START(kingdrby_state::cowrace)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_REPLACE("aysnd", YM2203, 3000000)
- MCFG_AY8910_PORT_A_READ_CB(READ8(kingdrby_state, sound_cmd_r))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("oki", okim6295_device, read)) // read B
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("oki", okim6295_device, write)) // write B
+ MCFG_DEVICE_REPLACE("aysnd", YM2203, 3000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, kingdrby_state, sound_cmd_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("oki", okim6295_device, read)) // read B
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("oki", okim6295_device, write)) // write B
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp
index 64208a14142..4934ba40b65 100644
--- a/src/mame/drivers/kingobox.cpp
+++ b/src/mame/drivers/kingobox.cpp
@@ -465,23 +465,23 @@ void kingofb_state::machine_reset()
MACHINE_CONFIG_START(kingofb_state::kingofb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kingobox_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kingobox_map)
- MCFG_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kingobox_video_map)
+ MCFG_DEVICE_ADD("video", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kingobox_video_map)
- MCFG_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kingobox_sprite_map)
+ MCFG_DEVICE_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kingobox_sprite_map)
MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("video", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sprite", INPUT_LINE_NMI))
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kingobox_sound_map)
- MCFG_CPU_IO_MAP(kingobox_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kingobox_sound_map)
+ MCFG_DEVICE_IO_MAP(kingobox_sound_io_map)
MCFG_DEVICE_ADD("soundnmi", CLOCK, 6000) /* Hz */
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(kingofb_state::kingofb)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kingofb_state, screen_update_kingofb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("nmigate", input_merger_device, in_w<0>))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("nmigate", input_merger_device, in_w<0>))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", kingobox)
MCFG_PALETTE_ADD("palette", 256+8*2)
@@ -510,11 +510,11 @@ MACHINE_CONFIG_START(kingofb_state::kingofb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // 100K (R30-44 even)/200K (R31-45 odd) ladder network
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // 100K (R30-44 even)/200K (R31-45 odd) ladder network
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -524,23 +524,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kingofb_state::ringking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(ringking_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ringking_map)
- MCFG_CPU_ADD("video", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(ringking_video_map)
+ MCFG_DEVICE_ADD("video", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ringking_video_map)
- MCFG_CPU_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(ringking_sprite_map)
+ MCFG_DEVICE_ADD("sprite", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ringking_sprite_map)
MCFG_INPUT_MERGER_ALL_HIGH("nmigate")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("video", INPUT_LINE_NMI))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("sprite", INPUT_LINE_NMI))
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
- MCFG_CPU_PROGRAM_MAP(kingobox_sound_map)
- MCFG_CPU_IO_MAP(ringking_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4.0 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kingobox_sound_map)
+ MCFG_DEVICE_IO_MAP(ringking_sound_io_map)
MCFG_DEVICE_ADD("soundnmi", CLOCK, 6000) /* Hz */
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -556,7 +556,7 @@ MACHINE_CONFIG_START(kingofb_state::ringking)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(kingofb_state, screen_update_ringking)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("nmigate", input_merger_device, in_w<0>))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("nmigate", input_merger_device, in_w<0>))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rk)
MCFG_PALETTE_ADD("palette", 256+8*2)
@@ -569,11 +569,11 @@ MACHINE_CONFIG_START(kingofb_state::ringking)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 1500000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1500000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp
index a51ebfd3dee..9d910cfe829 100644
--- a/src/mame/drivers/kingpin.cpp
+++ b/src/mame/drivers/kingpin.cpp
@@ -147,9 +147,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kingpin_state::kingpin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(kingpin_program_map)
- MCFG_CPU_IO_MAP(kingpin_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(kingpin_program_map)
+ MCFG_DEVICE_IO_MAP(kingpin_io_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
// PORT A read = watchdog?
@@ -163,9 +163,9 @@ MACHINE_CONFIG_START(kingpin_state::kingpin)
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(kingpin_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(kingpin_state, irq0_line_hold, 1000) // unknown freq
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(kingpin_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kingpin_state, irq0_line_hold, 1000) // unknown freq
/* video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
@@ -180,14 +180,14 @@ MACHINE_CONFIG_START(kingpin_state::kingpin)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("aysnd", AY8912, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(kingpin_state::dealracl)
kingpin(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dealracl_program_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dealracl_program_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp
index d6e40f37676..af3ce554574 100644
--- a/src/mame/drivers/kinst.cpp
+++ b/src/mame/drivers/kinst.cpp
@@ -697,11 +697,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(kinst_state::kinst)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2)
+ MCFG_DEVICE_ADD("maincpu", R4600LE, MASTER_CLOCK*2)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kinst_state, irq0_start)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kinst_state, irq0_start)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
diff --git a/src/mame/drivers/kissproto.cpp b/src/mame/drivers/kissproto.cpp
index 6a9bf6f39da..25bd8733162 100644
--- a/src/mame/drivers/kissproto.cpp
+++ b/src/mame/drivers/kissproto.cpp
@@ -51,8 +51,8 @@ DRIVER_INIT_MEMBER(kissp_state,kissp)
MACHINE_CONFIG_START(kissp_state::kissp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8035, 6000000/15)
- MCFG_CPU_PROGRAM_MAP(kissp_map)
+ MCFG_DEVICE_ADD("maincpu", I8035, 6000000/15)
+ MCFG_DEVICE_PROGRAM_MAP(kissp_map)
MACHINE_CONFIG_END
ROM_START(kissp)
diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp
index c5fda239200..193ad4dd1a6 100644
--- a/src/mame/drivers/klax.cpp
+++ b/src/mame/drivers/klax.cpp
@@ -196,8 +196,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(klax_state::klax)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(klax_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(klax_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -221,7 +221,7 @@ MACHINE_CONFIG_START(klax_state::klax)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(klax_state, screen_update_klax)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(klax_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, klax_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -238,19 +238,19 @@ void klax_state::bootleg_sound_map(address_map &map)
MACHINE_CONFIG_START(klax_state::klax2bl)
klax(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(klax2bl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(klax2bl_map)
MCFG_DEVICE_REMOVE("oki") // no 6295 here
- MCFG_CPU_ADD("audiocpu", Z80, 6000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(bootleg_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 6000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_sound_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", klax2bl)
// guess, probably something like this
- MCFG_SOUND_ADD("msm", MSM5205, 375000) /* ? */
-// MCFG_MSM5205_VCLK_CB(WRITELINE(klax_state, m5205_int1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 375000) /* ? */
+// MCFG_MSM5205_VCLK_CB(WRITELINE(*this, klax_state, m5205_int1)) /* interrupt function */
// MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp
index dccc835ddc2..62787a64d5c 100644
--- a/src/mame/drivers/kncljoe.cpp
+++ b/src/mame/drivers/kncljoe.cpp
@@ -258,14 +258,14 @@ void kncljoe_state::machine_reset()
MACHINE_CONFIG_START(kncljoe_state::kncljoe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kncljoe_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(6'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kncljoe_state, irq0_line_hold)
- MCFG_CPU_ADD("soundcpu", M6803, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(kncljoe_state, sound_nmi, (double)3970) //measured 3.970 kHz
+ MCFG_DEVICE_ADD("soundcpu", M6803, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kncljoe_state, sound_nmi, (double)3970) //measured 3.970 kHz
/* video hardware */
@@ -288,15 +288,15 @@ MACHINE_CONFIG_START(kncljoe_state::kncljoe)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kncljoe_state, unused_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(3'579'545)/4) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, kncljoe_state, unused_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("sn1", SN76489, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("sn1", SN76489, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("sn2", SN76489, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("sn2", SN76489, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index b991d853ef3..b702ae327e1 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -235,8 +235,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(koftball_state::koftball)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(21'477'272) / 2)
- MCFG_CPU_PROGRAM_MAP(koftball_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(21'477'272) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(koftball_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", koftball_state, bmc_interrupt, "screen", 0, 1)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -254,7 +254,7 @@ MACHINE_CONFIG_START(koftball_state::koftball)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545)) // guessed chip type, clock not verified
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) // guessed chip type, clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp
index 2f60e7ad681..a464dcb4fc2 100644
--- a/src/mame/drivers/koikoi.cpp
+++ b/src/mame/drivers/koikoi.cpp
@@ -355,9 +355,9 @@ void koikoi_state::machine_reset()
MACHINE_CONFIG_START(koikoi_state::koikoi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */
- MCFG_CPU_PROGRAM_MAP(koikoi_map)
- MCFG_CPU_IO_MAP(koikoi_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */
+ MCFG_DEVICE_PROGRAM_MAP(koikoi_map)
+ MCFG_DEVICE_IO_MAP(koikoi_io_map)
/* video hardware */
@@ -378,9 +378,9 @@ MACHINE_CONFIG_START(koikoi_state::koikoi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, KOIKOI_CRYSTAL/8)
- MCFG_AY8910_PORT_B_READ_CB(READ8(koikoi_state, input_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(koikoi_state, unknown_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, KOIKOI_CRYSTAL/8)
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, koikoi_state, input_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, koikoi_state, unknown_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp
index 1fb58660286..c57182a8461 100644
--- a/src/mame/drivers/konamigq.cpp
+++ b/src/mame/drivers/konamigq.cpp
@@ -329,8 +329,8 @@ MACHINE_RESET_MEMBER(konamigq_state,konamigq)
MACHINE_CONFIG_START(konamigq_state::konamigq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CXD8530BQ, XTAL(67'737'600))
- MCFG_CPU_PROGRAM_MAP(konamigq_map)
+ MCFG_DEVICE_ADD("maincpu", CXD8530BQ, XTAL(67'737'600))
+ MCFG_DEVICE_PROGRAM_MAP(konamigq_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -338,12 +338,12 @@ MACHINE_CONFIG_START(konamigq_state::konamigq)
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigq_state::scsi_dma_read, this ) )
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigq_state::scsi_dma_write, this ) )
- MCFG_CPU_ADD("soundcpu", M68000, XTAL(32'000'000)/4) /* 8MHz - measured */
- MCFG_CPU_PROGRAM_MAP(konamigq_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", M68000, XTAL(32'000'000)/4) /* 8MHz - measured */
+ MCFG_DEVICE_PROGRAM_MAP(konamigq_sound_map)
- MCFG_CPU_ADD("dasp", TMS57002, XTAL(48'000'000)/2) /* 24MHz - measured */
- MCFG_CPU_DATA_MAP(konamigq_dasp_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(konamigq_state, tms_sync, 48000)
+ MCFG_DEVICE_ADD("dasp", TMS57002, XTAL(48'000'000)/2) /* 24MHz - measured */
+ MCFG_DEVICE_DATA_MAP(konamigq_dasp_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(konamigq_state, tms_sync, 48000)
MCFG_MACHINE_START_OVERRIDE(konamigq_state, konamigq)
MCFG_MACHINE_RESET_OVERRIDE(konamigq_state, konamigq)
@@ -357,7 +357,7 @@ MACHINE_CONFIG_START(konamigq_state::konamigq)
MCFG_DEVICE_ADD("am53cf96", AM53CF96, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
+ MCFG_AM53CF96_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10))
/* video hardware */
MCFG_PSXGPU_ADD("maincpu", "gpu", CXD8538Q, 0x200000, XTAL(53'693'175))
@@ -370,7 +370,7 @@ MACHINE_CONFIG_START(konamigq_state::konamigq)
MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_DEVICE_ADDRESS_MAP(0, konamigq_k054539_map)
- MCFG_K054539_TIMER_HANDLER(WRITELINE(konamigq_state, k054539_irq_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, konamigq_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp
index fd5a50d83d0..64c7d5a4735 100644
--- a/src/mame/drivers/konamigv.cpp
+++ b/src/mame/drivers/konamigv.cpp
@@ -357,8 +357,8 @@ void konamigv_state::cdrom_config(device_t *device)
MACHINE_CONFIG_START(konamigv_state::konamigv)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530BQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( konamigv_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8530BQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( konamigv_map )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(konamigv_state::konamigv)
MCFG_DEVICE_ADD("am53cf96", AM53CF96, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
+ MCFG_AM53CF96_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10))
/* video hardware */
MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8514Q, 0x100000, XTAL(53'693'175) )
@@ -508,8 +508,8 @@ WRITE16_MEMBER(simpbowl_state::flash_w)
MACHINE_CONFIG_START(simpbowl_state::simpbowl)
konamigv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( simpbowl_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( simpbowl_map )
MCFG_FUJITSU_29F016A_ADD("flash0")
MCFG_FUJITSU_29F016A_ADD("flash1")
@@ -548,8 +548,8 @@ WRITE16_MEMBER(konamigv_state::btc_trackball_w)
MACHINE_CONFIG_START(konamigv_state::btchamp)
konamigv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( btchamp_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( btchamp_map )
MCFG_SHARP_LH28F400_ADD("flash")
@@ -606,8 +606,8 @@ WRITE16_MEMBER(konamigv_state::tokimeki_serial_w)
MACHINE_CONFIG_START(konamigv_state::tmosh)
konamigv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( tmosh_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( tmosh_map )
MACHINE_CONFIG_END
/*
@@ -622,8 +622,8 @@ CD:
MACHINE_CONFIG_START(konamigv_state::kdeadeye)
konamigv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( kdeadeye_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( kdeadeye_map )
MCFG_SHARP_LH28F400_ADD("flash")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index a800d7fea07..27834701832 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -1612,20 +1612,20 @@ WRITE_LINE_MEMBER(konamigx_state::hblank_irq_ack_w)
MACHINE_CONFIG_START(konamigx_state::konamigx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(gx_type2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", konamigx_state, konamigx_type2_vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(gx_type2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", konamigx_state, konamigx_type2_vblank_irq)
- MCFG_CPU_ADD("soundcpu", M68000, SUB_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(gxsndmap)
+ MCFG_DEVICE_ADD("soundcpu", M68000, SUB_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(gxsndmap)
- MCFG_CPU_ADD("dasp", TMS57002, MASTER_CLOCK/2)
- MCFG_CPU_DATA_MAP(gxtmsmap)
+ MCFG_DEVICE_ADD("dasp", TMS57002, MASTER_CLOCK/2)
+ MCFG_DEVICE_DATA_MAP(gxtmsmap)
MCFG_DEVICE_ADD("k053252", K053252, MASTER_CLOCK/4)
MCFG_K053252_OFFSETS(24, 16)
- MCFG_K053252_INT1_ACK_CB(WRITELINE(konamigx_state, vblank_irq_ack_w))
- MCFG_K053252_INT2_ACK_CB(WRITELINE(konamigx_state, hblank_irq_ack_w))
+ MCFG_K053252_INT1_ACK_CB(WRITELINE(*this, konamigx_state, vblank_irq_ack_w))
+ MCFG_K053252_INT2_ACK_CB(WRITELINE(*this, konamigx_state, hblank_irq_ack_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1685,7 +1685,7 @@ MACHINE_CONFIG_START(konamigx_state::konamigx)
MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_DEVICE_ROM("k054539")
- MCFG_K054539_TIMER_HANDLER(WRITELINE(konamigx_state, k054539_irq_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, konamigx_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "dasp", 0.5, 0)
MCFG_SOUND_ROUTE(1, "dasp", 0.5, 1)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
@@ -1788,8 +1788,8 @@ MACHINE_CONFIG_START(konamigx_state::opengolf)
MCFG_DEVICE_MODIFY("k055673")
MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX6, -53, -23)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gx_type1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gx_type1_map)
MCFG_DEVICE_ADD("adc0834", ADC0834, 0)
MCFG_ADC083X_INPUT_CB(konamigx_state, adc0834_callback)
@@ -1813,8 +1813,8 @@ MACHINE_CONFIG_START(konamigx_state::racinfrc)
MCFG_DEVICE_MODIFY("k055673")
MCFG_K055673_CONFIG("gfx2", K055673_LAYOUT_GX, -53, -23)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gx_type1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gx_type1_map)
MCFG_DEVICE_ADD("adc0834", ADC0834, 0)
MCFG_ADC083X_INPUT_CB(konamigx_state, adc0834_callback)
@@ -1824,7 +1824,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype3)
konamigx(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gx_type3_map)
+ MCFG_DEVICE_PROGRAM_MAP(gx_type3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konamigx_state, konamigx_type4_scanline, "screen", 0, 1)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
@@ -1865,7 +1865,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4)
konamigx(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gx_type4_map)
+ MCFG_DEVICE_PROGRAM_MAP(gx_type4_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konamigx_state, konamigx_type4_scanline, "screen", 0, 1)
MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp
index 30973076bad..d91b02def3f 100644
--- a/src/mame/drivers/konamim2.cpp
+++ b/src/mame/drivers/konamim2.cpp
@@ -1301,14 +1301,14 @@ void konamim2_state::machine_reset()
MACHINE_CONFIG_START(konamim2_state::m2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC602, 66000000) /* actually PPC602, 66MHz */
+ MCFG_DEVICE_ADD("maincpu", PPC602, 66000000) /* actually PPC602, 66MHz */
MCFG_PPC_BUS_FREQUENCY(33000000) /* Multiplier 2, Bus = 33MHz, Core = 66MHz */
- MCFG_CPU_PROGRAM_MAP(m2_main_m)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", konamim2_state, m2)
+ MCFG_DEVICE_PROGRAM_MAP(m2_main_m)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", konamim2_state, m2)
- MCFG_CPU_ADD("sub", PPC602, 66000000) /* actually PPC602, 66MHz */
+ MCFG_DEVICE_ADD("sub", PPC602, 66000000) /* actually PPC602, 66MHz */
MCFG_PPC_BUS_FREQUENCY(33000000) /* Multiplier 2, Bus = 33MHz, Core = 66MHz */
- MCFG_CPU_PROGRAM_MAP(m2_main_s)
+ MCFG_DEVICE_PROGRAM_MAP(m2_main_s)
// TODO: declaring as second screen causes palette confusion (wants to use palette from the other screen?)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
@@ -1333,11 +1333,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(konamim2_state::_3do_m2)
m2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(_3do_m2_main_m)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(_3do_m2_main_m)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(_3do_m2_main_s)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(_3do_m2_main_s)
MCFG_SOFTWARE_LIST_ADD("cd_list","3do_m2")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konblands.cpp b/src/mame/drivers/konblands.cpp
index 518c9936607..a826531163f 100644
--- a/src/mame/drivers/konblands.cpp
+++ b/src/mame/drivers/konblands.cpp
@@ -278,14 +278,14 @@ WRITE_LINE_MEMBER(konblands_state::ld_command_strobe_cb)
MACHINE_CONFIG_START(konblands_state::konblands)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",MC6809E,MASTER_CLOCK/12)
- MCFG_CPU_PROGRAM_MAP(konblands_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", konblands_state, vblank_irq)
- MCFG_CPU_PERIODIC_INT_DRIVER(konblands_state, timer_irq, 8) // 8 times per frame
+ MCFG_DEVICE_ADD("maincpu",MC6809E,MASTER_CLOCK/12)
+ MCFG_DEVICE_PROGRAM_MAP(konblands_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", konblands_state, vblank_irq)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(konblands_state, timer_irq, 8) // 8 times per frame
/* video hardware */
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
- MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(konblands_state, ld_command_strobe_cb))
+ MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(*this, konblands_state, ld_command_strobe_cb))
// TODO: might be different
MCFG_LASERDISC_OVERLAY_DRIVER(512, 256, konblands_state, screen_update)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
@@ -300,14 +300,14 @@ MACHINE_CONFIG_START(konblands_state::konblands)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn", SN76496, MASTER_CLOCK/12)
+ MCFG_DEVICE_ADD("sn", SN76496, MASTER_CLOCK/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(konblands_state::konblandsh)
konblands(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(konblandsh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(konblandsh_map)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp
index bc54516f7b2..5c276276840 100644
--- a/src/mame/drivers/konendev.cpp
+++ b/src/mame/drivers/konendev.cpp
@@ -306,9 +306,9 @@ INTERRUPT_GEN_MEMBER(konendev_state::vbl_interrupt)
MACHINE_CONFIG_START(konendev_state::konendev)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GCX, 32000000) // Clock unknown
- MCFG_CPU_PROGRAM_MAP(konendev_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", konendev_state, vbl_interrupt)
+ MCFG_DEVICE_ADD("maincpu", PPC403GCX, 32000000) // Clock unknown
+ MCFG_DEVICE_PROGRAM_MAP(konendev_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", konendev_state, vbl_interrupt)
/* video hardware */
MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette")
@@ -322,7 +322,7 @@ MACHINE_CONFIG_START(konendev_state::konendev)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("gcu", K057714, 0)
- MCFG_K057714_IRQ_CALLBACK(WRITELINE(konendev_state, gcu_interrupt))
+ MCFG_K057714_IRQ_CALLBACK(WRITELINE(*this, konendev_state, gcu_interrupt))
MCFG_NVRAM_ADD_0FILL("nvram0")
MCFG_NVRAM_ADD_0FILL("nvram1")
@@ -332,7 +332,7 @@ MACHINE_CONFIG_START(konendev_state::konendev)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400) // Clock unknown
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400) // Clock unknown
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp
index 7acf6b82dc8..0af10355da4 100644
--- a/src/mame/drivers/konin.cpp
+++ b/src/mame/drivers/konin.cpp
@@ -132,25 +132,25 @@ void konin_state::machine_start()
MACHINE_CONFIG_START(konin_state::konin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(konin_mem)
- MCFG_CPU_IO_MAP(konin_io)
- MCFG_I8085A_INTE(DEVWRITELINE("picu", i8214_device, inte_w))
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("intlatch", i8212_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(konin_mem)
+ MCFG_DEVICE_IO_MAP(konin_io)
+ MCFG_I8085A_INTE(WRITELINE("picu", i8214_device, inte_w))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("intlatch", i8212_device, inta_cb)
MCFG_DEVICE_ADD("intlatch", I8212, 0)
MCFG_I8212_MD_CALLBACK(GND)
- MCFG_I8212_DI_CALLBACK(DEVREAD8("picu", i8214_device, vector_r))
+ MCFG_I8212_DI_CALLBACK(READ8("picu", i8214_device, vector_r))
MCFG_I8212_INT_CALLBACK(INPUTLINE("maincpu", I8085_INTR_LINE))
MCFG_DEVICE_ADD("picu", I8214, XTAL(4'000'000))
- MCFG_I8214_INT_CALLBACK(DEVWRITELINE("intlatch", i8212_device, stb_w))
+ MCFG_I8214_INT_CALLBACK(WRITELINE("intlatch", i8212_device, stb_w))
MCFG_DEVICE_ADD("mainpit", PIT8253, 0)
// wild guess at UART clock and source
MCFG_PIT8253_CLK0(1536000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("mainppi", I8255, 0)
@@ -159,15 +159,15 @@ MACHINE_CONFIG_START(konin_state::konin)
MCFG_DEVICE_ADD("ioppi", I8255, 0)
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(konin_state, picu_r3_w))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, konin_state, picu_r3_w))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp
index a3f9ee0f043..97b7a951abf 100644
--- a/src/mame/drivers/konmedal.cpp
+++ b/src/mame/drivers/konmedal.cpp
@@ -381,9 +381,9 @@ void konmedal_state::machine_reset()
MACHINE_CONFIG_START(konmedal_state::tsukande)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
- MCFG_CPU_PROGRAM_MAP(medal_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", konmedal_state, konmedal_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(14'318'181)/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
+ MCFG_DEVICE_PROGRAM_MAP(medal_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", konmedal_state, konmedal_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -414,9 +414,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(konmedal_state::ddboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
- MCFG_CPU_PROGRAM_MAP(ddboy_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", konmedal_state, konmedal_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(14'318'181)/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
+ MCFG_DEVICE_PROGRAM_MAP(ddboy_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", konmedal_state, konmedal_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -541,8 +541,8 @@ WRITE8_MEMBER(konmedal_state::shuri_vrom_bank_w)
MACHINE_CONFIG_START(konmedal_state::shuriboy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 3) // divisor unknown
- MCFG_CPU_PROGRAM_MAP(shuriboy_main)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000) / 3) // divisor unknown
+ MCFG_DEVICE_PROGRAM_MAP(shuriboy_main)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konmedal_state, scanline, "screen", 0, 1)
/* video hardware */
diff --git a/src/mame/drivers/konmedal68k.cpp b/src/mame/drivers/konmedal68k.cpp
index a146d4f84a8..b0b4fdec03e 100644
--- a/src/mame/drivers/konmedal68k.cpp
+++ b/src/mame/drivers/konmedal68k.cpp
@@ -294,8 +294,8 @@ void konmedal68k_state::machine_reset()
MACHINE_CONFIG_START(konmedal68k_state::kzaurus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(33'868'800)/4 ) // 33.8688 MHz crystal verified on PCB
- MCFG_CPU_PROGRAM_MAP(kzaurus_main)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(33'868'800)/4 ) // 33.8688 MHz crystal verified on PCB
+ MCFG_DEVICE_PROGRAM_MAP(kzaurus_main)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konmedal68k_state, scanline, "screen", 0, 1)
/* video hardware */
diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp
index e9077c44549..1fdc26b1c82 100644
--- a/src/mame/drivers/kontest.cpp
+++ b/src/mame/drivers/kontest.cpp
@@ -255,10 +255,10 @@ void kontest_state::machine_reset()
MACHINE_CONFIG_START(kontest_state::kontest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(kontest_map)
- MCFG_CPU_IO_MAP(kontest_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kontest_state, kontest_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80,MAIN_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(kontest_map)
+ MCFG_DEVICE_IO_MAP(kontest_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kontest_state, kontest_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -274,10 +274,10 @@ MACHINE_CONFIG_START(kontest_state::kontest)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("sn1", SN76489A, MAIN_CLOCK/16)
+ MCFG_DEVICE_ADD("sn1", SN76489A, MAIN_CLOCK/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, MAIN_CLOCK/16)
+ MCFG_DEVICE_ADD("sn2", SN76489A, MAIN_CLOCK/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp
index 27ecd5dd3ab..75aaaec88ee 100644
--- a/src/mame/drivers/kopunch.cpp
+++ b/src/mame/drivers/kopunch.cpp
@@ -234,35 +234,35 @@ void kopunch_state::machine_start()
MACHINE_CONFIG_START(kopunch_state::kopunch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, 4000000) // 4 MHz?
- MCFG_CPU_PROGRAM_MAP(kopunch_map)
- MCFG_CPU_IO_MAP(kopunch_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kopunch_state, vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 4000000) // 4 MHz?
+ MCFG_DEVICE_PROGRAM_MAP(kopunch_map)
+ MCFG_DEVICE_IO_MAP(kopunch_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kopunch_state, vblank_interrupt)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
// $30 - always $9b (PPI mode 0, ports A & B & C as input)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
- MCFG_I8255_IN_PORTB_CB(READ8(kopunch_state, sensors1_r))
- MCFG_I8255_IN_PORTC_CB(READ8(kopunch_state, sensors2_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, kopunch_state, sensors1_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, kopunch_state, sensors2_r))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
// $34 - always $80 (PPI mode 0, ports A & B & C as output)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kopunch_state, coin_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kopunch_state, coin_w))
MCFG_I8255_OUT_PORTB_CB(LOGGER("PPI8255 - unmapped write port B"))
MCFG_I8255_OUT_PORTC_CB(LOGGER("PPI8255 - unmapped write port C"))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
// $38 - always $89 (PPI mode 0, ports A & B as output, port C as input)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kopunch_state, lamp_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kopunch_state, lamp_w))
MCFG_I8255_OUT_PORTB_CB(LOGGER("PPI8255 - unmapped write port B"))
MCFG_I8255_IN_PORTC_CB(IOPORT("DSW"))
MCFG_DEVICE_ADD("ppi8255_3", I8255A, 0)
// $3c - always $88 (PPI mode 0, ports A & B & lower C as output, upper C as input)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kopunch_state, scroll_x_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(kopunch_state, scroll_y_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kopunch_state, scroll_x_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, kopunch_state, scroll_y_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("P2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(kopunch_state, gfxbank_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, kopunch_state, gfxbank_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp
index 254a435d3eb..dfa07f35f6e 100644
--- a/src/mame/drivers/kramermc.cpp
+++ b/src/mame/drivers/kramermc.cpp
@@ -113,14 +113,14 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(kramermc_state::kramermc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 1500000)
- MCFG_CPU_PROGRAM_MAP(kramermc_mem)
- MCFG_CPU_IO_MAP(kramermc_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(kramermc_mem)
+ MCFG_DEVICE_IO_MAP(kramermc_io)
MCFG_DEVICE_ADD("z80pio", Z80PIO, 1500000)
- MCFG_Z80PIO_IN_PA_CB(READ8(kramermc_state, kramermc_port_a_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(kramermc_state, kramermc_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(kramermc_state, kramermc_port_b_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, kramermc_state, kramermc_port_a_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, kramermc_state, kramermc_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, kramermc_state, kramermc_port_b_r))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index 24c2bbb7ab1..495934bb9fc 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -298,9 +298,9 @@ WRITE_LINE_MEMBER(kron180_state::keyb_interrupt)
*/
MACHINE_CONFIG_START(kron180_state::kron180)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", Z180, XTAL(12'288'000))
- MCFG_CPU_PROGRAM_MAP (kron180_mem)
- MCFG_CPU_IO_MAP(kron180_iomap)
+ MCFG_DEVICE_ADD ("maincpu", Z180, XTAL(12'288'000))
+ MCFG_DEVICE_PROGRAM_MAP (kron180_mem)
+ MCFG_DEVICE_IO_MAP(kron180_iomap)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -314,7 +314,7 @@ MACHINE_CONFIG_START(kron180_state::kron180)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* keyboard TODO: fix it, doesn't work yet */
- MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE(kron180_state, keyb_interrupt))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE(*this, kron180_state, keyb_interrupt))
MACHINE_CONFIG_END
/* ROM definitions */
diff --git a/src/mame/drivers/krz2000.cpp b/src/mame/drivers/krz2000.cpp
index 276eff974e3..2acc9134f8f 100644
--- a/src/mame/drivers/krz2000.cpp
+++ b/src/mame/drivers/krz2000.cpp
@@ -62,9 +62,9 @@ void k2000_state::k2000_map(address_map &map)
}
MACHINE_CONFIG_START(k2000_state::k2000)
- MCFG_CPU_ADD("maincpu", M68301, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(k2000_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68301, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(k2000_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp
index 09c398b1c66..7b7283fecca 100644
--- a/src/mame/drivers/ksayakyu.cpp
+++ b/src/mame/drivers/ksayakyu.cpp
@@ -261,12 +261,12 @@ void ksayakyu_state::machine_reset()
MACHINE_CONFIG_START(ksayakyu_state::ksayakyu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8) //divider is guessed
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,MAIN_CLOCK/8) //divider is guessed
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_ADD("audiocpu", Z80, MAIN_CLOCK/8) //divider is guessed, controls DAC tempo
- MCFG_CPU_PROGRAM_MAP(soundcpu_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(ksayakyu_state, irq0_line_hold, 60) //guess, controls music tempo
+ MCFG_DEVICE_ADD("audiocpu", Z80, MAIN_CLOCK/8) //divider is guessed, controls DAC tempo
+ MCFG_DEVICE_PROGRAM_MAP(soundcpu_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ksayakyu_state, irq0_line_hold, 60) //guess, controls music tempo
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
@@ -290,17 +290,17 @@ MACHINE_CONFIG_START(ksayakyu_state::ksayakyu)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/16) //unknown clock
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ksayakyu_state, dummy1_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK/16) //unknown clock
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ksayakyu_state, dummy1_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/16) //unknown clock
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ksayakyu_state, dummy2_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ksayakyu_state, dummy3_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, MAIN_CLOCK/16) //unknown clock
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ksayakyu_state, dummy2_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ksayakyu_state, dummy3_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index 135d9560181..cc1ed6f7320 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -382,7 +382,7 @@ public:
m_analog2(*this, "analog2" ),
m_analog3(*this, "analog3" ),
m_pads(*this, "PADS" ),
- m_psxirq(*this, ":maincpu:irq" ),
+ m_psxirq(*this, "maincpu:irq" ),
m_ata(*this, "ata" ),
m_h8_response(*this, "h8_response"),
m_maincpu(*this, "maincpu" ),
@@ -517,11 +517,11 @@ public:
void casszi(machine_config &config);
void cassxzi(machine_config &config);
- static void punchmania_cassette_install(device_t *device);
- static void salarymc_cassette_install(device_t *device);
- static void hyperbbc_cassette_install(device_t *device);
- static void hyprbbc2_cassette_install(device_t *device);
- static void hypbbc2p_cassette_install(device_t *device);
+ void punchmania_cassette_install(device_t *device);
+ void salarymc_cassette_install(device_t *device);
+ void hyperbbc_cassette_install(device_t *device);
+ void hyprbbc2_cassette_install(device_t *device);
+ void hypbbc2p_cassette_install(device_t *device);
static void cr589_config(device_t *device);
void fbaitbc_map(address_map &map);
void flashbank_map(address_map &map);
@@ -1565,9 +1565,9 @@ void ksys573_state::salarymc_cassette_install(device_t *device)
{
devcb_base *devcb;
(void)devcb;
- MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_clk ) )
- MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_rst ) )
- MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( DEVWRITELINE( ":", ksys573_state, salarymc_lamp_d ) )
+ MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( WRITELINE( *this, ksys573_state, salarymc_lamp_clk ) )
+ MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( WRITELINE( *this, ksys573_state, salarymc_lamp_rst ) )
+ MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( WRITELINE( *this, ksys573_state, salarymc_lamp_d ) )
}
DRIVER_INIT_MEMBER( ksys573_state, salarymc )
@@ -1648,24 +1648,24 @@ void ksys573_state::hyperbbc_cassette_install(device_t *device)
{
devcb_base *devcb;
(void)devcb;
- MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe3 ) ) // line shared with x76f100 sda
- MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 scl
- MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst
- MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_green ) )
- MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_blue ) )
- MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_red ) )
- MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_start ) )
+ MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_strobe3 ) ) // line shared with x76f100 sda
+ MCFG_KONAMI573_CASSETTE_Y_D1_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 scl
+ MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst
+ MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_green ) )
+ MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_blue ) )
+ MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_red ) )
+ MCFG_KONAMI573_CASSETTE_Y_D7_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_start ) )
}
void ksys573_state::hypbbc2p_cassette_install(device_t *device)
{
devcb_base *devcb;
(void)devcb;
- MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 sda
- MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst
- MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_green ) )
- MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_blue ) )
- MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( DEVWRITELINE( ":", ksys573_state, hyperbbc_lamp_red ) )
+ MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_strobe2 ) ) // line shared with x76f100 sda
+ MCFG_KONAMI573_CASSETTE_Y_D3_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_strobe1 ) ) // line shared with x76f100 rst
+ MCFG_KONAMI573_CASSETTE_Y_D4_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_green ) )
+ MCFG_KONAMI573_CASSETTE_Y_D5_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_blue ) )
+ MCFG_KONAMI573_CASSETTE_Y_D6_HANDLER( WRITELINE( *this, ksys573_state, hyperbbc_lamp_red ) )
}
DRIVER_INIT_MEMBER( ksys573_state, hyperbbc )
@@ -2073,8 +2073,8 @@ void ksys573_state::cr589_config(device_t *device)
MACHINE_CONFIG_START(ksys573_state::konami573)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( konami573_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( konami573_map )
MCFG_RAM_MODIFY( "maincpu:ram" )
MCFG_RAM_DEFAULT_SIZE( "4M" )
@@ -2087,7 +2087,7 @@ MACHINE_CONFIG_START(ksys573_state::konami573)
MCFG_DEVICE_ADD( "mb89371", MB89371, 0 )
MCFG_DEVICE_ADD( "ata", ATA_INTERFACE, 0 )
- MCFG_ATA_INTERFACE_IRQ_HANDLER( WRITELINE( ksys573_state, ata_interrupt ) )
+ MCFG_ATA_INTERFACE_IRQ_HANDLER( WRITELINE( *this, ksys573_state, ata_interrupt ) )
MCFG_DEVICE_MODIFY( "ata:0" )
MCFG_SLOT_OPTION_ADD( "cr589", CR589 )
@@ -2095,7 +2095,7 @@ MACHINE_CONFIG_START(ksys573_state::konami573)
MCFG_SLOT_DEFAULT_OPTION( "cr589" )
MCFG_DEVICE_ADD( "cassette", KONAMI573_CASSETTE_SLOT, 0 )
- MCFG_KONAMI573_CASSETTE_DSR_HANDLER(DEVWRITELINE( "maincpu:sio1", psxsio1_device, write_dsr ) )
+ MCFG_KONAMI573_CASSETTE_DSR_HANDLER(WRITELINE( "maincpu:sio1", psxsio1_device, write_dsr ) )
// onboard flash
MCFG_FUJITSU_29F016A_ADD( "29f016a.31m" )
@@ -2136,16 +2136,16 @@ MACHINE_CONFIG_END
// Variants with additional digital sound board
MACHINE_CONFIG_START(ksys573_state::k573d)
konami573(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( konami573d_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( konami573d_map )
MCFG_KONAMI_573_DIGITAL_IO_BOARD_ADD( "k573dio", XTAL(19'660'800) )
MACHINE_CONFIG_END
// Variants with additional analogue i/o board
MACHINE_CONFIG_START(ksys573_state::k573a)
konami573(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( konami573a_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( konami573a_map )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::pccard1_16mb)
@@ -2245,7 +2245,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddr3m)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddr_output_callback ) )
pccard2_32mb(config);
cassyyi(config);
@@ -2254,7 +2254,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddr3mp)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddr_output_callback ) )
pccard2_32mb(config);
cassxzi(config);
@@ -2263,7 +2263,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddrusa)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddr_output_callback ) )
casszi(config);
MACHINE_CONFIG_END
@@ -2271,7 +2271,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddr5m)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddr_output_callback ) )
pccard2_32mb(config);
casszi(config);
@@ -2293,7 +2293,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::dsfdr)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddr_output_callback ) )
cassxzi(config);
MACHINE_CONFIG_END
@@ -2301,7 +2301,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::dsem)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddr_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddr_output_callback ) )
cassxi(config);
MACHINE_CONFIG_END
@@ -2311,7 +2311,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddrsolo)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddrsolo_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddrsolo_output_callback ) )
cassyi(config);
MACHINE_CONFIG_END
@@ -2319,7 +2319,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddrs2k)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddrsolo_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddrsolo_output_callback ) )
cassyyi(config);
MACHINE_CONFIG_END
@@ -2327,7 +2327,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::ddr4ms)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, ddrsolo_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, ddrsolo_output_callback ) )
pccard2_32mb(config);
cassxzi(config);
@@ -2343,7 +2343,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::drmn2m)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, drmn_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, drmn_output_callback ) )
cassxzi(config);
MACHINE_CONFIG_END
@@ -2351,7 +2351,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::drmn4m)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, drmn_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, drmn_output_callback ) )
casszi(config);
@@ -2403,8 +2403,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::fbaitbc)
konami573(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( fbaitbc_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( fbaitbc_map )
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0)
MCFG_UPD4701_PORTY("uPD4701_y")
@@ -2417,7 +2417,7 @@ MACHINE_CONFIG_START(ksys573_state::hyperbbc)
cassy(config); // The game doesn't check the security chip
MCFG_DEVICE_MODIFY( "cassette" )
- MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", hyperbbc_cassette_install )
+ MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", [this] (device_t *device) { hyperbbc_cassette_install(device); } )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::hypbbc2p)
@@ -2425,7 +2425,7 @@ MACHINE_CONFIG_START(ksys573_state::hypbbc2p)
cassy(config);
MCFG_DEVICE_MODIFY( "cassette" )
- MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", hypbbc2p_cassette_install )
+ MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", [this] (device_t *device) { hypbbc2p_cassette_install(device); } )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::salarymc)
@@ -2433,7 +2433,7 @@ MACHINE_CONFIG_START(ksys573_state::salarymc)
cassyi(config);
MCFG_DEVICE_MODIFY( "cassette" )
- MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", salarymc_cassette_install )
+ MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", [this] (device_t *device) { salarymc_cassette_install(device); } )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::gchgchmp)
@@ -2444,14 +2444,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::pnchmn)
konami573(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( konami573a_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( konami573a_map )
cassxi(config);
pccard1_32mb(config);
MCFG_DEVICE_MODIFY( "cassette" )
- MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", punchmania_cassette_install )
+ MCFG_SLOT_OPTION_MACHINE_CONFIG( "game", [this] (device_t *device) { punchmania_cassette_install(device); } )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::pnchmn2)
@@ -2461,8 +2461,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::gunmania)
konami573(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( gunmania_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( gunmania_map )
MCFG_DS2401_ADD( "gunmania_id" )
pccard2_32mb(config);
@@ -2471,7 +2471,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::dmx)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, dmx_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, dmx_output_callback ) )
casszi(config);
MACHINE_CONFIG_END
@@ -2479,7 +2479,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ksys573_state::mamboagg)
k573d(config);
MCFG_DEVICE_MODIFY( "k573dio" )
- MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( ksys573_state, mamboagg_output_callback ) )
+ MCFG_KONAMI_573_DIGITAL_IO_BOARD_OUTPUT_CALLBACK( WRITE8( *this, ksys573_state, mamboagg_output_callback ) )
casszi(config);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index 5fd30695409..8c48ad33bdd 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -295,34 +295,34 @@ void kungfur_state::machine_reset()
MACHINE_CONFIG_START(kungfur_state::kungfur)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 8000000/2) // 4MHz?
- MCFG_CPU_PROGRAM_MAP(kungfur_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(kungfur_state, kungfur_irq, 975) // close approximation
+ MCFG_DEVICE_ADD("maincpu", M6809, 8000000/2) // 4MHz?
+ MCFG_DEVICE_PROGRAM_MAP(kungfur_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kungfur_state, kungfur_irq, 975) // close approximation
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
// $4008 - always $83 (PPI mode 0, ports B & lower C as input)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kungfur_state, kungfur_output_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kungfur_state, kungfur_output_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(kungfur_state, kungfur_control_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, kungfur_state, kungfur_control_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
// $400c - always $80 (PPI mode 0, all ports as output)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(kungfur_state, kungfur_latch1_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(kungfur_state, kungfur_latch2_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(kungfur_state, kungfur_latch3_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, kungfur_state, kungfur_latch1_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, kungfur_state, kungfur_latch2_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, kungfur_state, kungfur_latch3_w))
/* no video! */
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("adpcm1", MSM5205, XTAL(384'000)) // clock verified with recording
- MCFG_MSM5205_VCLK_CB(WRITELINE(kungfur_state, kfr_adpcm1_int))
+ MCFG_DEVICE_ADD("adpcm1", MSM5205, XTAL(384'000)) // clock verified with recording
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, kungfur_state, kfr_adpcm1_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("adpcm2", MSM5205, XTAL(384'000)) // "
- MCFG_MSM5205_VCLK_CB(WRITELINE(kungfur_state, kfr_adpcm2_int))
+ MCFG_DEVICE_ADD("adpcm2", MSM5205, XTAL(384'000)) // "
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, kungfur_state, kfr_adpcm2_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp
index 4234576383b..39c56b722cc 100644
--- a/src/mame/drivers/kurukuru.cpp
+++ b/src/mame/drivers/kurukuru.cpp
@@ -843,14 +843,14 @@ void kurukuru_state::machine_reset()
MACHINE_CONFIG_START(kurukuru_state::kurukuru)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kurukuru_map)
- MCFG_CPU_IO_MAP(kurukuru_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kurukuru_map)
+ MCFG_DEVICE_IO_MAP(kurukuru_io)
- MCFG_CPU_ADD("audiocpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kurukuru_audio_map)
- MCFG_CPU_IO_MAP(kurukuru_audio_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_ADD("audiocpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kurukuru_audio_map)
+ MCFG_DEVICE_IO_MAP(kurukuru_audio_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -865,7 +865,7 @@ MACHINE_CONFIG_START(kurukuru_state::kurukuru)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
// latch irq vector is $ef (rst $28)
// timer irq vector is $f7 (rst $30)
@@ -873,14 +873,14 @@ MACHINE_CONFIG_START(kurukuru_state::kurukuru)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ym2149", YM2149, YM2149_CLOCK)
+ MCFG_DEVICE_ADD("ym2149", YM2149, YM2149_CLOCK)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(kurukuru_state, ym2149_aout_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kurukuru_state, ym2149_bout_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, kurukuru_state, ym2149_aout_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, kurukuru_state, ym2149_bout_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("adpcm", MSM5205, M5205_CLOCK)
- MCFG_MSM5205_VCLK_CB(WRITELINE(kurukuru_state, kurukuru_msm5205_vck))
+ MCFG_DEVICE_ADD("adpcm", MSM5205, M5205_CLOCK)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, kurukuru_state, kurukuru_msm5205_vck))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* changed on the fly */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -890,13 +890,13 @@ MACHINE_CONFIG_START(kurukuru_state::ppj)
kurukuru(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ppj_map)
- MCFG_CPU_IO_MAP(ppj_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ppj_map)
+ MCFG_DEVICE_IO_MAP(ppj_io)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(ppj_audio_map)
- MCFG_CPU_IO_MAP(ppj_audio_io)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(ppj_audio_map)
+ MCFG_DEVICE_IO_MAP(ppj_audio_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index 75db227e023..d6875a0d666 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -1348,37 +1348,37 @@ TIMER_DEVICE_CALLBACK_MEMBER(tandy200_state::tandy200_tp_tick)
MACHINE_CONFIG_START(kc85_state::kc85)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(kc85_mem)
- MCFG_CPU_IO_MAP(kc85_io)
- MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r))
- MCFG_I8085A_SOD(WRITELINE(kc85_state,kc85_sod_w))
+ MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(kc85_mem)
+ MCFG_DEVICE_IO_MAP(kc85_io)
+ MCFG_I8085A_SID(READLINE(*this, kc85_state,kc85_sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, kc85_state,kc85_sod_w))
/* video hardware */
kc85_video(config);
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w))
- MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, kc85_state, i8155_pa_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, kc85_state, i8155_pb_w))
+ MCFG_I8155_IN_PORTC_CB(READ8(*this, kc85_state, i8155_pc_r))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, kc85_state, i8155_to_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
MCFG_IM6402_ADD(IM6402_TAG, 0, 0)
- MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri))
+ MCFG_IM6402_TRO_CALLBACK(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kc85_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(kc85_state, write_centronics_select))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kc85_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, kc85_state, write_centronics_select))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
@@ -1398,37 +1398,37 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc8201_state::pc8201)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(pc8201_mem)
- MCFG_CPU_IO_MAP(pc8201_io)
- MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r))
- MCFG_I8085A_SOD(WRITELINE(kc85_state,kc85_sod_w))
+ MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(pc8201_mem)
+ MCFG_DEVICE_IO_MAP(pc8201_io)
+ MCFG_I8085A_SID(READLINE(*this, kc85_state,kc85_sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, kc85_state,kc85_sod_w))
/* video hardware */
kc85_video(config);
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w))
- MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, kc85_state, i8155_pa_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, kc85_state, i8155_pb_w))
+ MCFG_I8155_IN_PORTC_CB(READ8(*this, kc85_state, i8155_pc_r))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, kc85_state, i8155_to_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
MCFG_IM6402_ADD(IM6402_TAG, 0, 0)
- MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri))
+ MCFG_IM6402_TRO_CALLBACK(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(kc85_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(kc85_state, write_centronics_select))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, kc85_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, kc85_state, write_centronics_select))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED)
@@ -1459,33 +1459,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trsm100_state::trsm100)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(kc85_mem)
- MCFG_CPU_IO_MAP(trsm100_io)
- MCFG_I8085A_SID(READLINE(kc85_state,kc85_sid_r))
- MCFG_I8085A_SOD(WRITELINE(kc85_state,kc85_sod_w))
+ MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(kc85_mem)
+ MCFG_DEVICE_IO_MAP(trsm100_io)
+ MCFG_I8085A_SID(READLINE(*this, kc85_state,kc85_sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, kc85_state,kc85_sod_w))
/* video hardware */
kc85_video(config);
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(kc85_state, i8155_pa_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(kc85_state, i8155_pb_w))
- MCFG_I8155_IN_PORTC_CB(READ8(kc85_state, i8155_pc_r))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(kc85_state, i8155_to_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, kc85_state, i8155_pa_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, kc85_state, i8155_pb_w))
+ MCFG_I8155_IN_PORTC_CB(READ8(*this, kc85_state, i8155_pc_r))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, kc85_state, i8155_to_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, INPUTLINE(I8085_TAG, I8085_RST75_LINE))
MCFG_IM6402_ADD(IM6402_TAG, 0, 0)
- MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri))
+ MCFG_IM6402_TRO_CALLBACK(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CASSETTE_ADD("cassette")
@@ -1515,11 +1515,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy200_state::tandy200)
/* basic machine hardware */
- MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(tandy200_mem)
- MCFG_CPU_IO_MAP(tandy200_io)
- MCFG_I8085A_SID(READLINE(tandy200_state,kc85_sid_r))
- MCFG_I8085A_SOD(WRITELINE(tandy200_state,kc85_sod_w))
+ MCFG_DEVICE_ADD(I8085_TAG, I8085A, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(tandy200_mem)
+ MCFG_DEVICE_IO_MAP(tandy200_io)
+ MCFG_I8085A_SID(READLINE(*this, tandy200_state,kc85_sid_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, tandy200_state,kc85_sod_w))
/* video hardware */
tandy200_video(config);
@@ -1529,32 +1529,32 @@ MACHINE_CONFIG_START(tandy200_state::tandy200)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// MCFG_TCM5089_ADD(TCM5089_TAG, XTAL(3'579'545))
/* devices */
MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(4'915'200)/2)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(tandy200_state, i8155_pa_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(tandy200_state, i8155_pb_w))
- MCFG_I8155_IN_PORTC_CB(READ8(tandy200_state, i8155_pc_r))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(tandy200_state, i8155_to_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, tandy200_state, i8155_pa_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, tandy200_state, i8155_pb_w))
+ MCFG_I8155_IN_PORTC_CB(READ8(*this, tandy200_state, i8155_pc_r))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, tandy200_state, i8155_to_w))
MCFG_DEVICE_ADD(RP5C01A_TAG, RP5C01, XTAL(32'768))
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) /*XTAL(4'915'200)/2,*/
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
// MCFG_MC14412_ADD(MC14412_TAG, XTAL(1'000'000))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tandy200_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(tandy200_state, write_centronics_select))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tandy200_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, tandy200_state, write_centronics_select))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp
index a57e4d1a373..06b43ac3ea1 100644
--- a/src/mame/drivers/kyugo.cpp
+++ b/src/mame/drivers/kyugo.cpp
@@ -522,21 +522,21 @@ INTERRUPT_GEN_MEMBER(kyugo_state::vblank_irq)
MACHINE_CONFIG_START(kyugo_state::kyugo_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kyugo_main_map)
- MCFG_CPU_IO_MAP(kyugo_main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", kyugo_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kyugo_main_map)
+ MCFG_DEVICE_IO_MAP(kyugo_main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", kyugo_state, vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(gyrodine_sub_map)
- MCFG_CPU_IO_MAP(gyrodine_sub_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(kyugo_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(gyrodine_sub_map)
+ MCFG_DEVICE_IO_MAP(gyrodine_sub_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kyugo_state, irq0_line_hold, 4*60)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(kyugo_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(kyugo_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, kyugo_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, kyugo_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
/* video hardware */
@@ -554,12 +554,12 @@ MACHINE_CONFIG_START(kyugo_state::kyugo_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -567,44 +567,44 @@ MACHINE_CONFIG_START(kyugo_state::gyrodine)
kyugo_base(config);
/* add watchdog */
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gyrodine_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gyrodine_main_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(kyugo_state::repulse)
kyugo_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(repulse_sub_map)
- MCFG_CPU_IO_MAP(repulse_sub_portmap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(repulse_sub_map)
+ MCFG_DEVICE_IO_MAP(repulse_sub_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(kyugo_state::srdmissn)
kyugo_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(srdmissn_sub_map)
- MCFG_CPU_IO_MAP(srdmissn_sub_portmap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(srdmissn_sub_map)
+ MCFG_DEVICE_IO_MAP(srdmissn_sub_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(kyugo_state::flashgala)
kyugo_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(flashgala_sub_map)
- MCFG_CPU_IO_MAP(flashgala_sub_portmap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(flashgala_sub_map)
+ MCFG_DEVICE_IO_MAP(flashgala_sub_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(kyugo_state::legend)
kyugo_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(legend_sub_map)
- MCFG_CPU_IO_MAP(srdmissn_sub_portmap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(legend_sub_map)
+ MCFG_DEVICE_IO_MAP(srdmissn_sub_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp
index 66c3f595cdb..aa9c61a5695 100644
--- a/src/mame/drivers/labyrunr.cpp
+++ b/src/mame/drivers/labyrunr.cpp
@@ -167,9 +167,9 @@ void labyrunr_state::machine_start()
MACHINE_CONFIG_START(labyrunr_state::labyrunr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
- MCFG_CPU_PROGRAM_MAP(labyrunr_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(labyrunr_state, labyrunr_timer_interrupt, 4*60)
+ MCFG_DEVICE_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
+ MCFG_DEVICE_PROGRAM_MAP(labyrunr_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(labyrunr_state, labyrunr_timer_interrupt, 4*60)
MCFG_WATCHDOG_ADD("watchdog")
@@ -181,7 +181,7 @@ MACHINE_CONFIG_START(labyrunr_state::labyrunr)
MCFG_SCREEN_VISIBLE_AREA(0*8, 35*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(labyrunr_state, screen_update_labyrunr)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(labyrunr_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, labyrunr_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", labyrunr)
MCFG_PALETTE_ADD("palette", 2*8*16*16)
@@ -196,7 +196,7 @@ MACHINE_CONFIG_START(labyrunr_state::labyrunr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 3000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
@@ -204,7 +204,7 @@ MACHINE_CONFIG_START(labyrunr_state::labyrunr)
MCFG_SOUND_ROUTE(2, "mono", 0.40)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_SOUND_ADD("ym2", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 3000000)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp
index fb3e715670a..2f0e4cad122 100644
--- a/src/mame/drivers/ladybug.cpp
+++ b/src/mame/drivers/ladybug.cpp
@@ -724,8 +724,8 @@ void sraider_state::machine_reset()
MACHINE_CONFIG_START(ladybug_state::ladybug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(ladybug_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ladybug_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -745,36 +745,36 @@ MACHINE_CONFIG_START(ladybug_state::ladybug)
MCFG_LADYBUG_VIDEO_GFXDECODE("gfxdecode")
MCFG_DEVICE_ADD("videolatch", LS259, 0) // L5 on video board or H3 on single board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(ladybug_state, flipscreen_w)) // no other outputs used
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, ladybug_state, flipscreen_w)) // no other outputs used
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn1", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn2", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(dorodon_state::dorodon)
ladybug(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sraider_state::sraider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sraider_cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sraider_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sraider_cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sraider_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sraider_cpu2_map)
- MCFG_CPU_IO_MAP(sraider_cpu2_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sraider_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sraider_cpu2_map)
+ MCFG_DEVICE_IO_MAP(sraider_cpu2_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sraider_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -783,7 +783,7 @@ MACHINE_CONFIG_START(sraider_state::sraider)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(sraider_state, screen_update_sraider)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sraider_state, screen_vblank_sraider))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sraider_state, screen_vblank_sraider))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sraider)
@@ -799,19 +799,19 @@ MACHINE_CONFIG_START(sraider_state::sraider)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn1", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn2", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn3", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn3", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn4", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn4", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn5", SN76489, 4000000)
+ MCFG_DEVICE_ADD("sn5", SN76489, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp
index ad56581f06c..29823b8956f 100644
--- a/src/mame/drivers/ladyfrog.cpp
+++ b/src/mame/drivers/ladyfrog.cpp
@@ -291,13 +291,13 @@ void ladyfrog_state::machine_reset()
MACHINE_CONFIG_START(ladyfrog_state::ladyfrog)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(ladyfrog_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ladyfrog_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(ladyfrog_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ladyfrog_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(ladyfrog_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(ladyfrog_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(ladyfrog_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ladyfrog_state, irq0_line_hold, 2*60)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -321,12 +321,12 @@ MACHINE_CONFIG_START(ladyfrog_state::ladyfrog)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(8'000'000)/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ladyfrog_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ladyfrog_state, unk_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(8'000'000)/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ladyfrog_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, ladyfrog_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, XTAL(8'000'000)/4)
+ MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6)
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
@@ -340,7 +340,7 @@ MACHINE_CONFIG_START(ladyfrog_state::ladyfrog)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp
index e53d4e819b1..7cc4d8eedf1 100644
--- a/src/mame/drivers/laser3k.cpp
+++ b/src/mame/drivers/laser3k.cpp
@@ -969,8 +969,8 @@ PALETTE_INIT_MEMBER(laser3k_state, laser3k)
MACHINE_CONFIG_START(laser3k_state::laser3k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1021800)
- MCFG_CPU_PROGRAM_MAP(laser3k_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1021800)
+ MCFG_DEVICE_PROGRAM_MAP(laser3k_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -1019,15 +1019,15 @@ MACHINE_CONFIG_START(laser3k_state::laser3k)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(laser3k_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(laser3k_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(laser3k_state, ay3600_data_ready_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, laser3k_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, laser3k_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, laser3k_state, ay3600_data_ready_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD("sn76489", SN76489, 1020484)
+ MCFG_DEVICE_ADD("sn76489", SN76489, 1020484)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp
index 44b09b776ed..9e6a0278c8c 100644
--- a/src/mame/drivers/laserbas.cpp
+++ b/src/mame/drivers/laserbas.cpp
@@ -412,9 +412,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(laserbas_state::laserbas)
- MCFG_CPU_ADD("maincpu", Z80, CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(laserbas_memory)
- MCFG_CPU_IO_MAP(laserbas_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(laserbas_memory)
+ MCFG_DEVICE_IO_MAP(laserbas_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", laserbas_state, laserbas_scanline, "screen", 0, 1)
/* TODO: clocks aren't known */
@@ -422,17 +422,17 @@ MACHINE_CONFIG_START(laserbas_state::laserbas)
MCFG_PIT8253_CLK0(PIT_CLOCK)
MCFG_PIT8253_CLK1(PIT_CLOCK)
MCFG_PIT8253_CLK2(PIT_CLOCK)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(laserbas_state, pit_out_0_w))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(laserbas_state, pit_out_1_w))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(laserbas_state, pit_out_2_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, laserbas_state, pit_out_0_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, laserbas_state, pit_out_1_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, laserbas_state, pit_out_2_w))
MCFG_DEVICE_ADD("pit1", PIT8253, 0)
MCFG_PIT8253_CLK0(PIT_CLOCK)
MCFG_PIT8253_CLK1(PIT_CLOCK)
MCFG_PIT8253_CLK2(PIT_CLOCK)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(laserbas_state, pit_out_3_w))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(laserbas_state, pit_out_4_w))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(laserbas_state, pit_out_5_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, laserbas_state, pit_out_3_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, laserbas_state, pit_out_4_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, laserbas_state, pit_out_5_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(4000000, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
@@ -448,12 +448,12 @@ MACHINE_CONFIG_START(laserbas_state::laserbas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac1", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
- MCFG_SOUND_ADD("dac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
- MCFG_SOUND_ADD("dac3", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
- MCFG_SOUND_ADD("dac4", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
- MCFG_SOUND_ADD("dac5", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
- MCFG_SOUND_ADD("dac6", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
+ MCFG_DEVICE_ADD("dac1", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
+ MCFG_DEVICE_ADD("dac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
+ MCFG_DEVICE_ADD("dac3", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
+ MCFG_DEVICE_ADD("dac4", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
+ MCFG_DEVICE_ADD("dac5", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
+ MCFG_DEVICE_ADD("dac6", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.16)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp
index f1e3ffe0fbf..177eb070c48 100644
--- a/src/mame/drivers/laserbat.cpp
+++ b/src/mame/drivers/laserbat.cpp
@@ -466,11 +466,11 @@ void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int
MACHINE_CONFIG_START(laserbat_state_base::laserbat_base)
// basic machine hardware
- MCFG_CPU_ADD(m_maincpu, S2650, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(laserbat_map)
- MCFG_CPU_IO_MAP(laserbat_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", laserbat_state_base, laserbat_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE(m_screen, screen_device, vblank))
+ MCFG_DEVICE_ADD(m_maincpu, S2650, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(laserbat_map)
+ MCFG_DEVICE_IO_MAP(laserbat_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", laserbat_state_base, laserbat_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE(m_screen, screen_device, vblank))
// video hardware
MCFG_SCREEN_ADD(m_screen, RASTER)
@@ -506,7 +506,7 @@ MACHINE_CONFIG_START(laserbat_state::laserbat)
// sound board devices
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(m_csg, SN76477, 0) // audio output not used
+ MCFG_DEVICE_ADD(m_csg, SN76477) // audio output not used
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(270), CAP_P(1000)) // R21, switchable R30/R23/R24/R25/R29/R28/R27/R26, C21
MCFG_SN76477_DECAY_RES(RES_INF) // NC
MCFG_SN76477_ATTACK_PARAMS(0, RES_INF) // NC, NC
@@ -538,7 +538,7 @@ MACHINE_CONFIG_START(catnmous_state::catnmous)
// sound board devices
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(m_audiopcb, ZACCARIA_1B11107, 0)
+ MCFG_DEVICE_ADD(m_audiopcb, ZACCARIA_1B11107)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp
index e1bd72552c7..e31bf112cdd 100644
--- a/src/mame/drivers/lasso.cpp
+++ b/src/mame/drivers/lasso.cpp
@@ -494,12 +494,12 @@ MACHINE_RESET_MEMBER(lasso_state,wwjgtin)
MACHINE_CONFIG_START(lasso_state::base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 11289000/16) /* guess */
- MCFG_CPU_PROGRAM_MAP(lasso_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lasso_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, 11289000/16) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(lasso_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lasso_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", M6502, 600000)
- MCFG_CPU_PROGRAM_MAP(lasso_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 600000)
+ MCFG_DEVICE_PROGRAM_MAP(lasso_audio_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -519,10 +519,10 @@ MACHINE_CONFIG_START(lasso_state::base)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn76489.1", SN76489, 2000000)
+ MCFG_DEVICE_ADD("sn76489.1", SN76489, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("sn76489.2", SN76489, 2000000)
+ MCFG_DEVICE_ADD("sn76489.2", SN76489, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -530,8 +530,8 @@ MACHINE_CONFIG_START(lasso_state::lasso)
base(config);
/* basic machine hardware */
- MCFG_CPU_ADD("blitter", M6502, 11289000/16) /* guess */
- MCFG_CPU_PROGRAM_MAP(lasso_coprocessor_map)
+ MCFG_DEVICE_ADD("blitter", M6502, 11289000/16) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(lasso_coprocessor_map)
MCFG_PALETTE_ADD("palette", 0x40)
MCFG_PALETTE_INIT_OWNER(lasso_state, lasso)
@@ -541,11 +541,11 @@ MACHINE_CONFIG_START(lasso_state::chameleo)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(chameleo_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(chameleo_main_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(chameleo_audio_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(chameleo_audio_map)
/* video hardware */
MCFG_PALETTE_ADD("palette", 0x40)
@@ -559,11 +559,11 @@ MACHINE_CONFIG_START(lasso_state::wwjgtin)
base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wwjgtin_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wwjgtin_main_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(wwjgtin_audio_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(wwjgtin_audio_map)
MCFG_MACHINE_START_OVERRIDE(lasso_state,wwjgtin)
MCFG_MACHINE_RESET_OVERRIDE(lasso_state,wwjgtin)
@@ -580,7 +580,7 @@ MACHINE_CONFIG_START(lasso_state::wwjgtin)
MCFG_VIDEO_START_OVERRIDE(lasso_state,wwjgtin)
/* sound hardware */
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -589,13 +589,13 @@ MACHINE_CONFIG_START(lasso_state::pinbo)
base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M6502, XTAL(18'000'000)/24)
- MCFG_CPU_PROGRAM_MAP(pinbo_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lasso_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", M6502, XTAL(18'000'000)/24)
+ MCFG_DEVICE_PROGRAM_MAP(pinbo_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lasso_state, irq0_line_hold)
- MCFG_CPU_REPLACE("audiocpu", Z80, XTAL(18'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(pinbo_audio_map)
- MCFG_CPU_IO_MAP(pinbo_audio_io_map)
+ MCFG_DEVICE_REPLACE("audiocpu", Z80, XTAL(18'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(pinbo_audio_map)
+ MCFG_DEVICE_IO_MAP(pinbo_audio_io_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", pinbo)
@@ -609,10 +609,10 @@ MACHINE_CONFIG_START(lasso_state::pinbo)
MCFG_DEVICE_REMOVE("sn76489.1")
MCFG_DEVICE_REMOVE("sn76489.2")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'000'000)/12)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.55)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'000'000)/12)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.55)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp
index 4f3599d42f8..941bbbe96f9 100644
--- a/src/mame/drivers/lastbank.cpp
+++ b/src/mame/drivers/lastbank.cpp
@@ -511,15 +511,15 @@ TIMER_DEVICE_CALLBACK_MEMBER(lastbank_state::irq_scanline)
MACHINE_CONFIG_START(lastbank_state::lastbank)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/4) //!!! TC0091LVC !!!
- MCFG_CPU_PROGRAM_MAP(lastbank_map)
+ MCFG_DEVICE_ADD("maincpu",Z80,MASTER_CLOCK/4) //!!! TC0091LVC !!!
+ MCFG_DEVICE_PROGRAM_MAP(lastbank_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", lastbank_state, irq_scanline, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
- MCFG_CPU_ADD("audiocpu",Z80,MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(lastbank_audio_map)
- MCFG_CPU_IO_MAP(lastbank_audio_io)
+ MCFG_DEVICE_ADD("audiocpu",Z80,MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(lastbank_audio_map)
+ MCFG_DEVICE_IO_MAP(lastbank_audio_io)
// yes, we have no interrupts
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -534,7 +534,7 @@ MACHINE_CONFIG_START(lastbank_state::lastbank)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(lastbank_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(lastbank_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, lastbank_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lastbank )
@@ -555,11 +555,11 @@ MACHINE_CONFIG_START(lastbank_state::lastbank)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_ES8712_ADD("essnd", 0)
- MCFG_ES8712_MSM_WRITE_CALLBACK(DEVWRITE8("msm", msm6585_device, data_w))
+ MCFG_ES8712_MSM_WRITE_CALLBACK(WRITE8("msm", msm6585_device, data_w))
MCFG_ES8712_MSM_TAG("msm")
- MCFG_SOUND_ADD("msm", MSM6585, 640_kHz_XTAL) /* Not verified, It's actually MSM6585? */
- MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("essnd", es8712_device, msm_int))
+ MCFG_DEVICE_ADD("msm", MSM6585, 640_kHz_XTAL) /* Not verified, It's actually MSM6585? */
+ MCFG_MSM6585_VCK_CALLBACK(WRITELINE("essnd", es8712_device, msm_int))
MCFG_MSM6585_PRESCALER_SELECTOR(S40) /* Not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp
index 5ef11c7db36..f1f89c43dd5 100644
--- a/src/mame/drivers/lastduel.cpp
+++ b/src/mame/drivers/lastduel.cpp
@@ -490,13 +490,13 @@ void lastduel_state::machine_reset()
MACHINE_CONFIG_START(lastduel_state::lastduel)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) // Unconfirmed - could be 8MHz
- MCFG_CPU_PROGRAM_MAP(lastduel_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lastduel_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) // Unconfirmed - could be 8MHz
+ MCFG_DEVICE_PROGRAM_MAP(lastduel_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lastduel_state, irq2_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", lastduel_state, lastduel_timer_cb, attotime::from_hz(120))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(lastduel_state,lastduel)
@@ -508,7 +508,7 @@ MACHINE_CONFIG_START(lastduel_state::lastduel)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(lastduel_state, screen_update_lastduel)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -523,11 +523,11 @@ MACHINE_CONFIG_START(lastduel_state::lastduel)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(3'579'545))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -535,13 +535,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lastduel_state::madgear)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(madgear_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lastduel_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(madgear_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lastduel_state, irq5_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_irq", lastduel_state, madgear_timer_cb, attotime::from_hz(120))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(madgear_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(madgear_sound_map)
MCFG_MACHINE_START_OVERRIDE(lastduel_state,madgear)
@@ -553,7 +553,7 @@ MACHINE_CONFIG_START(lastduel_state::madgear)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(lastduel_state, screen_update_madgear)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -568,11 +568,11 @@ MACHINE_CONFIG_START(lastduel_state::madgear)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(3'579'545))
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_OKIM6295_ADD("oki", XTAL(10'000'000)/10, PIN7_HIGH)
diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp
index 4613409a406..cffa54f91dc 100644
--- a/src/mame/drivers/lastfght.cpp
+++ b/src/mame/drivers/lastfght.cpp
@@ -553,9 +553,9 @@ void lastfght_state::machine_reset()
MACHINE_CONFIG_START(lastfght_state::lastfght)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83044, 32000000/2)
- MCFG_CPU_PROGRAM_MAP( lastfght_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lastfght_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", H83044, 32000000/2)
+ MCFG_DEVICE_PROGRAM_MAP( lastfght_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lastfght_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp
index 52244147577..aec2701affd 100644
--- a/src/mame/drivers/laz_aftrshok.cpp
+++ b/src/mame/drivers/laz_aftrshok.cpp
@@ -66,10 +66,10 @@ void aftrshok_state::machine_reset()
MACHINE_CONFIG_START(aftrshok_state::aftrshok)
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(aftrshok_map)
-// MCFG_CPU_IO_MAP(aftrshok_io)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", aftrshok_state, irq0_line_hold)
+// MCFG_DEVICE_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_DEVICE_PROGRAM_MAP(aftrshok_map)
+// MCFG_DEVICE_IO_MAP(aftrshok_io)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", aftrshok_state, irq0_line_hold)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp
index 8656814f5cb..8796a67052d 100644
--- a/src/mame/drivers/laz_awetoss.cpp
+++ b/src/mame/drivers/laz_awetoss.cpp
@@ -46,10 +46,10 @@ void awetoss_state::machine_reset()
MACHINE_CONFIG_START(awetoss_state::awetoss)
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(awetoss_map)
-// MCFG_CPU_IO_MAP(awetoss_io)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", awetoss_state, irq0_line_hold)
+// MCFG_DEVICE_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_DEVICE_PROGRAM_MAP(awetoss_map)
+// MCFG_DEVICE_IO_MAP(awetoss_io)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", awetoss_state, irq0_line_hold)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp
index 50c3f71b634..ce5638180f1 100644
--- a/src/mame/drivers/laz_ribrac.cpp
+++ b/src/mame/drivers/laz_ribrac.cpp
@@ -50,9 +50,9 @@ void laz_ribrac_state::machine_reset()
MACHINE_CONFIG_START(laz_ribrac_state::laz_ribrac)
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
-// MCFG_CPU_PROGRAM_MAP(laz_ribrac_map)
-// MCFG_CPU_IO_MAP(laz_ribrac_io)
+// MCFG_DEVICE_ADD("maincpu", ??, 8000000) // unknown
+// MCFG_DEVICE_PROGRAM_MAP(laz_ribrac_map)
+// MCFG_DEVICE_IO_MAP(laz_ribrac_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp
index 09611f0cef0..e27dacd6ca3 100644
--- a/src/mame/drivers/lazercmd.cpp
+++ b/src/mame/drivers/lazercmd.cpp
@@ -629,13 +629,13 @@ void lazercmd_state::machine_reset()
MACHINE_CONFIG_START(lazercmd_state::lazercmd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz? */
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz? */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MCFG_CPU_PROGRAM_MAP(lazercmd_map)
- MCFG_CPU_DATA_MAP(lazercmd_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(lazercmd_map)
+ MCFG_DEVICE_DATA_MAP(lazercmd_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", lazercmd_state, lazercmd_timer, "screen", 0, 1)
/* video hardware */
@@ -653,10 +653,10 @@ MACHINE_CONFIG_START(lazercmd_state::lazercmd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac0", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
- MCFG_SOUND_ADD("dac1", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
- MCFG_SOUND_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
- MCFG_SOUND_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac0", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac1", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT)
@@ -668,13 +668,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lazercmd_state::medlanes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MCFG_CPU_PROGRAM_MAP(medlanes_map)
- MCFG_CPU_DATA_MAP(lazercmd_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(medlanes_map)
+ MCFG_DEVICE_DATA_MAP(lazercmd_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", lazercmd_state, lazercmd_timer, "screen", 0, 1)
/* video hardware */
@@ -692,8 +692,8 @@ MACHINE_CONFIG_START(lazercmd_state::medlanes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
- MCFG_SOUND_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT)
@@ -703,13 +703,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lazercmd_state::bbonk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
thus requiring an extra loading of approx 3-5 */
- MCFG_CPU_PROGRAM_MAP(bbonk_map)
- MCFG_CPU_DATA_MAP(lazercmd_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(bbonk_map)
+ MCFG_DEVICE_DATA_MAP(lazercmd_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", lazercmd_state, bbonk_timer, "screen", 0, 1)
/* video hardware */
@@ -727,8 +727,8 @@ MACHINE_CONFIG_START(lazercmd_state::bbonk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
- MCFG_SOUND_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac2", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_ADD("dac3", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp
index 4c5735ae2b0..9f5c1e0a3c3 100644
--- a/src/mame/drivers/lb186.cpp
+++ b/src/mame/drivers/lb186.cpp
@@ -118,8 +118,8 @@ void lb186_state::ncr5380(device_t *device)
devcb_base *devcb;
(void)devcb;
MCFG_DEVICE_CLOCK(10000000)
- MCFG_NCR5380N_IRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, int1_w))
- MCFG_NCR5380N_DRQ_HANDLER(DEVWRITELINE(":maincpu", i80186_cpu_device, drq0_w))
+ MCFG_NCR5380N_IRQ_HANDLER(WRITELINE(":maincpu", i80186_cpu_device, int1_w))
+ MCFG_NCR5380N_DRQ_HANDLER(WRITELINE(":maincpu", i80186_cpu_device, drq0_w))
}
static void scsi_devices(device_slot_interface &device)
@@ -134,24 +134,24 @@ FLOPPY_FORMATS_MEMBER( lb186_state::floppy_formats )
FLOPPY_FORMATS_END
MACHINE_CONFIG_START(lb186_state::lb186)
- MCFG_CPU_ADD("maincpu", I80186, 16_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(lb186_map)
- MCFG_CPU_IO_MAP(lb186_io)
+ MCFG_DEVICE_ADD("maincpu", I80186, 16_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(lb186_map)
+ MCFG_DEVICE_IO_MAP(lb186_io)
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
- MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
- MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(lb186_state, sio_out_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int0_w))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232_1", rs232_port_device, write_txd))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE("rs232_2", rs232_port_device, write_txd))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, lb186_state, sio_out_w))
- MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_a_w))
- MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_b_w))
+ MCFG_DEVICE_ADD("rs232_1", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w))
+ MCFG_DEVICE_ADD("rs232_2", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_b_w))
MCFG_WD1772_ADD("fdc", 16_MHz_XTAL / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int2_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int2_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", lb186_floppies, "525dd", lb186_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", lb186_floppies, nullptr, lb186_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", lb186_floppies, nullptr, lb186_state::floppy_formats)
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index e49a2b5ef31..7d2f95325cf 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -330,8 +330,8 @@ void lbeach_state::machine_reset()
MACHINE_CONFIG_START(lbeach_state::lbeach)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(16'000'000) / 32) // Motorola MC6800P, 500kHz
- MCFG_CPU_PROGRAM_MAP(lbeach_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(16'000'000) / 32) // Motorola MC6800P, 500kHz
+ MCFG_DEVICE_PROGRAM_MAP(lbeach_map)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp
index 926c1bd2ab3..87740ada0db 100644
--- a/src/mame/drivers/lc80.cpp
+++ b/src/mame/drivers/lc80.cpp
@@ -332,34 +332,34 @@ void lc80_state::machine_start()
MACHINE_CONFIG_START(lc80_state::lc80)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 900000) /* UD880D */
- MCFG_CPU_PROGRAM_MAP(lc80_mem)
- MCFG_CPU_IO_MAP(lc80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 900000) /* UD880D */
+ MCFG_DEVICE_PROGRAM_MAP(lc80_mem)
+ MCFG_DEVICE_IO_MAP(lc80_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_lc80 )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 900000)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(lc80_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(lc80_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(lc80_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, lc80_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, lc80_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, lc80_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, 900000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(lc80_state, pio1_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(lc80_state, pio1_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(lc80_state, pio1_pb_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, lc80_state, pio1_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, lc80_state, pio1_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, lc80_state, pio1_pb_w))
MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, 900000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PB_CB(READ8(lc80_state, pio2_pb_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, lc80_state, pio2_pb_r))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
@@ -371,34 +371,34 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lc80_state::lc80_2)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 1800000) /* UD880D */
- MCFG_CPU_PROGRAM_MAP(lc80_mem)
- MCFG_CPU_IO_MAP(lc80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 1800000) /* UD880D */
+ MCFG_DEVICE_PROGRAM_MAP(lc80_mem)
+ MCFG_DEVICE_IO_MAP(lc80_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_lc80 )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, 900000)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(lc80_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(lc80_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(lc80_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, lc80_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, lc80_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, lc80_state, ctc_z2_w))
MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, 900000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(lc80_state, pio1_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(lc80_state, pio1_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(lc80_state, pio1_pb_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, lc80_state, pio1_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, lc80_state, pio1_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, lc80_state, pio1_pb_w))
MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, 900000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PB_CB(READ8(lc80_state, pio2_pb_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, lc80_state, pio2_pb_r))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED)
@@ -413,8 +413,8 @@ static MACHINE_CONFIG_START( sc80 )
lc80_2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY(Z80_TAG)
- MCFG_CPU_PROGRAM_MAP(sc80_mem)
+ MCFG_DEVICE_MODIFY(Z80_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(sc80_mem)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/lckydraw.cpp b/src/mame/drivers/lckydraw.cpp
index 3affabd2e2e..b4b7a53f6ff 100644
--- a/src/mame/drivers/lckydraw.cpp
+++ b/src/mame/drivers/lckydraw.cpp
@@ -37,8 +37,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(lckydraw_state::lckydraw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8035, 6000000)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", I8035, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
/* video hardware */
//MCFG_DEFAULT_LAYOUT()
diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp
index 53ea557d5b9..56cabe96c30 100644
--- a/src/mame/drivers/lcmate2.cpp
+++ b/src/mame/drivers/lcmate2.cpp
@@ -230,9 +230,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(lcmate2_state::lcmate2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545)) // confirmed
- MCFG_CPU_PROGRAM_MAP(lcmate2_mem)
- MCFG_CPU_IO_MAP(lcmate2_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545)) // confirmed
+ MCFG_DEVICE_PROGRAM_MAP(lcmate2_mem)
+ MCFG_DEVICE_IO_MAP(lcmate2_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -255,7 +255,7 @@ MACHINE_CONFIG_START(lcmate2_state::lcmate2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
diff --git a/src/mame/drivers/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp
index b0ce7f15841..0484fd844e5 100644
--- a/src/mame/drivers/ldplayer.cpp
+++ b/src/mame/drivers/ldplayer.cpp
@@ -638,7 +638,7 @@ MACHINE_CONFIG_START(ldv1000_state::ldv1000)
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -651,7 +651,7 @@ MACHINE_CONFIG_START(pr8210_state::pr8210)
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp
index 1f143791dd8..322e0630983 100644
--- a/src/mame/drivers/leapster.cpp
+++ b/src/mame/drivers/leapster.cpp
@@ -309,9 +309,9 @@ void leapster_state::leapster_aux(address_map &map)
MACHINE_CONFIG_START(leapster_state::leapster)
/* basic machine hardware */
// CPU is ArcTangent-A5 '5.1' (ARCompact core)
- MCFG_CPU_ADD("maincpu", ARCA5, 96000000/10)
- MCFG_CPU_PROGRAM_MAP(leapster_map)
- MCFG_CPU_IO_MAP(leapster_aux)
+ MCFG_DEVICE_ADD("maincpu", ARCA5, 96000000/10)
+ MCFG_DEVICE_PROGRAM_MAP(leapster_map)
+ MCFG_DEVICE_IO_MAP(leapster_aux)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp
index 81ea917f9d8..2b1e89bb8cb 100644
--- a/src/mame/drivers/legionna.cpp
+++ b/src/mame/drivers/legionna.cpp
@@ -1228,15 +1228,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(legionna_state::legionna)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(legionna_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(legionna_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1248,9 +1248,9 @@ MACHINE_CONFIG_START(legionna_state::legionna)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", legionna)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16)
@@ -1261,8 +1261,8 @@ MACHINE_CONFIG_START(legionna_state::legionna)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -1271,23 +1271,23 @@ MACHINE_CONFIG_START(legionna_state::legionna)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::heatbrl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(heatbrl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(heatbrl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1299,9 +1299,9 @@ MACHINE_CONFIG_START(legionna_state::heatbrl)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl)
@@ -1314,8 +1314,8 @@ MACHINE_CONFIG_START(legionna_state::heatbrl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -1324,23 +1324,23 @@ MACHINE_CONFIG_START(legionna_state::heatbrl)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::godzilla)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
- MCFG_CPU_PROGRAM_MAP(godzilla_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(godzilla_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
- MCFG_CPU_IO_MAP(godzilla_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_IO_MAP(godzilla_sound_io_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1353,10 +1353,10 @@ MACHINE_CONFIG_START(legionna_state::godzilla)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_BASE_CB(WRITE16(legionna_state, tile_scroll_base_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_BASE_CB(WRITE16(*this, legionna_state, tile_scroll_base_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl)
@@ -1369,7 +1369,7 @@ MACHINE_CONFIG_START(legionna_state::godzilla)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1379,22 +1379,22 @@ MACHINE_CONFIG_START(legionna_state::godzilla)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::denjinmk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
- MCFG_CPU_PROGRAM_MAP(denjinmk_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(denjinmk_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1408,9 +1408,9 @@ MACHINE_CONFIG_START(legionna_state::denjinmk)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", heatbrl)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
MCFG_PALETTE_ADD_INIT_BLACK("palette", 128*16)
@@ -1422,7 +1422,7 @@ MACHINE_CONFIG_START(legionna_state::denjinmk)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1432,22 +1432,22 @@ MACHINE_CONFIG_START(legionna_state::denjinmk)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::grainbow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
- MCFG_CPU_PROGRAM_MAP(grainbow_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(grainbow_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1459,9 +1459,9 @@ MACHINE_CONFIG_START(legionna_state::grainbow)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", grainbow)
@@ -1475,7 +1475,7 @@ MACHINE_CONFIG_START(legionna_state::grainbow)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", 14318180/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1485,23 +1485,23 @@ MACHINE_CONFIG_START(legionna_state::grainbow)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::cupsoc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2)
- MCFG_CPU_PROGRAM_MAP(cupsoc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cupsoc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", legionna_state, irq4_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(legionna_state, videowrite_cb_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, legionna_state, videowrite_cb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1513,9 +1513,9 @@ MACHINE_CONFIG_START(legionna_state::cupsoc)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(legionna_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(legionna_state, tile_scroll_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(legionna_state, tile_vreg_1a_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, legionna_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, legionna_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, legionna_state, tile_vreg_1a_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cupsoc)
@@ -1528,8 +1528,8 @@ MACHINE_CONFIG_START(legionna_state::cupsoc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -1538,14 +1538,14 @@ MACHINE_CONFIG_START(legionna_state::cupsoc)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(legionna_state::cupsocs)
cupsoc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cupsocs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cupsocs_map)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index f8f6fc43bf7..5b82be489a3 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -1005,14 +1005,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(leland_state::leland)
/* basic machine hardware */
- MCFG_CPU_ADD("master", Z80, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(master_map_program)
- MCFG_CPU_IO_MAP(master_map_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", leland_state, leland_master_interrupt)
+ MCFG_DEVICE_ADD("master", Z80, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(master_map_program)
+ MCFG_DEVICE_IO_MAP(master_map_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", leland_state, leland_master_interrupt)
- MCFG_CPU_ADD("slave", Z80, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(slave_small_map_program)
- MCFG_CPU_IO_MAP(slave_map_io)
+ MCFG_DEVICE_ADD("slave", Z80, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(slave_small_map_program)
+ MCFG_DEVICE_IO_MAP(slave_map_io)
MCFG_MACHINE_START_OVERRIDE(leland_state,leland)
MCFG_MACHINE_RESET_OVERRIDE(leland_state,leland)
@@ -1026,22 +1026,22 @@ MACHINE_CONFIG_START(leland_state::leland)
MCFG_SPEAKER_STANDARD_MONO("speaker")
// only one of the AY sockets is populated
- MCFG_SOUND_ADD("ay8910", AY8910, 10000000/6)
+ MCFG_DEVICE_ADD("ay8910", AY8910, 10000000/6)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(1000, 0, 0)
- MCFG_AY8910_PORT_A_READ_CB(READ8(leland_state, leland_sound_port_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(leland_state, leland_sound_port_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, leland_state, leland_sound_port_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, leland_state, leland_sound_port_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
-// MCFG_SOUND_ADD("ay8912", AY8912, 10000000/6)
+// MCFG_DEVICE_ADD("ay8912", AY8912, 10000000/6)
// MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
// MCFG_AY8910_RES_LOADS(1000, 0, 0)
-// MCFG_AY8910_PORT_A_READ_CB(READ8(leland_state, leland_sound_port_r))
-// MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(leland_state, leland_sound_port_w))
+// MCFG_AY8910_PORT_A_READ_CB(READ8(*this, leland_state, leland_sound_port_r))
+// MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, leland_state, leland_sound_port_w))
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac0", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u79 + r17-r23 (24k,12k,6.2k,3k,1.5k,750,390,180)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u88 + r27-r34 (24k,12k,6.2k,3k,1.5k,750,390,180)
+ MCFG_DEVICE_ADD("dac0", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u79 + r17-r23 (24k,12k,6.2k,3k,1.5k,750,390,180)
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u88 + r27-r34 (24k,12k,6.2k,3k,1.5k,750,390,180)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
@@ -1052,13 +1052,13 @@ MACHINE_CONFIG_START(leland_state::redline)
leland(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("master")
- MCFG_CPU_IO_MAP(master_redline_map_io)
+ MCFG_DEVICE_MODIFY("master")
+ MCFG_DEVICE_IO_MAP(master_redline_map_io)
- MCFG_CPU_ADD("audiocpu", I80186, MCU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(leland_80186_map_program)
- MCFG_CPU_IO_MAP(redline_80186_map_io)
- MCFG_80186_CHIP_SELECT_CB(DEVWRITE16("custom", leland_80186_sound_device, peripheral_ctrl))
+ MCFG_DEVICE_ADD("audiocpu", I80186, MCU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(leland_80186_map_program)
+ MCFG_DEVICE_IO_MAP(redline_80186_map_io)
+ MCFG_80186_CHIP_SELECT_CB(WRITE16("custom", leland_80186_sound_device, peripheral_ctrl))
/* sound hardware */
MCFG_DEVICE_ADD("custom", REDLINE_80186, 0)
@@ -1069,9 +1069,9 @@ MACHINE_CONFIG_START(leland_state::quarterb)
redline(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_IO_MAP(leland_80186_map_io)
- MCFG_80186_TMROUT0_HANDLER(DEVWRITELINE("custom", leland_80186_sound_device, i80186_tmr0_w))
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_IO_MAP(leland_80186_map_io)
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE("custom", leland_80186_sound_device, i80186_tmr0_w))
/* sound hardware */
MCFG_DEVICE_REPLACE("custom", LELAND_80186, 0)
@@ -1082,27 +1082,27 @@ MACHINE_CONFIG_START(leland_state::lelandi)
quarterb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("slave")
- MCFG_CPU_PROGRAM_MAP(slave_large_map_program)
+ MCFG_DEVICE_MODIFY("slave")
+ MCFG_DEVICE_PROGRAM_MAP(slave_large_map_program)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(leland_state::ataxx)
/* basic machine hardware */
- MCFG_CPU_ADD("master", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(master_map_program_2)
- MCFG_CPU_IO_MAP(master_map_io_2)
+ MCFG_DEVICE_ADD("master", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(master_map_program_2)
+ MCFG_DEVICE_IO_MAP(master_map_io_2)
- MCFG_CPU_ADD("slave", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(slave_map_program)
- MCFG_CPU_IO_MAP(slave_map_io_2)
+ MCFG_DEVICE_ADD("slave", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(slave_map_program)
+ MCFG_DEVICE_IO_MAP(slave_map_io_2)
- MCFG_CPU_ADD("audiocpu", I80186, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(leland_80186_map_program)
- MCFG_CPU_IO_MAP(ataxx_80186_map_io)
- MCFG_80186_CHIP_SELECT_CB(DEVWRITE16("custom", leland_80186_sound_device, peripheral_ctrl))
- MCFG_80186_TMROUT0_HANDLER(DEVWRITELINE("custom", leland_80186_sound_device, i80186_tmr0_w))
+ MCFG_DEVICE_ADD("audiocpu", I80186, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(leland_80186_map_program)
+ MCFG_DEVICE_IO_MAP(ataxx_80186_map_io)
+ MCFG_80186_CHIP_SELECT_CB(WRITE16("custom", leland_80186_sound_device, peripheral_ctrl))
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE("custom", leland_80186_sound_device, i80186_tmr0_w))
MCFG_MACHINE_START_OVERRIDE(leland_state,ataxx)
MCFG_MACHINE_RESET_OVERRIDE(leland_state,ataxx)
@@ -1122,8 +1122,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(leland_state::wsf)
ataxx(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE("custom", leland_80186_sound_device, i80186_tmr1_w))
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_80186_TMROUT1_HANDLER(WRITELINE("custom", leland_80186_sound_device, i80186_tmr1_w))
MCFG_DEVICE_REMOVE("custom")
MCFG_DEVICE_ADD("custom", WSF_80186, 0)
diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp
index 7f8d3596a38..9aace7fff73 100644
--- a/src/mame/drivers/lemmings.cpp
+++ b/src/mame/drivers/lemmings.cpp
@@ -216,12 +216,12 @@ void lemmings_state::machine_start()
MACHINE_CONFIG_START(lemmings_state::lemmings)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(lemmings_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lemmings_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(lemmings_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lemmings_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", M6809,32220000/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6809,32220000/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1")
@@ -233,7 +233,7 @@ MACHINE_CONFIG_START(lemmings_state::lemmings)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(lemmings_state, screen_update_lemmings)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(lemmings_state, screen_vblank_lemmings))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, lemmings_state, screen_vblank_lemmings))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lemmings)
MCFG_PALETTE_ADD("palette", 1024)
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index c71a57ffb05..bf5ce51cf47 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -492,12 +492,12 @@ void lethal_state::machine_reset()
MACHINE_CONFIG_START(lethal_state::lethalen)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(le_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lethal_state, lethalen_interrupt)
+ MCFG_DEVICE_ADD("maincpu", HD6309, MAIN_CLOCK/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(le_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lethal_state, lethalen_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, MAIN_CLOCK/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(le_sound)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MAIN_CLOCK/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(le_sound)
MCFG_DEVICE_ADD("bank4000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank4000_map)
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 4fc6a1c4b10..d08e385239b 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -633,8 +633,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(lethalj_state::gameroom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lethalj_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lethalj_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -667,7 +667,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lethalj_state::lethalj)
gameroom(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK_LETHALJ) /* pixel clock */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/lft.cpp b/src/mame/drivers/lft.cpp
index d76a6f4967e..398f30831a1 100644
--- a/src/mame/drivers/lft.cpp
+++ b/src/mame/drivers/lft.cpp
@@ -90,9 +90,9 @@ void lft_state::machine_reset()
MACHINE_CONFIG_START(lft_state::lft)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80186, 4000000) // no idea
- MCFG_CPU_PROGRAM_MAP(lft_mem)
- MCFG_CPU_IO_MAP(lft_io)
+ MCFG_DEVICE_ADD("maincpu", I80186, 4000000) // no idea
+ MCFG_DEVICE_PROGRAM_MAP(lft_mem)
+ MCFG_DEVICE_IO_MAP(lft_io)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/lg-dvd.cpp b/src/mame/drivers/lg-dvd.cpp
index 2ca76ab2bfc..6cd1ac901f9 100644
--- a/src/mame/drivers/lg-dvd.cpp
+++ b/src/mame/drivers/lg-dvd.cpp
@@ -32,8 +32,8 @@ void lg_dvd_state::lg_dvd_map(address_map &map)
}
MACHINE_CONFIG_START(lg_dvd_state::lg)
- MCFG_CPU_ADD( "maincpu", I80C52, XTAL(16'000'000) )
- MCFG_CPU_PROGRAM_MAP( lg_dvd_map )
+ MCFG_DEVICE_ADD( "maincpu", I80C52, XTAL(16'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP( lg_dvd_map )
MACHINE_CONFIG_END
ROM_START( lggp40 )
diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp
index 5f5781afb0e..02036273f33 100644
--- a/src/mame/drivers/lgp.cpp
+++ b/src/mame/drivers/lgp.cpp
@@ -408,19 +408,19 @@ PALETTE_INIT_MEMBER(lgp_state, lgp)
/* DRIVER */
MACHINE_CONFIG_START(lgp_state::lgp)
/* main cpu */
- MCFG_CPU_ADD("maincpu", Z80, CPU_PCB_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_program_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lgp_state, vblank_callback_lgp)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_PCB_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_program_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lgp_state, vblank_callback_lgp)
/* sound cpu */
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_PCB_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_program_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_PCB_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_program_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
- MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(lgp_state, ld_command_strobe_cb))
+ MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(WRITELINE(*this, lgp_state, ld_command_strobe_cb))
MCFG_LASERDISC_OVERLAY_DRIVER(256, 256, lgp_state, screen_update_lgp)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
@@ -435,7 +435,7 @@ MACHINE_CONFIG_START(lgp_state::lgp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp
index cd7fcae74b8..4202881fb34 100644
--- a/src/mame/drivers/liberate.cpp
+++ b/src/mame/drivers/liberate.cpp
@@ -744,13 +744,13 @@ MACHINE_RESET_MEMBER(liberate_state,liberate)
MACHINE_CONFIG_START(liberate_state::liberate_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",DECO16, 2000000)
- MCFG_CPU_PROGRAM_MAP(liberate_map)
- MCFG_CPU_IO_MAP(deco16_io_map)
+ MCFG_DEVICE_ADD("maincpu",DECO16, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(liberate_map)
+ MCFG_DEVICE_IO_MAP(deco16_io_map)
- MCFG_CPU_ADD("audiocpu",DECO_222, 1500000) /* is it a real 222 (M6502 with bitswapped opcodes), or the same thing in external logic? */
- MCFG_CPU_PROGRAM_MAP(liberate_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(liberate_state, nmi_line_pulse, 16*60) /* ??? */
+ MCFG_DEVICE_ADD("audiocpu",DECO_222, 1500000) /* is it a real 222 (M6502 with bitswapped opcodes), or the same thing in external logic? */
+ MCFG_DEVICE_PROGRAM_MAP(liberate_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(liberate_state, nmi_line_pulse, 16*60) /* ??? */
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -765,7 +765,7 @@ MACHINE_CONFIG_START(liberate_state::liberate_base)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(liberate_state, screen_update_liberate)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(liberate_state, deco16_interrupt))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, liberate_state, deco16_interrupt))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", liberate)
MCFG_PALETTE_ADD("palette", 33)
@@ -778,25 +778,25 @@ MACHINE_CONFIG_START(liberate_state::liberate_base)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8912, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8912, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(liberate_state::liberate)
liberate_base(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(liberate_state::liberatb)
liberate_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", M6502, 2000000)
- MCFG_CPU_PROGRAM_MAP(liberatb_map)
+ MCFG_DEVICE_REPLACE("maincpu", M6502, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(liberatb_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(liberate_state::boomrang)
@@ -811,14 +811,14 @@ MACHINE_CONFIG_START(liberate_state::prosoccr)
liberate_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(10000000/8) //xtal is unknown?
- MCFG_CPU_PROGRAM_MAP(prosoccr_map)
- MCFG_CPU_IO_MAP(prosoccr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(10000000/8) //xtal is unknown?
+ MCFG_DEVICE_PROGRAM_MAP(prosoccr_map)
+ MCFG_DEVICE_IO_MAP(prosoccr_io_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_CLOCK(10000000/8) //xtal is 12 Mhz, divider is unknown
- MCFG_CPU_PROGRAM_MAP(prosoccr_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_CLOCK(10000000/8) //xtal is 12 Mhz, divider is unknown
+ MCFG_DEVICE_PROGRAM_MAP(prosoccr_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -834,13 +834,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(liberate_state::prosport)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO16, 2000000)
- MCFG_CPU_PROGRAM_MAP(prosport_map)
- MCFG_CPU_IO_MAP(deco16_io_map)
+ MCFG_DEVICE_ADD("maincpu", DECO16, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(prosport_map)
+ MCFG_DEVICE_IO_MAP(deco16_io_map)
- MCFG_CPU_ADD("audiocpu", DECO_222, 1500000/2) /* is it a real 222 (M6502 with bitswapped opcodes), or the same thing in external logic? */
- MCFG_CPU_PROGRAM_MAP(liberate_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(liberate_state, nmi_line_pulse, 16*60) /* ??? */
+ MCFG_DEVICE_ADD("audiocpu", DECO_222, 1500000/2) /* is it a real 222 (M6502 with bitswapped opcodes), or the same thing in external logic? */
+ MCFG_DEVICE_PROGRAM_MAP(liberate_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(liberate_state, nmi_line_pulse, 16*60) /* ??? */
// MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -855,7 +855,7 @@ MACHINE_CONFIG_START(liberate_state::prosport)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(liberate_state, screen_update_prosport)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(liberate_state, deco16_interrupt))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, liberate_state, deco16_interrupt))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", prosport)
MCFG_PALETTE_ADD("palette", 256)
@@ -868,10 +868,10 @@ MACHINE_CONFIG_START(liberate_state::prosport)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8912, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8912, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8912, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index 7450f395641..b641c566c35 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -423,8 +423,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(liberatr_state::liberatr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */
- MCFG_CPU_PROGRAM_MAP(liberatr_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */
+ MCFG_DEVICE_PROGRAM_MAP(liberatr_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(driver_device,irq0_line_hold,4*60)
MCFG_DEVICE_ADD("earom", ER2055, 0)
@@ -434,10 +434,10 @@ MACHINE_CONFIG_START(liberatr_state::liberatr)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // START LED2
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // TBSWP
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // SPARE
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(liberatr_state, trackball_reset_w)) // CTRLD
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(liberatr_state, coin_counter_right_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(liberatr_state, coin_counter_left_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(liberatr_state, planet_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, liberatr_state, trackball_reset_w)) // CTRLD
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, liberatr_state, coin_counter_right_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, liberatr_state, coin_counter_left_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, liberatr_state, planet_select_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -452,12 +452,12 @@ MACHINE_CONFIG_START(liberatr_state::liberatr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW2"))
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(RES_K(4.7), CAP_U(0.01), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK/16) /* 1.25Mhz from Phi2 signal from 6502 */
MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(RES_K(4.7), CAP_U(0.01), 5.0)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -468,8 +468,8 @@ MACHINE_CONFIG_START(liberatr_state::liberat2)
liberatr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(liberat2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(liberat2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp
index 89e6cd74c60..ad458b6270f 100644
--- a/src/mame/drivers/limenko.cpp
+++ b/src/mame/drivers/limenko.cpp
@@ -703,10 +703,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(limenko_state::limenko)
- MCFG_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(limenko_map)
- MCFG_CPU_IO_MAP(limenko_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", limenko_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(limenko_map)
+ MCFG_DEVICE_IO_MAP(limenko_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", limenko_state, irq0_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -727,30 +727,30 @@ MACHINE_CONFIG_START(limenko_state::limenko)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("qs1000", qs1000_device, set_irq))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("qs1000", qs1000_device, set_irq))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
+ MCFG_DEVICE_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
- MCFG_QS1000_IN_P1_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_QS1000_OUT_P1_CB(WRITE8(limenko_state, qs1000_p1_w))
- MCFG_QS1000_OUT_P2_CB(WRITE8(limenko_state, qs1000_p2_w))
- MCFG_QS1000_OUT_P3_CB(WRITE8(limenko_state, qs1000_p3_w))
+ MCFG_QS1000_IN_P1_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_QS1000_OUT_P1_CB(WRITE8(*this, limenko_state, qs1000_p1_w))
+ MCFG_QS1000_OUT_P2_CB(WRITE8(*this, limenko_state, qs1000_p2_w))
+ MCFG_QS1000_OUT_P3_CB(WRITE8(*this, limenko_state, qs1000_p3_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(limenko_state::spotty)
- MCFG_CPU_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
- MCFG_CPU_PROGRAM_MAP(spotty_map)
- MCFG_CPU_IO_MAP(spotty_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", limenko_state, irq0_line_hold)
-
- MCFG_CPU_ADD("audiocpu", AT89C4051, 4000000) /* 4 MHz */
- MCFG_MCS51_PORT_P1_IN_CB(READ8(limenko_state, spotty_sound_r))
- MCFG_MCS51_PORT_P1_OUT_CB(DEVWRITE8("oki", okim6295_device, write)) //? sound latch and ?
- MCFG_MCS51_PORT_P3_IN_CB(READ8(limenko_state, spotty_sound_cmd_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(limenko_state, spotty_sound_cmd_w)) //not sure about anything...
+ MCFG_DEVICE_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(spotty_map)
+ MCFG_DEVICE_IO_MAP(spotty_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", limenko_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", AT89C4051, 4000000) /* 4 MHz */
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, limenko_state, spotty_sound_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8("oki", okim6295_device, write)) //? sound latch and ?
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, limenko_state, spotty_sound_cmd_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, limenko_state, spotty_sound_cmd_w)) //not sure about anything...
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/lindbergh.cpp b/src/mame/drivers/lindbergh.cpp
index 939a77b5b41..dc765db9e9a 100644
--- a/src/mame/drivers/lindbergh.cpp
+++ b/src/mame/drivers/lindbergh.cpp
@@ -391,7 +391,7 @@ void lindbergh_state::machine_reset()
}
MACHINE_CONFIG_START(lindbergh_state::lindbergh)
- MCFG_CPU_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */
+ MCFG_DEVICE_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */
MCFG_PCI_ROOT_ADD( ":pci")
MCFG_I82875P_HOST_ADD( ":pci:00.0", 0x103382c0, ":maincpu", 512*1024*1024)
diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp
index f981a1599e5..53b10ad2293 100644
--- a/src/mame/drivers/lisa.cpp
+++ b/src/mame/drivers/lisa.cpp
@@ -100,30 +100,30 @@ static const floppy_interface lisa_floppy_interface =
/* Lisa1 and Lisa 2 machine */
MACHINE_CONFIG_START(lisa_state::lisa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 5093760) /* 20.37504 MHz / 4 */
- MCFG_CPU_PROGRAM_MAP(lisa_map)
- MCFG_CPU_VBLANK_INT_DRIVER(SCREEN_TAG, lisa_state, lisa_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 5093760) /* 20.37504 MHz / 4 */
+ MCFG_DEVICE_PROGRAM_MAP(lisa_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER(SCREEN_TAG, lisa_state, lisa_interrupt)
- MCFG_CPU_ADD(COP421_TAG, COP421, 3900000)
+ MCFG_DEVICE_ADD(COP421_TAG, COP421, 3900000)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true )
- MCFG_CPU_ADD(KB_COP421_TAG, COP421, 3900000) // ?
+ MCFG_DEVICE_ADD(KB_COP421_TAG, COP421, 3900000) // ?
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true )
- MCFG_CPU_ADD("fdccpu", M6504, 2000000) /* 16.000 MHz / 8 in when DIS asserted, 16.000 MHz / 9 otherwise (?) */
- MCFG_CPU_PROGRAM_MAP(lisa_fdc_map)
+ MCFG_DEVICE_ADD("fdccpu", M6504, 2000000) /* 16.000 MHz / 8 in when DIS asserted, 16.000 MHz / 9 otherwise (?) */
+ MCFG_DEVICE_PROGRAM_MAP(lisa_fdc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("latch", LS259, 0) // U4E
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(lisa_state, diag1_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(lisa_state, diag2_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(lisa_state, seg1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(lisa_state, seg2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(lisa_state, setup_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(lisa_state, sfmsk_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(lisa_state, vtmsk_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(lisa_state, hdmsk_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, lisa_state, diag1_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, lisa_state, diag2_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, lisa_state, seg1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, lisa_state, seg2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, lisa_state, setup_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, lisa_state, sfmsk_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, lisa_state, vtmsk_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, lisa_state, hdmsk_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -139,7 +139,7 @@ MACHINE_CONFIG_START(lisa_state::lisa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* nvram */
@@ -154,11 +154,11 @@ MACHINE_CONFIG_START(lisa_state::lisa)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 500000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(lisa_state, COPS_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(lisa_state, COPS_via_out_b))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(lisa_state, COPS_via_out_ca2))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(lisa_state, COPS_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(lisa_state, COPS_via_irq_func))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, lisa_state, COPS_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, lisa_state, COPS_via_out_b))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, lisa_state, COPS_via_out_ca2))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, lisa_state, COPS_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, lisa_state, COPS_via_irq_func))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 500000)
@@ -168,8 +168,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lisa_state::lisa210)
lisa(config);
- MCFG_CPU_MODIFY( "fdccpu" )
- MCFG_CPU_PROGRAM_MAP(lisa210_fdc_map)
+ MCFG_DEVICE_MODIFY( "fdccpu" )
+ MCFG_DEVICE_PROGRAM_MAP(lisa210_fdc_map)
/* Lisa 2/10 and MacXL had a slightly different FDC interface */
MCFG_IWM_MODIFY("fdc", lisa210_fdc_interface)
diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp
index 863784d23cc..10c82cdd235 100644
--- a/src/mame/drivers/littlerb.cpp
+++ b/src/mame/drivers/littlerb.cpp
@@ -284,8 +284,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::littlerb_sound_step_cb)
}
MACHINE_CONFIG_START(littlerb_state::littlerb)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 10MHz rated part, near 16Mhz XTAL
- MCFG_CPU_PROGRAM_MAP(littlerb_main)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 10MHz rated part, near 16Mhz XTAL
+ MCFG_DEVICE_PROGRAM_MAP(littlerb_main)
MCFG_INDER_VIDEO_ADD("inder_vid") // XTAL(40'000'000)
@@ -295,8 +295,8 @@ MACHINE_CONFIG_START(littlerb_state::littlerb)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp
index 98e574e3a54..1182b075d48 100644
--- a/src/mame/drivers/lkage.cpp
+++ b/src/mame/drivers/lkage.cpp
@@ -490,13 +490,13 @@ void lkage_state::machine_reset()
MACHINE_CONFIG_START(lkage_state::lkage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lkage_map_mcu)
- MCFG_CPU_IO_MAP(lkage_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lkage_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lkage_map_mcu)
+ MCFG_DEVICE_IO_MAP(lkage_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lkage_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lkage_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lkage_sound_map)
/* IRQs are triggered by the YM2203 */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,MCU_CLOCK)
@@ -520,19 +520,19 @@ MACHINE_CONFIG_START(lkage_state::lkage)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK )
+ MCFG_DEVICE_ADD("ym1", YM2203, AUDIO_CLOCK )
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, AUDIO_CLOCK )
+ MCFG_DEVICE_ADD("ym2", YM2203, AUDIO_CLOCK )
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -543,13 +543,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lkage_state::lkageb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lkage_map_boot)
- MCFG_CPU_IO_MAP(lkage_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lkage_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lkage_map_boot)
+ MCFG_DEVICE_IO_MAP(lkage_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lkage_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(lkage_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(lkage_sound_map)
/* IRQs are triggered by the YM2203 */
@@ -571,19 +571,19 @@ MACHINE_CONFIG_START(lkage_state::lkageb)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, AUDIO_CLOCK)
+ MCFG_DEVICE_ADD("ym1", YM2203, AUDIO_CLOCK)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, AUDIO_CLOCK)
+ MCFG_DEVICE_ADD("ym2", YM2203, AUDIO_CLOCK)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp
index b1df7121948..9fd175f26fc 100644
--- a/src/mame/drivers/llc.cpp
+++ b/src/mame/drivers/llc.cpp
@@ -201,10 +201,10 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(llc_state::llc1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'000'000))
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'000'000))
MCFG_Z80_DAISY_CHAIN(llc1_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(llc1_mem)
- MCFG_CPU_IO_MAP(llc1_io)
+ MCFG_DEVICE_PROGRAM_MAP(llc1_mem)
+ MCFG_DEVICE_IO_MAP(llc1_io)
MCFG_MACHINE_START_OVERRIDE(llc_state, llc1 )
MCFG_MACHINE_RESET_OVERRIDE(llc_state, llc1 )
@@ -223,21 +223,21 @@ MACHINE_CONFIG_START(llc_state::llc1)
MCFG_DEFAULT_LAYOUT(layout_llc1)
MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000))
- MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc1_port1_a_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(llc_state, llc1_port1_a_w))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(llc_state, llc1_port1_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc1_port1_a_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, llc_state, llc1_port1_a_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, llc_state, llc1_port1_b_w))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(3'000'000))
- MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc1_port2_a_r))
- MCFG_Z80PIO_IN_PB_CB(READ8(llc_state, llc1_port2_b_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc1_port2_a_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, llc_state, llc1_port2_b_r))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(3'000'000))
// timer 0 irq does digit display, and timer 3 irq does scan of the
// monitor keyboard.
// No idea how the CTC is connected, so guessed.
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(llc_state, kbd_put))
@@ -245,10 +245,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(llc_state::llc2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'000'000))
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'000'000))
MCFG_Z80_DAISY_CHAIN(llc2_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(llc2_mem)
- MCFG_CPU_IO_MAP(llc2_io)
+ MCFG_DEVICE_PROGRAM_MAP(llc2_mem)
+ MCFG_DEVICE_IO_MAP(llc2_io)
MCFG_MACHINE_RESET_OVERRIDE(llc_state, llc2 )
@@ -266,16 +266,16 @@ MACHINE_CONFIG_START(llc_state::llc2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000))
- MCFG_Z80PIO_IN_PA_CB(DEVREAD8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read))
- MCFG_Z80PIO_IN_PB_CB(READ8(llc_state, llc2_port1_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(llc_state, llc2_port1_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, llc_state, llc2_port1_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, llc_state, llc2_port1_b_w))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(3'000'000))
- MCFG_Z80PIO_IN_PA_CB(READ8(llc_state, llc2_port2_a_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc2_port2_a_r))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(3'000'000))
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index d760af4afae..796248ad3bd 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -470,18 +470,18 @@ void lockon_state::machine_reset()
MACHINE_CONFIG_START(lockon_state::lockon)
- MCFG_CPU_ADD("maincpu", V30, 16_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(main_v30)
+ MCFG_DEVICE_ADD("maincpu", V30, 16_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(main_v30)
- MCFG_CPU_ADD("ground", V30, 16_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(ground_v30)
+ MCFG_DEVICE_ADD("ground", V30, 16_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(ground_v30)
- MCFG_CPU_ADD("object", V30, 16_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(object_v30)
+ MCFG_DEVICE_ADD("object", V30, 16_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(object_v30)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL / 4)
- MCFG_CPU_PROGRAM_MAP(sound_prg)
- MCFG_CPU_IO_MAP(sound_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL / 4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_prg)
+ MCFG_DEVICE_IO_MAP(sound_io)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_ASTABLE(10000, 4700, 10000e-12) * 4096)
@@ -497,7 +497,7 @@ MACHINE_CONFIG_START(lockon_state::lockon)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(lockon_state, screen_update_lockon)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(lockon_state, screen_vblank_lockon))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, lockon_state, screen_vblank_lockon))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lockon)
@@ -506,10 +506,10 @@ MACHINE_CONFIG_START(lockon_state::lockon)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2203, 16_MHz_XTAL / 4)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(lockon_state, ym2203_irq))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 16_MHz_XTAL / 4)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, lockon_state, ym2203_irq))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("YM2203"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lockon_state, ym2203_out_b))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, lockon_state, ym2203_out_b))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "f2203.1l", 1.0)
diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp
index 19ac316f34b..a5ae142fe0c 100644
--- a/src/mame/drivers/lola8a.cpp
+++ b/src/mame/drivers/lola8a.cpp
@@ -264,16 +264,16 @@ WRITE_LINE_MEMBER(lola8a_state::crtc_vsync)
MACHINE_CONFIG_START(lola8a_state::lola8a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(lola8a_mem)
- MCFG_CPU_IO_MAP(lola8a_io)
- MCFG_I8085A_SID(READLINE(lola8a_state, cass_r))
- MCFG_I8085A_SOD(WRITELINE(lola8a_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(lola8a_mem)
+ MCFG_DEVICE_IO_MAP(lola8a_io)
+ MCFG_I8085A_SID(READLINE(*this, lola8a_state, cass_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, lola8a_state, cass_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, XTAL(4'915'200) / 4)
- MCFG_AY8910_PORT_A_READ_CB(READ8(lola8a_state, lola8a_port_a_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lola8a_state, lola8a_port_b_w))
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, XTAL(4'915'200) / 4)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, lola8a_state, lola8a_port_a_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, lola8a_state, lola8a_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
/* video hardware */
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(lola8a_state::lola8a)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(lola8a_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(lola8a_state, crtc_vsync))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, lola8a_state, crtc_vsync))
MCFG_PALETTE_ADD_3BIT_BRG("palette")
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index 0e50e0c4714..3b5613caa94 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -629,28 +629,28 @@ MACHINE_CONFIG_START(looping_state::looping)
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CPU_CLOCK, looping_map, looping_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", looping_state, looping_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", looping_state, looping_interrupt)
// CPU TMS9980A for audio subsystem; no line connections
MCFG_TMS99xx_ADD("audiocpu", TMS9980A, SOUND_CLOCK/4, looping_sound_map, looping_sound_io_map)
- MCFG_CPU_ADD("mcu", COP420, COP_CLOCK)
+ MCFG_DEVICE_ADD("mcu", COP420, COP_CLOCK)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
- MCFG_COP400_WRITE_L_CB(WRITE8(looping_state, cop_l_w))
- MCFG_COP400_READ_L_CB(READ8(looping_state, cop_unk_r))
- MCFG_COP400_READ_G_CB(READ8(looping_state, cop_unk_r))
- MCFG_COP400_READ_IN_CB(READ8(looping_state, cop_unk_r))
- MCFG_COP400_READ_SI_CB(READLINE(looping_state, cop_serial_r))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, looping_state, cop_l_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, looping_state, cop_unk_r))
+ MCFG_COP400_READ_G_CB(READ8(*this, looping_state, cop_unk_r))
+ MCFG_COP400_READ_IN_CB(READ8(*this, looping_state, cop_unk_r))
+ MCFG_COP400_READ_SI_CB(READLINE(*this, looping_state, cop_serial_r))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // C9 on CPU board
// Q0 = A16
// Q1 = A17
// Q2 = COLOR 9
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(looping_state, plr2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, looping_state, plr2_w))
// Q4 = C0
// Q5 = C1
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(looping_state, main_irq_ack_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(looping_state, watchdog_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, looping_state, main_irq_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, looping_state, watchdog_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -666,35 +666,35 @@ MACHINE_CONFIG_START(looping_state::looping)
MCFG_PALETTE_INIT_OWNER(looping_state, looping)
MCFG_DEVICE_ADD("videolatch", LS259, 0) // E2 on video board
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(looping_state, level2_irq_set))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(looping_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(looping_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, looping_state, level2_irq_set))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, looping_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, looping_state, flip_screen_y_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/4)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SOUND_CLOCK/4)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
- MCFG_SOUND_ADD("tms", TMS5220, TMS_CLOCK)
- MCFG_TMS52XX_IRQ_HANDLER(WRITELINE(looping_state, looping_spcint))
+ MCFG_DEVICE_ADD("tms", TMS5220, TMS_CLOCK)
+ MCFG_TMS52XX_IRQ_HANDLER(WRITELINE(*this, looping_state, looping_spcint))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_2BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("sen0", LS259, 0) // B3 on sound board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(looping_state, looping_souint_clr))
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(looping_state, looping_sound_sw))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, looping_state, looping_souint_clr))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, looping_state, looping_sound_sw))
MCFG_DEVICE_ADD("sen1", LS259, 0) // A1 on sound board with outputs connected to 4016 at B1
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(looping_state, ay_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(looping_state, speech_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(looping_state, ballon_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, looping_state, ay_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, looping_state, speech_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, looping_state, ballon_enable_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp
index 8284da4d4f2..eb6bbe627ee 100644
--- a/src/mame/drivers/lordgun.cpp
+++ b/src/mame/drivers/lordgun.cpp
@@ -639,28 +639,28 @@ void lordgun_state::machine_start()
}
MACHINE_CONFIG_START(lordgun_state::lordgun)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(lordgun_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(lordgun_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(20'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(lordgun_soundmem_map)
- MCFG_CPU_IO_MAP(lordgun_soundio_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(20'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(lordgun_soundmem_map)
+ MCFG_DEVICE_IO_MAP(lordgun_soundio_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DIP"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(lordgun_state, fake_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lordgun_state, lordgun_eeprom_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lordgun_state, lordgun_eeprom_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("SERVICE"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lordgun_state, fake2_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lordgun_state, fake2_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("START1"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lordgun_state, fake_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("START2"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lordgun_state, fake_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("COIN"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lordgun_state, fake_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -681,7 +681,7 @@ MACHINE_CONFIG_START(lordgun_state::lordgun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -691,28 +691,28 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lordgun_state::aliencha)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(aliencha_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(aliencha_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(20'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(lordgun_soundmem_map)
- MCFG_CPU_IO_MAP(aliencha_soundio_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(20'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(lordgun_soundmem_map)
+ MCFG_DEVICE_IO_MAP(aliencha_soundio_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(lordgun_state, aliencha_dip_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(lordgun_state, fake2_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lordgun_state, aliencha_eeprom_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, lordgun_state, aliencha_dip_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lordgun_state, fake2_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lordgun_state, aliencha_eeprom_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("SERVICE"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lordgun_state, aliencha_dip_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lordgun_state, aliencha_dip_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lordgun_state, fake_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lordgun_state, fake_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("COIN"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lordgun_state, fake_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lordgun_state, fake_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -733,7 +733,7 @@ MACHINE_CONFIG_START(lordgun_state::aliencha)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymf", YMF278B, 26000000) // ? 26MHz matches video (decrease for faster music tempo)
+ MCFG_DEVICE_ADD("ymf", YMF278B, 26000000) // ? 26MHz matches video (decrease for faster music tempo)
MCFG_DEVICE_ADDRESS_MAP(0, ymf278_map)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp
index ff21698047f..279249567b4 100644
--- a/src/mame/drivers/lsasquad.cpp
+++ b/src/mame/drivers/lsasquad.cpp
@@ -558,12 +558,12 @@ MACHINE_RESET_MEMBER(lsasquad_state,lsasquad)
MACHINE_CONFIG_START(lsasquad_state::lsasquad)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(lsasquad_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lsasquad_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(lsasquad_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lsasquad_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(lsasquad_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(lsasquad_sound_map)
/* IRQs are triggered by the YM2203 */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, MASTER_CLOCK / 8)
@@ -576,7 +576,7 @@ MACHINE_CONFIG_START(lsasquad_state::lsasquad)
MCFG_MACHINE_RESET_OVERRIDE(lsasquad_state,lsasquad)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -598,13 +598,13 @@ MACHINE_CONFIG_START(lsasquad_state::lsasquad)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("aysnd", YM2149, MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(lsasquad_state, unk))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lsasquad_state, unk))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, lsasquad_state, unk))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, lsasquad_state, unk))
MCFG_SOUND_ROUTE(0, "mono", 0.12)
MCFG_SOUND_ROUTE(1, "mono", 0.12)
MCFG_SOUND_ROUTE(2, "mono", 0.12)
@@ -614,24 +614,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lsasquad_state::storming)
lsasquad(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(storming_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(storming_map)
MCFG_DEVICE_REMOVE("bmcu")
- MCFG_SOUND_REPLACE("aysnd", AY8910, MASTER_CLOCK / 8) // AY-3-8910A
+ MCFG_DEVICE_REPLACE("aysnd", AY8910, MASTER_CLOCK / 8) // AY-3-8910A
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(lsasquad_state::daikaiju)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
- MCFG_CPU_PROGRAM_MAP(daikaiju_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lsasquad_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(daikaiju_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lsasquad_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(daikaiju_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(daikaiju_sound_map)
/* IRQs are triggered by the YM2203 */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, MASTER_CLOCK / 8)
@@ -644,7 +644,7 @@ MACHINE_CONFIG_START(lsasquad_state::daikaiju)
MCFG_MACHINE_RESET_OVERRIDE(lsasquad_state,lsasquad)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
@@ -664,13 +664,13 @@ MACHINE_CONFIG_START(lsasquad_state::daikaiju)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("aysnd", YM2149, MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(lsasquad_state, unk))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lsasquad_state, unk))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, lsasquad_state, unk))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, lsasquad_state, unk))
MCFG_SOUND_ROUTE(0, "mono", 0.12)
MCFG_SOUND_ROUTE(1, "mono", 0.12)
MCFG_SOUND_ROUTE(2, "mono", 0.12)
diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp
index 4c0bd5506bd..c71a49108fa 100644
--- a/src/mame/drivers/ltcasino.cpp
+++ b/src/mame/drivers/ltcasino.cpp
@@ -656,9 +656,9 @@ uint32_t ltcasino_state::screen_update_ltcasino(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(ltcasino_state::ltcasino)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(ltcasino_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ltcasino_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502,2000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ltcasino_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ltcasino_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -676,7 +676,7 @@ MACHINE_CONFIG_START(ltcasino_state::ltcasino)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index 88ba9395aad..05ca8b5dc7e 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -528,8 +528,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
MACHINE_CONFIG_START(ltd_state::ltd3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(ltd3_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(ltd3_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -544,9 +544,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ltd_state::ltd4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545)) // guess, no details available
- MCFG_CPU_PROGRAM_MAP(ltd4_map)
- MCFG_CPU_IO_MAP(ltd4_io)
+ MCFG_DEVICE_ADD("maincpu", M6803, XTAL(3'579'545)) // guess, no details available
+ MCFG_DEVICE_PROGRAM_MAP(ltd4_map)
+ MCFG_DEVICE_IO_MAP(ltd4_io)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -557,9 +557,9 @@ MACHINE_CONFIG_START(ltd_state::ltd4)
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd_0", AY8910, XTAL(3'579'545)/2) /* guess */
+ MCFG_DEVICE_ADD("aysnd_0", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MCFG_SOUND_ADD("aysnd_1", AY8910, XTAL(3'579'545)/2) /* guess */
+ MCFG_DEVICE_ADD("aysnd_1", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index 8c45122f184..27fb9b67e43 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -975,10 +975,10 @@ INTERRUPT_GEN_MEMBER(luckgrln_state::luckgrln_irq)
}
MACHINE_CONFIG_START(luckgrln_state::luckgrln)
- MCFG_CPU_ADD("maincpu", Z180,8000000)
- MCFG_CPU_PROGRAM_MAP(mainmap)
- MCFG_CPU_IO_MAP(luckgrln_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", luckgrln_state, luckgrln_irq)
+ MCFG_DEVICE_ADD("maincpu", Z180,8000000)
+ MCFG_DEVICE_PROGRAM_MAP(mainmap)
+ MCFG_DEVICE_IO_MAP(luckgrln_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", luckgrln_state, luckgrln_irq)
MCFG_MC6845_ADD("crtc", H46505, "screen", 6000000/4) /* unknown clock, hand tuned to get ~60 fps */
MCFG_MC6845_SHOW_BORDER_AREA(false)
@@ -1003,9 +1003,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(luckgrln_state::_7smash)
luckgrln(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(_7smash_map)
- MCFG_CPU_IO_MAP(_7smash_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(_7smash_map)
+ MCFG_DEVICE_IO_MAP(_7smash_io)
MCFG_DEVICE_REMOVE("rtc")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index c48e7062f4c..8d8894c82cb 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -1466,10 +1466,10 @@ WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int)
MACHINE_CONFIG_START(lucky74_state::lucky74)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */
- MCFG_CPU_PROGRAM_MAP(lucky74_map)
- MCFG_CPU_IO_MAP(lucky74_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lucky74_state, nmi_interrupt) /* 60 Hz. measured */
+ MCFG_DEVICE_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_DEVICE_PROGRAM_MAP(lucky74_map)
+ MCFG_DEVICE_IO_MAP(lucky74_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lucky74_state, nmi_interrupt) /* 60 Hz. measured */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1491,8 +1491,8 @@ MACHINE_CONFIG_START(lucky74_state::lucky74)
MCFG_DEVICE_ADD("ppi8255_3", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW4"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lucky74_state, lamps_a_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lucky74_state, lamps_b_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lucky74_state, lamps_a_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lucky74_state, lamps_b_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1511,23 +1511,23 @@ MACHINE_CONFIG_START(lucky74_state::lucky74)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_DEVICE_ADD("sn1", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn2", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_DEVICE_ADD("sn2", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn3", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
+ MCFG_DEVICE_ADD("sn3", SN76489, C_06B49P_CLKOUT_03) /* 3 MHz. */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("aysnd", AY8910, C_06B49P_CLKOUT_04) /* 1.5 MHz. */
+ MCFG_DEVICE_ADD("aysnd", AY8910, C_06B49P_CLKOUT_04) /* 1.5 MHz. */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN3"))
/* port b read is a sort of status byte */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(lucky74_state, ym2149_portb_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, lucky74_state, ym2149_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.00) /* not routed to audio hardware */
- MCFG_SOUND_ADD("msm", MSM5205, C_06B49P_CLKOUT_06) /* 375 kHz. */
- MCFG_MSM5205_VCLK_CB(WRITELINE(lucky74_state, lucky74_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, C_06B49P_CLKOUT_06) /* 375 kHz. */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, lucky74_state, lucky74_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
diff --git a/src/mame/drivers/luckybal.cpp b/src/mame/drivers/luckybal.cpp
index d7ecf4d13ba..58c8a073b89 100644
--- a/src/mame/drivers/luckybal.cpp
+++ b/src/mame/drivers/luckybal.cpp
@@ -525,15 +525,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(luckybal_state::luckybal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io)
+ MCFG_DEVICE_ADD("maincpu", Z180, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io)
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(luckybal_state, output_port_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(luckybal_state, output_port_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(luckybal_state, input_port_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(luckybal_state, output_port_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, luckybal_state, output_port_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, luckybal_state, output_port_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, luckybal_state, input_port_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, luckybal_state, output_port_c_w))
MCFG_DEVICE_ADD("latch1", CD4099, 0)
@@ -548,7 +548,7 @@ MACHINE_CONFIG_START(luckybal_state::luckybal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // DAC 08
+ MCFG_DEVICE_ADD("dac", DAC08, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // DAC 08
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp
index d6a778efa26..bce09a5c377 100644
--- a/src/mame/drivers/lvcards.cpp
+++ b/src/mame/drivers/lvcards.cpp
@@ -457,10 +457,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(lvcards_state::lvcards)
// basic machine hardware
- MCFG_CPU_ADD("maincpu",Z80, 18432000/4) // unknown frequency, assume same as tehkanwc.cpp
- MCFG_CPU_PROGRAM_MAP(lvcards_map)
- MCFG_CPU_IO_MAP(lvcards_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lvcards_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80, 18432000/4) // unknown frequency, assume same as tehkanwc.cpp
+ MCFG_DEVICE_PROGRAM_MAP(lvcards_map)
+ MCFG_DEVICE_IO_MAP(lvcards_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lvcards_state, irq0_line_hold)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -478,7 +478,7 @@ MACHINE_CONFIG_START(lvcards_state::lvcards)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 18432000/12) // unknown frequency, assume same as tehkanwc.cpp
+ MCFG_DEVICE_ADD("aysnd", AY8910, 18432000/12) // unknown frequency, assume same as tehkanwc.cpp
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -489,8 +489,8 @@ MACHINE_CONFIG_START(lvcards_state::lvpoker)
// basic machine hardware
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lvpoker_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lvpoker_map)
MCFG_MACHINE_START_OVERRIDE(lvcards_state,lvpoker)
MCFG_MACHINE_RESET_OVERRIDE(lvcards_state,lvpoker)
MACHINE_CONFIG_END
@@ -500,8 +500,8 @@ MACHINE_CONFIG_START(lvcards_state::ponttehk)
// basic machine hardware
MCFG_NVRAM_ADD_1FILL("nvram")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ponttehk_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ponttehk_map)
MCFG_MACHINE_RESET_OVERRIDE(lvcards_state,lvpoker)
// video hardware
diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp
index 55d09289878..9fb72ddc5fc 100644
--- a/src/mame/drivers/lviv.cpp
+++ b/src/mame/drivers/lviv.cpp
@@ -424,26 +424,26 @@ INPUT_PORTS_END
/* machine definition */
MACHINE_CONFIG_START(lviv_state::lviv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2500000)
- MCFG_CPU_PROGRAM_MAP(lviv_mem)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(lviv_mem)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(lviv_state, lviv_ppi_0_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(lviv_state, lviv_ppi_0_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(lviv_state, lviv_ppi_0_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lviv_state, lviv_ppi_0_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(lviv_state, lviv_ppi_0_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lviv_state, lviv_ppi_0_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, lviv_state, lviv_ppi_0_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lviv_state, lviv_ppi_0_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, lviv_state, lviv_ppi_0_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lviv_state, lviv_ppi_0_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, lviv_state, lviv_ppi_0_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lviv_state, lviv_ppi_0_portc_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(lviv_state, lviv_ppi_1_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(lviv_state, lviv_ppi_1_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(lviv_state, lviv_ppi_1_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(lviv_state, lviv_ppi_1_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(lviv_state, lviv_ppi_1_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(lviv_state, lviv_ppi_1_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, lviv_state, lviv_ppi_1_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, lviv_state, lviv_ppi_1_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, lviv_state, lviv_ppi_1_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, lviv_state, lviv_ppi_1_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, lviv_state, lviv_ppi_1_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, lviv_state, lviv_ppi_1_portc_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -462,7 +462,7 @@ MACHINE_CONFIG_START(lviv_state::lviv)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* snapshot */
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index 83f87b599b4..957584c2e51 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -929,13 +929,13 @@ void lwings_state::machine_reset()
MACHINE_CONFIG_START(lwings_state::lwings)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on PCB */
- MCFG_CPU_PROGRAM_MAP(lwings_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lwings_state, lwings_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(lwings_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lwings_state, lwings_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/4) /* verified on PCB */
- MCFG_CPU_PROGRAM_MAP(lwings_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222) // approximation from pcb music recording - where is the frequency actually derived from??
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/4) /* verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(lwings_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222) // approximation from pcb music recording - where is the frequency actually derived from??
MCFG_WATCHDOG_ADD("watchdog")
@@ -948,7 +948,7 @@ MACHINE_CONFIG_START(lwings_state::lwings)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(lwings_state, screen_update_lwings)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lwings)
@@ -961,13 +961,13 @@ MACHINE_CONFIG_START(lwings_state::lwings)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("2203a", YM2203, XTAL(12'000'000)/8) /* verified on PCB */
+ MCFG_DEVICE_ADD("2203a", YM2203, XTAL(12'000'000)/8) /* verified on PCB */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("2203b", YM2203, XTAL(12'000'000)/8) /* verified on PCB */
+ MCFG_DEVICE_ADD("2203b", YM2203, XTAL(12'000'000)/8) /* verified on PCB */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -985,13 +985,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(lwings_state::fball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(fball_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lwings_state, avengers_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(fball_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lwings_state, avengers_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/4) // ?
- MCFG_CPU_PROGRAM_MAP(fball_sound_map)
-// MCFG_CPU_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/4) // ?
+ MCFG_DEVICE_PROGRAM_MAP(fball_sound_map)
+// MCFG_DEVICE_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 222)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1004,7 +1004,7 @@ MACHINE_CONFIG_START(lwings_state::fball)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1) // the 16-pixel black border on left edge is correct, test mode actually uses that area
MCFG_SCREEN_UPDATE_DRIVER(lwings_state, screen_update_lwings)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", lwings)
@@ -1028,17 +1028,17 @@ MACHINE_CONFIG_START(lwings_state::trojan)
lwings(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(12'000'000)/4) /* verified on PCB */
- MCFG_CPU_PROGRAM_MAP(trojan_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(12'000'000)/4) /* verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(trojan_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_CLOCK(XTAL(12'000'000)/4) /* verified on PCB */
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_CLOCK(XTAL(12'000'000)/4) /* verified on PCB */
- MCFG_CPU_ADD("adpcm", Z80, XTAL(12'000'000)/4) /* verified on PCB */
- MCFG_CPU_PROGRAM_MAP(trojan_adpcm_map)
- MCFG_CPU_IO_MAP(trojan_adpcm_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 4000)
+ MCFG_DEVICE_ADD("adpcm", Z80, XTAL(12'000'000)/4) /* verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(trojan_adpcm_map)
+ MCFG_DEVICE_IO_MAP(trojan_adpcm_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(lwings_state, irq0_line_hold, 4000)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", trojan)
@@ -1051,7 +1051,7 @@ MACHINE_CONFIG_START(lwings_state::trojan)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("5205", MSM5205, XTAL(384'000)) /* verified on PCB */
+ MCFG_DEVICE_ADD("5205", MSM5205, XTAL(384'000)) /* verified on PCB */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* slave mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1060,12 +1060,12 @@ MACHINE_CONFIG_START(lwings_state::avengers)
trojan(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(avengers_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", lwings_state, avengers_interrupt) // RST 38h triggered by software
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(avengers_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", lwings_state, avengers_interrupt) // RST 38h triggered by software
- MCFG_CPU_MODIFY("adpcm")
- MCFG_CPU_IO_MAP(avengers_adpcm_io_map)
+ MCFG_DEVICE_MODIFY("adpcm")
+ MCFG_DEVICE_IO_MAP(avengers_adpcm_io_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(lwings_state,avengers)
diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp
index 9f4bbd06cc8..6da419052de 100644
--- a/src/mame/drivers/lwriter.cpp
+++ b/src/mame/drivers/lwriter.cpp
@@ -353,41 +353,41 @@ WRITE_LINE_MEMBER(lwriter_state::scc_int)
#define RXC_CLK ((CPU_CLK.value() - (87 * 16 * 70)) / 3) // Tuned to get 9600 baud according to manual, needs rework based on real hardware
MACHINE_CONFIG_START(lwriter_state::lwriter)
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLK)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLK)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
MCFG_SCC8530_ADD("scc", CPU_CLK, RXC_CLK, 0, RXC_CLK, 0)
/* Port A */
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SCC_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
/* Port B */
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80SCC_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80SCC_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
/* Interrupt */
- MCFG_Z80SCC_OUT_INT_CB(DEVWRITELINE("via", via6522_device, write_ca1))
- //MCFG_Z80SCC_OUT_INT_CB(WRITELINE(lwriter_state, scc_int))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE("via", via6522_device, write_ca1))
+ //MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, lwriter_state, scc_int))
- MCFG_RS232_PORT_ADD ("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc8530_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc8530_device, ctsa_w))
+ MCFG_DEVICE_ADD ("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("scc", scc8530_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("scc", scc8530_device, ctsa_w))
- MCFG_RS232_PORT_ADD ("rs232b", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc8530_device, rxb_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc8530_device, ctsb_w))
+ MCFG_DEVICE_ADD ("rs232b", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("scc", scc8530_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("scc", scc8530_device, ctsb_w))
#if TPI
MCFG_DEVICE_ADD("tpi", TPI6525, 0)
#else
MCFG_DEVICE_ADD("via", VIA6522, CPU_CLK/10) // 68000 E clock presumed
- MCFG_VIA6522_READPA_HANDLER(READ8(lwriter_state, via_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(lwriter_state, via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(lwriter_state, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(lwriter_state, via_pb_w))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(lwriter_state, via_cb1_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(lwriter_state, via_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(lwriter_state, via_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(lwriter_state, via_int_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, lwriter_state, via_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, lwriter_state, via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, lwriter_state, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, lwriter_state, via_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, lwriter_state, via_cb1_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, lwriter_state, via_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, lwriter_state, via_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, lwriter_state, via_int_w))
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp
index 9261ff1c2f2..27a0168afc8 100644
--- a/src/mame/drivers/lynx.cpp
+++ b/src/mame/drivers/lynx.cpp
@@ -77,8 +77,8 @@ void lynx_state::sound_cb()
MACHINE_CONFIG_START(lynx_state::lynx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, 4000000) /* vti core, integrated in vlsi, stz, but not bbr bbs */
- MCFG_CPU_PROGRAM_MAP(lynx_mem)
+ MCFG_DEVICE_ADD("maincpu", M65SC02, 4000000) /* vti core, integrated in vlsi, stz, but not bbr bbs */
+ MCFG_DEVICE_PROGRAM_MAP(lynx_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -96,7 +96,7 @@ MACHINE_CONFIG_START(lynx_state::lynx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", LYNX_SND, 0)
+ MCFG_DEVICE_ADD("custom", LYNX_SND, 0)
MCFG_LYNX_SND_SET_TIMER(lynx_state, sound_cb)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -120,7 +120,7 @@ static MACHINE_CONFIG_START( lynx2 )
MCFG_DEVICE_REMOVE("mono")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_DEVICE_REMOVE("lynx")
- MCFG_SOUND_ADD("custom", LYNX2_SND, 0)
+ MCFG_DEVICE_ADD("custom", LYNX2_SND, 0)
MCFG_LYNX_SND_SET_TIMER(lynx_state, sound_cb)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp
index d300f94a48d..3dff6ec115f 100644
--- a/src/mame/drivers/m10.cpp
+++ b/src/mame/drivers/m10.cpp
@@ -815,13 +815,13 @@ static const char *const m10_sample_names[] =
MACHINE_CONFIG_START(m10_state::m10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,IREMM10_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(m10_main)
+ MCFG_DEVICE_ADD("maincpu", M6502,IREMM10_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(m10_main)
MCFG_MACHINE_START_OVERRIDE(m10_state,m10)
MCFG_MACHINE_RESET_OVERRIDE(m10_state,m10)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", m10_state, m10_interrupt)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m10_state, m10_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -844,7 +844,7 @@ MACHINE_CONFIG_START(m10_state::m10)
MCFG_TTL74123_A_PIN_VALUE(1) /* A pin - driven by the CRTC */
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(m10_state, ic8j1_output_changed))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, m10_state, ic8j1_output_changed))
MCFG_DEVICE_ADD("ic8j2", TTL74123, 0)
MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_DIODE) /* the hook up type */
/* 10k + 20k variable resistor */
@@ -853,12 +853,12 @@ MACHINE_CONFIG_START(m10_state::m10)
MCFG_TTL74123_A_PIN_VALUE(1) /* A pin - driven by the CRTC */
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(m10_state, ic8j2_output_changed))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, m10_state, ic8j2_output_changed))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(m10_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -869,9 +869,9 @@ MACHINE_CONFIG_START(m10_state::m11)
m10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(m11_main)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", m10_state, m11_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(m11_main)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m10_state, m11_interrupt)
/* sound hardware */
MACHINE_CONFIG_END
@@ -879,13 +879,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m10_state::m15)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,IREMM15_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(m15_main)
+ MCFG_DEVICE_ADD("maincpu", M6502,IREMM15_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(m15_main)
MCFG_MACHINE_START_OVERRIDE(m10_state,m10)
MCFG_MACHINE_RESET_OVERRIDE(m10_state,m10)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m10_state, m15_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m10_state, m15_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -902,7 +902,7 @@ MACHINE_CONFIG_START(m10_state::m15)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(m10_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -912,8 +912,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m10_state::headoni)
m15(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(11730000/16)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(11730000/16)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp
index b32c46ae64f..70bbfdc3010 100644
--- a/src/mame/drivers/m107.cpp
+++ b/src/mame/drivers/m107.cpp
@@ -720,13 +720,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(m107_state::firebarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33, XTAL(28'000'000)/2) /* NEC V33, 28MHz clock */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", V33, XTAL(28'000'000)/2) /* NEC V33, 28MHz clock */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu", V35, XTAL(14'318'181))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", V35, XTAL(14'318'181))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_V25_CONFIG(rtypeleo_decryption_table)
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
@@ -756,7 +756,7 @@ MACHINE_CONFIG_START(m107_state::firebarr)
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("upd71059c", pic8259_device, ir3_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("upd71059c", pic8259_device, ir3_w))
MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", NEC_INPUT_LINE_INTP0))
@@ -772,11 +772,11 @@ MACHINE_CONFIG_START(m107_state::dsoccr94)
firebarr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(20000000/2) /* NEC V33, Could be 28MHz clock? */
- MCFG_CPU_IO_MAP(dsoccr94_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(20000000/2) /* NEC V33, Could be 28MHz clock? */
+ MCFG_DEVICE_IO_MAP(dsoccr94_io_map)
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(dsoccr94_decryption_table)
/* video hardware */
@@ -786,11 +786,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m107_state::wpksoc)
firebarr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wpksoc_map)
- MCFG_CPU_IO_MAP(wpksoc_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wpksoc_map)
+ MCFG_DEVICE_IO_MAP(wpksoc_io_map)
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(leagueman_decryption_table)
MACHINE_CONFIG_END
@@ -798,7 +798,7 @@ MACHINE_CONFIG_START(m107_state::airass)
firebarr(config);
MCFG_GFXDECODE_MODIFY("gfxdecode", m107)
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(gunforce_decryption_table)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp
index 56cc8c7ab84..44343dbcf14 100644
--- a/src/mame/drivers/m14.cpp
+++ b/src/mame/drivers/m14.cpp
@@ -432,10 +432,10 @@ void m14_state::machine_reset()
MACHINE_CONFIG_START(m14_state::m14)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A,6000000) //guess: 6 Mhz internally divided by 2
- MCFG_CPU_PROGRAM_MAP(m14_map)
- MCFG_CPU_IO_MAP(m14_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m14_state, m14_irq)
+ MCFG_DEVICE_ADD("maincpu",I8085A,6000000) //guess: 6 Mhz internally divided by 2
+ MCFG_DEVICE_PROGRAM_MAP(m14_map)
+ MCFG_DEVICE_IO_MAP(m14_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m14_state, m14_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -454,12 +454,12 @@ MACHINE_CONFIG_START(m14_state::m14)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(m14_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
-// MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+// MCFG_DEVICE_ADD("discrete", DISCRETE)
// MCFG_DISCRETE_INTF(m14)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp
index 68197116455..c19dbee0ecb 100644
--- a/src/mame/drivers/m20.cpp
+++ b/src/mame/drivers/m20.cpp
@@ -789,11 +789,11 @@ static void keyboard(device_slot_interface &device)
MACHINE_CONFIG_START(m20_state::m20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8001, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(m20_program_mem)
- MCFG_CPU_DATA_MAP(m20_data_mem)
- MCFG_CPU_IO_MAP(m20_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(m20_state,m20_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z8001, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(m20_program_mem)
+ MCFG_DEVICE_DATA_MAP(m20_data_mem)
+ MCFG_DEVICE_IO_MAP(m20_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(m20_state,m20_irq_callback)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("160K")
@@ -811,7 +811,7 @@ MACHINE_CONFIG_START(m20_state::m20)
/* Devices */
MCFG_FD1797_ADD("fd1797", 1000000)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("i8259", pic8259_device, ir0_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("i8259", pic8259_device, ir0_w))
MCFG_FLOPPY_DRIVE_ADD("fd1797:0", m20_floppies, "5dd", m20_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1797:1", m20_floppies, "5dd", m20_state::floppy_formats)
@@ -823,30 +823,30 @@ MACHINE_CONFIG_START(m20_state::m20)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_DEVICE_ADD("i8251_1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("kbd", rs232_port_device, write_txd))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("i8259", pic8259_device, ir4_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("kbd", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("i8259", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("i8251_2", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("i8259", pic8259_device, ir3_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("i8259", pic8259_device, ir5_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("i8259", pic8259_device, ir3_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("i8259", pic8259_device, ir5_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(1230782)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(m20_state, tty_clock_tick_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, m20_state, tty_clock_tick_w))
MCFG_PIT8253_CLK1(1230782)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(m20_state, kbd_clock_tick_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, m20_state, kbd_clock_tick_w))
MCFG_PIT8253_CLK2(1230782)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(m20_state, timer_tick_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, m20_state, timer_tick_w))
MCFG_DEVICE_ADD("i8259", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(m20_state, int_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, m20_state, int_w))
- MCFG_RS232_PORT_ADD("kbd", keyboard, "m20")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251_1", i8251_device, write_rxd))
+ MCFG_DEVICE_ADD("kbd", RS232_PORT, keyboard, "m20")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251_1", i8251_device, write_rxd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251_2", i8251_device, write_rxd))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251_2", i8251_device, write_rxd))
MCFG_DEVICE_ADD("apb", M20_8086, 0)
diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp
index da748f16081..c7f268837bd 100644
--- a/src/mame/drivers/m24.cpp
+++ b/src/mame/drivers/m24.cpp
@@ -254,46 +254,47 @@ void m24_state::cfg_m20_format(device_t *device)
MACHINE_CONFIG_START(m24_state::olivetti)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(m24_map)
- MCFG_CPU_IO_MAP(m24_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(m24_map)
+ MCFG_DEVICE_IO_MAP(m24_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb", "maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "mb1", pc_isa8_cards, "cga_m24", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "mb2", pc_isa8_cards, "fdc_xt", true)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("mb1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga_m24", true)
+ MCFG_DEVICE_ADD("mb2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", true)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_m20_format)
- MCFG_ISA8_SLOT_ADD("mb:isa", "mb3", pc_isa8_cards, "lpt", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "mb4", pc_isa8_cards, "com", true)
+ MCFG_DEVICE_ADD("mb3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", true)
+ MCFG_DEVICE_ADD("mb4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")
MCFG_RAM_EXTRA_OPTIONS("64K, 128K, 256K, 512K")
- MCFG_CPU_ADD("kbc", TMS7000, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(kbc_map)
- MCFG_TMS7000_IN_PORTA_CB(READ8(m24_state, pa_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(m24_state, pb_w))
+ MCFG_DEVICE_ADD("kbc", TMS7000, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(kbc_map)
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, m24_state, pa_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, m24_state, pb_w))
MCFG_DEVICE_ADD("keyboard", M24_KEYBOARD, 0)
- MCFG_M24_KEYBOARD_OUT_DATA_HANDLER(WRITELINE(m24_state, kbcin_w))
+ MCFG_M24_KEYBOARD_OUT_DATA_HANDLER(WRITELINE(*this, m24_state, kbcin_w))
MCFG_DEVICE_ADD("mm58174an", MM58274C, 0)
MCFG_MM58274C_MODE24(1) // ?
MCFG_MM58274C_DAY1(1) // ?
MCFG_DEVICE_ADD("z8000_apb", M24_Z8000, 0)
- MCFG_M24_Z8000_HALT(WRITELINE(m24_state, halt_i86_w))
+ MCFG_M24_Z8000_HALT(WRITELINE(*this, m24_state, halt_i86_w))
MCFG_DEVICE_MODIFY("mb:dma8237")
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE(":", m24_state, dma_hrq_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, m24_state, dma_hrq_w))
MCFG_DEVICE_MODIFY("mb:pic8259")
- devcb = &downcast<pic8259_device &>(*device).set_out_int_callback(DEVCB_DEVWRITELINE(":", m24_state, int_w));
+ devcb = &downcast<pic8259_device &>(*device).set_out_int_callback(DEVCB_WRITELINE(*this, m24_state, int_w));
/* software lists */
MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150")
diff --git a/src/mame/drivers/m3.cpp b/src/mame/drivers/m3.cpp
index b6661dbcd8b..f053cd1111c 100644
--- a/src/mame/drivers/m3.cpp
+++ b/src/mame/drivers/m3.cpp
@@ -113,9 +113,9 @@ void m3_state::machine_reset()
}
MACHINE_CONFIG_START(m3_state::m3)
- MCFG_CPU_ADD("maincpu", Z80, 2'000'000) // no idea of clock.
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2'000'000) // no idea of clock.
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index 5b32de5e738..c09bd1b2f1c 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -1407,18 +1407,18 @@ void brno_state::machine_reset()
MACHINE_CONFIG_START(m5_state::m5)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(m5_mem)
- MCFG_CPU_IO_MAP(m5_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(m5_mem)
+ MCFG_DEVICE_IO_MAP(m5_io)
MCFG_Z80_DAISY_CHAIN(m5_daisy_chain)
- MCFG_CPU_ADD(Z80_FD5_TAG, Z80, XTAL(14'318'181)/4)
- MCFG_CPU_PROGRAM_MAP(fd5_mem)
- MCFG_CPU_IO_MAP(fd5_io)
+ MCFG_DEVICE_ADD(Z80_FD5_TAG, Z80, XTAL(14'318'181)/4)
+ MCFG_DEVICE_PROGRAM_MAP(fd5_mem)
+ MCFG_DEVICE_IO_MAP(fd5_io)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(14'318'181)/4)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
@@ -1428,7 +1428,7 @@ MACHINE_CONFIG_START(m5_state::m5)
// ZC2 = EXCLK
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m5_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, m5_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -1438,11 +1438,11 @@ MACHINE_CONFIG_START(m5_state::m5)
MCFG_CASSETTE_INTERFACE("m5_cass")
MCFG_DEVICE_ADD(I8255A_TAG, I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(m5_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(m5_state, ppi_pa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(m5_state, ppi_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(m5_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(m5_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, m5_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, m5_state, ppi_pa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, m5_state, ppi_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, m5_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, m5_state, ppi_pc_w))
MCFG_UPD765A_ADD(UPD765_TAG, true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE(Z80_FD5_TAG, INPUT_LINE_IRQ0))
@@ -1473,7 +1473,7 @@ MACHINE_CONFIG_START(m5_state::ntsc)
// video hardware
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(m5_state, sordm5_video_interrupt_callback))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, m5_state, sordm5_video_interrupt_callback))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -1488,7 +1488,7 @@ MACHINE_CONFIG_START(m5_state::pal)
// video hardware
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(m5_state, sordm5_video_interrupt_callback))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, m5_state, sordm5_video_interrupt_callback))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -1502,9 +1502,9 @@ MACHINE_CONFIG_START(brno_state::brno)
m5(config);
// basic machine hardware
- MCFG_CPU_MODIFY(Z80_TAG)
- MCFG_CPU_PROGRAM_MAP(m5_mem_brno)
- MCFG_CPU_IO_MAP(brno_io)
+ MCFG_DEVICE_MODIFY(Z80_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(m5_mem_brno)
+ MCFG_DEVICE_IO_MAP(brno_io)
// MCFG_Z80_DAISY_CHAIN(m5_daisy_chain)
@@ -1516,7 +1516,7 @@ MACHINE_CONFIG_START(brno_state::brno)
// video hardware
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(m5_state, sordm5_video_interrupt_callback))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, m5_state, sordm5_video_interrupt_callback))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
diff --git a/src/mame/drivers/m52.cpp b/src/mame/drivers/m52.cpp
index 9b3d685af48..6cb8cfb86bf 100644
--- a/src/mame/drivers/m52.cpp
+++ b/src/mame/drivers/m52.cpp
@@ -398,10 +398,10 @@ void m52_state::machine_reset()
MACHINE_CONFIG_START(m52_state::m52)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m52_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m52_state, irq0_line_hold)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", m52)
@@ -425,8 +425,8 @@ MACHINE_CONFIG_START(m52_state::alpha1v)
m52(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(alpha1v_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(alpha1v_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 136, 376, 282, 16, 272)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp
index 6f7ba22674b..8220e5505b2 100644
--- a/src/mame/drivers/m57.cpp
+++ b/src/mame/drivers/m57.cpp
@@ -232,9 +232,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(m57_state::m57)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m57_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m57_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/m58.cpp b/src/mame/drivers/m58.cpp
index bfece67a6aa..56a7c9f7f75 100644
--- a/src/mame/drivers/m58.cpp
+++ b/src/mame/drivers/m58.cpp
@@ -195,9 +195,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(m58_state::yard)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
- MCFG_CPU_PROGRAM_MAP(yard_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m58_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(yard_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m58_state, irq0_line_hold)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", yard)
diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp
index 439e1a26b99..271468d11c5 100644
--- a/src/mame/drivers/m62.cpp
+++ b/src/mame/drivers/m62.cpp
@@ -968,10 +968,10 @@ void m62_state::machine_reset()
MACHINE_CONFIG_START(m62_state::ldrun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 24000000/6)
- MCFG_CPU_PROGRAM_MAP(ldrun_map)
- MCFG_CPU_IO_MAP(kungfum_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m62_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 24000000/6)
+ MCFG_DEVICE_PROGRAM_MAP(ldrun_map)
+ MCFG_DEVICE_IO_MAP(kungfum_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m62_state, irq0_line_hold)
/* video hardware */
@@ -1002,10 +1002,10 @@ MACHINE_CONFIG_START(m62_state::kungfum)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(18432000/6)
- MCFG_CPU_PROGRAM_MAP(kungfum_map)
- MCFG_CPU_IO_MAP(kungfum_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(18432000/6)
+ MCFG_DEVICE_PROGRAM_MAP(kungfum_map)
+ MCFG_DEVICE_IO_MAP(kungfum_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1020,10 +1020,10 @@ MACHINE_CONFIG_START(m62_state::battroad)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(18432000/6)
- MCFG_CPU_PROGRAM_MAP(battroad_map)
- MCFG_CPU_IO_MAP(battroad_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(18432000/6)
+ MCFG_DEVICE_PROGRAM_MAP(battroad_map)
+ MCFG_DEVICE_IO_MAP(battroad_io_map)
MCFG_MACHINE_START_OVERRIDE(m62_state,battroad)
@@ -1045,9 +1045,9 @@ MACHINE_CONFIG_START(m62_state::ldrun2)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ldrun2_map)
- MCFG_CPU_IO_MAP(ldrun2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ldrun2_map)
+ MCFG_DEVICE_IO_MAP(ldrun2_io_map)
MCFG_VIDEO_START_OVERRIDE(m62_state,ldrun2)
MCFG_SCREEN_MODIFY("screen")
@@ -1059,9 +1059,9 @@ MACHINE_CONFIG_START(m62_state::ldrun3)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ldrun3_map)
- MCFG_CPU_IO_MAP(ldrun3_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ldrun3_map)
+ MCFG_DEVICE_IO_MAP(ldrun3_io_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(m62_state,ldrun2)
@@ -1074,9 +1074,9 @@ MACHINE_CONFIG_START(m62_state::ldrun4)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ldrun4_map)
- MCFG_CPU_IO_MAP(ldrun4_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ldrun4_map)
+ MCFG_DEVICE_IO_MAP(ldrun4_io_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(m62_state,ldrun4)
@@ -1089,8 +1089,8 @@ MACHINE_CONFIG_START(m62_state::lotlot)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lotlot_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lotlot_map)
/* video hardware */
@@ -1111,9 +1111,9 @@ MACHINE_CONFIG_START(m62_state::kidniki)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kidniki_map)
- MCFG_CPU_IO_MAP(kidniki_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kidniki_map)
+ MCFG_DEVICE_IO_MAP(kidniki_io_map)
/* video hardware */
MCFG_GFXDECODE_ADD("fg_decode", "chr_palette", m62_fg_kidniki)
@@ -1128,8 +1128,8 @@ MACHINE_CONFIG_START(m62_state::spelunkr)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spelunkr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spelunkr_map)
/* video hardware */
MCFG_GFXDECODE_ADD("fg_decode", "chr_palette", m62_fg_spelunkr)
@@ -1144,8 +1144,8 @@ MACHINE_CONFIG_START(m62_state::spelunk2)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spelunk2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spelunk2_map)
/* video hardware */
@@ -1166,10 +1166,10 @@ MACHINE_CONFIG_START(m62_state::youjyudn)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(18432000/6)
- MCFG_CPU_PROGRAM_MAP(youjyudn_map)
- MCFG_CPU_IO_MAP(youjyudn_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(18432000/6)
+ MCFG_DEVICE_PROGRAM_MAP(youjyudn_map)
+ MCFG_DEVICE_IO_MAP(youjyudn_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1187,8 +1187,8 @@ MACHINE_CONFIG_START(m62_state::horizon)
ldrun(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(horizon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(horizon_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp
index 96bf59c153d..7cfe1c8b50b 100644
--- a/src/mame/drivers/m63.cpp
+++ b/src/mame/drivers/m63.cpp
@@ -755,24 +755,24 @@ INTERRUPT_GEN_MEMBER(m63_state::vblank_irq)
MACHINE_CONFIG_START(m63_state::m63)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL(12'000'000)/4) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(m63_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m63_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(12'000'000)/4) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(m63_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m63_state, vblank_irq)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // probably chip at E7 obscured by pulldown resistor
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(m63_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(m63_state, m63_flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(m63_state, pal_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(m63_state, coin1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(m63_state, coin2_w))
-
- MCFG_CPU_ADD("soundcpu",I8039,XTAL(12'000'000)/4) /* ????? */
- MCFG_CPU_PROGRAM_MAP(i8039_map)
- MCFG_CPU_IO_MAP(i8039_port_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(m63_state, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(m63_state, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(m63_state, irq_r))
- MCFG_CPU_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60)
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, m63_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, m63_state, m63_flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, m63_state, pal_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, m63_state, coin1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, m63_state, coin2_w))
+
+ MCFG_DEVICE_ADD("soundcpu",I8039,XTAL(12'000'000)/4) /* ????? */
+ MCFG_DEVICE_PROGRAM_MAP(i8039_map)
+ MCFG_DEVICE_IO_MAP(i8039_port_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, m63_state, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, m63_state, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, m63_state, irq_r))
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60)
MCFG_MACHINE_START_OVERRIDE(m63_state,m63)
MCFG_MACHINE_RESET_OVERRIDE(m63_state,m63)
@@ -797,35 +797,35 @@ MACHINE_CONFIG_START(m63_state::m63)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* ????? */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* ????? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m63_state::atomboy)
m63(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m63_state::fghtbskt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(fghtbskt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m63_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fghtbskt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m63_state, vblank_irq)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(m63_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(m63_state, fghtbskt_flipscreen_w))
- //MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(m63_state, fghtbskt_samples_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, m63_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, m63_state, fghtbskt_flipscreen_w))
+ //MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, m63_state, fghtbskt_samples_w))
- MCFG_CPU_ADD("soundcpu", I8039,XTAL(12'000'000)/4) /* ????? */
- MCFG_CPU_PROGRAM_MAP(i8039_map)
- MCFG_CPU_IO_MAP(i8039_port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2)
+ MCFG_DEVICE_ADD("soundcpu", I8039,XTAL(12'000'000)/4) /* ????? */
+ MCFG_DEVICE_PROGRAM_MAP(i8039_map)
+ MCFG_DEVICE_IO_MAP(i8039_port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2)
MCFG_MACHINE_START_OVERRIDE(m63_state,m63)
MCFG_MACHINE_RESET_OVERRIDE(m63_state,m63)
@@ -848,10 +848,10 @@ MACHINE_CONFIG_START(m63_state::fghtbskt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(m63_state, fghtbskt_sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp
index d298837588b..1d1cd410561 100644
--- a/src/mame/drivers/m6805evs.cpp
+++ b/src/mame/drivers/m6805evs.cpp
@@ -103,8 +103,8 @@ void m6805evs_state::machine_reset()
MACHINE_CONFIG_START(m6805evs_state::m6805evs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6805, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6805, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
ROM_START(m6805evs)
diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp
index a93a2ec6525..e356b8235c7 100644
--- a/src/mame/drivers/m68705prg.cpp
+++ b/src/mame/drivers/m68705prg.cpp
@@ -243,26 +243,26 @@ MACHINE_CONFIG_END
template<> MACHINE_CONFIG_START(p3prg_state::prg)
m68705prg(config);
- MCFG_CPU_ADD("mcu", M68705P3, 1_MHz_XTAL)
- MCFG_M68705_PORTB_W_CB(WRITE8(p3prg_state, pb_w))
+ MCFG_DEVICE_ADD("mcu", M68705P3, 1_MHz_XTAL)
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, p3prg_state, pb_w))
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_START(p5prg_state::prg)
m68705prg(config);
- MCFG_CPU_ADD("mcu", M68705P5, 1_MHz_XTAL)
- MCFG_M68705_PORTB_W_CB(WRITE8(p5prg_state, pb_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, 1_MHz_XTAL)
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, p5prg_state, pb_w))
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_START(r3prg_state::prg)
m68705prg(config);
- MCFG_CPU_ADD("mcu", M68705R3, 1_MHz_XTAL)
- MCFG_M68705_PORTB_W_CB(WRITE8(r3prg_state, pb_w))
+ MCFG_DEVICE_ADD("mcu", M68705R3, 1_MHz_XTAL)
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, r3prg_state, pb_w))
MACHINE_CONFIG_END
template<> MACHINE_CONFIG_START(u3prg_state::prg)
m68705prg(config);
- MCFG_CPU_ADD("mcu", M68705U3, 1_MHz_XTAL)
- MCFG_M68705_PORTB_W_CB(WRITE8(u3prg_state, pb_w))
+ MCFG_DEVICE_ADD("mcu", M68705U3, 1_MHz_XTAL)
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, u3prg_state, pb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp
index 263a1a8637f..ec9bbe4aca6 100644
--- a/src/mame/drivers/m72.cpp
+++ b/src/mame/drivers/m72.cpp
@@ -1861,22 +1861,22 @@ MACHINE_CONFIG_START(m72_state::m72_audio_chips)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
- MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
+ MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO)
MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1884,13 +1884,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m72_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MCFG_CPU_PROGRAM_MAP(m72_map)
- MCFG_CPU_IO_MAP(m72_portmap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu",Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_ram_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_DEVICE_PROGRAM_MAP(m72_map)
+ MCFG_DEVICE_IO_MAP(m72_portmap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("soundcpu",Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_ram_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
@@ -1911,29 +1911,29 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m72)
m72_base(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, fake_nmi, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, fake_nmi, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m72_8751)
m72_base(config);
- MCFG_CPU_ADD("mcu",I8751, XTAL(8'000'000)) /* Uses its own XTAL */
- MCFG_CPU_IO_MAP(mcu_io_map)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(m72_state, mcu_port1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(m72_state, mcu_port3_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m72_state, mcu_int)
+ MCFG_DEVICE_ADD("mcu",I8751, XTAL(8'000'000)) /* Uses its own XTAL */
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, m72_state, mcu_port1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, m72_state, mcu_port3_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m72_state, mcu_int)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::rtype)
m72_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rtype_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rtype_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(rtype_sound_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(rtype_sound_portmap)
MCFG_DEVICE_REMOVE("m72")
MCFG_DEVICE_REMOVE("dac")
@@ -1942,11 +1942,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m72_xmultipl)
m72_8751(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(xmultiplm72_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(xmultiplm72_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MACHINE_CONFIG_END
@@ -1954,11 +1954,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m72_dbreed)
m72_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dbreedm72_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dbreedm72_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MACHINE_CONFIG_END
@@ -1970,14 +1970,14 @@ MACHINE_CONFIG_END
// M81 is closest to M72
MACHINE_CONFIG_START(m72_state::m81_hharry)
m72_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hharry_map)
- MCFG_CPU_IO_MAP(m81_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hharry_map)
+ MCFG_DEVICE_IO_MAP(m81_portmap)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(sound_rom_map)
- MCFG_CPU_IO_MAP(rtype2_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(sound_rom_map)
+ MCFG_DEVICE_IO_MAP(rtype2_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55)
MCFG_VIDEO_START_OVERRIDE(m72_state,hharry)
@@ -1988,16 +1988,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m81_xmultipl)
m81_hharry(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(xmultipl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(xmultipl_map)
MCFG_VIDEO_START_OVERRIDE(m72_state,xmultipl) // different offsets
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::m81_dbreed)
m81_xmultipl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dbreed_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dbreed_map)
MACHINE_CONFIG_END
/****************************************** M84 ***********************************************/
@@ -2006,15 +2006,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::rtype2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MCFG_CPU_PROGRAM_MAP(rtype2_map)
- MCFG_CPU_IO_MAP(m84_portmap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
-
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_rom_map)
- MCFG_CPU_IO_MAP(rtype2_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_DEVICE_PROGRAM_MAP(rtype2_map)
+ MCFG_DEVICE_IO_MAP(m84_portmap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_rom_map)
+ MCFG_DEVICE_IO_MAP(rtype2_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
@@ -2038,8 +2038,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::hharryu)
rtype2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hharryu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hharryu_map)
MCFG_VIDEO_START_OVERRIDE(m72_state,hharryu)
MACHINE_CONFIG_END
@@ -2050,14 +2050,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::cosmccop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V35,MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(kengo_map)
- MCFG_CPU_IO_MAP(m84_v33_portmap)
-
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_rom_map)
- MCFG_CPU_IO_MAP(rtype2_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_ADD("maincpu", V35,MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(kengo_map)
+ MCFG_DEVICE_IO_MAP(m84_v33_portmap)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_rom_map)
+ MCFG_DEVICE_IO_MAP(rtype2_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MCFG_MACHINE_START_OVERRIDE(m72_state,kengo)
@@ -2081,7 +2081,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::kengo)
cosmccop(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(gunforce_decryption_table)
MACHINE_CONFIG_END
@@ -2097,14 +2097,14 @@ M82-B-A and as the bottom board
MACHINE_CONFIG_START(m72_state::m82)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MCFG_CPU_PROGRAM_MAP(m82_map)
- MCFG_CPU_IO_MAP(m82_portmap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_rom_map)
- MCFG_CPU_IO_MAP(rtype2_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_DEVICE_PROGRAM_MAP(m82_map)
+ MCFG_DEVICE_IO_MAP(m82_portmap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_rom_map)
+ MCFG_DEVICE_IO_MAP(rtype2_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
@@ -2132,14 +2132,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m72_state::poundfor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
- MCFG_CPU_PROGRAM_MAP(rtype2_map)
- MCFG_CPU_IO_MAP(poundfor_portmap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_rom_map)
- MCFG_CPU_IO_MAP(poundfor_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(m72_state, fake_nmi, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
+ MCFG_DEVICE_PROGRAM_MAP(rtype2_map)
+ MCFG_DEVICE_IO_MAP(poundfor_portmap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_rom_map)
+ MCFG_DEVICE_IO_MAP(poundfor_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m72_state, fake_nmi, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp
index 49d9fefc9af..06511282b05 100644
--- a/src/mame/drivers/m79152pc.cpp
+++ b/src/mame/drivers/m79152pc.cpp
@@ -126,9 +126,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(m79152pc_state::m79152pc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -142,27 +142,27 @@ MACHINE_CONFIG_START(m79152pc_state::m79152pc)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", z80sio_device, rxca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", z80sio_device, rxca_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
//MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("uart", Z80SIO, XTAL(4'000'000))
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- //MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- //MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- //MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", z80sio_device, ctsa_w))
- //MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- //MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", z80sio_device, rxb_w))
- //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", z80sio_device, ctsb_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+ //MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ //MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ //MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", z80sio_device, ctsa_w))
+ //MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ //MCFG_RS232_RXD_HANDLER(WRITELINE("uart", z80sio_device, rxb_w))
+ //MCFG_RS232_CTS_HANDLER(WRITELINE("uart", z80sio_device, ctsb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp
index 97e1d3fa07d..dc953c96e06 100644
--- a/src/mame/drivers/m79amb.cpp
+++ b/src/mame/drivers/m79amb.cpp
@@ -197,9 +197,9 @@ INTERRUPT_GEN_MEMBER(m79amb_state::m79amb_interrupt)
MACHINE_CONFIG_START(m79amb_state::m79amb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(19'660'800) / 10)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", m79amb_state, m79amb_interrupt)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(19'660'800) / 10)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", m79amb_state, m79amb_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -212,7 +212,7 @@ MACHINE_CONFIG_START(m79amb_state::m79amb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(m79amb)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp
index 69a35eaef30..dbfbdd11db4 100644
--- a/src/mame/drivers/m90.cpp
+++ b/src/mame/drivers/m90.cpp
@@ -723,16 +723,16 @@ WRITE_LINE_MEMBER(m90_state::bomblord_vblank_int_w)
/* Basic hardware -- no decryption table is setup for CPU */
MACHINE_CONFIG_START(m90_state::m90)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V35, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map)
- MCFG_CPU_IO_MAP(m90_main_cpu_io_map)
-
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(m90_sound_cpu_map)
- MCFG_CPU_IO_MAP(m90_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, nmi_line_pulse, 128*60) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_ADD("maincpu", V35, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(m90_main_cpu_map)
+ MCFG_DEVICE_IO_MAP(m90_main_cpu_io_map)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(m90_sound_cpu_map)
+ MCFG_DEVICE_IO_MAP(m90_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, nmi_line_pulse, 128*60) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -752,20 +752,20 @@ MACHINE_CONFIG_START(m90_state::m90)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
- MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
+ MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO)
MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545)) /* verified on pcb */
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
MCFG_SOUND_ROUTE(0, "speaker", 0.15)
MCFG_SOUND_ROUTE(1, "speaker", 0.15)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -773,13 +773,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::hasamu)
m90(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(gunforce_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::quizf1)
m90(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(lethalth_decryption_table)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8)
@@ -787,7 +787,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::matchit2)
m90(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(matchit2_decryption_table)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(6*8, 54*8-1, 17*8-8, 47*8-1+8)
@@ -795,7 +795,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::riskchal)
m90(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(gussun_decryption_table)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
@@ -803,7 +803,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::bombrman)
m90(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(bomberman_decryption_table)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
@@ -811,7 +811,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::bbmanwj)
m90(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_V25_CONFIG(dynablaster_decryption_table)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
@@ -819,26 +819,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::bbmanw)
bbmanwj(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(m99_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, fake_nmi, 128*60)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(m99_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, fake_nmi, 128*60)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::bomblord)
m90(config);
- MCFG_CPU_REPLACE("maincpu", V30, 32000000/4)
- MCFG_CPU_PROGRAM_MAP(bomblord_main_cpu_map)
- MCFG_CPU_IO_MAP(m90_main_cpu_io_map)
+ MCFG_DEVICE_REPLACE("maincpu", V30, 32000000/4)
+ MCFG_DEVICE_PROGRAM_MAP(bomblord_main_cpu_map)
+ MCFG_DEVICE_IO_MAP(m90_main_cpu_io_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(m99_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, bomblord_fake_nmi, 128*60)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(m99_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, bomblord_fake_nmi, 128*60)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(10*8, 50*8-1, 17*8, 47*8-1)
MCFG_SCREEN_UPDATE_DRIVER(m90_state, screen_update_bomblord)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m90_state, bomblord_vblank_int_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, m90_state, bomblord_vblank_int_w))
MCFG_VIDEO_START_OVERRIDE(m90_state,bomblord)
MACHINE_CONFIG_END
@@ -846,20 +846,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m90_state::dynablsb)
m90(config);
- MCFG_CPU_REPLACE("maincpu", V30, 32000000/4)
- MCFG_CPU_PROGRAM_MAP(dynablsb_main_cpu_map)
- MCFG_CPU_IO_MAP(dynablsb_main_cpu_io_map)
+ MCFG_DEVICE_REPLACE("maincpu", V30, 32000000/4)
+ MCFG_DEVICE_PROGRAM_MAP(dynablsb_main_cpu_map)
+ MCFG_DEVICE_IO_MAP(dynablsb_main_cpu_io_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(dynablsb_sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(m90_state, irq0_line_hold, 64*60) /* half the sample rate of the original */
- MCFG_CPU_IRQ_ACKNOWLEDGE_REMOVE()
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(dynablsb_sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(m90_state, irq0_line_hold, 64*60) /* half the sample rate of the original */
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_REMOVE()
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(320, 240)
MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(m90_state, screen_update_dynablsb)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(m90_state, dynablsb_vblank_int_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, m90_state, dynablsb_vblank_int_w))
MCFG_VIDEO_START_OVERRIDE(m90_state,dynablsb)
@@ -870,7 +870,7 @@ MACHINE_CONFIG_START(m90_state::dynablsb)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(false)
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_YM2151_IRQ_HANDLER(NOOP) /* this bootleg polls the YM2151 instead of taking interrupts from it */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index 1c06a2354be..a363a16b9b8 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -894,13 +894,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(m92_state::m92)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",V33,XTAL(18'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(m92_map)
- MCFG_CPU_IO_MAP(m92_portmap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu",V33,XTAL(18'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(m92_map)
+ MCFG_DEVICE_IO_MAP(m92_portmap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("upd71059c", pic8259_device, inta_cb)
- MCFG_CPU_ADD("soundcpu" ,V35, XTAL(14'318'181))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu" ,V35, XTAL(14'318'181))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("upd71059c", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
@@ -934,7 +934,7 @@ MACHINE_CONFIG_START(m92_state::m92)
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("upd71059c", pic8259_device, ir3_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("upd71059c", pic8259_device, ir3_w))
MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181)/4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", NEC_INPUT_LINE_INTP0))
@@ -948,52 +948,52 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::gunforce)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(gunforce_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::bmaster)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(bomberman_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::lethalth)
m92(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lethalth_map)
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lethalth_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(lethalth_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::uccops)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(dynablaster_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::mysticri)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(mysticri_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::majtitl2)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(majtitl2_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::hook)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(hook_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::ppan)
m92(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(ppan_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(ppan_portmap)
MCFG_DEVICE_REMOVE("soundcpu")
MCFG_DEVICE_REMOVE("soundlatch")
@@ -1012,21 +1012,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::rtypeleo)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(rtypeleo_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::inthunt)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(inthunt_decryption_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::nbbatman)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(leagueman_decryption_table)
MACHINE_CONFIG_END
@@ -1047,7 +1047,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::psoldier)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(psoldier_decryption_table)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", psoldier)
@@ -1055,7 +1055,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::dsoccr94j)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(dsoccr94_decryption_table)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", psoldier)
@@ -1063,7 +1063,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(m92_state::gunforc2)
m92(config);
- MCFG_CPU_MODIFY("soundcpu")
+ MCFG_DEVICE_MODIFY("soundcpu")
MCFG_V25_CONFIG(lethalth_decryption_table)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index 1ee8b801fe2..908b0c6ae96 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -936,9 +936,9 @@ static const floppy_interface mac_floppy_interface =
MACHINE_CONFIG_START(mac_state::mac512ke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
- MCFG_CPU_PROGRAM_MAP(mac512ke_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mac512ke_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -956,7 +956,7 @@ MACHINE_CONFIG_START(mac_state::mac512ke)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_PWM, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 2 x ls161
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_PWM, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 2 x ls161
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -966,20 +966,20 @@ MACHINE_CONFIG_START(mac_state::mac512ke)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_MACKBD_ADD(MACKBD_TAG)
#ifdef MAC_USE_EMULATED_KBD
- MCFG_MACKBD_DATAOUT_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
- MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(mac_state, mac_kbd_clk_in))
+ MCFG_MACKBD_DATAOUT_HANDLER(WRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(*this, mac_state, mac_kbd_clk_in))
#endif
/* internal ram */
@@ -989,8 +989,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macplus)
mac512ke(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(macplus_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(macplus_map)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
@@ -998,7 +998,7 @@ MACHINE_CONFIG_START(mac_state::macplus)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_MODIFY(mac_floppy_interface)
@@ -1014,17 +1014,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macse)
macplus(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(macse_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(macse_map)
MCFG_DEVICE_REMOVE("via6522_0")
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_bbadb))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -1039,17 +1039,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macclasc)
macplus(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(macse_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(macse_map)
MCFG_DEVICE_REMOVE("via6522_0")
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_bbadb))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -1061,9 +1061,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macprtb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, C15M)
- MCFG_CPU_PROGRAM_MAP(macprtb_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68000, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(macprtb_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -1083,7 +1083,7 @@ MACHINE_CONFIG_START(mac_state::macprtb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1096,20 +1096,20 @@ MACHINE_CONFIG_START(mac_state::macprtb)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_IWM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a_pmu))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_pmu))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a_pmu))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_pmu))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a_pmu))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b_pmu))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a_pmu))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_pmu))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1123,15 +1123,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020PMMU, C15M)
- MCFG_CPU_PROGRAM_MAP(macii_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68020PMMU, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(macii_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_PALETTE_ADD("palette", 256)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1139,12 +1139,12 @@ MACHINE_CONFIG_START(mac_state::macii)
MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("nubus","nb9", mac_nubus_cards, "48gc")
MCFG_NUBUS_SLOT_ADD("nubus","nba", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbb", mac_nubus_cards, nullptr)
@@ -1159,28 +1159,28 @@ MACHINE_CONFIG_START(mac_state::macii)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_IWM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_ii))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b_ii))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_bbadb))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, C7M/10)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state, mac_via2_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state, mac_via2_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via2_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1194,21 +1194,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciihmu)
macii(config);
- MCFG_CPU_REPLACE("maincpu", M68020HMMU, C15M)
- MCFG_CPU_PROGRAM_MAP(macii_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68020HMMU, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(macii_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciifx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68030, 40000000)
- MCFG_CPU_PROGRAM_MAP(maciifx_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68030, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(maciifx_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1216,12 +1216,12 @@ MACHINE_CONFIG_START(mac_state::maciifx)
MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("nubus","nb9", mac_nubus_cards, "48gc")
MCFG_NUBUS_SLOT_ADD("nubus","nba", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbb", mac_nubus_cards, nullptr)
@@ -1235,21 +1235,21 @@ MACHINE_CONFIG_START(mac_state::maciifx)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_IWM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_ii))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b_ii))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1264,9 +1264,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maclc)
macii(config);
- MCFG_CPU_REPLACE("maincpu", M68020HMMU, C15M)
- MCFG_CPU_PROGRAM_MAP(maclc_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68020HMMU, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(maclc_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(256)
@@ -1279,7 +1279,7 @@ MACHINE_CONFIG_START(mac_state::maclc)
MCFG_SCREEN_SIZE(1024,768)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macv8)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mac_state, mac_rbv_vbl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mac_state, mac_rbv_vbl))
MCFG_DEFAULT_LAYOUT(layout_mac)
MCFG_RAM_MODIFY(RAM_TAG)
@@ -1287,7 +1287,7 @@ MACHINE_CONFIG_START(mac_state::maclc)
MCFG_RAM_EXTRA_OPTIONS("4M,6M,8M,10M")
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_egadb))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_egadb))
MCFG_NUBUS_SLOT_REMOVE("nb9")
MCFG_NUBUS_SLOT_REMOVE("nba")
@@ -1299,32 +1299,32 @@ MACHINE_CONFIG_START(mac_state::maclc)
MCFG_DEVICE_ADD("pds", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("pds","lcpds", mac_lcpds_cards, nullptr)
- MCFG_ASC_REPLACE("asc", C15M, V8, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_REPLACE("asc", C15M, V8, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_EGRET_ADD(EGRET_341S0850)
- MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_EGRET_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_EGRET_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_EGRET_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maclc2)
maclc(config);
- MCFG_CPU_REPLACE("maincpu", M68030, C15M)
- MCFG_CPU_PROGRAM_MAP(maclc_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(maclc_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1336,21 +1336,21 @@ MACHINE_CONFIG_START(mac_state::maccclas)
MCFG_EGRET_REMOVE()
MCFG_CUDA_ADD(CUDA_341S0788) // should be 0417, but that version won't sync up properly with the '030 right now
- MCFG_CUDA_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_CUDA_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_CUDA_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_CUDA_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_cdadb))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maclc3)
maclc(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000)
- MCFG_CPU_PROGRAM_MAP(maclc3_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(maclc3_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_VIDEO_START_OVERRIDE(mac_state,macsonora)
MCFG_VIDEO_RESET_OVERRIDE(mac_state,macsonora)
@@ -1362,15 +1362,15 @@ MACHINE_CONFIG_START(mac_state::maclc3)
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("8M,16M,32M,48M,64M,80M")
- MCFG_ASC_REPLACE("asc", C15M, SONORA, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_REPLACE("asc", C15M, SONORA, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_EGRET_REPLACE(EGRET_341S0851)
- MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_EGRET_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_EGRET_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_EGRET_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maclc520)
@@ -1378,21 +1378,21 @@ MACHINE_CONFIG_START(mac_state::maclc520)
MCFG_EGRET_REMOVE()
MCFG_CUDA_ADD(CUDA_341S0060)
- MCFG_CUDA_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_CUDA_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_CUDA_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_CUDA_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_cdadb))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciivx)
maclc(config);
- MCFG_CPU_REPLACE("maincpu", M68030, C32M)
- MCFG_CPU_PROGRAM_MAP(maclc3_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, C32M)
+ MCFG_DEVICE_PROGRAM_MAP(maclc3_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_VIDEO_START_OVERRIDE(mac_state,macv8)
MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv)
@@ -1402,12 +1402,12 @@ MACHINE_CONFIG_START(mac_state::maciivx)
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, nullptr)
@@ -1417,18 +1417,18 @@ MACHINE_CONFIG_START(mac_state::maciivx)
MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M,40M,44M,48M,52M,56M,60M,64M")
MCFG_EGRET_REPLACE(EGRET_341S0851)
- MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_EGRET_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_EGRET_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_EGRET_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciivi)
maclc(config);
- MCFG_CPU_REPLACE("maincpu", M68030, C15M)
- MCFG_CPU_PROGRAM_MAP(maclc3_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(maclc3_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_VIDEO_START_OVERRIDE(mac_state,macv8)
MCFG_VIDEO_RESET_OVERRIDE(mac_state,macrbv)
@@ -1438,12 +1438,12 @@ MACHINE_CONFIG_START(mac_state::maciivi)
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("nubus","nbc", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, nullptr)
@@ -1453,18 +1453,18 @@ MACHINE_CONFIG_START(mac_state::maciivi)
MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M,40M,44M,48M,52M,56M,60M,64M")
MCFG_EGRET_REPLACE(EGRET_341S0851)
- MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_EGRET_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_EGRET_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_EGRET_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciix)
macii(config);
- MCFG_CPU_REPLACE("maincpu", M68030, C15M)
- MCFG_CPU_PROGRAM_MAP(macii_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(macii_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -1480,9 +1480,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macse30)
- MCFG_CPU_ADD("maincpu", M68030, C15M)
- MCFG_CPU_PROGRAM_MAP(macse30_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68030, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(macse30_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
/* video hardware */
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
@@ -1501,7 +1501,7 @@ MACHINE_CONFIG_START(mac_state::macse30)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1514,38 +1514,38 @@ MACHINE_CONFIG_START(mac_state::macse30)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_DEVICE_ADD("pds", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("pds","pds030", mac_pds030_cards, nullptr)
MCFG_SWIM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_bbadb))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state, mac_via2_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state, mac_via2_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via2_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1558,9 +1558,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macpb140)
- MCFG_CPU_ADD("maincpu", M68030, C15M)
- MCFG_CPU_PROGRAM_MAP(macpb140_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68030, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(macpb140_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
/* video hardware */
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
@@ -1579,7 +1579,7 @@ MACHINE_CONFIG_START(mac_state::macpb140)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1590,28 +1590,28 @@ MACHINE_CONFIG_START(mac_state::macpb140)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_SWIM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_via2pmu))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_via2pmu))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b_via2pmu))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_via2pmu))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a_pmu))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b_pmu))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a_pmu))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b_pmu))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state, mac_via2_in_a_pmu))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state, mac_via2_in_b_pmu))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via2_out_a_pmu))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via2_out_b_pmu))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via2_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1625,9 +1625,9 @@ MACHINE_CONFIG_END
// PowerBook 145 = 140 @ 25 MHz (still 2MB RAM - the 145B upped that to 4MB)
MACHINE_CONFIG_START(mac_state::macpb145)
macpb140(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000)
- MCFG_CPU_PROGRAM_MAP(macpb140_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(macpb140_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1637,9 +1637,9 @@ MACHINE_CONFIG_END
// PowerBook 170 = 140 @ 25 MHz with an active-matrix LCD (140/145/145B were passive)
MACHINE_CONFIG_START(mac_state::macpb170)
macpb140(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000)
- MCFG_CPU_PROGRAM_MAP(macpb140_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(macpb140_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1648,9 +1648,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macpb160)
- MCFG_CPU_ADD("maincpu", M68030, 25000000)
- MCFG_CPU_PROGRAM_MAP(macpb160_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(macpb160_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
/* video hardware */
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
@@ -1669,7 +1669,7 @@ MACHINE_CONFIG_START(mac_state::macpb160)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1680,28 +1680,28 @@ MACHINE_CONFIG_START(mac_state::macpb160)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_SWIM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_via2pmu))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_via2pmu))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b_via2pmu))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_via2pmu))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a_pmu))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b_pmu))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a_pmu))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b_pmu))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state, mac_via2_in_a_pmu))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state, mac_via2_in_b_pmu))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via2_out_a_pmu))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via2_out_b_pmu))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via2_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1714,9 +1714,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macpb180)
macpb160(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 33000000)
- MCFG_CPU_PROGRAM_MAP(macpb160_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 33000000)
+ MCFG_DEVICE_PROGRAM_MAP(macpb160_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1725,9 +1725,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macpb180c)
macpb160(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 33000000)
- MCFG_CPU_PROGRAM_MAP(macpb165c_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 33000000)
+ MCFG_DEVICE_PROGRAM_MAP(macpb165c_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_SCREEN_MODIFY(MAC_SCREEN_NAME)
MCFG_SCREEN_SIZE(800, 525)
@@ -1742,9 +1742,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macpd210)
macpb160(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000)
- MCFG_CPU_PROGRAM_MAP(macpd210_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(macpd210_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1753,9 +1753,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macclas2)
maclc(config);
- MCFG_CPU_REPLACE("maincpu", M68030, C15M)
- MCFG_CPU_PROGRAM_MAP(maclc_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, C15M)
+ MCFG_DEVICE_PROGRAM_MAP(maclc_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_VIDEO_START_OVERRIDE(mac_state,macv8)
MCFG_VIDEO_RESET_OVERRIDE(mac_state,maceagle)
@@ -1765,7 +1765,7 @@ MACHINE_CONFIG_START(mac_state::macclas2)
MCFG_SCREEN_VISIBLE_AREA(0, MAC_H_VIS-1, 0, MAC_V_VIS-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv)
- MCFG_ASC_REPLACE("asc", C15M, EAGLE, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_REPLACE("asc", C15M, EAGLE, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1774,18 +1774,18 @@ MACHINE_CONFIG_START(mac_state::macclas2)
MCFG_RAM_EXTRA_OPTIONS("2M,4M,6M,8M,10M")
MCFG_EGRET_REPLACE(EGRET_341S0851)
- MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_EGRET_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_EGRET_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_EGRET_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciici)
macii(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000)
- MCFG_CPU_PROGRAM_MAP(maciici_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(maciici_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(256)
@@ -1803,7 +1803,7 @@ MACHINE_CONFIG_START(mac_state::maciici)
MCFG_SCREEN_SIZE(640, 870)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mac_state, mac_rbv_vbl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mac_state, mac_rbv_vbl))
MCFG_DEFAULT_LAYOUT(layout_mac)
/* internal ram */
@@ -1815,9 +1815,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::maciisi)
macii(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 20000000)
- MCFG_CPU_PROGRAM_MAP(maciici_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(maciici_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_ENTRIES(256)
@@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(mac_state::maciisi)
MCFG_SCREEN_SIZE(640, 870)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mac_state, mac_rbv_vbl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mac_state, mac_rbv_vbl))
MCFG_DEFAULT_LAYOUT(layout_mac)
/* internal ram */
@@ -1847,21 +1847,21 @@ MACHINE_CONFIG_START(mac_state::maciisi)
MCFG_RAM_EXTRA_OPTIONS("4M,8M,16M,32M,48M,64M,128M")
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_egadb))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_egadb))
MCFG_EGRET_ADD(EGRET_344S0100)
- MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_EGRET_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_EGRET_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_EGRET_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::pwrmac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC601, 60000000)
- MCFG_CPU_PROGRAM_MAP(pwrmac_map)
+ MCFG_DEVICE_ADD("maincpu", PPC601, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(pwrmac_map)
/* video hardware */
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
@@ -1890,28 +1890,28 @@ MACHINE_CONFIG_START(mac_state::pwrmac)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac_state, mac_scsi_irq))
MCFG_IWM_ADD("fdc", mac_iwm_interface)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_cdadb))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, 783360)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state, mac_via2_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state, mac_via2_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via2_irq))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -1919,17 +1919,17 @@ MACHINE_CONFIG_START(mac_state::pwrmac)
MCFG_RAM_EXTRA_OPTIONS("16M,32M,64M,128M")
MCFG_CUDA_ADD(CUDA_341S0060)
- MCFG_CUDA_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
- MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
- MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_CUDA_RESET_CALLBACK(WRITELINE(*this, mac_state, cuda_reset_w))
+ MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(*this, mac_state, adb_linechange_w))
+ MCFG_CUDA_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_CUDA_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac_state::macqd700)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68040, 25000000)
- MCFG_CPU_PROGRAM_MAP(quadra700_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
+ MCFG_DEVICE_ADD("maincpu", M68040, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(quadra700_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MCFG_SCREEN_ADD(MAC_SCREEN_NAME, RASTER)
MCFG_SCREEN_REFRESH_RATE(75.08)
@@ -1945,7 +1945,7 @@ MACHINE_CONFIG_START(mac_state::macqd700)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, EASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, EASC, WRITELINE(*this, mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1953,12 +1953,12 @@ MACHINE_CONFIG_START(mac_state::macqd700)
MCFG_RTC3430042_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("nubus", NUBUS, 0)
MCFG_NUBUS_CPU("maincpu")
- MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(mac_state, nubus_irq_9_w))
- MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(mac_state, nubus_irq_a_w))
- MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(mac_state, nubus_irq_b_w))
- MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(mac_state, nubus_irq_c_w))
- MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(mac_state, nubus_irq_d_w))
- MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
+ MCFG_NUBUS_OUT_IRQ9_CB(WRITELINE(*this, mac_state, nubus_irq_9_w))
+ MCFG_NUBUS_OUT_IRQA_CB(WRITELINE(*this, mac_state, nubus_irq_a_w))
+ MCFG_NUBUS_OUT_IRQB_CB(WRITELINE(*this, mac_state, nubus_irq_b_w))
+ MCFG_NUBUS_OUT_IRQC_CB(WRITELINE(*this, mac_state, nubus_irq_c_w))
+ MCFG_NUBUS_OUT_IRQD_CB(WRITELINE(*this, mac_state, nubus_irq_d_w))
+ MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(*this, mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("nubus","nbd", mac_nubus_cards, nullptr)
MCFG_NUBUS_SLOT_ADD("nubus","nbe", mac_nubus_cards, nullptr)
@@ -1966,22 +1966,22 @@ MACHINE_CONFIG_START(mac_state::macqd700)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(mac_state, set_scc_interrupt))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, mac_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via_out_b_bbadb))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac_state,mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, C7M/10)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac_state, mac_via2_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac_state, mac_via2_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac_state,mac_via2_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac_state,mac_via2_out_b))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac_state,mac_via2_irq))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
@@ -1989,8 +1989,8 @@ MACHINE_CONFIG_START(mac_state::macqd700)
MCFG_DEVICE_ADD(MAC_539X_1_TAG, NCR539X, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR539X_OUT_IRQ_CB(WRITELINE(mac_state, irq_539x_1_w))
- MCFG_NCR539X_OUT_DRQ_CB(WRITELINE(mac_state, drq_539x_1_w))
+ MCFG_NCR539X_OUT_IRQ_CB(WRITELINE(*this, mac_state, irq_539x_1_w))
+ MCFG_NCR539X_OUT_DRQ_CB(WRITELINE(*this, mac_state, drq_539x_1_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index 3f2b3ce51fc..5723630b2b2 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -1326,8 +1326,8 @@ static const floppy_interface mac_floppy_interface =
MACHINE_CONFIG_START(mac128_state::mac512ke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
- MCFG_CPU_PROGRAM_MAP(mac512ke_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mac512ke_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -1345,7 +1345,7 @@ MACHINE_CONFIG_START(mac128_state::mac512ke)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD(DAC_TAG, DAC_8BIT_PWM, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 2 x ls161
+ MCFG_DEVICE_ADD(DAC_TAG, DAC_8BIT_PWM, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // 2 x ls161
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, DAC_TAG, 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, DAC_TAG, -1.0, DAC_VREF_NEG_INPUT)
@@ -1355,20 +1355,20 @@ MACHINE_CONFIG_START(mac128_state::mac512ke)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_interface)
MCFG_SCC85C30_ADD("scc", C7M, C3_7M, 0, C3_7M, 0)
- MCFG_Z80SCC_OUT_INT_CB(WRITELINE(mac128_state, set_scc_interrupt))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, mac128_state, set_scc_interrupt))
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_READPA_HANDLER(READ8(mac128_state,mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(mac128_state,mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac128_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac128_state,mac_via_out_b))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac128_state,mac_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac128_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, mac128_state,mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, mac128_state,mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, mac128_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, mac128_state,mac_via_out_b))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, mac128_state,mac_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, mac128_state,mac_via_irq))
MCFG_MACKBD_ADD(MACKBD_TAG)
#ifdef MAC_USE_EMULATED_KBD
- MCFG_MACKBD_DATAOUT_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
- MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(mac128_state, mac_kbd_clk_in))
+ MCFG_MACKBD_DATAOUT_HANDLER(WRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(*this, mac128_state, mac_kbd_clk_in))
#endif
/* internal ram */
@@ -1391,8 +1391,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mac128_state::macplus)
mac512ke(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(macplus_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(macplus_map)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
@@ -1400,7 +1400,7 @@ MACHINE_CONFIG_START(mac128_state::macplus)
MCFG_DEVICE_ADD("ncr5380", NCR5380, C7M)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_NCR5380_IRQ_CB(WRITELINE(mac128_state, mac_scsi_irq))
+ MCFG_NCR5380_IRQ_CB(WRITELINE(*this, mac128_state, mac_scsi_irq))
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_MODIFY(mac_floppy_interface)
diff --git a/src/mame/drivers/macp.cpp b/src/mame/drivers/macp.cpp
index 3f4bd7be256..9904459cefb 100644
--- a/src/mame/drivers/macp.cpp
+++ b/src/mame/drivers/macp.cpp
@@ -55,9 +55,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(macp_state::macp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(macp_map)
- MCFG_CPU_IO_MAP(macp_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(macp_map)
+ MCFG_DEVICE_IO_MAP(macp_io)
/* video hardware */
//MCFG_DEFAULT_LAYOUT()
@@ -71,8 +71,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(macp_state::macp0)
macp(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(macp0_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(macp0_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(macp_state::macpmsm)
diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp
index b113b380f5b..2dfdbdf54a2 100644
--- a/src/mame/drivers/macpci.cpp
+++ b/src/mame/drivers/macpci.cpp
@@ -92,8 +92,8 @@ uint32_t macpci_state::screen_update_pippin(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(macpci_state::pippin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC603, 66000000)
- MCFG_CPU_PROGRAM_MAP(pippin_mem)
+ MCFG_DEVICE_ADD("maincpu", PPC603, 66000000)
+ MCFG_DEVICE_PROGRAM_MAP(pippin_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -109,7 +109,7 @@ MACHINE_CONFIG_START(macpci_state::pippin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_DEVICE_ADD( "cdda", CDDA )
MCFG_SOUND_ROUTE( 0, "lspeaker", 1.00 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 1.00 )
@@ -121,20 +121,20 @@ MACHINE_CONFIG_START(macpci_state::pippin)
MCFG_RAM_DEFAULT_SIZE("32M")
MCFG_DEVICE_ADD("via6522_0", VIA6522, C7M/10)
- MCFG_VIA6522_READPA_HANDLER(READ8(macpci_state, mac_via_in_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(macpci_state, mac_via_in_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(macpci_state,mac_via_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(macpci_state,mac_via_out_b))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(macpci_state, mac_adb_via_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(macpci_state,mac_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, macpci_state, mac_via_in_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, macpci_state, mac_via_in_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, macpci_state,mac_via_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, macpci_state,mac_via_out_b))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, macpci_state, mac_adb_via_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, macpci_state,mac_via_irq))
//MCFG_DEVICE_ADD("scc", SCC8530, C7M)
- //MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(macpci_state, set_scc_interrupt))
+ //MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, macpci_state, set_scc_interrupt))
MCFG_CUDA_ADD(CUDA_341S0060)
- MCFG_CUDA_RESET_CALLBACK(WRITELINE(macpci_state, cuda_reset_w))
- MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(macpci_state, cuda_adb_linechange_w))
- MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
- MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
+ MCFG_CUDA_RESET_CALLBACK(WRITELINE(*this, macpci_state, cuda_reset_w))
+ MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(*this, macpci_state, cuda_adb_linechange_w))
+ MCFG_CUDA_VIA_CLOCK_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb1))
+ MCFG_CUDA_VIA_DATA_CALLBACK(WRITELINE("via6522_0", via6522_device, write_cb2))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp
index a4cb0b55ecf..dfa688351ca 100644
--- a/src/mame/drivers/macrossp.cpp
+++ b/src/mame/drivers/macrossp.cpp
@@ -544,12 +544,12 @@ void macrossp_state::machine_reset()
MACHINE_CONFIG_START(macrossp_state::macrossp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */
- MCFG_CPU_PROGRAM_MAP(macrossp_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", macrossp_state, irq3_line_hold) // there are others ...
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(macrossp_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", macrossp_state, irq3_line_hold) // there are others ...
- MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(macrossp_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 32000000/2) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(macrossp_sound_map)
/* video hardware */
@@ -559,7 +559,7 @@ MACHINE_CONFIG_START(macrossp_state::macrossp)
MCFG_SCREEN_SIZE(32*16, 16*16)
MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 0*16, 15*16-1)
MCFG_SCREEN_UPDATE_DRIVER(macrossp_state, screen_update_macrossp)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(macrossp_state, screen_vblank_macrossp))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, macrossp_state, screen_vblank_macrossp))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", macrossp)
@@ -571,13 +571,13 @@ MACHINE_CONFIG_START(macrossp_state::macrossp)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_SOUND_ADD("ensoniq", ES5506, 16000000)
+ MCFG_DEVICE_ADD("ensoniq", ES5506, 16000000)
MCFG_ES5506_REGION0("ensoniq.0")
MCFG_ES5506_REGION1("ensoniq.1")
MCFG_ES5506_REGION2("ensoniq.2")
MCFG_ES5506_REGION3("ensoniq.3")
MCFG_ES5506_CHANNELS(1) /* channels */
- MCFG_ES5506_IRQ_CB(WRITELINE(macrossp_state, irqhandler))
+ MCFG_ES5506_IRQ_CB(WRITELINE(*this, macrossp_state, irqhandler))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.1)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp
index 7ff6fad678f..fae15235e26 100644
--- a/src/mame/drivers/macs.cpp
+++ b/src/mame/drivers/macs.cpp
@@ -498,12 +498,12 @@ ST0016_DMA_OFFS_CB(macs_state::dma_offset)
MACHINE_CONFIG_START(macs_state::macs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(macs_mem)
- MCFG_CPU_IO_MAP(macs_io)
+ MCFG_DEVICE_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(macs_mem)
+ MCFG_DEVICE_IO_MAP(macs_io)
MCFG_ST0016_DMA_OFFS_CB(macs_state, dma_offset)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", macs_state, irq0_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", macs_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(macs_state, macs)
MCFG_MACHINE_RESET_OVERRIDE(macs_state, macs)
diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp
index 876d32de1ad..9bc9700b42b 100644
--- a/src/mame/drivers/madalien.cpp
+++ b/src/mame/drivers/madalien.cpp
@@ -153,11 +153,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(madalien_state::madalien)
/* main CPU */
- MCFG_CPU_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", M6502, SOUND_CLOCK / 8) /* 512kHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, SOUND_CLOCK / 8) /* 512kHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
madalien_video(config);
@@ -170,14 +170,14 @@ MACHINE_CONFIG_START(madalien_state::madalien)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK / 4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(madalien_state, madalien_portA_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(madalien_state, madalien_portB_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SOUND_CLOCK / 4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, madalien_state, madalien_portA_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, madalien_state, madalien_portB_w))
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
MCFG_SOUND_ROUTE(1, "discrete", 1.0, 1)
MCFG_SOUND_ROUTE(2, "discrete", 1.0, 2)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(madalien)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp
index 6c3faa95925..a846f511513 100644
--- a/src/mame/drivers/madmotor.cpp
+++ b/src/mame/drivers/madmotor.cpp
@@ -268,12 +268,12 @@ uint32_t madmotor_state::screen_update_madmotor(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(madmotor_state::madmotor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
- MCFG_CPU_PROGRAM_MAP(madmotor_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", madmotor_state, irq6_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
+ MCFG_DEVICE_PROGRAM_MAP(madmotor_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", madmotor_state, irq6_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, 8053000/2) /* Custom chip 45, Crystal near CPU is 8.053 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(madmotor_state::madmotor)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ym1", YM2203, 21470000/6)
+ MCFG_DEVICE_ADD("ym1", YM2203, 21470000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_YM2151_ADD("ym2", 21470000/6)
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index ba4617d33ac..18d65da9f15 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -697,9 +697,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(magic10_state::magic10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) // 10 MHz.
- MCFG_CPU_PROGRAM_MAP(magic10_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", magic10_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK) // 10 MHz.
+ MCFG_DEVICE_PROGRAM_MAP(magic10_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", magic10_state, irq1_line_hold)
// 1FILL is required by vanilla magic10 at least (otherwise gameplay won't work properly)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -728,8 +728,8 @@ MACHINE_CONFIG_START(magic10_state::magic10a)
magic10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(magic10a_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(magic10a_map)
MACHINE_CONFIG_END
@@ -737,8 +737,8 @@ MACHINE_CONFIG_START(magic10_state::magic102)
magic10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(magic102_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(magic102_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 0*8, 30*8-1)
@@ -749,8 +749,8 @@ MACHINE_CONFIG_START(magic10_state::hotslot)
magic10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hotslot_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hotslot_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(8*8, 56*8-1, 2*8, 32*8-1)
@@ -761,9 +761,9 @@ MACHINE_CONFIG_START(magic10_state::sgsafari)
magic10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sgsafari_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", magic10_state, irq2_line_hold) /* L1 interrupts */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sgsafari_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", magic10_state, irq2_line_hold) /* L1 interrupts */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 44*8-1, 0*8, 30*8-1)
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index 3829f22ea64..25a73efcef4 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -994,9 +994,9 @@ void magicard_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(magicard_state::magicard)
- MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A / 2) /* SCC-68070 CCA84 datasheet */
- MCFG_CPU_PROGRAM_MAP(magicard_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", magicard_state, magicard_irq) /* no interrupts? (it erases the vectors..) */
+ MCFG_DEVICE_ADD("maincpu", SCC68070, CLOCK_A / 2) /* SCC-68070 CCA84 datasheet */
+ MCFG_DEVICE_PROGRAM_MAP(magicard_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", magicard_state, magicard_irq) /* no interrupts? (it erases the vectors..) */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -1009,17 +1009,17 @@ MACHINE_CONFIG_START(magicard_state::magicard)
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("saa", SAA1099, CLOCK_B)
+ MCFG_DEVICE_ADD("saa", SAA1099, CLOCK_B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(magicard_state::hotslots)
magicard(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hotslots_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hotslots_mem)
MCFG_DEVICE_REMOVE("saa")
- MCFG_SOUND_ADD("ssg", YMZ284, 4000000)
+ MCFG_DEVICE_ADD("ssg", YMZ284, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp
index 607f0070703..c6717591c4a 100644
--- a/src/mame/drivers/magicfly.cpp
+++ b/src/mame/drivers/magicfly.cpp
@@ -940,8 +940,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(magicfly_state::magicfly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
- MCFG_CPU_PROGRAM_MAP(magicfly_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(magicfly_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -965,7 +965,7 @@ MACHINE_CONFIG_START(magicfly_state::magicfly)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp
index e20b4389cf4..4fb281d9c7b 100644
--- a/src/mame/drivers/magictg.cpp
+++ b/src/mame/drivers/magictg.cpp
@@ -911,22 +911,22 @@ INPUT_PORTS_END
*************************************/
MACHINE_CONFIG_START(magictg_state::magictg)
- MCFG_CPU_ADD("mips", R5000BE, 150000000) /* TODO: CPU type and clock are unknown */
+ MCFG_DEVICE_ADD("mips", R5000BE, 150000000) /* TODO: CPU type and clock are unknown */
//MCFG_MIPS3_ICACHE_SIZE(16384) /* TODO: Unknown */
//MCFG_MIPS3_DCACHE_SIZE(16384) /* TODO: Unknown */
- MCFG_CPU_PROGRAM_MAP(magictg_map)
+ MCFG_DEVICE_PROGRAM_MAP(magictg_map)
- MCFG_CPU_ADD("adsp", ADSP2181, 16000000)
- MCFG_CPU_PROGRAM_MAP(adsp_program_map)
- MCFG_CPU_DATA_MAP(adsp_data_map)
- MCFG_CPU_IO_MAP(adsp_io_map)
+ MCFG_DEVICE_ADD("adsp", ADSP2181, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(adsp_program_map)
+ MCFG_DEVICE_DATA_MAP(adsp_data_map)
+ MCFG_DEVICE_IO_MAP(adsp_io_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp
index 8def6e4ca2a..531ad0efb8f 100644
--- a/src/mame/drivers/magmax.cpp
+++ b/src/mame/drivers/magmax.cpp
@@ -331,13 +331,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(magmax_state::magmax)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(magmax_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", magmax_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(magmax_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", magmax_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(20'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(magmax_sound_map)
- MCFG_CPU_IO_MAP(magmax_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(20'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(magmax_sound_map)
+ MCFG_DEVICE_IO_MAP(magmax_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -358,15 +358,15 @@ MACHINE_CONFIG_START(magmax_state::magmax)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(magmax_state, ay8910_portA_0_w)) /*write port A*/
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(magmax_state, ay8910_portB_0_w)) /*write port B*/
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, magmax_state, ay8910_portA_0_w)) /*write port A*/
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, magmax_state, ay8910_portB_0_w)) /*write port B*/
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay3", AY8910, XTAL(20'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp
index 1c492464355..cd890d2e4a6 100644
--- a/src/mame/drivers/magnum.cpp
+++ b/src/mame/drivers/magnum.cpp
@@ -279,12 +279,12 @@ void magnum_state::magnum_lcdc(address_map &map)
}
MACHINE_CONFIG_START(magnum_state::magnum)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(magnum_map)
- MCFG_CPU_IO_MAP(magnum_io)
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(magnum_map)
+ MCFG_DEVICE_IO_MAP(magnum_io)
MCFG_DEVICE_ADD("rtc", CDP1879, XTAL(32'768))
- MCFG_CDP1879_IRQ_CALLBACK(WRITELINE(magnum_state, rtcirq_w))
+ MCFG_CDP1879_IRQ_CALLBACK(WRITELINE(*this, magnum_state, rtcirq_w))
MCFG_SCREEN_ADD("screen1", LCD)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(magnum_state::magnum)
MCFG_PALETTE_ADD_MONOCHROME_INVERTED("palette")
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("beep", BEEP, 500) /// frequency is guessed
+ MCFG_DEVICE_ADD("beep", BEEP, 500) /// frequency is guessed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magreel.cpp b/src/mame/drivers/magreel.cpp
index 64cb031028f..fd1a9e01a51 100644
--- a/src/mame/drivers/magreel.cpp
+++ b/src/mame/drivers/magreel.cpp
@@ -121,8 +121,8 @@ void magreel_state::machine_reset()
MACHINE_CONFIG_START(magreel_state::magreel)
/* basic machine hardware - all information unknown */
-// MCFG_CPU_ADD("maincpu",m68000,MAIN_CLOCK/12)
-// MCFG_CPU_PROGRAM_MAP(magreel_map)
+// MCFG_DEVICE_ADD("maincpu",m68000,MAIN_CLOCK/12)
+// MCFG_DEVICE_PROGRAM_MAP(magreel_map)
/* video hardware */
// MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp
index cd83d2052fd..9aada34adac 100644
--- a/src/mame/drivers/magtouch.cpp
+++ b/src/mame/drivers/magtouch.cpp
@@ -192,10 +192,10 @@ void magtouch_state::magtouch_sb_conf(device_t *device)
MACHINE_CONFIG_START(magtouch_state::magtouch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
- MCFG_CPU_PROGRAM_MAP(magtouch_map)
- MCFG_CPU_IO_MAP(magtouch_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(magtouch_map)
+ MCFG_DEVICE_IO_MAP(magtouch_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
/* video hardware */
pcvideo_trident_vga(config);
@@ -203,28 +203,29 @@ MACHINE_CONFIG_START(magtouch_state::magtouch)
pcat_common(config);
MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) )
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ MCFG_MICROTOUCH_ADD( "microtouch", 9600, WRITELINE("ns16450_0", ins8250_uart_device, rx_w) )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_MODIFY("dma8237_1")
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(magtouch_state, dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, magtouch_state, dma8237_1_dack_w))
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_2", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir3_w))
- //MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
-
- MCFG_ISA8_SLOT_ADD("isa", "isa1", magtouch_isa8_cards, "sb15", true)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259_2", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259_1", pic8259_device, ir3_w))
+ //MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259_1", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259_1", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259_1", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237_1", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237_1", am9517a_device, dreq3_w))
+
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", magtouch_isa8_cards, "sb15", true)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("sb15", magtouch_sb_def)
MCFG_SLOT_OPTION_MACHINE_CONFIG("sb15", magtouch_sb_conf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp
index 26aceb969a5..01aaab86be4 100644
--- a/src/mame/drivers/mainevt.cpp
+++ b/src/mame/drivers/mainevt.cpp
@@ -413,13 +413,13 @@ INTERRUPT_GEN_MEMBER(mainevt_state::devstors_sound_timer_irq)
MACHINE_CONFIG_START(mainevt_state::mainevt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, 3000000) /* ?? */
- MCFG_CPU_PROGRAM_MAP(mainevt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mainevt_state, mainevt_interrupt)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, 3000000) /* ?? */
+ MCFG_DEVICE_PROGRAM_MAP(mainevt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mainevt_state, mainevt_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 3.579545_MHz_XTAL) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(mainevt_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mainevt_state, mainevt_sound_timer_irq, 8*60) /* ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3.579545_MHz_XTAL) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mainevt_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mainevt_state, mainevt_sound_timer_irq, 8*60) /* ??? */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -448,12 +448,12 @@ MACHINE_CONFIG_START(mainevt_state::mainevt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232", K007232, 3.579545_MHz_XTAL)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(mainevt_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3.579545_MHz_XTAL)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, mainevt_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -461,13 +461,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mainevt_state::devstors)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, 24_MHz_XTAL / 8) // E & Q generated by 052109
- MCFG_CPU_PROGRAM_MAP(devstors_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mainevt_state, dv_interrupt)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, 24_MHz_XTAL / 8) // E & Q generated by 052109
+ MCFG_DEVICE_PROGRAM_MAP(devstors_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mainevt_state, dv_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 3.579545_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(devstors_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mainevt_state, devstors_sound_timer_irq, 4*60) /* ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(devstors_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mainevt_state, devstors_sound_timer_irq, 4*60) /* ??? */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -502,8 +502,8 @@ MACHINE_CONFIG_START(mainevt_state::devstors)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
- MCFG_SOUND_ADD("k007232", K007232, 3.579545_MHz_XTAL)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(mainevt_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3.579545_MHz_XTAL)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, mainevt_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp
index e9596b077b7..7bb9db9880b 100644
--- a/src/mame/drivers/mainsnk.cpp
+++ b/src/mame/drivers/mainsnk.cpp
@@ -377,14 +377,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(mainsnk_state::mainsnk)
- MCFG_CPU_ADD("maincpu", Z80, 3360000)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mainsnk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3360000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mainsnk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(mainsnk_state, irq0_line_assert, 244)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mainsnk_state, irq0_line_assert, 244)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -405,10 +405,10 @@ MACHINE_CONFIG_START(mainsnk_state::mainsnk)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 24ec91ec071..e37fdd5c29b 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -996,10 +996,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(majorpkr_state::majorpkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 6 MHz.
- MCFG_CPU_PROGRAM_MAP(map)
- MCFG_CPU_IO_MAP(portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", majorpkr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) // 6 MHz.
+ MCFG_DEVICE_PROGRAM_MAP(map)
+ MCFG_DEVICE_IO_MAP(portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", majorpkr_state, irq0_line_hold)
MCFG_DEVICE_ADD("palette_bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(palettebanks)
diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp
index 200afe9963a..aab4cf86ed3 100644
--- a/src/mame/drivers/malzak.cpp
+++ b/src/mame/drivers/malzak.cpp
@@ -302,11 +302,11 @@ void malzak_state::machine_reset()
MACHINE_CONFIG_START(malzak_state::malzak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 3800000/4)
- MCFG_CPU_PROGRAM_MAP(malzak_map)
- MCFG_CPU_IO_MAP(malzak_io_map)
- MCFG_CPU_DATA_MAP(malzak_data_map)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
+ MCFG_DEVICE_ADD("maincpu", S2650, 3800000/4)
+ MCFG_DEVICE_PROGRAM_MAP(malzak_map)
+ MCFG_DEVICE_IO_MAP(malzak_io_map)
+ MCFG_DEVICE_DATA_MAP(malzak_data_map)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -329,13 +329,13 @@ MACHINE_CONFIG_START(malzak_state::malzak)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("saa5050", SAA5050, 6000000)
- MCFG_SAA5050_D_CALLBACK(READ8(malzak_state, videoram_r))
+ MCFG_SAA5050_D_CALLBACK(READ8(*this, malzak_state, videoram_r))
MCFG_SAA5050_SCREEN_SIZE(42, 24, 64)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_DEVICE_ADD("sn1", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -351,7 +351,7 @@ MACHINE_CONFIG_START(malzak_state::malzak)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_DEVICE_ADD("sn2", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -372,8 +372,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(malzak_state::malzak2)
malzak(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(malzak2_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(malzak2_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp
index 58fc68cd36a..ef720a1bf44 100644
--- a/src/mame/drivers/manohman.cpp
+++ b/src/mame/drivers/manohman.cpp
@@ -244,9 +244,9 @@ INPUT_PORTS_END
*********************************************/
MACHINE_CONFIG_START(manohman_state::manohman)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) // MC68000P8
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(manohman_state, iack_handler)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000)) // MC68000P8
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(manohman_state, iack_handler)
MCFG_DEVICE_ADD("pit", PIT68230, XTAL(8'000'000)) // MC68230P8
MCFG_PIT68230_TIMER_IRQ_CB(INPUTLINE("maincpu", M68K_IRQ_2))
@@ -259,7 +259,7 @@ MACHINE_CONFIG_START(manohman_state::manohman)
MCFG_NVRAM_ADD_NO_FILL("nvram") // KM6264BL-10 x2 + MAX696CFL + battery
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("saa", SAA1099, XTAL(8'000'000) / 2) // clock not verified
+ MCFG_DEVICE_ADD("saa", SAA1099, XTAL(8'000'000) / 2) // clock not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp
index f1ab252ccec..2034331ba32 100644
--- a/src/mame/drivers/mappy.cpp
+++ b/src/mame/drivers/mappy.cpp
@@ -1319,18 +1319,18 @@ void mappy_state::machine_start()
MACHINE_CONFIG_START(mappy_state::superpac_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(superpac_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(superpac_cpu1_map)
- MCFG_CPU_ADD("sub", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(superpac_cpu2_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(superpac_cpu2_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 2M on CPU board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mappy_state, int_on_2_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mappy_state, int_on_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("namco", namco_15xx_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("namcoio_1", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("namcoio_2", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mappy_state, int_on_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mappy_state, int_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("namco", namco_15xx_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("namcoio_1", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namcoio_2", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_WATCHDOG_ADD("watchdog")
@@ -1352,14 +1352,14 @@ MACHINE_CONFIG_START(mappy_state::superpac_common)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(mappy_state, screen_update_superpac)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mappy_state, vblank_irq)) // cause IRQs on both CPUs; also update the custom I/O chips
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mappy_state, vblank_irq)) // cause IRQs on both CPUs; also update the custom I/O chips
MCFG_VIDEO_START_OVERRIDE(mappy_state,superpac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
+ MCFG_DEVICE_ADD("namco", NAMCO_15XX, 18432000/768)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1376,11 +1376,11 @@ MACHINE_CONFIG_START(mappy_state::superpac)
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
- MCFG_NAMCO56XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO56XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO56XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mappy_state::pacnpal)
@@ -1392,14 +1392,14 @@ MACHINE_CONFIG_START(mappy_state::pacnpal)
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_lamps))
+ MCFG_NAMCO56XX_OUT_0_CB(WRITE8(*this, mappy_state, out_lamps))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_59XX, 0)
- MCFG_NAMCO59XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO59XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO59XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO59XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO59XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO59XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO59XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
MACHINE_CONFIG_END
@@ -1414,14 +1414,14 @@ MACHINE_CONFIG_START(mappy_state::grobda)
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
- MCFG_NAMCO56XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO56XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO56XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
/* sound hardware */
- MCFG_SOUND_ADD("dac", DAC_4BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.275) // alternate route to 15XX-related DAC?
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.275) // alternate route to 15XX-related DAC?
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1430,22 +1430,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mappy_state::phozon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* MAIN CPU */
- MCFG_CPU_PROGRAM_MAP(phozon_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* MAIN CPU */
+ MCFG_DEVICE_PROGRAM_MAP(phozon_cpu1_map)
- MCFG_CPU_ADD("sub", MC6809E, PIXEL_CLOCK/4) /* SOUND CPU */
- MCFG_CPU_PROGRAM_MAP(phozon_cpu2_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, PIXEL_CLOCK/4) /* SOUND CPU */
+ MCFG_DEVICE_PROGRAM_MAP(phozon_cpu2_map)
- MCFG_CPU_ADD("sub2", MC6809E, PIXEL_CLOCK/4) /* SUB CPU */
- MCFG_CPU_PROGRAM_MAP(phozon_cpu3_map)
+ MCFG_DEVICE_ADD("sub2", MC6809E, PIXEL_CLOCK/4) /* SUB CPU */
+ MCFG_DEVICE_PROGRAM_MAP(phozon_cpu3_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 5C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mappy_state, int_on_2_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mappy_state, int_on_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mappy_state, int_on_3_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("namco", namco_15xx_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("namcoio_1", namco58xx_device, set_reset_line)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("namcoio_2", namco56xx_device, set_reset_line)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mappy_state, int_on_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mappy_state, int_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mappy_state, int_on_3_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("namco", namco_15xx_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("namcoio_1", namco58xx_device, set_reset_line)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namcoio_2", namco56xx_device, set_reset_line)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
@@ -1460,11 +1460,11 @@ MACHINE_CONFIG_START(mappy_state::phozon)
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
- MCFG_NAMCO56XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO56XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO56XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
MCFG_DEVICE_ADD("dipmux", LS157, 0)
MCFG_74157_A_IN_CB(IOPORT("DSW2"))
@@ -1480,14 +1480,14 @@ MACHINE_CONFIG_START(mappy_state::phozon)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(mappy_state, screen_update_phozon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mappy_state, vblank_irq)) // cause IRQs on all three CPUs; also update the custom I/O chips
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mappy_state, vblank_irq)) // cause IRQs on all three CPUs; also update the custom I/O chips
MCFG_VIDEO_START_OVERRIDE(mappy_state,phozon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
+ MCFG_DEVICE_ADD("namco", NAMCO_15XX, 18432000/768)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1496,19 +1496,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mappy_state::mappy_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(mappy_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mappy_cpu1_map)
- MCFG_CPU_ADD("sub", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(mappy_cpu2_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mappy_cpu2_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 2M on CPU board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mappy_state, int_on_2_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mappy_state, int_on_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mappy_state, mappy_flip_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("namco", namco_15xx_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("namcoio_1", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("namcoio_2", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mappy_state, int_on_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mappy_state, int_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mappy_state, mappy_flip_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("namco", namco_15xx_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("namcoio_1", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namcoio_2", namcoio_device, set_reset_line)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_WATCHDOG_ADD("watchdog")
@@ -1530,14 +1530,14 @@ MACHINE_CONFIG_START(mappy_state::mappy_common)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(mappy_state, screen_update_mappy)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mappy_state, vblank_irq)) // cause IRQs on both CPUs; also update the custom I/O chips
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mappy_state, vblank_irq)) // cause IRQs on both CPUs; also update the custom I/O chips
MCFG_VIDEO_START_OVERRIDE(mappy_state,mappy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("namco", NAMCO_15XX, 18432000/768)
+ MCFG_DEVICE_ADD("namco", NAMCO_15XX, 18432000/768)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1553,11 +1553,11 @@ MACHINE_CONFIG_START(mappy_state::mappy)
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_58XX, 0)
- MCFG_NAMCO58XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO58XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO58XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO58XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO58XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mappy_state::digdug2)
@@ -1574,11 +1574,11 @@ MACHINE_CONFIG_START(mappy_state::digdug2)
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
- MCFG_NAMCO56XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO56XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO56XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mappy_state::todruaga)
@@ -1599,14 +1599,14 @@ MACHINE_CONFIG_START(mappy_state::motos)
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_lamps))
+ MCFG_NAMCO56XX_OUT_0_CB(WRITE8(*this, mappy_state, out_lamps))
MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
- MCFG_NAMCO56XX_IN_0_CB(DEVREAD8("dipmux", ls157_device, output_r))
+ MCFG_NAMCO56XX_IN_0_CB(READ8("dipmux", ls157_device, output_r))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSW1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO56XX_IN_3_CB(IOPORT("DSW0"))
- MCFG_NAMCO56XX_OUT_0_CB(DEVWRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
+ MCFG_NAMCO56XX_OUT_0_CB(WRITELINE("dipmux", ls157_device, select_w)) MCFG_DEVCB_BIT(0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp
index f49c32879c8..8017c964c69 100644
--- a/src/mame/drivers/marineb.cpp
+++ b/src/mame/drivers/marineb.cpp
@@ -542,14 +542,14 @@ WRITE_LINE_MEMBER(marineb_state::wanted_vblank_irq)
MACHINE_CONFIG_START(marineb_state::marineb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz? */
- MCFG_CPU_PROGRAM_MAP(marineb_map)
- MCFG_CPU_IO_MAP(marineb_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(marineb_map)
+ MCFG_DEVICE_IO_MAP(marineb_io_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(marineb_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(marineb_state, flipscreen_y_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(marineb_state, flipscreen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, marineb_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, marineb_state, flipscreen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, marineb_state, flipscreen_x_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -559,7 +559,7 @@ MACHINE_CONFIG_START(marineb_state::marineb)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(marineb_state, screen_update_marineb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(marineb_state, marineb_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, marineb_state, marineb_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", marineb)
MCFG_PALETTE_ADD("palette", 256)
@@ -567,7 +567,7 @@ MACHINE_CONFIG_START(marineb_state::marineb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK)
+ MCFG_DEVICE_ADD("ay1", AY8910, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -589,8 +589,8 @@ MACHINE_CONFIG_START(marineb_state::springer)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(marineb_state, flipscreen_y_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(marineb_state, flipscreen_x_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, marineb_state, flipscreen_y_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, marineb_state, flipscreen_x_w)) MCFG_DEVCB_INVERT
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -614,23 +614,23 @@ MACHINE_CONFIG_START(marineb_state::wanted)
marineb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(wanted_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(wanted_io_map)
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(marineb_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, marineb_state, irq_mask_w))
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", wanted)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(marineb_state, screen_update_springer)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(marineb_state, wanted_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, marineb_state, wanted_vblank_irq))
// sound hardware (PSG type verified only for bcruzm12)
- MCFG_SOUND_REPLACE("ay1", AY8912, SOUND_CLOCK)
+ MCFG_DEVICE_REPLACE("ay1", AY8912, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8912, SOUND_CLOCK)
+ MCFG_DEVICE_ADD("ay2", AY8912, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -652,8 +652,8 @@ MACHINE_CONFIG_START(marineb_state::bcruzm12)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("outlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(marineb_state, flipscreen_y_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(marineb_state, flipscreen_x_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, marineb_state, flipscreen_y_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, marineb_state, flipscreen_x_w)) MCFG_DEVCB_INVERT
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp
index ae0374ad25b..4fc03e91f0c 100644
--- a/src/mame/drivers/marinedt.cpp
+++ b/src/mame/drivers/marinedt.cpp
@@ -629,10 +629,10 @@ PALETTE_INIT_MEMBER(marinedt_state, marinedt)
MACHINE_CONFIG_START(marinedt_state::marinedt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(marinedt_map)
- MCFG_CPU_IO_MAP(marinedt_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", marinedt_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(marinedt_map)
+ MCFG_DEVICE_IO_MAP(marinedt_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", marinedt_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -647,7 +647,7 @@ MACHINE_CONFIG_START(marinedt_state::marinedt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp
index efdc3a5d876..8531bdf2dff 100644
--- a/src/mame/drivers/mario.cpp
+++ b/src/mame/drivers/mario.cpp
@@ -338,32 +338,32 @@ WRITE_LINE_MEMBER(mario_state::vblank_irq)
MACHINE_CONFIG_START(mario_state::mario_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(mario_map)
- MCFG_CPU_IO_MAP(mario_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(mario_map)
+ MCFG_DEVICE_IO_MAP(mario_io_map)
/* devices */
MCFG_DEVICE_ADD("z80dma", Z80DMA, Z80_CLOCK)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(mario_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(mario_state, memory_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, mario_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, mario_state, memory_write_byte))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 2L (7E80H)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mario_state, gfx_bank_w)) // ~T ROM
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mario_state, gfx_bank_w)) // ~T ROM
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // 2 PSL
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mario_state, flip_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(mario_state, palette_bank_w)) // CREF 0
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(mario_state, nmi_mask_w)) // NMI EI
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("z80dma", z80dma_device, rdy_w)) // DMA SET
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mario_state, coin_counter_1_w)) // COUNTER 2 (misnumbered on schematic)
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mario_state, coin_counter_2_w)) // COUNTER 1 (misnumbered on schematic)
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mario_state, flip_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, mario_state, palette_bank_w)) // CREF 0
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, mario_state, nmi_mask_w)) // NMI EI
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("z80dma", z80dma_device, rdy_w)) // DMA SET
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, mario_state, coin_counter_1_w)) // COUNTER 2 (misnumbered on schematic)
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, mario_state, coin_counter_2_w)) // COUNTER 1 (misnumbered on schematic)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(mario_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mario_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mario_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mario)
MCFG_PALETTE_ADD("palette", 256)
@@ -378,9 +378,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mario_state::masao)
mario_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(4000000) /* 4.000 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(masao_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(4000000) /* 4.000 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(masao_map)
/* sound hardware */
masao_audio(config);
diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp
index 761a856c6e2..3c6b50249e9 100644
--- a/src/mame/drivers/markham.cpp
+++ b/src/mame/drivers/markham.cpp
@@ -182,13 +182,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(markham_state::markham)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MCFG_CPU_PROGRAM_MAP(markham_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", markham_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
+ MCFG_DEVICE_PROGRAM_MAP(markham_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", markham_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MCFG_CPU_PROGRAM_MAP(markham_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", markham_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2) /* 4.000MHz */
+ MCFG_DEVICE_PROGRAM_MAP(markham_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", markham_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -209,10 +209,10 @@ MACHINE_CONFIG_START(markham_state::markham)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, 8000000/2)
+ MCFG_DEVICE_ADD("sn1", SN76496, 8000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_SOUND_ADD("sn2", SN76496, 8000000/2)
+ MCFG_DEVICE_ADD("sn2", SN76496, 8000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp
index 5212016a953..41841a766e1 100644
--- a/src/mame/drivers/marywu.cpp
+++ b/src/mame/drivers/marywu.cpp
@@ -183,31 +183,31 @@ void marywu_state::machine_start()
MACHINE_CONFIG_START(marywu_state::marywu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(10'738'635)) //actual CPU is a Winbond w78c31b-24
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(10'738'635)) //actual CPU is a Winbond w78c31b-24
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_IO_MAP(io_map)
//TODO: figure out what each bit is mapped to in the 80c31 ports P1 and P3
/* Keyboard & display interface */
MCFG_DEVICE_ADD("i8279", I8279, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
- MCFG_I8279_OUT_SL_CB(WRITE8(marywu_state, multiplex_7seg_w)) // select block of 7seg modules by multiplexing the SL scan lines
- MCFG_I8279_IN_RL_CB(READ8(marywu_state, keyboard_r)) // keyboard Return Lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(marywu_state, display_7seg_data_w))
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, marywu_state, multiplex_7seg_w)) // select block of 7seg modules by multiplexing the SL scan lines
+ MCFG_I8279_IN_RL_CB(READ8(*this, marywu_state, keyboard_r)) // keyboard Return Lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, marywu_state, display_7seg_data_w))
/* Video */
MCFG_DEFAULT_LAYOUT(layout_marywu)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(marywu_state, ay1_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(marywu_state, ay1_port_b_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, marywu_state, ay1_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, marywu_state, ay1_port_b_w))
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(10'738'635)) /* should it be perhaps a fraction of the XTAL clock ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(marywu_state, ay2_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(marywu_state, ay2_port_b_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, marywu_state, ay2_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, marywu_state, ay2_port_b_w))
MACHINE_CONFIG_END
ROM_START( marywu )
diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp
index cd4d1982d84..4d0e2ad1643 100644
--- a/src/mame/drivers/mastboy.cpp
+++ b/src/mame/drivers/mastboy.cpp
@@ -808,18 +808,18 @@ void mastboy_state::machine_reset()
MACHINE_CONFIG_START(mastboy_state::mastboy)
- MCFG_CPU_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */
- MCFG_CPU_PROGRAM_MAP(mastboy_map)
- MCFG_CPU_IO_MAP(mastboy_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */
+ MCFG_DEVICE_PROGRAM_MAP(mastboy_map)
+ MCFG_DEVICE_IO_MAP(mastboy_io_map)
MCFG_EEPROM_2816_ADD("earom")
MCFG_DEVICE_ADD("outlatch", LS259, 0) // IC17
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mastboy_state, irq0_ack_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("msm", msm5205_device, s2_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("msm", msm5205_device, s1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("msm", msm5205_device, reset_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("earom", eeprom_parallel_28xx_device, oe_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mastboy_state, irq0_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("msm", msm5205_device, s2_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("msm", msm5205_device, s1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("msm", msm5205_device, reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("earom", eeprom_parallel_28xx_device, oe_w))
MCFG_DEVICE_ADD("bank_c000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank_c000_map)
@@ -836,7 +836,7 @@ MACHINE_CONFIG_START(mastboy_state::mastboy)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(mastboy_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mastboy_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mastboy_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mastboy)
MCFG_PALETTE_ADD("palette", 0x100)
@@ -846,8 +846,8 @@ MACHINE_CONFIG_START(mastboy_state::mastboy)
MCFG_SAA1099_ADD("saa", 6000000 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(mastboy_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, mastboy_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mastboyo.cpp b/src/mame/drivers/mastboyo.cpp
index b366f7f4525..4e816489f39 100644
--- a/src/mame/drivers/mastboyo.cpp
+++ b/src/mame/drivers/mastboyo.cpp
@@ -186,10 +186,10 @@ PALETTE_INIT_MEMBER(mastboyo_state, mastboyo)
MACHINE_CONFIG_START(mastboyo_state::mastboyo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 20_MHz_XTAL/6)
- MCFG_CPU_PROGRAM_MAP(mastboyo_map)
- MCFG_CPU_IO_MAP(mastboyo_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(mastboyo_state, irq0_line_hold, 256.244f) // not sure, INT0 pin was measured at 256.244Hz
+ MCFG_DEVICE_ADD("maincpu", Z80, 20_MHz_XTAL/6)
+ MCFG_DEVICE_PROGRAM_MAP(mastboyo_map)
+ MCFG_DEVICE_IO_MAP(mastboyo_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mastboyo_state, irq0_line_hold, 256.244f) // not sure, INT0 pin was measured at 256.244Hz
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -210,7 +210,7 @@ MACHINE_CONFIG_START(mastboyo_state::mastboyo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 20_MHz_XTAL/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 20_MHz_XTAL/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0")) // DSW
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1")) // player inputs
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp
index 2881910e916..af5941a1be5 100644
--- a/src/mame/drivers/matmania.cpp
+++ b/src/mame/drivers/matmania.cpp
@@ -302,13 +302,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(matmania_state::matmania)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(matmania_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", matmania_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(matmania_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", matmania_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", M6502, 1200000) /* 1.2 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(matmania_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(matmania_state, nmi_line_pulse, 15*60) /* ???? */
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1200000) /* 1.2 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(matmania_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(matmania_state, nmi_line_pulse, 15*60) /* ???? */
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -330,13 +330,13 @@ MACHINE_CONFIG_START(matmania_state::matmania)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -345,14 +345,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(matmania_state::maniach)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(maniach_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", matmania_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(maniach_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", matmania_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", M6809, 1500000) /* 1.5 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(maniach_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6809, 1500000) /* 1.5 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(maniach_sound_map)
- MCFG_CPU_ADD("mcu", TAITO68705_MCU, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */
+ MCFG_DEVICE_ADD("mcu", TAITO68705_MCU, 1500000*2) /* (don't know really how fast, but it doesn't need to even be this fast) */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slice per frame - high interleaving to sync main and mcu */
@@ -374,11 +374,11 @@ MACHINE_CONFIG_START(matmania_state::maniach)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, 3600000)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, 3600000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index e1ef07a3969..6604e0a7ad2 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -324,15 +324,15 @@ TIMER_DEVICE_CALLBACK_MEMBER( maxaflex_state::mf_interrupt )
MACHINE_CONFIG_START(maxaflex_state::maxaflex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
- MCFG_CPU_PROGRAM_MAP(a600xl_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
+ MCFG_DEVICE_PROGRAM_MAP(a600xl_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", maxaflex_state, mf_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("mcu", M68705P3, 3579545)
- MCFG_M68705_PORTA_R_CB(READ8(maxaflex_state, mcu_portA_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(maxaflex_state, mcu_portA_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(maxaflex_state, mcu_portB_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(maxaflex_state, mcu_portC_w))
+ MCFG_DEVICE_ADD("mcu", M68705P3, 3579545)
+ MCFG_M68705_PORTA_R_CB(READ8(*this, maxaflex_state, mcu_portA_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, maxaflex_state, mcu_portA_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, maxaflex_state, mcu_portB_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, maxaflex_state, mcu_portC_w))
MCFG_DEVICE_ADD("gtia", ATARI_GTIA, 0)
MCFG_GTIA_REGION(GTIA_NTSC)
@@ -342,10 +342,10 @@ MACHINE_CONFIG_START(maxaflex_state::maxaflex)
MCFG_ANTIC_GTIA("gtia")
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(maxaflex_state, pia_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(maxaflex_state, pia_pb_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(maxaflex_state, pia_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(maxaflex_state, pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, maxaflex_state, pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, maxaflex_state, pia_pb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, maxaflex_state, pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, maxaflex_state, pia_cb2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -363,13 +363,13 @@ MACHINE_CONFIG_START(maxaflex_state::maxaflex)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
+ MCFG_DEVICE_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
MCFG_POKEY_INTERRUPT_CB(maxaflex_state, interrupt_cb)
MCFG_POKEY_OUTPUT_RC(RES_K(1), CAP_U(0.0), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index 6291f0344c2..af30d4ade4f 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -764,76 +764,76 @@ READ8_MEMBER(maygay1b_state::mcu_port2_r)
MACHINE_CONFIG_START(maygay1b_state::maygay_m1)
- MCFG_CPU_ADD("maincpu", MC6809, M1_MASTER_CLOCK/2) // claimed to be 4 MHz
- MCFG_CPU_PROGRAM_MAP(m1_memmap)
+ MCFG_DEVICE_ADD("maincpu", MC6809, M1_MASTER_CLOCK/2) // claimed to be 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(m1_memmap)
- MCFG_CPU_ADD("mcu", I80C51, 2000000) // EP840034.A-P-80C51AVW
- MCFG_MCS51_PORT_P0_IN_CB(READ8(maygay1b_state, mcu_port0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(maygay1b_state, mcu_port0_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(maygay1b_state, mcu_port1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(maygay1b_state, mcu_port2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(maygay1b_state, mcu_port2_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(maygay1b_state, mcu_port3_w))
+ MCFG_DEVICE_ADD("mcu", I80C51, 2000000) // EP840034.A-P-80C51AVW
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, maygay1b_state, mcu_port0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, maygay1b_state, mcu_port0_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, maygay1b_state, mcu_port1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, maygay1b_state, mcu_port2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, maygay1b_state, mcu_port2_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, maygay1b_state, mcu_port3_w))
MCFG_DEVICE_ADD("duart68681", MC68681, M1_DUART_CLOCK)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(maygay1b_state, duart_irq_handler))
- MCFG_MC68681_INPORT_CALLBACK(READ8(maygay1b_state, m1_duart_r))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, maygay1b_state, duart_irq_handler))
+ MCFG_MC68681_INPORT_CALLBACK(READ8(*this, maygay1b_state, m1_duart_r))
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(maygay1b_state, m1_pia_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(maygay1b_state, m1_pia_portb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, maygay1b_state, m1_pia_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, maygay1b_state, m1_pia_portb_w))
MCFG_DEVICE_ADD("mainlatch", HC259, 0) // U29
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(maygay1b_state, ramen_w)) // m_RAMEN
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(maygay1b_state, alarmen_w)) // AlarmEn
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(maygay1b_state, nmien_w)) // Enable
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(maygay1b_state, rts_w)) // RTS
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(maygay1b_state, psurelay_w)) // PSURelay
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(maygay1b_state, wdog_w)) // WDog
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(maygay1b_state, srsel_w)) // Srsel
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, maygay1b_state, ramen_w)) // m_RAMEN
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, maygay1b_state, alarmen_w)) // AlarmEn
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, maygay1b_state, nmien_w)) // Enable
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, maygay1b_state, rts_w)) // RTS
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, maygay1b_state, psurelay_w)) // PSURelay
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, maygay1b_state, wdog_w)) // WDog
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, maygay1b_state, srsel_w)) // Srsel
MCFG_S16LF01_ADD("vfd",0)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aysnd", YM2149, M1_MASTER_CLOCK)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(maygay1b_state, m1_meter_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(maygay1b_state, m1_lockout_w))
+ MCFG_DEVICE_ADD("aysnd", YM2149, M1_MASTER_CLOCK)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, maygay1b_state, m1_meter_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, maygay1b_state, m1_lockout_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2413, M1_MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, M1_MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("msm6376", OKIM6376, 102400) //? Seems to work well with samples, but unconfirmed
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 102400) //? Seems to work well with samples, but unconfirmed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmitimer", maygay1b_state, maygay1b_nmitimer_callback, attotime::from_hz(75)) // freq?
MCFG_DEVICE_ADD("i8279", I8279, M1_MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(maygay1b_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(maygay1b_state, lamp_data_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(maygay1b_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, maygay1b_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, maygay1b_state, lamp_data_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, maygay1b_state, kbd_r)) // kbd RL lines
#ifndef USE_MCU
// on M1B there is a 2nd i8279, on M1 / M1A a 8051 handles this task!
MCFG_DEVICE_ADD("i8279_2", I8279, M1_MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(maygay1b_state, scanlines_2_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(maygay1b_state, lamp_data_2_w)) // display A&B
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, maygay1b_state, scanlines_2_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, maygay1b_state, lamp_data_2_w)) // display A&B
#endif
MCFG_STARPOINT_48STEP_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(maygay1b_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, maygay1b_state, reel_optic_cb<0>))
MCFG_STARPOINT_48STEP_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(maygay1b_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, maygay1b_state, reel_optic_cb<1>))
MCFG_STARPOINT_48STEP_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(maygay1b_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, maygay1b_state, reel_optic_cb<2>))
MCFG_STARPOINT_48STEP_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(maygay1b_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, maygay1b_state, reel_optic_cb<3>))
MCFG_STARPOINT_48STEP_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(maygay1b_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, maygay1b_state, reel_optic_cb<4>))
MCFG_STARPOINT_48STEP_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(maygay1b_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, maygay1b_state, reel_optic_cb<5>))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
@@ -850,12 +850,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(maygay1b_state::maygay_m1_nec)
maygay_m1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(m1_nec_memmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(m1_nec_memmap)
MCFG_DEVICE_REMOVE("msm6376")
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/maygayep.cpp b/src/mame/drivers/maygayep.cpp
index 992a026ce77..5f1d9de6496 100644
--- a/src/mame/drivers/maygayep.cpp
+++ b/src/mame/drivers/maygayep.cpp
@@ -107,12 +107,12 @@ DRIVER_INIT_MEMBER(maygayep_state,maygayep)
}
MACHINE_CONFIG_START(maygayep_state::maygayep)
- MCFG_CPU_ADD("maincpu", H83002, 16000000 )
- MCFG_CPU_PROGRAM_MAP( maygayep_map )
+ MCFG_DEVICE_ADD("maincpu", H83002, 16000000 )
+ MCFG_DEVICE_PROGRAM_MAP( maygayep_map )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, 10000000 )
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 10000000 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/maygaysw.cpp b/src/mame/drivers/maygaysw.cpp
index bb311f47325..e4a6902ee5f 100644
--- a/src/mame/drivers/maygaysw.cpp
+++ b/src/mame/drivers/maygaysw.cpp
@@ -131,8 +131,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(maygayew_state::maygayew)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,8000000) // MC68306FC16 - standard 68000 core + peripherals
- MCFG_CPU_PROGRAM_MAP(maygayew_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,8000000) // MC68306FC16 - standard 68000 core + peripherals
+ MCFG_DEVICE_PROGRAM_MAP(maygayew_map)
MACHINE_CONFIG_END
ROM_START( mg_gbr )
diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp
index f8461b456b2..c34b853ae87 100644
--- a/src/mame/drivers/maygayv1.cpp
+++ b/src/mame/drivers/maygayv1.cpp
@@ -869,22 +869,22 @@ void maygayv1_state::machine_reset()
MACHINE_CONFIG_START(maygayv1_state::maygayv1)
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("soundcpu", I8052, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_prg)
- MCFG_CPU_DATA_MAP(sound_data)
- MCFG_CPU_IO_MAP(sound_io)
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(maygayv1_state, data_from_i8031))
- MCFG_MCS51_SERIAL_RX_CB(READ8(maygayv1_state, data_to_i8031))
+ MCFG_DEVICE_ADD("soundcpu", I8052, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_prg)
+ MCFG_DEVICE_DATA_MAP(sound_data)
+ MCFG_DEVICE_IO_MAP(sound_io)
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, maygayv1_state, data_from_i8031))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, maygayv1_state, data_to_i8031))
/* U25 ST 2 9148 EF68B21P */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(maygayv1_state, b_read))
- MCFG_PIA_READPB_HANDLER(READ8(maygayv1_state, b_read))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(maygayv1_state, b_writ))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(maygayv1_state, b_writ))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, maygayv1_state, b_read))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, maygayv1_state, b_read))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, maygayv1_state, b_writ))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, maygayv1_state, b_writ))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -895,26 +895,26 @@ MACHINE_CONFIG_START(maygayv1_state::maygayv1)
MCFG_SCREEN_SIZE(640, 300)
MCFG_SCREEN_VISIBLE_AREA(0, 640 - 1, 0, 300 - 1)
MCFG_SCREEN_UPDATE_DRIVER(maygayv1_state, screen_update_maygayv1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(maygayv1_state, screen_vblank_maygayv1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, maygayv1_state, screen_vblank_maygayv1))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 16)
MCFG_DEVICE_ADD("duart68681", MC68681, DUART_CLOCK)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(maygayv1_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(WRITELINE(maygayv1_state, duart_txa))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, maygayv1_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE(*this, maygayv1_state, duart_txa))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(maygayv1_state, strobe_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(maygayv1_state, lamp_data_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(maygayv1_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, maygayv1_state, strobe_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, maygayv1_state, lamp_data_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, maygayv1_state, kbd_r)) // kbd RL lines
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd",YM2413, MASTER_CLOCK / 4)
+ MCFG_DEVICE_ADD("ymsnd",YM2413, MASTER_CLOCK / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
- MCFG_SOUND_ADD("upd",UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd",UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index d440e38a07c..376535cb5ef 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -964,24 +964,24 @@ void mazerbla_state::machine_reset()
MACHINE_CONFIG_START(mazerbla_state::mazerbla)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
- MCFG_CPU_PROGRAM_MAP(mazerbla_map)
- MCFG_CPU_IO_MAP(mazerbla_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback)
-
- MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK) /* 4 MHz, NMI, IM1 INT */
- MCFG_CPU_PROGRAM_MAP(mazerbla_cpu2_map)
- MCFG_CPU_IO_MAP(mazerbla_cpu2_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mazerbla_state, irq0_line_hold, 400) /* frequency in Hz */
-
- MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
- MCFG_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
- MCFG_CPU_IO_MAP(mazerbla_cpu3_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
+ MCFG_DEVICE_PROGRAM_MAP(mazerbla_map)
+ MCFG_DEVICE_IO_MAP(mazerbla_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback)
+
+ MCFG_DEVICE_ADD("sub", Z80, MASTER_CLOCK) /* 4 MHz, NMI, IM1 INT */
+ MCFG_DEVICE_PROGRAM_MAP(mazerbla_cpu2_map)
+ MCFG_DEVICE_IO_MAP(mazerbla_cpu2_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mazerbla_state, irq0_line_hold, 400) /* frequency in Hz */
+
+ MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
+ MCFG_DEVICE_PROGRAM_MAP(mazerbla_cpu3_map)
+ MCFG_DEVICE_IO_MAP(mazerbla_cpu3_io_map)
/* (vblank related ??) int generated by a custom video processor
and cleared on ANY port access.
but handled differently for now
*/
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold)
/* synchronization forced on the fly */
MCFG_DEVICE_ADD("vcu", MB_VCU, SOUND_CLOCK/4)
@@ -997,7 +997,7 @@ MACHINE_CONFIG_START(mazerbla_state::mazerbla)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mazerbla_state, screen_update_mazerbla)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mazerbla_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mazerbla_state, screen_vblank))
MCFG_PALETTE_ADD("palette", 256+1)
MCFG_PALETTE_INIT_OWNER(mazerbla_state, mazerbla)
@@ -1009,23 +1009,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mazerbla_state::greatgun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
- MCFG_CPU_PROGRAM_MAP(mazerbla_map)
- MCFG_CPU_IO_MAP(greatgun_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback)
-
- MCFG_CPU_ADD("sub", Z80, SOUND_CLOCK / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */
- MCFG_CPU_PROGRAM_MAP(greatgun_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mazerbla_state, sound_interrupt, (double)14318180/16/16/16/16 )
-
- MCFG_CPU_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
- MCFG_CPU_PROGRAM_MAP(mazerbla_cpu3_map)
- MCFG_CPU_IO_MAP(greatgun_cpu3_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
+ MCFG_DEVICE_PROGRAM_MAP(mazerbla_map)
+ MCFG_DEVICE_IO_MAP(greatgun_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mazerbla_state,irq_callback)
+
+ MCFG_DEVICE_ADD("sub", Z80, SOUND_CLOCK / 4) /* 3.579500 MHz, NMI - caused by sound command write, periodic INT */
+ MCFG_DEVICE_PROGRAM_MAP(greatgun_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mazerbla_state, sound_interrupt, (double)14318180/16/16/16/16 )
+
+ MCFG_DEVICE_ADD("sub2", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM1 INT */
+ MCFG_DEVICE_PROGRAM_MAP(mazerbla_cpu3_map)
+ MCFG_DEVICE_IO_MAP(greatgun_cpu3_io_map)
/* (vblank related ??) int generated by a custom video processor
and cleared on ANY port access.
but handled differently for now
*/
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mazerbla_state, irq0_line_hold)
MCFG_DEVICE_ADD("vcu", MB_VCU, SOUND_CLOCK/4)
MCFG_MB_VCU_CPU("sub2")
@@ -1040,7 +1040,7 @@ MACHINE_CONFIG_START(mazerbla_state::greatgun)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mazerbla_state, screen_update_mazerbla)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mazerbla_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mazerbla_state, screen_vblank))
MCFG_PALETTE_ADD("palette", 256+1)
MCFG_PALETTE_INIT_OWNER(mazerbla_state, mazerbla)
@@ -1048,12 +1048,12 @@ MACHINE_CONFIG_START(mazerbla_state::greatgun)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, SOUND_CLOCK / 8)
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay1", AY8910, SOUND_CLOCK / 8)
+ MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, SOUND_CLOCK / 8)
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(mazerbla_state, gg_led_ctrl_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, SOUND_CLOCK / 8)
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, mazerbla_state, gg_led_ctrl_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp
index bc35d247d86..a301b8fa359 100644
--- a/src/mame/drivers/mbc200.cpp
+++ b/src/mame/drivers/mbc200.cpp
@@ -302,13 +302,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(mbc200_state::mbc200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1
- MCFG_CPU_PROGRAM_MAP(mbc200_mem)
- MCFG_CPU_IO_MAP(mbc200_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1
+ MCFG_DEVICE_PROGRAM_MAP(mbc200_mem)
+ MCFG_DEVICE_IO_MAP(mbc200_io)
- MCFG_CPU_ADD("subcpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1
- MCFG_CPU_PROGRAM_MAP(mbc200_sub_mem)
- MCFG_CPU_IO_MAP(mbc200_sub_io)
+ MCFG_DEVICE_ADD("subcpu",Z80, XTAL(8'000'000)/2) // NEC D780C-1
+ MCFG_DEVICE_PROGRAM_MAP(mbc200_sub_mem)
+ MCFG_DEVICE_IO_MAP(mbc200_sub_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -327,20 +327,20 @@ MACHINE_CONFIG_START(mbc200_state::mbc200)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1000) // frequency unknown
+ MCFG_DEVICE_ADD("beeper", BEEP, 1000) // frequency unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("ppi_1", I8255, 0)
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mbc200_state, p1_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mbc200_state, p1_portc_w))
MCFG_DEVICE_ADD("ppi_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mbc200_state, p2_porta_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mbc200_state, p2_porta_r))
MCFG_DEVICE_ADD("ppi_m", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mbc200_state, pm_porta_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mbc200_state, pm_portb_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mbc200_state, pm_porta_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mbc200_state, pm_portb_w))
MCFG_DEVICE_ADD("uart1", I8251, 0) // INS8251N
diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp
index b03dc34be0c..dd556833ea3 100644
--- a/src/mame/drivers/mbc55x.cpp
+++ b/src/mame/drivers/mbc55x.cpp
@@ -243,16 +243,16 @@ static void mbc55x_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(mbc55x_state::mbc55x)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, I8088, 3600000)
- MCFG_CPU_PROGRAM_MAP(mbc55x_mem)
- MCFG_CPU_IO_MAP(mbc55x_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(PIC8259_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, I8088, 3600000)
+ MCFG_DEVICE_PROGRAM_MAP(mbc55x_mem)
+ MCFG_DEVICE_IO_MAP(mbc55x_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(PIC8259_TAG, pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(14'318'181),896,0,300,262,0,200)
MCFG_SCREEN_UPDATE_DEVICE(VID_MC6845_NAME, mc6845_device, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mbc55x_state, screen_vblank_mbc55x))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mbc55x_state, screen_vblank_mbc55x))
MCFG_PALETTE_ADD("palette", SCREEN_NO_COLOURS * 3)
MCFG_PALETTE_INIT_OWNER(mbc55x_state, mbc55x)
@@ -265,38 +265,38 @@ MACHINE_CONFIG_START(mbc55x_state::mbc55x)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO(MONO_TAG)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,MONO_TAG, 0.75)
/* Devices */
MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(PIC8259_TAG, pic8259_device, ir3_w))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(PIC8259_TAG, pic8259_device, ir3_w))
MCFG_DEVICE_ADD(PIT8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(PIT_C0_CLOCK)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(PIC8259_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(PIC8259_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(PIT_C1_CLOCK)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(PIC8259_TAG, pic8259_device, ir1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(PIC8259_TAG, pic8259_device, ir1_w))
MCFG_PIT8253_CLK2(PIT_C2_CLOCK)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mbc55x_state, pit8253_t2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, mbc55x_state, pit8253_t2))
MCFG_DEVICE_ADD(PIC8259_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(PPI8255_TAG, I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mbc55x_state, mbc55x_ppi_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mbc55x_state, mbc55x_ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mbc55x_state, mbc55x_ppi_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mbc55x_state, mbc55x_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(mbc55x_state, mbc55x_ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mbc55x_state, mbc55x_ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mbc55x_state, mbc55x_ppi_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mbc55x_state, mbc55x_ppi_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mbc55x_state, mbc55x_ppi_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mbc55x_state, mbc55x_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mbc55x_state, mbc55x_ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mbc55x_state, mbc55x_ppi_portc_w))
MCFG_MC6845_ADD(VID_MC6845_NAME, MC6845, SCREEN_TAG, XTAL(14'318'181)/8)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mbc55x_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(mbc55x_state, vid_hsync_changed))
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(mbc55x_state, vid_vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, mbc55x_state, vid_hsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, mbc55x_state, vid_vsync_changed))
/* Backing storage */
MCFG_FD1793_ADD(FDC_TAG, XTAL(1'000'000))
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index bfa988b4e59..9b27b908743 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -647,19 +647,19 @@ static void mbee_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(mbee_state::mbee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 6) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(mbee_mem)
- MCFG_CPU_IO_MAP(mbee_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 6) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mbee_mem)
+ MCFG_DEVICE_IO_MAP(mbee_io)
MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee)
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(12'000'000) / 6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(mbee_state, pio_ardy))
- MCFG_Z80PIO_IN_PB_CB(READ8(mbee_state, pio_port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(mbee_state, pio_port_b_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, mbee_state, pio_ardy))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mbee_state, pio_port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mbee_state, pio_port_b_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -679,7 +679,7 @@ MACHINE_CONFIG_START(mbee_state::mbee)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
@@ -688,13 +688,13 @@ MACHINE_CONFIG_START(mbee_state::mbee)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mbee_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(mbee_state, crtc_update_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(mbee_state, crtc_vs))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, mbee_state, crtc_vs))
MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 3)
MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 3)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("z80pio", z80pio_device, strobe_a))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("z80pio", z80pio_device, strobe_a))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -706,19 +706,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbeeic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL_13_5MHz / 4) /* 3.37500 MHz */
- MCFG_CPU_PROGRAM_MAP(mbeeic_mem)
- MCFG_CPU_IO_MAP(mbeeic_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL_13_5MHz / 4) /* 3.37500 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mbeeic_mem)
+ MCFG_DEVICE_IO_MAP(mbeeic_io)
MCFG_Z80_DAISY_CHAIN(mbee_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee)
MCFG_DEVICE_ADD("z80pio", Z80PIO, 3375000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(mbee_state, pio_ardy))
- MCFG_Z80PIO_IN_PB_CB(READ8(mbee_state, pio_port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(mbee_state, pio_port_b_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, mbee_state, pio_ardy))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mbee_state, pio_port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mbee_state, pio_port_b_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -738,7 +738,7 @@ MACHINE_CONFIG_START(mbee_state::mbeeic)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
@@ -747,13 +747,13 @@ MACHINE_CONFIG_START(mbee_state::mbeeic)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(mbee_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(mbee_state, crtc_update_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(mbee_state, crtc_vs))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, mbee_state, crtc_vs))
MCFG_QUICKLOAD_ADD("quickload", mbee_state, mbee, "mwb,com,bee", 2)
MCFG_QUICKLOAD_ADD("quickload2", mbee_state, mbee_z80bin, "bin", 2)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("z80pio", z80pio_device, strobe_a))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("z80pio", z80pio_device, strobe_a))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -764,33 +764,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbeepc)
mbeeic(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbeepc_mem)
- MCFG_CPU_IO_MAP(mbeepc_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbeepc_mem)
+ MCFG_DEVICE_IO_MAP(mbeepc_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbeeppc)
mbeeic(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbeeppc_mem)
- MCFG_CPU_IO_MAP(mbeeppc_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbeeppc_mem)
+ MCFG_DEVICE_IO_MAP(mbeeppc_io)
MCFG_VIDEO_START_OVERRIDE(mbee_state, premium)
MCFG_GFXDECODE_MODIFY("gfxdecode", premium)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(mbee_state, premium)
MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(mbee_state, rtc_irq_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, mbee_state, rtc_irq_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbee56)
mbeeic(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbee56_mem)
- MCFG_CPU_IO_MAP(mbee56_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbee56_mem)
+ MCFG_DEVICE_IO_MAP(mbee56_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee56)
MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mbee_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mbee_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_drq_w))
MCFG_WD_FDC_ENMF_CALLBACK(GND)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mbee_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -800,23 +800,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbee128)
mbee56(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbee256_mem)
- MCFG_CPU_IO_MAP(mbee128_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbee256_mem)
+ MCFG_DEVICE_IO_MAP(mbee128_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128)
MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(mbee_state, rtc_irq_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, mbee_state, rtc_irq_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbee128p)
mbeeppc(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbee256_mem)
- MCFG_CPU_IO_MAP(mbee128_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbee256_mem)
+ MCFG_DEVICE_IO_MAP(mbee128_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128)
MCFG_WD2793_ADD("fdc", XTAL(4'000'000) / 2)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mbee_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mbee_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, mbee_state, fdc_drq_w))
MCFG_WD_FDC_ENMF_CALLBACK(GND)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", mbee_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -826,9 +826,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbee256)
mbee128p(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbee256_mem)
- MCFG_CPU_IO_MAP(mbee256_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbee256_mem)
+ MCFG_DEVICE_IO_MAP(mbee256_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee256)
MCFG_DEVICE_REMOVE("fdc:0")
@@ -841,9 +841,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mbee_state::mbeett)
mbeeppc(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mbeett_mem)
- MCFG_CPU_IO_MAP(mbeett_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mbeett_mem)
+ MCFG_DEVICE_IO_MAP(mbeett_io)
MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbeett)
MCFG_DEVICE_REMOVE("quickload")
MCFG_DEVICE_REMOVE("quickload2")
diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp
index 373c6597cf0..5b99ee313c0 100644
--- a/src/mame/drivers/mc10.cpp
+++ b/src/mame/drivers/mc10.cpp
@@ -511,19 +511,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mc10_state::mc10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545)) /* 0,894886 MHz */
- MCFG_CPU_PROGRAM_MAP(mc10_mem)
- MCFG_CPU_IO_MAP(mc10_io)
+ MCFG_DEVICE_ADD("maincpu", M6803, XTAL(3'579'545)) /* 0,894886 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mc10_mem)
+ MCFG_DEVICE_IO_MAP(mc10_io)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
- MCFG_MC6847_INPUT_CALLBACK(READ8(mc10_state, mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, mc10_state, mc6847_videoram_r))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -547,9 +547,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mc10_state::alice32)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6803, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(alice32_mem)
- MCFG_CPU_IO_MAP(mc10_io)
+ MCFG_DEVICE_ADD("maincpu", M6803, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(alice32_mem)
+ MCFG_DEVICE_IO_MAP(mc10_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -565,7 +565,7 @@ MACHINE_CONFIG_START(mc10_state::alice32)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -589,8 +589,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mc10_state::alice90)
alice32(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(alice90_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(alice90_mem)
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("32K")
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index a87a8d379f6..de828400681 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -542,10 +542,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(mc1000_state::ne555_tick)
MACHINE_CONFIG_START(mc1000_state::mc1000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(mc1000_mem)
- MCFG_CPU_OPCODES_MAP(mc1000_banking_mem)
- MCFG_CPU_IO_MAP(mc1000_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(mc1000_mem)
+ MCFG_DEVICE_OPCODES_MAP(mc1000_banking_mem)
+ MCFG_DEVICE_IO_MAP(mc1000_io)
/* timers */
MCFG_TIMER_DRIVER_ADD_PERIODIC("ne555clear", mc1000_state, ne555_tick, attotime::from_hz(MC1000_NE555_FREQ))
@@ -559,17 +559,17 @@ MACHINE_CONFIG_START(mc1000_state::mc1000)
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
MCFG_DEVICE_ADD(MC6847_TAG, MC6847_NTSC, XTAL(3'579'545))
- MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(mc1000_state, hs_w))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(mc1000_state, fs_w))
- MCFG_MC6847_INPUT_CALLBACK(READ8(mc1000_state, videoram_r))
+ MCFG_MC6847_HSYNC_CALLBACK(WRITELINE(*this, mc1000_state, hs_w))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, mc1000_state, fs_w))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, mc1000_state, videoram_r))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, 3579545/2)
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, 3579545/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(RES_K(2.2), 0, 0)
- MCFG_AY8910_PORT_B_READ_CB(READ8(mc1000_state, keydata_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(mc1000_state, keylatch_w))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, mc1000_state, keydata_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, mc1000_state, keylatch_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -580,7 +580,7 @@ MACHINE_CONFIG_START(mc1000_state::mc1000)
MCFG_SOFTWARE_LIST_ADD("cass_list", "mc1000_cass")
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(mc1000_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, mc1000_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp
index 9d7cc298943..8129735299c 100644
--- a/src/mame/drivers/mc1502.cpp
+++ b/src/mame/drivers/mc1502.cpp
@@ -238,74 +238,74 @@ static INPUT_PORTS_START( mc1502 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mc1502_state::mc1502)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(16'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(mc1502_map)
- MCFG_CPU_IO_MAP(mc1502_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(16'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(mc1502_map)
+ MCFG_DEVICE_IO_MAP(mc1502_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_MACHINE_START_OVERRIDE( mc1502_state, mc1502 )
MCFG_MACHINE_RESET_OVERRIDE( mc1502_state, mc1502 )
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000)/12) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(16'000'000)/12) /* serial port */
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(mc1502_state, mc1502_pit8253_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, mc1502_state, mc1502_pit8253_out1_changed))
MCFG_PIT8253_CLK2(XTAL(16'000'000)/12) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mc1502_state, mc1502_pit8253_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, mc1502_state, mc1502_pit8253_out2_changed))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("ppi8255n1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mc1502_state, mc1502_ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(mc1502_state, mc1502_ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mc1502_state, mc1502_ppi_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mc1502_state, mc1502_ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mc1502_state, mc1502_ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mc1502_state, mc1502_ppi_portc_w))
MCFG_DEVICE_ADD("ppi8255n2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mc1502_state, mc1502_kppi_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mc1502_state, mc1502_kppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(DEVREAD8("cent_status_in", input_buffer_device, read))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mc1502_state, mc1502_kppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mc1502_state, mc1502_kppi_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mc1502_state, mc1502_kppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8("cent_status_in", input_buffer_device, read))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mc1502_state, mc1502_kppi_portc_w))
MCFG_DEVICE_ADD("upd8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
/* XXX RxD data are accessible via PPI port C, bit 7 */
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir7_w)) /* default handler does nothing */
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
- MCFG_I8251_SYNDET_HANDLER(WRITELINE(mc1502_state, mc1502_i8251_syndet))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir7_w)) /* default handler does nothing */
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir7_w))
+ MCFG_I8251_SYNDET_HANDLER(WRITELINE(*this, mc1502_state, mc1502_i8251_syndet))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd8251", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("upd8251", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("upd8251", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("upd8251", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("upd8251", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("upd8251", i8251_device, write_cts))
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259", pic8259_device, ir7_w))
- MCFG_ISA8_SLOT_ADD("isa", "board0", mc1502_isa8_cards, "cga_mc1502", true)
- MCFG_ISA8_SLOT_ADD("isa", "isa1", mc1502_isa8_cards, "fdc", false)
- MCFG_ISA8_SLOT_ADD("isa", "isa2", mc1502_isa8_cards, "rom", false)
+ MCFG_DEVICE_ADD("board0", ISA8_SLOT, 0, "isa", mc1502_isa8_cards, "cga_mc1502", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", mc1502_isa8_cards, "fdc", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "isa", mc1502_isa8_cards, "rom", false)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6))
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
- MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5))
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
diff --git a/src/mame/drivers/mc8020.cpp b/src/mame/drivers/mc8020.cpp
index bac308f21e6..0f5bb55c86d 100644
--- a/src/mame/drivers/mc8020.cpp
+++ b/src/mame/drivers/mc8020.cpp
@@ -296,9 +296,9 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(mc8020_state::mc8020)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(2'457'600))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(2'457'600))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
/* video hardware */
@@ -314,17 +314,17 @@ MACHINE_CONFIG_START(mc8020_state::mc8020)
/* devices */
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(2'457'600))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(mc8020_state, port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(mc8020_state, port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(mc8020_state, port_b_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mc8020_state, port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mc8020_state, port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mc8020_state, port_b_w))
MCFG_DEVICE_ADD("ctc_clock", CLOCK, XTAL(2'457'600) / 64) // guess
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(2'457'600))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mc8030.cpp b/src/mame/drivers/mc8030.cpp
index c1485b82d95..fbedc2739aa 100644
--- a/src/mame/drivers/mc8030.cpp
+++ b/src/mame/drivers/mc8030.cpp
@@ -183,9 +183,9 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(mc8030_state::mc8030)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(2'457'600))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(2'457'600))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
/* video hardware */
@@ -202,10 +202,10 @@ MACHINE_CONFIG_START(mc8030_state::mc8030)
/* Devices */
MCFG_DEVICE_ADD("zve_pio", Z80PIO, XTAL(2'457'600))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(mc8030_state, zve_port_a_r))
- //MCFG_Z80PIO_OUT_PA_CB(WRITE8(mc8030_state, zve_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(mc8030_state, zve_port_b_r))
- //MCFG_Z80PIO_OUT_PB_CB(WRITE8(mc8030_state, zve_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, mc8030_state, zve_port_a_r))
+ //MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mc8030_state, zve_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mc8030_state, zve_port_b_r))
+ //MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mc8030_state, zve_port_b_w))
MCFG_DEVICE_ADD("zve_ctc", Z80CTC, XTAL(2'457'600))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -213,10 +213,10 @@ MACHINE_CONFIG_START(mc8030_state::mc8030)
MCFG_DEVICE_ADD("asp_pio", Z80PIO, XTAL(2'457'600))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(mc8030_state, asp_port_a_r))
- //MCFG_Z80PIO_OUT_PA_CB(WRITE8(mc8030_state, asp_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(mc8030_state, asp_port_b_r))
- //MCFG_Z80PIO_OUT_PB_CB(WRITE8(mc8030_state, asp_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, mc8030_state, asp_port_a_r))
+ //MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mc8030_state, asp_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mc8030_state, asp_port_b_r))
+ //MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, mc8030_state, asp_port_b_w))
MCFG_DEVICE_ADD("asp_ctc", Z80CTC, XTAL(2'457'600))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -225,19 +225,19 @@ MACHINE_CONFIG_START(mc8030_state::mc8030)
// ZC2: KMBG (??)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("asp_sio", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("asp_sio", z80sio_device, rxca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("asp_sio", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("asp_sio", z80sio_device, rxca_w))
MCFG_DEVICE_ADD("asp_sio", Z80SIO, 4800)
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// SIO CH A in = keyboard; out = beeper; CH B = IFSS (??)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("asp_sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("asp_sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("asp_sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("asp_sio", z80sio_device, ctsa_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp
index 9283ac03ed5..3d8c2c81420 100644
--- a/src/mame/drivers/mcatadv.cpp
+++ b/src/mame/drivers/mcatadv.cpp
@@ -437,13 +437,13 @@ void mcatadv_state::machine_start()
MACHINE_CONFIG_START(mcatadv_state::mcatadv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(mcatadv_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mcatadv_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(mcatadv_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mcatadv_state, irq1_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(mcatadv_sound_map)
- MCFG_CPU_IO_MAP(mcatadv_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(mcatadv_sound_map)
+ MCFG_DEVICE_IO_MAP(mcatadv_sound_io_map)
/* video hardware */
@@ -453,7 +453,7 @@ MACHINE_CONFIG_START(mcatadv_state::mcatadv)
MCFG_SCREEN_SIZE(320, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(mcatadv_state, screen_update_mcatadv)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mcatadv_state, screen_vblank_mcatadv))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mcatadv_state, screen_vblank_mcatadv))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mcatadv)
@@ -472,7 +472,7 @@ MACHINE_CONFIG_START(mcatadv_state::mcatadv)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.32)
MCFG_SOUND_ROUTE(1, "mono", 0.5)
@@ -482,11 +482,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mcatadv_state::nost)
mcatadv(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(nost_sound_map)
- MCFG_CPU_IO_MAP(nost_sound_io_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(nost_sound_map)
+ MCFG_DEVICE_IO_MAP(nost_sound_io_map)
- MCFG_SOUND_REPLACE("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_REPLACE("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.2)
MCFG_SOUND_ROUTE(1, "mono", 0.5)
diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp
index 2d05c052965..7faf8992bca 100644
--- a/src/mame/drivers/mcb216.cpp
+++ b/src/mame/drivers/mcb216.cpp
@@ -119,36 +119,36 @@ MACHINE_RESET_MEMBER( mcb216_state, cb308 )
MACHINE_CONFIG_START(mcb216_state::mcb216)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(mcb216_mem)
- MCFG_CPU_IO_MAP(mcb216_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mcb216_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mcb216_mem)
+ MCFG_DEVICE_IO_MAP(mcb216_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mcb216_state, irq_callback)
MCFG_MACHINE_RESET_OVERRIDE(mcb216_state, mcb216)
MCFG_DEVICE_ADD("tms5501", TMS5501, 8_MHz_XTAL / 4)
- MCFG_TMS5501_XMT_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_TMS5501_XMT_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_TMS5501_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("tms5501", tms5501_device, rcv_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("tms5501", tms5501_device, rcv_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mcb216_state::cb308)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(cb308_mem)
- MCFG_CPU_IO_MAP(mcb216_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mcb216_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cb308_mem)
+ MCFG_DEVICE_IO_MAP(mcb216_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mcb216_state, irq_callback)
MCFG_MACHINE_RESET_OVERRIDE(mcb216_state, cb308)
MCFG_DEVICE_ADD("tms5501", TMS5501, 8_MHz_XTAL / 4)
- MCFG_TMS5501_XMT_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_TMS5501_XMT_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_TMS5501_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("tms5501", tms5501_device, rcv_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("tms5501", tms5501_device, rcv_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/mccpm.cpp b/src/mame/drivers/mccpm.cpp
index bc63043ae06..6e0efe99c67 100644
--- a/src/mame/drivers/mccpm.cpp
+++ b/src/mame/drivers/mccpm.cpp
@@ -80,24 +80,24 @@ void mccpm_state::machine_reset()
MACHINE_CONFIG_START(mccpm_state::mccpm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mccpm_mem)
- MCFG_CPU_IO_MAP(mccpm_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mccpm_mem)
+ MCFG_DEVICE_IO_MAP(mccpm_io)
/* Devices */
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(4'000'000))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index a3ebb15629d..790c4fd12e8 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -1752,15 +1752,15 @@ static const char *const twotiger_sample_names[] =
MACHINE_CONFIG_START(mcr_state::mcr_90009)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8)
MCFG_Z80_DAISY_CHAIN(mcr_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(cpu_90009_map)
- MCFG_CPU_IO_MAP(cpu_90009_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_90009_map)
+ MCFG_DEVICE_IO_MAP(cpu_90009_portmap)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr_state, mcr_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("ctc", Z80CTC, MAIN_OSC_MCR_I/8 /* same as "maincpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 16)
@@ -1783,7 +1783,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_90009)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ssio", MIDWAY_SSIO, 0)
+ MCFG_DEVICE_ADD("ssio", MIDWAY_SSIO)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1804,9 +1804,9 @@ MACHINE_CONFIG_START(mcr_state::mcr_90010)
mcr_90009(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cpu_90010_map)
- MCFG_CPU_IO_MAP(cpu_90010_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cpu_90010_map)
+ MCFG_DEVICE_IO_MAP(cpu_90010_portmap)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1820,7 +1820,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_90010_tt)
mcr_90010(config);
/* sound hardware */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(twotiger_sample_names)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
@@ -1838,7 +1838,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_91475)
MCFG_PALETTE_FORMAT(xxxxRRRRBBBBGGGG)
/* sound hardware */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(journey_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
@@ -1851,10 +1851,10 @@ MACHINE_CONFIG_START(mcr_state::mcr_91490)
mcr_90010(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(5000000)
- MCFG_CPU_PROGRAM_MAP(cpu_91490_map)
- MCFG_CPU_IO_MAP(cpu_91490_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(5000000)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_91490_map)
+ MCFG_DEVICE_IO_MAP(cpu_91490_portmap)
MCFG_DEVICE_MODIFY("ctc")
MCFG_DEVICE_CLOCK(5000000 /* same as "maincpu" */)
@@ -1866,7 +1866,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_91490_snt)
mcr_91490(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("snt", MIDWAY_SQUAWK_N_TALK, 0)
+ MCFG_DEVICE_ADD("snt", MIDWAY_SQUAWK_N_TALK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1877,10 +1877,10 @@ MACHINE_CONFIG_START(mcr_nflfoot_state::mcr_91490_ipu)
mcr_91490_snt(config);
/* basic machine hardware */
- MCFG_CPU_ADD("ipu", Z80, 7372800/2)
+ MCFG_DEVICE_ADD("ipu", Z80, 7372800/2)
MCFG_Z80_DAISY_CHAIN(mcr_ipu_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(ipu_91695_map)
- MCFG_CPU_IO_MAP(ipu_91695_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(ipu_91695_map)
+ MCFG_DEVICE_IO_MAP(ipu_91695_portmap)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(mcr_nflfoot_state, ipu_interrupt)
@@ -1895,8 +1895,8 @@ MACHINE_CONFIG_START(mcr_nflfoot_state::mcr_91490_ipu)
MCFG_DEVICE_ADD("ipu_sio", Z80SIO0, 7372800/2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("ipu", INPUT_LINE_IRQ0))
- MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(mcr_nflfoot_state, sio_txda_w))
- MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(mcr_nflfoot_state, sio_txdb_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(*this, mcr_nflfoot_state, sio_txda_w))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(*this, mcr_nflfoot_state, sio_txdb_w))
MACHINE_CONFIG_END
@@ -1905,7 +1905,7 @@ MACHINE_CONFIG_START(mcr_state::mcr_91490_tcs)
mcr_91490(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK, 0)
+ MCFG_DEVICE_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index e50948393f2..ac2ab174d01 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -1081,15 +1081,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(mcr3_state::mcrmono)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(mcrmono_map)
- MCFG_CPU_IO_MAP(mcrmono_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(mcrmono_map)
+ MCFG_DEVICE_IO_MAP(mcrmono_portmap)
MCFG_Z80_DAISY_CHAIN(mcr_daisy_chain)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr3_state, mcr_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK/4 /* same as "maincpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 16)
@@ -1122,7 +1122,7 @@ MACHINE_CONFIG_START(mcr3_state::mono_tcs)
mcrmono(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK, 0)
+ MCFG_DEVICE_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1142,7 +1142,7 @@ MACHINE_CONFIG_START(mcr3_state::mono_sg)
mcrmono(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0)
+ MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1156,13 +1156,13 @@ MACHINE_CONFIG_START(mcr3_state::mcrscroll)
mcrmono(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("ssio", MIDWAY_SSIO, 0)
+ MCFG_DEVICE_ADD("ssio", MIDWAY_SSIO)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spyhunt_map)
- MCFG_CPU_IO_MAP(spyhunt_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spyhunt_map)
+ MCFG_DEVICE_IO_MAP(spyhunt_portmap)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1183,7 +1183,7 @@ MACHINE_CONFIG_START(mcr3_state::mcrsc_csd)
mcrscroll(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("csd", MIDWAY_CHEAP_SQUEAK_DELUXE, 0)
+ MCFG_DEVICE_ADD("csd", MIDWAY_CHEAP_SQUEAK_DELUXE)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp
index ba090cefab3..773e8a88a9d 100644
--- a/src/mame/drivers/mcr68.cpp
+++ b/src/mame/drivers/mcr68.cpp
@@ -898,8 +898,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(mcr68_state::mcr68)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 7723800)
- MCFG_CPU_PROGRAM_MAP(mcr68_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 7723800)
+ MCFG_DEVICE_PROGRAM_MAP(mcr68_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -935,7 +935,7 @@ MACHINE_CONFIG_START(mcr68_state::xenophob)
mcr68(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0)
+ MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -943,7 +943,7 @@ MACHINE_CONFIG_START(mcr68_state::intlaser)
mcr68(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0)
+ MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_WATCHDOG_MODIFY("watchdog")
@@ -955,9 +955,9 @@ MACHINE_CONFIG_START(mcr68_state::spyhunt2)
mcr68(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("sg", MIDWAY_SOUNDS_GOOD, 0)
+ MCFG_DEVICE_ADD("sg", MIDWAY_SOUNDS_GOOD)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK, 0)
+ MCFG_DEVICE_ADD("tcs", MIDWAY_TURBO_CHEAP_SQUEAK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_ADC0844_ADD("adc")
@@ -972,7 +972,7 @@ MACHINE_CONFIG_START(mcr68_state::archrivl)
mcr68(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -981,11 +981,11 @@ MACHINE_CONFIG_START(mcr68_state::pigskin)
mcr68(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pigskin_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pigskin_map)
MACHINE_CONFIG_END
@@ -993,11 +993,11 @@ MACHINE_CONFIG_START(mcr68_state::trisport)
mcr68(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(trisport_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(trisport_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp
index 1af9b65f906..739e8eb7aef 100644
--- a/src/mame/drivers/meadows.cpp
+++ b/src/mame/drivers/meadows.cpp
@@ -624,12 +624,12 @@ static const char *const bowl3d_sample_names[] =
MACHINE_CONFIG_START(meadows_state::meadows)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MCFG_CPU_PROGRAM_MAP(meadows_main_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(meadows_main_map)
- MCFG_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(meadows_state, audio_interrupt, (double)5000000/131072)
+ MCFG_DEVICE_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(meadows_state, audio_interrupt, (double)5000000/131072)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -640,18 +640,18 @@ MACHINE_CONFIG_START(meadows_state::meadows)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(meadows_state, screen_update_meadows)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(meadows_state, meadows_vblank_irq)) // one interrupt per frame!?
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meadows_state, meadows_vblank_irq)) // one interrupt per frame!?
MCFG_GFXDECODE_ADD("gfxdecode", "palette", meadows)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* audio hardware */
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_START_CB(meadows_state, meadows_sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
@@ -661,9 +661,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(meadows_state::minferno)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */
- MCFG_CPU_PROGRAM_MAP(minferno_main_map)
- MCFG_CPU_DATA_MAP(minferno_data_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(minferno_main_map)
+ MCFG_DEVICE_DATA_MAP(minferno_data_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -672,7 +672,7 @@ MACHINE_CONFIG_START(meadows_state::minferno)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 24*8-1)
MCFG_SCREEN_UPDATE_DRIVER(meadows_state, screen_update_meadows)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(meadows_state, minferno_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meadows_state, minferno_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", minferno)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -685,12 +685,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(meadows_state::bowl3d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MCFG_CPU_PROGRAM_MAP(bowl3d_main_map)
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(bowl3d_main_map)
- MCFG_CPU_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(meadows_state, audio_interrupt, (double)5000000/131072)
+ MCFG_DEVICE_ADD("audiocpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(meadows_state, audio_interrupt, (double)5000000/131072)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -701,23 +701,23 @@ MACHINE_CONFIG_START(meadows_state::bowl3d)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(meadows_state, screen_update_meadows)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(meadows_state, meadows_vblank_irq)) // one interrupt per frame!?
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meadows_state, meadows_vblank_irq)) // one interrupt per frame!?
MCFG_GFXDECODE_ADD("gfxdecode", "palette", meadows)
MCFG_PALETTE_ADD_MONOCHROME("palette")
/* audio hardware */
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_START_CB(meadows_state, meadows_sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples2", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(bowl3d_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp
index 88cdef56dfe..49c5a76201d 100644
--- a/src/mame/drivers/mediagx.cpp
+++ b/src/mame/drivers/mediagx.cpp
@@ -883,10 +883,10 @@ void mediagx_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(mediagx_state::mediagx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000)
- MCFG_CPU_PROGRAM_MAP(mediagx_map)
- MCFG_CPU_IO_MAP(mediagx_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", MEDIAGX, 166000000)
+ MCFG_DEVICE_PROGRAM_MAP(mediagx_map)
+ MCFG_DEVICE_IO_MAP(mediagx_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
@@ -894,7 +894,7 @@ MACHINE_CONFIG_START(mediagx_state::mediagx)
MCFG_PCI_BUS_LEGACY_DEVICE(18, DEVICE_SELF, mediagx_state, cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_TIMER_DRIVER_ADD("sound_timer", mediagx_state, sound_timer_callback)
@@ -914,10 +914,10 @@ MACHINE_CONFIG_START(mediagx_state::mediagx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp
index 2d4fd0286d8..acd3d2b69d4 100644
--- a/src/mame/drivers/megadriv.cpp
+++ b/src/mame/drivers/megadriv.cpp
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(md_cons_state::ms_megadriv)
MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, nullptr)
MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv")
@@ -397,7 +397,7 @@ MACHINE_CONFIG_START(md_cons_state::ms_megadpal)
MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, nullptr)
MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv")
@@ -415,7 +415,7 @@ MACHINE_CONFIG_START(md_cons_state::dcat16_megadriv)
MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, megadriv)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
// has SD card slot instead?
// MCFG_MD_CARTRIDGE_ADD("mdslot", md_cart, nullptr)
@@ -613,19 +613,19 @@ MACHINE_CONFIG_START(md_cons_state::genesis_32x)
MCFG_SEGA_32X_PALETTE("gen_vdp:palette")
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
// we need to remove and re-add the sound system because the balance is different
// due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is slient?!)
MCFG_DEVICE_REMOVE("ymsnd")
MCFG_DEVICE_REMOVE("snsnd")
- MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
+ MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
/* sound hardware */
- MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
+ MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
@@ -654,19 +654,19 @@ MACHINE_CONFIG_START(md_cons_state::mdj_32x)
MCFG_SEGA_32X_PALETTE("gen_vdp:palette")
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
// we need to remove and re-add the sound system because the balance is different
// due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is slient?!)
MCFG_DEVICE_REMOVE("ymsnd")
MCFG_DEVICE_REMOVE("snsnd")
- MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
+ MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
/* sound hardware */
- MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
+ MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
@@ -695,19 +695,19 @@ MACHINE_CONFIG_START(md_cons_state::md_32x)
MCFG_SEGA_32X_PALETTE("gen_vdp:palette")
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
// we need to remove and re-add the sound system because the balance is different
// due to MAME / MESS having severe issues if the dac output is > 0.40? (sound is corrupted even if DAC is slient?!)
MCFG_DEVICE_REMOVE("ymsnd")
MCFG_DEVICE_REMOVE("snsnd")
- MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
+ MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7)
MCFG_SOUND_ROUTE(0, "lspeaker", (0.50)/2)
MCFG_SOUND_ROUTE(1, "rspeaker", (0.50)/2)
/* sound hardware */
- MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
+ MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", (0.25)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", (0.25)/2)
@@ -760,7 +760,7 @@ MACHINE_CONFIG_START(md_cons_state::genesis_scd)
MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_US, 0)
MCFG_GFX_PALETTE("gen_vdp:palette")
@@ -778,7 +778,7 @@ MACHINE_CONFIG_START(md_cons_state::md_scd)
MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_EUROPE, 0)
MCFG_GFX_PALETTE("gen_vdp:palette")
@@ -796,7 +796,7 @@ MACHINE_CONFIG_START(md_cons_state::mdj_scd)
MCFG_MACHINE_RESET_OVERRIDE(md_cons_state, ms_megadriv)
MCFG_SCREEN_MODIFY("megadriv")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_cons_state, screen_vblank_console))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_cons_state, screen_vblank_console))
MCFG_DEVICE_ADD("segacd", SEGA_SEGACD_JAPAN, 0)
MCFG_GFX_PALETTE("gen_vdp:palette")
diff --git a/src/mame/drivers/megadriv_acbl.cpp b/src/mame/drivers/megadriv_acbl.cpp
index 0adad079572..0f152cda187 100644
--- a/src/mame/drivers/megadriv_acbl.cpp
+++ b/src/mame/drivers/megadriv_acbl.cpp
@@ -287,8 +287,8 @@ void md_boot_state::md_bootleg_map(address_map &map)
MACHINE_CONFIG_START(md_boot_state::md_bootleg)
md_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(md_bootleg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(md_bootleg_map)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/megadriv_rad.cpp b/src/mame/drivers/megadriv_rad.cpp
index 489015890a0..20fe7cc6e4b 100644
--- a/src/mame/drivers/megadriv_rad.cpp
+++ b/src/mame/drivers/megadriv_rad.cpp
@@ -135,24 +135,24 @@ MACHINE_RESET_MEMBER(megadriv_radica_state, megadriv_radica)
MACHINE_CONFIG_START(megadriv_radica_state::megadriv_radica_3button_ntsc)
md_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(megadriv_radica_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_radica_map)
MCFG_MACHINE_START_OVERRIDE(megadriv_radica_state, megadriv_radica_3button)
MCFG_MACHINE_RESET_OVERRIDE(megadriv_radica_state, megadriv_radica)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megadriv_radica_state::megadriv_radica_3button_pal)
md_pal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(megadriv_radica_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_radica_map)
MCFG_MACHINE_START_OVERRIDE(megadriv_radica_state, megadriv_radica_3button)
MCFG_MACHINE_RESET_OVERRIDE(megadriv_radica_state, megadriv_radica)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megadriv_radica_state::megadriv_radica_6button_pal)
md_pal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(megadriv_radica_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_radica_map)
MCFG_MACHINE_START_OVERRIDE(megadriv_radica_state, megadriv_radica_6button)
MCFG_MACHINE_RESET_OVERRIDE(megadriv_radica_state, megadriv_radica)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megaphx.cpp b/src/mame/drivers/megaphx.cpp
index f14d0598218..7ffa1018263 100644
--- a/src/mame/drivers/megaphx.cpp
+++ b/src/mame/drivers/megaphx.cpp
@@ -374,30 +374,30 @@ WRITE_LINE_MEMBER( megaphx_state::dsw_w )
}
MACHINE_CONFIG_START(megaphx_state::megaphx)
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(megaphx_68k_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(megaphx_68k_map)
- MCFG_CPU_ADD("pic", PIC16C54, 6_MHz_XTAL) // correct?
- MCFG_PIC16C5x_READ_A_CB(READ8(megaphx_state, pic_porta_r))
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(megaphx_state, pic_porta_w))
- MCFG_PIC16C5x_READ_B_CB(READ8(megaphx_state, pic_portb_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(megaphx_state, pic_portb_w))
+ MCFG_DEVICE_ADD("pic", PIC16C54, 6_MHz_XTAL) // correct?
+ MCFG_PIC16C5x_READ_A_CB(READ8(*this, megaphx_state, pic_porta_r))
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, megaphx_state, pic_porta_w))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, megaphx_state, pic_portb_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, megaphx_state, pic_portb_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_TTL166_ADD("ttl166_1")
MCFG_TTL166_DATA_CB(IOPORT("DSW1"))
- MCFG_TTL166_QH_CB(DEVWRITELINE("ttl166_2", ttl166_device, serial_w))
+ MCFG_TTL166_QH_CB(WRITELINE("ttl166_2", ttl166_device, serial_w))
MCFG_TTL166_ADD("ttl166_2")
MCFG_TTL166_DATA_CB(IOPORT("DSW2"))
- MCFG_TTL166_QH_CB(WRITELINE(megaphx_state, dsw_w))
+ MCFG_TTL166_QH_CB(WRITELINE(*this, megaphx_state, dsw_w))
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
- MCFG_I8255_IN_PORTC_CB(READ8(megaphx_state, ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(megaphx_state, ppi_portc_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, megaphx_state, ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, megaphx_state, ppi_portc_w))
MCFG_INDER_VIDEO_ADD("inder_vid")
diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp
index f4b40378ed4..d377c2d7980 100644
--- a/src/mame/drivers/megaplay.cpp
+++ b/src/mame/drivers/megaplay.cpp
@@ -667,29 +667,29 @@ MACHINE_CONFIG_START(mplay_state::megaplay)
/* The Megaplay has an extra BIOS cpu which drives an SMS VDP
which includes an SN76496 for sound */
- MCFG_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
- MCFG_CPU_PROGRAM_MAP(megaplay_bios_map)
- MCFG_CPU_IO_MAP(megaplay_bios_io_map)
+ MCFG_DEVICE_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
+ MCFG_DEVICE_PROGRAM_MAP(megaplay_bios_map)
+ MCFG_DEVICE_IO_MAP(megaplay_bios_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("io1", CXD1095, 0)
MCFG_CXD1095_IN_PORTA_CB(IOPORT("DSW0"))
MCFG_CXD1095_IN_PORTB_CB(IOPORT("DSW1"))
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(mplay_state, bios_banksel_w))
- MCFG_CXD1095_IN_PORTE_CB(READ8(mplay_state, bios_6204_r))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(mplay_state, bios_width_w))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, mplay_state, bios_banksel_w))
+ MCFG_CXD1095_IN_PORTE_CB(READ8(*this, mplay_state, bios_6204_r))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, mplay_state, bios_width_w))
MCFG_DEVICE_ADD("io2", CXD1095, 0)
MCFG_CXD1095_IN_PORTA_CB(IOPORT("TEST"))
MCFG_CXD1095_IN_PORTB_CB(IOPORT("COIN"))
- MCFG_CXD1095_IN_PORTC_CB(READ8(mplay_state, bios_6402_r))
- MCFG_CXD1095_OUT_PORTC_CB(WRITE8(mplay_state, bios_6402_w))
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(mplay_state, bios_gamesel_w))
- MCFG_CXD1095_IN_PORTE_CB(READ8(mplay_state, bios_6404_r))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(mplay_state, bios_6404_w))
+ MCFG_CXD1095_IN_PORTC_CB(READ8(*this, mplay_state, bios_6402_r))
+ MCFG_CXD1095_OUT_PORTC_CB(WRITE8(*this, mplay_state, bios_6402_w))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, mplay_state, bios_gamesel_w))
+ MCFG_CXD1095_IN_PORTE_CB(READ8(*this, mplay_state, bios_6404_r))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, mplay_state, bios_6404_w))
- MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
+ MCFG_DEVICE_ADD("sn2", SN76496, MASTER_CLOCK/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 27e046f4613..720aa6f1bf5 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -1684,12 +1684,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(megasys1_state::system_A)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */
- MCFG_CPU_PROGRAM_MAP(megasys1A_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(megasys1A_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", megasys1_state, megasys1A_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */
- MCFG_CPU_PROGRAM_MAP(megasys1A_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M68000, SOUND_CPU_CLOCK) /* 7MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(megasys1A_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(120000))
@@ -1701,7 +1701,7 @@ MACHINE_CONFIG_START(megasys1_state::system_A)
MCFG_SCREEN_RAW_PARAMS(SYS_A_CPU_CLOCK,406,0,256,263,16,240)
MCFG_SCREEN_UPDATE_DRIVER(megasys1_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(megasys1_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, megasys1_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1722,7 +1722,7 @@ MACHINE_CONFIG_START(megasys1_state::system_A)
MCFG_GENERIC_LATCH_16_ADD("soundlatch2")
MCFG_YM2151_ADD("ymsnd", SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(megasys1_state,sound_irq))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, megasys1_state,sound_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
@@ -1742,7 +1742,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megasys1_state::system_A_iganinju)
system_A(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_REMOVE("scantimer")
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", megasys1_state, megasys1A_iganinju_scanline, "screen", 0, 1)
MACHINE_CONFIG_END
@@ -1755,14 +1755,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megasys1_state::kickoffb)
system_A(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(kickoffb_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(kickoffb_sound_map)
MCFG_DEVICE_REMOVE("ymsnd")
MCFG_DEVICE_REMOVE("oki2")
- MCFG_SOUND_ADD("ymsnd", YM2203, SOUND_CPU_CLOCK / 2)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(megasys1_state, sound_irq)) // TODO: needs to be checked
+ MCFG_DEVICE_ADD("ymsnd", YM2203, SOUND_CPU_CLOCK / 2)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, megasys1_state, sound_irq)) // TODO: needs to be checked
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -1772,28 +1772,28 @@ MACHINE_CONFIG_START(megasys1_state::system_B)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(SYS_B_CPU_CLOCK) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(megasys1B_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(SYS_B_CPU_CLOCK) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megasys1B_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(megasys1_state, megasys1B_scanline)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(megasys1B_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(megasys1B_sound_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megasys1_state::system_B_monkelf)
system_B(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(megasys1B_monkelf_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(megasys1B_monkelf_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(megasys1_state::system_Bbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, SYS_B_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(megasys1B_edfbl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, SYS_B_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(megasys1B_edfbl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", megasys1_state, megasys1B_scanline, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1)
@@ -1805,7 +1805,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Bbl)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(megasys1_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(megasys1_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, megasys1_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_ALWAYS_UPDATE)
@@ -1847,14 +1847,14 @@ MACHINE_CONFIG_START(megasys1_state::system_C)
system_A(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(SYS_C_CPU_CLOCK) /* 12MHz */
- MCFG_CPU_PROGRAM_MAP(megasys1C_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(SYS_C_CPU_CLOCK) /* 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megasys1C_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(megasys1_state, megasys1B_scanline)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(megasys1B_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(megasys1B_sound_map)
MACHINE_CONFIG_END
@@ -1872,9 +1872,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megasys1_state::system_D)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(megasys1D_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", megasys1_state, megasys1D_irq)
+ MCFG_DEVICE_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megasys1D_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", megasys1_state, megasys1D_irq)
MCFG_MACHINE_RESET_OVERRIDE(megasys1_state,megasys1)
@@ -1885,7 +1885,7 @@ MACHINE_CONFIG_START(megasys1_state::system_D)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(megasys1_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(megasys1_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, megasys1_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ABC)
@@ -1922,13 +1922,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(megasys1_state::system_Z)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
- MCFG_CPU_PROGRAM_MAP(megasys1Z_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
+ MCFG_DEVICE_PROGRAM_MAP(megasys1Z_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", megasys1_state, megasys1A_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* OSC 12MHz divided by 4 ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_IO_MAP(z80_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000) /* OSC 12MHz divided by 4 ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_IO_MAP(z80_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1953,7 +1953,7 @@ MACHINE_CONFIG_START(megasys1_state::system_Z)
MCFG_GENERIC_LATCH_8_ADD("soundlatch_z")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp
index 011eb5f7a9a..9384dabe4be 100644
--- a/src/mame/drivers/megatech.cpp
+++ b/src/mame/drivers/megatech.cpp
@@ -680,22 +680,22 @@ MACHINE_CONFIG_START(mtech_state::megatech)
md_ntsc(config);
/* Megatech has an extra SMS based bios *and* an additional screen */
- MCFG_CPU_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
- MCFG_CPU_PROGRAM_MAP(megatech_bios_map)
- MCFG_CPU_IO_MAP(megatech_bios_portmap)
+ MCFG_DEVICE_ADD("mtbios", Z80, MASTER_CLOCK / 15) /* ?? */
+ MCFG_DEVICE_PROGRAM_MAP(megatech_bios_map)
+ MCFG_DEVICE_IO_MAP(megatech_bios_portmap)
MCFG_DEVICE_ADD("io1", CXD1095, 0)
MCFG_CXD1095_IN_PORTA_CB(IOPORT("BIOS_DSW0"))
MCFG_CXD1095_IN_PORTB_CB(IOPORT("BIOS_DSW1"))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(mtech_state, cart_select_w))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, mtech_state, cart_select_w))
MCFG_DEVICE_ADD("io2", CXD1095, 0)
MCFG_CXD1095_IN_PORTA_CB(IOPORT("BIOS_IN0"))
MCFG_CXD1095_IN_PORTB_CB(IOPORT("BIOS_IN1"))
- MCFG_CXD1095_IN_PORTC_CB(READ8(mtech_state, bios_portc_r))
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(mtech_state, bios_portd_w))
- MCFG_CXD1095_IN_PORTE_CB(READ8(mtech_state, bios_porte_r))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(mtech_state, bios_porte_w))
+ MCFG_CXD1095_IN_PORTC_CB(READ8(*this, mtech_state, bios_portc_r))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, mtech_state, bios_portd_w))
+ MCFG_CXD1095_IN_PORTE_CB(READ8(*this, mtech_state, bios_porte_r))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, mtech_state, bios_porte_w))
MCFG_MACHINE_RESET_OVERRIDE(mtech_state, megatech)
@@ -706,7 +706,7 @@ MACHINE_CONFIG_START(mtech_state::megatech)
sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mtech_state, screen_update_main)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mtech_state, screen_vblank_main))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mtech_state, screen_vblank_main))
MCFG_DEVICE_MODIFY("gen_vdp")
MCFG_SEGA315_5313_INT_CB(INPUTLINE("genesis_snd_z80", 0))
@@ -724,7 +724,7 @@ MACHINE_CONFIG_START(mtech_state::megatech)
MCFG_SEGA315_5246_INT_CB(INPUTLINE("mtbios", 0))
/* sound hardware */
- MCFG_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
+ MCFG_DEVICE_ADD("sn2", SN76496, MASTER_CLOCK/15)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp
index e5aa36e81fb..c791ac102e7 100644
--- a/src/mame/drivers/megazone.cpp
+++ b/src/mame/drivers/megazone.cpp
@@ -301,26 +301,26 @@ WRITE_LINE_MEMBER(megazone_state::vblank_irq)
MACHINE_CONFIG_START(megazone_state::megazone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, XTAL(18'432'000)/9) /* 2.048 MHz */
- MCFG_CPU_PROGRAM_MAP(megazone_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, XTAL(18'432'000)/9) /* 2.048 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megazone_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* Z80 Clock is derived from the H1 signal */
- MCFG_CPU_PROGRAM_MAP(megazone_sound_map)
- MCFG_CPU_IO_MAP(megazone_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* Z80 Clock is derived from the H1 signal */
+ MCFG_DEVICE_PROGRAM_MAP(megazone_sound_map)
+ MCFG_DEVICE_IO_MAP(megazone_sound_io_map)
- MCFG_CPU_ADD("daccpu", I8039, XTAL(14'318'181)/2) /* 7.15909MHz */
- MCFG_CPU_PROGRAM_MAP(megazone_i8039_map)
- MCFG_CPU_IO_MAP(megazone_i8039_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(megazone_state, i8039_irqen_and_status_w))
+ MCFG_DEVICE_ADD("daccpu", I8039, XTAL(14'318'181)/2) /* 7.15909MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megazone_i8039_map)
+ MCFG_DEVICE_IO_MAP(megazone_i8039_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, megazone_state, i8039_irqen_and_status_w))
MCFG_QUANTUM_TIME(attotime::from_hz(900))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 13A
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(megazone_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(megazone_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(megazone_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(megazone_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, megazone_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, megazone_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, megazone_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, megazone_state, irq_mask_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -332,7 +332,7 @@ MACHINE_CONFIG_START(megazone_state::megazone)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(megazone_state, screen_update_megazone)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(megazone_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, megazone_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", megazone)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -344,22 +344,22 @@ MACHINE_CONFIG_START(megazone_state::megazone)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(14'318'181)/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(megazone_state, megazone_port_a_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(megazone_state, megazone_port_b_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(14'318'181)/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, megazone_state, megazone_port_a_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, megazone_state, megazone_port_b_w))
MCFG_SOUND_ROUTE(0, "filter.0.0", 0.30)
MCFG_SOUND_ROUTE(1, "filter.0.1", 0.30)
MCFG_SOUND_ROUTE(2, "filter.0.2", 0.30)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_FILTER_RC_ADD("filter.0.0", 0)
+ MCFG_DEVICE_ADD("filter.0.0", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_FILTER_RC_ADD("filter.0.1", 0)
+ MCFG_DEVICE_ADD("filter.0.1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_FILTER_RC_ADD("filter.0.2", 0)
+ MCFG_DEVICE_ADD("filter.0.2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp
index 46de0abd8ab..0c2c8a634b9 100644
--- a/src/mame/drivers/meijinsn.cpp
+++ b/src/mame/drivers/meijinsn.cpp
@@ -361,14 +361,14 @@ void meijinsn_state::machine_reset()
MACHINE_CONFIG_START(meijinsn_state::meijinsn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 9000000 )
- MCFG_CPU_PROGRAM_MAP(meijinsn_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 9000000 )
+ MCFG_DEVICE_PROGRAM_MAP(meijinsn_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", meijinsn_state, meijinsn_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(meijinsn_sound_map)
- MCFG_CPU_IO_MAP(meijinsn_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(meijinsn_state, irq0_line_hold, 160*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(meijinsn_sound_map)
+ MCFG_DEVICE_IO_MAP(meijinsn_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(meijinsn_state, irq0_line_hold, 160*60)
/* video hardware */
@@ -388,8 +388,8 @@ MACHINE_CONFIG_START(meijinsn_state::meijinsn)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 9d2ff88e9cc..5d3716a4fd7 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -375,8 +375,8 @@ void mekd2_state::machine_start()
MACHINE_CONFIG_START(mekd2_state::mekd2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL_MEKD2 / 2) /* 614.4 kHz */
- MCFG_CPU_PROGRAM_MAP(mekd2_mem)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL_MEKD2 / 2) /* 614.4 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(mekd2_mem)
MCFG_DEFAULT_LAYOUT(layout_mekd2)
@@ -389,11 +389,11 @@ MACHINE_CONFIG_START(mekd2_state::mekd2)
/* Devices */
MCFG_DEVICE_ADD("pia_s", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mekd2_state, mekd2_key_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(mekd2_state, mekd2_key40_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mekd2_state, mekd2_segment_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mekd2_state, mekd2_digit_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mekd2_state, mekd2_nmi_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mekd2_state, mekd2_key_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, mekd2_state, mekd2_key40_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mekd2_state, mekd2_segment_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mekd2_state, mekd2_digit_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mekd2_state, mekd2_nmi_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
@@ -402,13 +402,13 @@ MACHINE_CONFIG_START(mekd2_state::mekd2)
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(mekd2_state, cass_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, mekd2_state, cass_w))
MCFG_DEVICE_ADD("acia_tx_clock", CLOCK, XTAL_MEKD2 / 256) // 4800Hz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
MCFG_DEVICE_ADD("acia_rx_clock", CLOCK, 300) // toggled by cassette circuit
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_rxc))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mekd2_c", mekd2_state, mekd2_c, attotime::from_hz(4800))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mekd2_p", mekd2_state, mekd2_p, attotime::from_hz(40000))
diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp
index 53f8e5e3027..7e48c098c56 100644
--- a/src/mame/drivers/mephisto.cpp
+++ b/src/mame/drivers/mephisto.cpp
@@ -298,8 +298,8 @@ void mephisto_state::machine_reset()
MACHINE_CONFIG_START(mephisto_state::mephisto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M65C02,4915200) /* 65C02 */
- MCFG_CPU_PROGRAM_MAP(mephisto_mem)
+ MCFG_DEVICE_ADD("maincpu",M65C02,4915200) /* 65C02 */
+ MCFG_DEVICE_PROGRAM_MAP(mephisto_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("outlatch", HC259, 0)
@@ -309,11 +309,11 @@ MACHINE_CONFIG_START(mephisto_state::mephisto)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led103"))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led104"))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led105"))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mephisto_state, write_led7))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, mephisto_state, write_led7))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", mephisto_state, update_nmi, attotime::from_hz(600))
@@ -325,8 +325,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_state::rebel5)
mephisto(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rebel5_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rebel5_mem)
MCFG_DEVICE_REMOVE("nmi_timer")
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer_r5", mephisto_state, update_nmi_r5, attotime::from_hz(600))
@@ -334,8 +334,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_state::mm2)
mephisto(config);
- MCFG_CPU_REPLACE("maincpu", M65C02, 3700000)
- MCFG_CPU_PROGRAM_MAP(mm2_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 3700000)
+ MCFG_DEVICE_PROGRAM_MAP(mm2_mem)
MCFG_MACHINE_START_OVERRIDE(mephisto_state, mm2 )
MCFG_DEVICE_REMOVE("nmi_timer")
@@ -344,9 +344,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_state::mm4tk)
mephisto(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_REPLACE("maincpu", M65C02, 18000000)
- MCFG_CPU_PROGRAM_MAP(mephisto_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_REPLACE("maincpu", M65C02, 18000000)
+ MCFG_DEVICE_PROGRAM_MAP(mephisto_mem)
MACHINE_CONFIG_END
ROM_START(rebel5)
diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp
index 3aba7444cd2..021b73a34b6 100644
--- a/src/mame/drivers/mephisto_montec.cpp
+++ b/src/mame/drivers/mephisto_montec.cpp
@@ -455,14 +455,14 @@ static INPUT_PORTS_START( smondial2 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mephisto_montec_state::montec)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP( montec_mem )
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_assert, XTAL(4'000'000) / (1 << 13))
+ MCFG_DEVICE_ADD("maincpu", M65C02, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP( montec_mem )
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_assert, XTAL(4'000'000) / (1 << 13))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_MEPHISTO_SENSORS_BOARD_ADD("board")
@@ -472,16 +472,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_montec_state::monteciv)
montec(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(8'000'000) )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(8'000'000) )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_montec_state::megaiv)
montec(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(4'915'200) )
- MCFG_CPU_PROGRAM_MAP(megaiv_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(4'915'200) / (1 << 13))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(4'915'200) )
+ MCFG_DEVICE_PROGRAM_MAP(megaiv_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(4'915'200) / (1 << 13))
MCFG_DEVICE_REMOVE("board")
MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board")
@@ -491,10 +491,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_montec_state::mondial2)
megaiv(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(2'000'000) )
- MCFG_CPU_PROGRAM_MAP(mondial2_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(2'000'000) / (1 << 12))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(2'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(mondial2_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(2'000'000) / (1 << 12))
MCFG_TIMER_DRIVER_ADD_PERIODIC("refresh_leds", mephisto_montec_state, refresh_leds, attotime::from_hz(10))
MCFG_DEFAULT_LAYOUT(layout_mephisto_mondial2)
@@ -502,16 +502,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_montec_state::smondial)
megaiv(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(4'000'000) )
- MCFG_CPU_PROGRAM_MAP(smondial_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(4'000'000) / (1 << 13))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(4'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(smondial_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(4'000'000) / (1 << 13))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_montec_state::smondial2)
smondial(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(smondial2_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(smondial2_mem)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "smondial2_cart")
MCFG_SOFTWARE_LIST_ADD("cart_list", "smondial2")
diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp
index 926ce10cb2b..c5508529d3a 100644
--- a/src/mame/drivers/mephistp.cpp
+++ b/src/mame/drivers/mephistp.cpp
@@ -160,9 +160,9 @@ void mephisto_pinball_state::machine_reset()
MACHINE_CONFIG_START(mephisto_pinball_state::mephisto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL(18'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(mephisto_map)
- //MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("muart", i8256_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(18'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(mephisto_map)
+ //MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("muart", i8256_device, inta_cb)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -171,27 +171,27 @@ MACHINE_CONFIG_START(mephisto_pinball_state::mephisto)
//MCFG_I8256_TXD_HANDLER(INPUTLINE("audiocpu", MCS51_RX_LINE))
MCFG_DEVICE_ADD("ic20", I8155, XTAL(18'000'000)/6)
- //MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("muart", i8256_device, write_txc))
+ //MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE("muart", i8256_device, write_txc))
MCFG_DEVICE_ADD("ic9", I8155, XTAL(18'000'000)/6)
- //MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(mephisto_pinball_state, clk_shift_w))
-
- MCFG_CPU_ADD("soundcpu", I8051, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(mephisto_8051_map) // EA tied high for external program ROM
- MCFG_CPU_IO_MAP(mephisto_8051_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(mephisto_pinball_state, ay8910_read))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(mephisto_pinball_state, ay8910_write))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(mephisto_pinball_state, t0_t1_w))
+ //MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, mephisto_pinball_state, clk_shift_w))
+
+ MCFG_DEVICE_ADD("soundcpu", I8051, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mephisto_8051_map) // EA tied high for external program ROM
+ MCFG_DEVICE_IO_MAP(mephisto_8051_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, mephisto_pinball_state, ay8910_read))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, mephisto_pinball_state, ay8910_write))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, mephisto_pinball_state, t0_t1_w))
MCFG_MCS51_SERIAL_RX_CB(NOOP) // from MUART
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(12'000'000)/8)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(mephisto_pinball_state, ay8910_columns_w))
- MCFG_AY8910_PORT_B_READ_CB(READ8(mephisto_pinball_state, ay8910_inputs_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(12'000'000)/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, mephisto_pinball_state, ay8910_columns_w))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, mephisto_pinball_state, ay8910_inputs_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("dac", DAC08, 0)
+ MCFG_DEVICE_ADD("dac", DAC08, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -200,10 +200,10 @@ MACHINE_CONFIG_END
#ifdef UNUSED_DEFINITION
static MACHINE_CONFIG_START(sport2k)
mephisto(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(sport2k_8051_io)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(sport2k_8051_io)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp
index 5f50d022e7f..75a0a48cee1 100644
--- a/src/mame/drivers/merit.cpp
+++ b/src/mame/drivers/merit.cpp
@@ -1397,9 +1397,9 @@ MACHINE_START_MEMBER(merit_state,casino5)
}
MACHINE_CONFIG_START(merit_state::pitboss)
- MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(pitboss_map)
- MCFG_CPU_IO_MAP(trvwhiz_io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(pitboss_map)
+ MCFG_DEVICE_IO_MAP(trvwhiz_io_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -1408,8 +1408,8 @@ MACHINE_CONFIG_START(merit_state::pitboss)
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(merit_state, led1_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(merit_state, misc_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, merit_state, led1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, merit_state, misc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1421,22 +1421,22 @@ MACHINE_CONFIG_START(merit_state::pitboss)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(merit_state, crtc_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(merit_state, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(merit_state, hsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, merit_state, hsync_changed))
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", 0))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, CRTC_CLOCK)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(merit_state, led2_w))
+ MCFG_DEVICE_ADD("aysnd", AY8912, CRTC_CLOCK)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, merit_state, led2_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::casino5)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(casino5_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(casino5_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1446,9 +1446,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::bigappg)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bigappg_map)
- MCFG_CPU_IO_MAP(tictac_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bigappg_map)
+ MCFG_DEVICE_IO_MAP(tictac_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -1456,8 +1456,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::misdraw)
bigappg(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(misdraw_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(misdraw_map)
MCFG_NVRAM_ADD_0FILL("cpunvram")
MACHINE_CONFIG_END
@@ -1465,9 +1465,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::dodge)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dodge_map)
- MCFG_CPU_IO_MAP(tictac_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dodge_map)
+ MCFG_DEVICE_IO_MAP(tictac_io_map)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", merit_state, dodge_nvram_init)
MACHINE_CONFIG_END
@@ -1475,55 +1475,55 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::tictac)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tictac_map)
- MCFG_CPU_IO_MAP(tictac_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tictac_map)
+ MCFG_DEVICE_IO_MAP(tictac_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::trvwhiz)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(trvwhiz_map)
- MCFG_CPU_IO_MAP(trvwhiz_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(trvwhiz_map)
+ MCFG_DEVICE_IO_MAP(trvwhiz_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::dtrvwz5)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dtrvwz5_map)
- MCFG_CPU_IO_MAP(tictac_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dtrvwz5_map)
+ MCFG_DEVICE_IO_MAP(tictac_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::phrcraze)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(phrcraze_map)
- MCFG_CPU_IO_MAP(phrcraze_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(phrcraze_map)
+ MCFG_DEVICE_IO_MAP(phrcraze_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::trvwhziv)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(trvwhziv_map)
- MCFG_CPU_IO_MAP(tictac_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(trvwhziv_map)
+ MCFG_DEVICE_IO_MAP(tictac_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(merit_state::couple)
pitboss(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(couple_map)
- MCFG_CPU_IO_MAP(tictac_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(couple_map)
+ MCFG_DEVICE_IO_MAP(tictac_io_map)
MCFG_DEVICE_REMOVE("ppi8255_1")
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(merit_state, led1_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(merit_state, misc_couple_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, merit_state, led1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, merit_state, misc_couple_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index a5fc7f710b6..e15812c78e3 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -1104,28 +1104,28 @@ TIMER_DEVICE_CALLBACK_MEMBER(meritm_state::vblank_end_tick)
}
MACHINE_CONFIG_START(meritm_state::meritm_crt250)
- MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6)
- MCFG_CPU_PROGRAM_MAP(meritm_crt250_map)
- MCFG_CPU_IO_MAP(meritm_crt250_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, SYSTEM_CLK/6)
+ MCFG_DEVICE_PROGRAM_MAP(meritm_crt250_map)
+ MCFG_DEVICE_IO_MAP(meritm_crt250_io_map)
MCFG_Z80_DAISY_CHAIN(meritm_daisy_chain)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(meritm_state, meritm_crt250_port_b_w)) // used LMP x DRIVE
- MCFG_I8255_IN_PORTC_CB(READ8(meritm_state, meritm_8255_port_c_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, meritm_state, meritm_crt250_port_b_w)) // used LMP x DRIVE
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, meritm_state, meritm_8255_port_c_r))
MCFG_DEVICE_ADD("z80pio_0", Z80PIO, SYSTEM_CLK/6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(meritm_state, meritm_audio_pio_port_a_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(meritm_state, meritm_audio_pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(meritm_state, meritm_audio_pio_port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(meritm_state, meritm_audio_pio_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, meritm_state, meritm_audio_pio_port_a_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, meritm_state, meritm_audio_pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, meritm_state, meritm_audio_pio_port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, meritm_state, meritm_audio_pio_port_b_w))
MCFG_DEVICE_ADD("z80pio_1", Z80PIO, SYSTEM_CLK/6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_Z80PIO_IN_PA_CB(IOPORT("PIO1_PORTA"))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(meritm_state, meritm_io_pio_port_a_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, meritm_state, meritm_io_pio_port_a_w))
MCFG_Z80PIO_IN_PB_CB(IOPORT("PIO1_PORTB"))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(meritm_state, meritm_io_pio_port_b_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, meritm_state, meritm_io_pio_port_b_w))
MCFG_TIMER_DRIVER_ADD_SCANLINE("vblank_start", meritm_state, vblank_start_tick, "screen", 259, 262)
MCFG_TIMER_DRIVER_ADD_SCANLINE("vblank_end", meritm_state, vblank_end_tick, "screen", 262, 262)
@@ -1135,58 +1135,58 @@ MACHINE_CONFIG_START(meritm_state::meritm_crt250)
MCFG_DS1204_ADD("ds1204")
MCFG_V9938_ADD("v9938_0", "screen", 0x20000, SYSTEM_CLK)
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(meritm_state,meritm_vdp0_interrupt))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, meritm_state,meritm_vdp0_interrupt))
MCFG_V9938_ADD("v9938_1", "screen", 0x20000, SYSTEM_CLK)
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(meritm_state,meritm_vdp1_interrupt))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, meritm_state,meritm_vdp1_interrupt))
MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938_0", SYSTEM_CLK)
MCFG_SCREEN_UPDATE_DRIVER(meritm_state, screen_update_meritm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8930, SYSTEM_CLK/12)
+ MCFG_DEVICE_ADD("aysnd", AY8930, SYSTEM_CLK/12)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW")) /* Port A read */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(meritm_state, meritm_ay8930_port_b_w)) /* Port B write */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, meritm_state, meritm_ay8930_port_b_w)) /* Port B write */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(meritm_state::meritm_crt250_questions)
meritm_crt250(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(meritm_crt250_questions_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(meritm_crt250_questions_map)
MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_questions)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(meritm_state::meritm_crt250_crt252_crt258)
meritm_crt250_questions(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(meritm_crt250_crt258_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(meritm_crt250_crt258_io_map)
MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_crt252_crt258)
MCFG_DEVICE_ADD("ns16550", NS16550, UART_CLK)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
- MCFG_MICROTOUCH_ADD("microtouch", 9600, DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
+ MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE("ns16550", ins8250_uart_device, rx_w))
MCFG_MICROTOUCH_TOUCH_CB(meritm_state, meritm_touch_coord_transform)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(meritm_state::meritm_crt260)
meritm_crt250(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(meritm_map)
- MCFG_CPU_IO_MAP(meritm_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(meritm_map)
+ MCFG_DEVICE_IO_MAP(meritm_io_map)
MCFG_DEVICE_REMOVE("ppi8255")
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTC_CB(READ8(meritm_state, meritm_8255_port_c_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, meritm_state, meritm_8255_port_c_r))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) // DS1232, TD connected to VCC
MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt260)
MCFG_DEVICE_ADD("ns16550", NS16550, UART_CLK)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
- MCFG_MICROTOUCH_ADD("microtouch", 9600, DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
+ MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE("ns16550", ins8250_uart_device, rx_w))
MCFG_MICROTOUCH_TOUCH_CB(meritm_state, meritm_touch_coord_transform)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp
index b186017ea58..dca2f08d22e 100644
--- a/src/mame/drivers/mermaid.cpp
+++ b/src/mame/drivers/mermaid.cpp
@@ -423,21 +423,21 @@ WRITE_LINE_MEMBER(mermaid_state::rougien_adpcm_int)
MACHINE_CONFIG_START(mermaid_state::mermaid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) // ???
- MCFG_CPU_PROGRAM_MAP(mermaid_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) // ???
+ MCFG_DEVICE_PROGRAM_MAP(mermaid_map)
MCFG_DEVICE_ADD("latch1", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mermaid_state, ay1_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mermaid_state, ay2_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mermaid_state, ay1_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mermaid_state, ay2_enable_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // ???
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(mermaid_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mermaid_state, flip_screen_y_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mermaid_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, mermaid_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, mermaid_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, mermaid_state, nmi_mask_w))
MCFG_DEVICE_ADD("latch2", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // ???
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(mermaid_state, rougien_gfxbankswitch1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(mermaid_state, rougien_gfxbankswitch2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, mermaid_state, rougien_gfxbankswitch1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, mermaid_state, rougien_gfxbankswitch2_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // very frequent
/* video hardware */
@@ -447,7 +447,7 @@ MACHINE_CONFIG_START(mermaid_state::mermaid)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mermaid_state, screen_update_mermaid)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mermaid_state, screen_vblank_mermaid))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mermaid_state, screen_vblank_mermaid))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mermaid)
@@ -458,10 +458,10 @@ MACHINE_CONFIG_START(mermaid_state::mermaid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -470,24 +470,24 @@ MACHINE_CONFIG_START(mermaid_state::rougien)
mermaid(config);
MCFG_DEVICE_MODIFY("latch1")
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mermaid_state, rougien_sample_playback_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mermaid_state, rougien_sample_playback_w))
MCFG_DEVICE_MODIFY("latch2")
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mermaid_state, rougien_sample_rom_hi_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(mermaid_state, rougien_sample_rom_lo_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mermaid_state, rougien_sample_rom_hi_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, mermaid_state, rougien_sample_rom_lo_w))
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(mermaid_state,rougien)
- MCFG_SOUND_ADD("adpcm", MSM5205, 384000)
- MCFG_MSM5205_VCK_CALLBACK(WRITELINE(mermaid_state, rougien_adpcm_int))
+ MCFG_DEVICE_ADD("adpcm", MSM5205, 384000)
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE(*this, mermaid_state, rougien_adpcm_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("adpcm_counter", RIPPLE_COUNTER, 0)
MCFG_DEVICE_ROM("adpcm")
MCFG_RIPPLE_COUNTER_STAGES(12)
- MCFG_RIPPLE_COUNTER_ROM_OUT_CB(WRITE8(mermaid_state, adpcm_data_w))
+ MCFG_RIPPLE_COUNTER_ROM_OUT_CB(WRITE8(*this, mermaid_state, adpcm_data_w))
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp
index 9fdea2ffe32..4c79a3a62ba 100644
--- a/src/mame/drivers/mes.cpp
+++ b/src/mame/drivers/mes.cpp
@@ -130,9 +130,9 @@ void mes_state::kbd_put(u8 data)
MACHINE_CONFIG_START(mes_state::mes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp
index afedb709ddd..a8ebc3fc72f 100644
--- a/src/mame/drivers/metalmx.cpp
+++ b/src/mame/drivers/metalmx.cpp
@@ -693,25 +693,25 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(metalmx_state::metalmx)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(14'318'181))
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(14'318'181))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("adsp", ADSP2105, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(adsp_program_map)
- MCFG_CPU_DATA_MAP(adsp_data_map)
+ MCFG_DEVICE_ADD("adsp", ADSP2105, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(adsp_program_map)
+ MCFG_DEVICE_DATA_MAP(adsp_data_map)
- MCFG_CPU_ADD("gsp", TMS34020, 40000000) /* Unverified */
- MCFG_CPU_PROGRAM_MAP(gsp_map)
+ MCFG_DEVICE_ADD("gsp", TMS34020, 40000000) /* Unverified */
+ MCFG_DEVICE_PROGRAM_MAP(gsp_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(4000000) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
MCFG_TMS340X0_OUTPUT_INT_CB(INPUTLINE("maincpu", 4))
- MCFG_CPU_ADD("dsp32c_1", DSP32C, 40000000) /* Unverified */
- MCFG_CPU_PROGRAM_MAP(dsp32c_1_map)
+ MCFG_DEVICE_ADD("dsp32c_1", DSP32C, 40000000) /* Unverified */
+ MCFG_DEVICE_PROGRAM_MAP(dsp32c_1_map)
- MCFG_CPU_ADD("dsp32c_2", DSP32C, 40000000) /* Unverified */
- MCFG_CPU_PROGRAM_MAP(dsp32c_2_map)
+ MCFG_DEVICE_ADD("dsp32c_2", DSP32C, 40000000) /* Unverified */
+ MCFG_DEVICE_PROGRAM_MAP(dsp32c_2_map)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -726,7 +726,7 @@ MACHINE_CONFIG_START(metalmx_state::metalmx)
MCFG_DEVICE_ADD("cage", ATARI_CAGE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0) // TODO: speedup address
- MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(metalmx_state,cage_irq_callback))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8(*this, metalmx_state,cage_irq_callback))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp
index 3280eb882f2..108dec22e54 100644
--- a/src/mame/drivers/metlclsh.cpp
+++ b/src/mame/drivers/metlclsh.cpp
@@ -278,12 +278,12 @@ void metlclsh_state::machine_reset()
MACHINE_CONFIG_START(metlclsh_state::metlclsh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 1500000) // ?
- MCFG_CPU_PROGRAM_MAP(metlclsh_master_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, 1500000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(metlclsh_master_map)
// IRQ by YM3526, NMI by cpu #2
- MCFG_CPU_ADD("sub", M6809, 1500000) // ?
- MCFG_CPU_PROGRAM_MAP(metlclsh_slave_map)
+ MCFG_DEVICE_ADD("sub", M6809, 1500000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(metlclsh_slave_map)
// IRQ by cpu #1, NMI by coins insertion
@@ -303,13 +303,13 @@ MACHINE_CONFIG_START(metlclsh_state::metlclsh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp
index 106e45e8dc6..8ef457878b4 100644
--- a/src/mame/drivers/metlfrzr.cpp
+++ b/src/mame/drivers/metlfrzr.cpp
@@ -365,9 +365,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(metlfrzr_state::scanline)
MACHINE_CONFIG_START(metlfrzr_state::metlfrzr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(metlfrzr_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(metlfrzr_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", metlfrzr_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("t5182", T5182, 0)
@@ -391,7 +391,7 @@ MACHINE_CONFIG_START(metlfrzr_state::metlfrzr)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL(14'318'181) / 4) /* 3.579545 MHz */
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("t5182", t5182_device, ym2151_irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index 7339bb56a01..9519e11f0be 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -3057,7 +3057,7 @@ void metro_state::machine_start()
MACHINE_CONFIG_START(metro_state::i4100_config)
MCFG_DEVICE_ADD("vdp", I4100, 26.666_MHz_XTAL)
MCFG_I4100_GFXDECODE("gfxdecode")
- MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
+ MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(*this, metro_state,vdp_blit_end_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(58.2328) // VSync 58.2328Hz, HSync 15.32kHz
@@ -3065,15 +3065,15 @@ MACHINE_CONFIG_START(metro_state::i4100_config)
MCFG_SCREEN_SIZE(320, 240)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DEVICE("vdp", imagetek_i4100_device, screen_update)
- MCFG_SCREEN_PALETTE(":vdp:palette")
+ MCFG_SCREEN_PALETTE("vdp:palette")
- MCFG_GFXDECODE_ADD("gfxdecode", ":vdp:palette", i4100)
+ MCFG_GFXDECODE_ADD("gfxdecode", "vdp:palette", i4100)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::i4220_config)
MCFG_DEVICE_ADD("vdp2", I4220, 26.666_MHz_XTAL)
MCFG_I4100_GFXDECODE("gfxdecode")
- MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
+ MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(*this, metro_state,vdp_blit_end_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(58.2328) // VSync 58.2328Hz, HSync 15.32kHz
@@ -3081,15 +3081,15 @@ MACHINE_CONFIG_START(metro_state::i4220_config)
MCFG_SCREEN_SIZE(320, 240)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DEVICE("vdp2", imagetek_i4100_device, screen_update)
- MCFG_SCREEN_PALETTE(":vdp2:palette")
+ MCFG_SCREEN_PALETTE("vdp2:palette")
- MCFG_GFXDECODE_ADD("gfxdecode", ":vdp2:palette", i4220)
+ MCFG_GFXDECODE_ADD("gfxdecode", "vdp2:palette", i4220)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::i4300_config)
MCFG_DEVICE_ADD("vdp3", I4300, 26.666_MHz_XTAL)
MCFG_I4100_GFXDECODE("gfxdecode")
- MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
+ MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(*this, metro_state,vdp_blit_end_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(58.2328) // VSync 58.2328Hz, HSync 15.32kHz
@@ -3097,9 +3097,9 @@ MACHINE_CONFIG_START(metro_state::i4300_config)
MCFG_SCREEN_SIZE(320, 240)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DEVICE("vdp3", imagetek_i4100_device, screen_update)
- MCFG_SCREEN_PALETTE(":vdp3:palette")
+ MCFG_SCREEN_PALETTE("vdp3:palette")
- MCFG_GFXDECODE_ADD("gfxdecode", ":vdp3:palette", i4300)
+ MCFG_GFXDECODE_ADD("gfxdecode", "vdp3:palette", i4300)
MACHINE_CONFIG_END
// TODO: these comes from the CRTC inside the i4100
@@ -3147,9 +3147,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::msgogo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(msgogo_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(msgogo_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 60) // ?
/* video hardware */
i4220_config(config);
@@ -3157,12 +3157,12 @@ MACHINE_CONFIG_START(metro_state::msgogo)
MCFG_I4100_TILEMAP_XOFFSETS(-2,-2,-2)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq)) // timing is off, shaking sprites in intro
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq)) // timing is off, shaking sprites in intro
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_DEVICE_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
MCFG_DEVICE_ADDRESS_MAP(0, ymf278_map)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -3170,29 +3170,29 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::balcube)
msgogo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(balcube_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(balcube_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::daitoa)
msgogo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(daitoa_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(daitoa_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::bangball)
msgogo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bangball_map)
- MCFG_CPU_PERIODIC_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bangball_map)
+ MCFG_DEVICE_PERIODIC_INT_REMOVE()
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", metro_state, bangball_scanline, "screen", 0, 1)
// doesn't like 58.2 Hz
@@ -3203,9 +3203,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::batlbubl)
msgogo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(batlbubl_map)
- MCFG_CPU_PERIODIC_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(batlbubl_map)
+ MCFG_DEVICE_PERIODIC_INT_REMOVE()
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", metro_state, bangball_scanline, "screen", 0, 1)
// doesn't like 58.2 Hz
@@ -3216,32 +3216,32 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::metro_upd7810_sound)
- MCFG_CPU_ADD("audiocpu", UPD7810, 24_MHz_XTAL/2)
- MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r))
- MCFG_CPU_PROGRAM_MAP(metro_sound_map)
- MCFG_UPD7810_PORTA_READ_CB(READ8(metro_state, metro_porta_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(metro_state, metro_porta_w))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(metro_state, metro_portb_w))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(metro_state, metro_sound_rombank_w))
+ MCFG_DEVICE_ADD("audiocpu", UPD7810, 24_MHz_XTAL/2)
+ MCFG_UPD7810_RXD(READLINE(*this, metro_state, metro_rxd_r))
+ MCFG_DEVICE_PROGRAM_MAP(metro_sound_map)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, metro_state, metro_porta_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, metro_state, metro_porta_w))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, metro_state, metro_portb_w))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, metro_state, metro_sound_rombank_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::daitorid_upd7810_sound)
- MCFG_CPU_ADD("audiocpu", UPD7810, 12_MHz_XTAL)
- MCFG_UPD7810_RXD(READLINE(metro_state, metro_rxd_r))
- MCFG_CPU_PROGRAM_MAP(metro_sound_map)
- MCFG_UPD7810_PORTA_READ_CB(READ8(metro_state, metro_porta_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(metro_state, metro_porta_w))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(metro_state, daitorid_portb_w))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(metro_state, daitorid_sound_rombank_w))
+ MCFG_DEVICE_ADD("audiocpu", UPD7810, 12_MHz_XTAL)
+ MCFG_UPD7810_RXD(READLINE(*this, metro_state, metro_rxd_r))
+ MCFG_DEVICE_PROGRAM_MAP(metro_sound_map)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, metro_state, metro_porta_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, metro_state, metro_porta_w))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, metro_state, daitorid_portb_w))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, metro_state, daitorid_sound_rombank_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::daitorid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(daitorid_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(daitorid_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
daitorid_upd7810_sound(config);
@@ -3251,7 +3251,7 @@ MACHINE_CONFIG_START(metro_state::daitorid)
MCFG_I4100_TILEMAP_XOFFSETS(-2,-2,-2)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3269,8 +3269,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::puzzli)
daitorid(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PERIODIC_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PERIODIC_INT_REMOVE()
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", metro_state, bangball_scanline, "screen", 0, 1)
MCFG_DEVICE_MODIFY("screen")
@@ -3281,9 +3281,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::dharma)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(dharma_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(dharma_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3291,7 +3291,7 @@ MACHINE_CONFIG_START(metro_state::dharma)
i4220_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3301,16 +3301,16 @@ MACHINE_CONFIG_START(metro_state::dharma)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // sample rate = M6295 clock / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::karatour)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(karatour_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(karatour_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3318,7 +3318,7 @@ MACHINE_CONFIG_START(metro_state::karatour)
i4100_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, karatour_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, karatour_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3328,7 +3328,7 @@ MACHINE_CONFIG_START(metro_state::karatour)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3336,9 +3336,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::sankokushi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(kokushi_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(kokushi_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3346,7 +3346,7 @@ MACHINE_CONFIG_START(metro_state::sankokushi)
i4220_config_320x240(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, karatour_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, karatour_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3356,7 +3356,7 @@ MACHINE_CONFIG_START(metro_state::sankokushi)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3364,9 +3364,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::lastfort)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(lastfort_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(lastfort_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3374,7 +3374,7 @@ MACHINE_CONFIG_START(metro_state::lastfort)
i4100_config_360x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3384,23 +3384,23 @@ MACHINE_CONFIG_START(metro_state::lastfort)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_LOW) // sample rate = M6295 clock / 165
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::lastforg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(lastforg_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(lastforg_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
i4100_config_360x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, karatour_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, karatour_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3410,22 +3410,22 @@ MACHINE_CONFIG_START(metro_state::lastforg)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::dokyusei)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(dokyusei_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(dokyusei_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
/* video hardware */
i4300_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3433,16 +3433,16 @@ MACHINE_CONFIG_START(metro_state::dokyusei)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::dokyusp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(dokyusp_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(dokyusp_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -3452,7 +3452,7 @@ MACHINE_CONFIG_START(metro_state::dokyusp)
i4300_config_384x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3460,7 +3460,7 @@ MACHINE_CONFIG_START(metro_state::dokyusp)
MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3468,9 +3468,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::gakusai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(gakusai_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gakusai_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -3480,7 +3480,7 @@ MACHINE_CONFIG_START(metro_state::gakusai)
i4300_config_320x240(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3488,7 +3488,7 @@ MACHINE_CONFIG_START(metro_state::gakusai)
MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
MACHINE_CONFIG_END
@@ -3496,10 +3496,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::gakusai2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(gakusai2_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gakusai2_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -3509,7 +3509,7 @@ MACHINE_CONFIG_START(metro_state::gakusai2)
i4300_config_320x240(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3517,7 +3517,7 @@ MACHINE_CONFIG_START(metro_state::gakusai2)
MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00)
MACHINE_CONFIG_END
@@ -3525,9 +3525,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::pangpoms)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(pangpoms_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(pangpoms_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3535,7 +3535,7 @@ MACHINE_CONFIG_START(metro_state::pangpoms)
i4100_config_360x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3545,7 +3545,7 @@ MACHINE_CONFIG_START(metro_state::pangpoms)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3553,9 +3553,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::poitto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(poitto_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(poitto_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3563,7 +3563,7 @@ MACHINE_CONFIG_START(metro_state::poitto)
i4100_config_360x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3573,7 +3573,7 @@ MACHINE_CONFIG_START(metro_state::poitto)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3581,9 +3581,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::pururun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2) /* Not confirmed */
- MCFG_CPU_PROGRAM_MAP(pururun_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2) /* Not confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(pururun_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
daitorid_upd7810_sound(config);
@@ -3591,7 +3591,7 @@ MACHINE_CONFIG_START(metro_state::pururun)
i4220_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3610,16 +3610,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::skyalert)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(skyalert_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(skyalert_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
i4100_config_360x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3629,7 +3629,7 @@ MACHINE_CONFIG_START(metro_state::skyalert)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_LOW) // sample rate = M6295 clock / 165
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3637,9 +3637,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::toride2g)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(toride2g_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(toride2g_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
metro_upd7810_sound(config);
@@ -3647,7 +3647,7 @@ MACHINE_CONFIG_START(metro_state::toride2g)
i4220_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3657,7 +3657,7 @@ MACHINE_CONFIG_START(metro_state::toride2g)
MCFG_OKIM6295_ADD("oki", 24_MHz_XTAL/20, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -3665,9 +3665,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::mouja)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mouja_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mouja_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(metro_state,metro_irq_callback)
MCFG_WATCHDOG_ADD("watchdog")
@@ -3675,7 +3675,7 @@ MACHINE_CONFIG_START(metro_state::mouja)
i4300_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3683,7 +3683,7 @@ MACHINE_CONFIG_START(metro_state::mouja)
MCFG_DEVICE_ADDRESS_MAP(0, mouja_okimap)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3.579545_MHz_XTAL)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -3691,15 +3691,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::vmetal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(vmetal_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(vmetal_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
/* video hardware */
i4220_config_304x224(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, metro_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, metro_vblank_irq))
MCFG_DEVICE_MODIFY("vdp2")
MCFG_I4100_TILEMAP_XOFFSETS(-16,-16,-16)
@@ -3712,12 +3712,12 @@ MACHINE_CONFIG_START(metro_state::vmetal)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_ES8712_ADD("essnd", 0)
- MCFG_ES8712_RESET_HANDLER(WRITELINE(metro_state, vmetal_es8712_irq))
- MCFG_ES8712_MSM_WRITE_CALLBACK(DEVWRITE8("msm", msm6585_device, data_w))
+ MCFG_ES8712_RESET_HANDLER(WRITELINE(*this, metro_state, vmetal_es8712_irq))
+ MCFG_ES8712_MSM_WRITE_CALLBACK(WRITE8("msm", msm6585_device, data_w))
MCFG_ES8712_MSM_TAG("msm")
- MCFG_SOUND_ADD("msm", MSM6585, 640_kHz_XTAL) /* Not verified, value from docs */
- MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("essnd", es8712_device, msm_int))
+ MCFG_DEVICE_ADD("msm", MSM6585, 640_kHz_XTAL) /* Not verified, value from docs */
+ MCFG_MSM6585_VCK_CALLBACK(WRITELINE("essnd", es8712_device, msm_int))
MCFG_MSM6585_PRESCALER_SELECTOR(S40) /* Not verified, value from docs */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3726,18 +3726,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::blzntrnd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(blzntrnd_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(blzntrnd_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(metro_state, metro_periodic_interrupt, 8*60) // ?
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(blzntrnd_sound_map)
- MCFG_CPU_IO_MAP(blzntrnd_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(blzntrnd_sound_map)
+ MCFG_DEVICE_IO_MAP(blzntrnd_sound_io_map)
/* video hardware */
MCFG_DEVICE_ADD("vdp2", I4220, 26.666_MHz_XTAL)
MCFG_I4100_GFXDECODE("gfxdecode")
- MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(metro_state,vdp_blit_end_w))
+ MCFG_I4100_BLITTER_END_CALLBACK(WRITELINE(*this, metro_state,vdp_blit_end_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(58.2328) // VSync 58.2328Hz, HSync 15.32kHz
@@ -3745,12 +3745,12 @@ MACHINE_CONFIG_START(metro_state::blzntrnd)
MCFG_SCREEN_SIZE(320, 240)
MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(metro_state, screen_update_psac_vdp2_mix)
- MCFG_SCREEN_PALETTE(":vdp2:palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, karatour_vblank_irq))
+ MCFG_SCREEN_PALETTE("vdp2:palette")
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, karatour_vblank_irq))
MCFG_VIDEO_START_OVERRIDE(metro_state,blzntrnd)
- MCFG_GFXDECODE_ADD("gfxdecode", ":vdp2:palette", blzntrnd)
+ MCFG_GFXDECODE_ADD("gfxdecode", "vdp2:palette", blzntrnd)
MCFG_DEVICE_ADD("k053936", K053936, 0)
MCFG_K053936_OFFSETS(-77, -21)
@@ -3762,7 +3762,7 @@ MACHINE_CONFIG_START(metro_state::blzntrnd)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2610, 16_MHz_XTAL/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16_MHz_XTAL/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3786,7 +3786,7 @@ MACHINE_CONFIG_START(metro_state::gstrik2)
MCFG_DEVICE_REMOVE("rspeaker")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_REPLACE("ymsnd", YM2610, 16_MHz_XTAL/2)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2610, 16_MHz_XTAL/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -3797,23 +3797,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(metro_state::puzzlet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83007, 20_MHz_XTAL) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
- MCFG_CPU_PROGRAM_MAP(puzzlet_map)
- MCFG_CPU_IO_MAP(puzzlet_io_map)
+ MCFG_DEVICE_ADD("maincpu", H83007, 20_MHz_XTAL) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
+ MCFG_DEVICE_PROGRAM_MAP(puzzlet_map)
+ MCFG_DEVICE_IO_MAP(puzzlet_io_map)
/* Coins/service */
MCFG_PUZZLET_IO_ADD("coins")
- MCFG_PUZZLET_IO_DATA_CALLBACK(DEVWRITELINE("maincpu:sci1", h8_sci_device, rx_w))
+ MCFG_PUZZLET_IO_DATA_CALLBACK(WRITELINE("maincpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("maincpu:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":coins", puzzlet_io_device, ce_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":coins", puzzlet_io_device, clk_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("coins", puzzlet_io_device, ce_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("coins", puzzlet_io_device, clk_w))
/* video hardware */
// TODO: looks like game is running in i4220 compatibilty mode, $778000 seems to be an id for the chip?
i4220_config(config);
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(metro_state, puzzlet_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, metro_state, puzzlet_vblank_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -3821,7 +3821,7 @@ MACHINE_CONFIG_START(metro_state::puzzlet)
MCFG_OKIM6295_ADD("oki", 20_MHz_XTAL/5, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, 20_MHz_XTAL/5)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 20_MHz_XTAL/5)
MCFG_SOUND_ROUTE(0, "mono", 0.90)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp
index 74250a8a540..4c50e6bcc14 100644
--- a/src/mame/drivers/mexico86.cpp
+++ b/src/mame/drivers/mexico86.cpp
@@ -427,22 +427,22 @@ void mexico86_state::machine_reset()
MACHINE_CONFIG_START(mexico86_state::mexico86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
- MCFG_CPU_PROGRAM_MAP(mexico86_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
+ MCFG_DEVICE_PROGRAM_MAP(mexico86_map)
- MCFG_CPU_ADD("audiocpu", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
- MCFG_CPU_PROGRAM_MAP(mexico86_sound_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mexico86_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
+ MCFG_DEVICE_PROGRAM_MAP(mexico86_sound_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mexico86_state, irq0_line_hold)
- MCFG_CPU_ADD("mcu", M68705P3, 4000000) /* xtal is 4MHz, divided by 4 internally */
+ MCFG_DEVICE_ADD("mcu", M68705P3, 4000000) /* xtal is 4MHz, divided by 4 internally */
MCFG_M68705_PORTC_R_CB(IOPORT("IN0"));
- MCFG_M68705_PORTA_W_CB(WRITE8(mexico86_state, mexico86_68705_port_a_w));
- MCFG_M68705_PORTB_W_CB(WRITE8(mexico86_state, mexico86_68705_port_b_w));
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mexico86_state, mexico86_m68705_interrupt)
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, mexico86_state, mexico86_68705_port_a_w));
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, mexico86_state, mexico86_68705_port_b_w));
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mexico86_state, mexico86_m68705_interrupt)
- MCFG_CPU_ADD("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
- MCFG_CPU_PROGRAM_MAP(mexico86_sub_cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mexico86_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
+ MCFG_DEVICE_PROGRAM_MAP(mexico86_sub_cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mexico86_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper synchronization of the CPUs */
@@ -462,7 +462,7 @@ MACHINE_CONFIG_START(mexico86_state::mexico86)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 3000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(0, "mono", 0.30)
@@ -490,8 +490,8 @@ MACHINE_CONFIG_START(mexico86_state::kikikai)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mexico86_state, kikikai_interrupt) // IRQs should be triggered by the MCU, but we don't have it
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mexico86_state, kikikai_interrupt) // IRQs should be triggered by the MCU, but we don't have it
MCFG_DEVICE_REMOVE("mcu") // we don't have code for the MC6801U4
diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index 560d8786d55..55d86691364 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -585,8 +585,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(meyc8080_state::meyc8080)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(20'000'000) / 10) // divider guessed
- MCFG_CPU_PROGRAM_MAP(meyc8080_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(20'000'000) / 10) // divider guessed
+ MCFG_DEVICE_PROGRAM_MAP(meyc8080_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -600,7 +600,7 @@ MACHINE_CONFIG_START(meyc8080_state::meyc8080)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_2BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.66) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.66) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp
index 7591cd3648a..50f9bb3985f 100644
--- a/src/mame/drivers/meyc8088.cpp
+++ b/src/mame/drivers/meyc8088.cpp
@@ -350,22 +350,22 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(meyc8088_state::meyc8088)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, (XTAL(15'000'000) / 3) * 0.95) // NOTE: underclocked to prevent errors on diagnostics, MAME i8088 cycle timing is probably inaccurate
- MCFG_CPU_PROGRAM_MAP(meyc8088_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, (XTAL(15'000'000) / 3) * 0.95) // NOTE: underclocked to prevent errors on diagnostics, MAME i8088 cycle timing is probably inaccurate
+ MCFG_DEVICE_PROGRAM_MAP(meyc8088_map)
MCFG_DEVICE_ADD("i8155_1", I8155, XTAL(15'000'000) / (3*1))
// all ports set to input
- MCFG_I8155_IN_PORTA_CB(READ8(meyc8088_state, meyc8088_input_r))
+ MCFG_I8155_IN_PORTA_CB(READ8(*this, meyc8088_state, meyc8088_input_r))
MCFG_I8155_IN_PORTB_CB(IOPORT("SW"))
- MCFG_I8155_IN_PORTC_CB(READ8(meyc8088_state, meyc8088_status_r))
+ MCFG_I8155_IN_PORTC_CB(READ8(*this, meyc8088_state, meyc8088_status_r))
// i8251A trigger txc/rxc (debug related, unpopulated on sold boards)
MCFG_DEVICE_ADD("i8155_2", I8155, XTAL(15'000'000) / (3*32))
// all ports set to output
- MCFG_I8155_OUT_PORTA_CB(WRITE8(meyc8088_state, meyc8088_lights2_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(meyc8088_state, meyc8088_lights1_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(meyc8088_state, meyc8088_common_w))
- MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("dac", dac_bit_interface, write))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, meyc8088_state, meyc8088_lights2_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, meyc8088_state, meyc8088_lights1_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, meyc8088_state, meyc8088_common_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE("dac", dac_bit_interface, write))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(meyc8088_state::meyc8088)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000)/3, 320, 0, 256, 261, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(meyc8088_state, screen_update_meyc8088)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(meyc8088_state, screen_vblank_meyc8088))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, meyc8088_state, screen_vblank_meyc8088))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 32)
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(meyc8088_state::meyc8088)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mfabfz.cpp b/src/mame/drivers/mfabfz.cpp
index 84061de188f..66736d5a729 100644
--- a/src/mame/drivers/mfabfz.cpp
+++ b/src/mame/drivers/mfabfz.cpp
@@ -103,24 +103,24 @@ void mfabfz_state::machine_reset()
MACHINE_CONFIG_START(mfabfz_state::mfabfz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mfabfz_mem)
- MCFG_CPU_IO_MAP(mfabfz_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mfabfz_mem)
+ MCFG_DEVICE_IO_MAP(mfabfz_io)
// uart1 - terminal - clock hardware unknown
MCFG_DEVICE_ADD("uart1_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
// uart2 - cassette - clock comes from 2MHz through a divider consisting of 4 chips and some jumpers.
MCFG_DEVICE_ADD("uart2", I8251, 0)
@@ -137,12 +137,12 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(mfabfz_state::mfabfz85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mfabfz_mem)
- MCFG_CPU_IO_MAP(mfabfz85_io)
- MCFG_I8085A_SID(DEVREADLINE("rs232", rs232_port_device, rxd_r))
- MCFG_I8085A_SOD(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_DEVCB_INVERT
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mfabfz_mem)
+ MCFG_DEVICE_IO_MAP(mfabfz85_io)
+ MCFG_I8085A_SID(READLINE("rs232", rs232_port_device, rxd_r))
+ MCFG_I8085A_SOD(WRITELINE("rs232", rs232_port_device, write_txd)) MCFG_DEVCB_INVERT
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD("uart2", I8251, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index 3410c103214..dc69e9c0579 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -637,9 +637,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(mgames_state::mgames)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* 3 MHz? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mgames_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK/6) /* 3 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mgames_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index b428eb08d30..838c5124b14 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -591,8 +591,8 @@ DRIVER_INIT_MEMBER(mgavegas_state,mgavegas133)
MACHINE_CONFIG_START(mgavegas_state::mgavegas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLK)
- MCFG_CPU_PROGRAM_MAP(mgavegas_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLK)
+ MCFG_DEVICE_PROGRAM_MAP(mgavegas_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("int_0", mgavegas_state, int_0, attotime::from_hz(6000)) //6KHz from MSM5205 /VCK
@@ -603,19 +603,19 @@ MACHINE_CONFIG_START(mgavegas_state::mgavegas)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, AY_CLK)
+ MCFG_DEVICE_ADD("aysnd", AY8910, AY_CLK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.3)
- MCFG_AY8910_PORT_A_READ_CB(READ8(mgavegas_state, ay8910_a_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(mgavegas_state, ay8910_b_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, mgavegas_state, ay8910_a_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, mgavegas_state, ay8910_b_r))
- MCFG_SOUND_ADD("5205", MSM5205, MSM_CLK)
+ MCFG_DEVICE_ADD("5205", MSM5205, MSM_CLK)
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 2.0)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2",2.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp
index df407f5e498..f07137de3ca 100644
--- a/src/mame/drivers/mgolf.cpp
+++ b/src/mame/drivers/mgolf.cpp
@@ -371,8 +371,8 @@ void mgolf_state::machine_reset()
MACHINE_CONFIG_START(mgolf_state::mgolf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16) /* ? */
- MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 16) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
/* video hardware */
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index acd5d95c682..fa69a69df31 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -532,11 +532,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mhavoc_state::mhavoc)
/* basic machine hardware */
- MCFG_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */
- MCFG_CPU_PROGRAM_MAP(alpha_map)
+ MCFG_DEVICE_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(alpha_map)
- MCFG_CPU_ADD("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */
- MCFG_CPU_PROGRAM_MAP(gamma_map)
+ MCFG_DEVICE_ADD("gamma", M6502, MHAVOC_CLOCK_1_25M) /* 1.25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gamma_map)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -564,20 +564,20 @@ MACHINE_CONFIG_START(mhavoc_state::mhavoc)
* ==> DISCRETE emulation, below is just an approximation.
*/
- MCFG_SOUND_ADD("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW1"))
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), CAP_U(0.001), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), CAP_U(0.001), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("pokey3", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_DEVICE_ADD("pokey3", POKEY, MHAVOC_CLOCK_1_25M)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), CAP_U(0.001), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("pokey4", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_DEVICE_ADD("pokey4", POKEY, MHAVOC_CLOCK_1_25M)
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), CAP_U(0.001), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -586,7 +586,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mhavoc_state::mhavocrv)
mhavoc(config);
- MCFG_SOUND_ADD("tms", TMS5220, MHAVOC_CLOCK/2/9)
+ MCFG_DEVICE_ADD("tms", TMS5220, MHAVOC_CLOCK/2/9)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -595,18 +595,18 @@ MACHINE_CONFIG_START(mhavoc_state::alphaone)
mhavoc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("alpha")
- MCFG_CPU_PROGRAM_MAP(alphaone_map)
+ MCFG_DEVICE_MODIFY("alpha")
+ MCFG_DEVICE_PROGRAM_MAP(alphaone_map)
MCFG_DEVICE_REMOVE("gamma")
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 580, 0, 500)
/* sound hardware */
- MCFG_SOUND_REPLACE("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_DEVICE_REPLACE("pokey1", POKEY, MHAVOC_CLOCK_1_25M)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_REPLACE("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
+ MCFG_DEVICE_REPLACE("pokey2", POKEY, MHAVOC_CLOCK_1_25M)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_REMOVE("pokey3")
diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp
index cefd0c0bac6..b1831a54c43 100644
--- a/src/mame/drivers/mice.cpp
+++ b/src/mame/drivers/mice.cpp
@@ -163,36 +163,36 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(mice_state::mice)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mice_mem)
- MCFG_CPU_IO_MAP(mice_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mice_mem)
+ MCFG_DEVICE_IO_MAP(mice_io)
MCFG_DEVICE_ADD("uart", I8251, 6.144_MHz_XTAL / 2)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_I8251_TXRDY_HANDLER(INPUTLINE("maincpu", I8085_RST65_LINE))
MCFG_I8251_RXRDY_HANDLER(INPUTLINE("maincpu", I8085_RST75_LINE))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", mice_terminal)
MCFG_DEVICE_ADD("rpt", I8155, 6.144_MHz_XTAL / 2)
MCFG_I8155_IN_PORTC_CB(IOPORT("BAUD"))
- MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("ppi", I8255, 0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mice_state::mice2)
mice(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mice2_mem)
- MCFG_CPU_IO_MAP(mice2_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mice2_mem)
+ MCFG_DEVICE_IO_MAP(mice2_io)
MCFG_DEVICE_MODIFY("rs232")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", mice2_terminal)
diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp
index d0641c1540b..8b990802c95 100644
--- a/src/mame/drivers/micral.cpp
+++ b/src/mame/drivers/micral.cpp
@@ -375,12 +375,12 @@ MACHINE_RESET_MEMBER( micral_state, micral )
MACHINE_CONFIG_START(micral_state::micral)
// basic machine hardware
- MCFG_CPU_ADD( "maincpu", Z80, XTAL(4'000'000) )
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD( "maincpu", Z80, XTAL(4'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
// no i/o ports on main cpu
- MCFG_CPU_ADD( "keyboard", Z80, XTAL(1'000'000) ) // freq unknown
- MCFG_CPU_PROGRAM_MAP(mem_kbd)
- MCFG_CPU_IO_MAP(io_kbd)
+ MCFG_DEVICE_ADD( "keyboard", Z80, XTAL(1'000'000) ) // freq unknown
+ MCFG_DEVICE_PROGRAM_MAP(mem_kbd)
+ MCFG_DEVICE_IO_MAP(io_kbd)
MCFG_MACHINE_RESET_OVERRIDE(micral_state, micral)
@@ -397,20 +397,20 @@ MACHINE_CONFIG_START(micral_state::micral)
MCFG_DEVICE_ADD("crtc", CRT5037, 4000000 / 8) // xtal freq unknown
MCFG_TMS9927_CHAR_WIDTH(8) // unknown
- //MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE(TMS5501_TAG, tms5501_device, sens_w))
+ //MCFG_TMS9927_VSYN_CALLBACK(WRITELINE(TMS5501_TAG, tms5501_device, sens_w))
MCFG_VIDEO_SET_SCREEN("screen")
/* sound hardware */
//MCFG_SPEAKER_STANDARD_MONO("mono")
- //MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ //MCFG_DEVICE_ADD("beeper", BEEP, 2000)
//MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("uart", AY51013, 0) // CDP6402
MCFG_AY51013_TX_CLOCK(153600)
MCFG_AY51013_RX_CLOCK(153600)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
MACHINE_CONFIG_END
ROM_START( micral )
diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp
index cbe6ea18c5e..06efbab66da 100644
--- a/src/mame/drivers/micro20.cpp
+++ b/src/mame/drivers/micro20.cpp
@@ -156,32 +156,32 @@ void micro20_state::micro20_map(address_map &map)
MACHINE_CONFIG_START(micro20_state::micro20)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, M68020, XTAL(16'670'000))
- MCFG_CPU_PROGRAM_MAP(micro20_map)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, M68020, XTAL(16'670'000))
+ MCFG_DEVICE_PROGRAM_MAP(micro20_map)
MCFG_DEVICE_ADD(DUART_A_TAG, MC68681, XTAL(3'686'400))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(DUART_A_TAG, mc68681_device, rx_a_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(DUART_A_TAG, mc68681_device, rx_a_w))
MCFG_DEVICE_ADD(DUART_B_TAG, MC68681, XTAL(3'686'400))
MCFG_WD1772_ADD(FDC_TAG, XTAL(16'670'000) / 2)
MCFG_DEVICE_ADD(PIT_TAG, PIT68230, XTAL(16'670'000) / 2)
- MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE(micro20_state, timerirq_w))
- MCFG_PIT68230_H4_CB(WRITELINE(micro20_state, h4_w))
- MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(micro20_state, portb_w))
- MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(micro20_state, portc_w))
+ MCFG_PIT68230_TIMER_IRQ_CB(WRITELINE(*this, micro20_state, timerirq_w))
+ MCFG_PIT68230_H4_CB(WRITELINE(*this, micro20_state, h4_w))
+ MCFG_PIT68230_PB_OUTPUT_CB(WRITE8(*this, micro20_state, portb_w))
+ MCFG_PIT68230_PC_OUTPUT_CB(WRITE8(*this, micro20_state, portc_w))
MCFG_DEVICE_ADD(RTC_TAG, MSM58321, XTAL(32'768))
MCFG_MSM58321_DEFAULT_24H(false)
- MCFG_MSM58321_D0_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb0_w))
- MCFG_MSM58321_D1_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb1_w))
- MCFG_MSM58321_D2_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb2_w))
- MCFG_MSM58321_D3_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb3_w))
- MCFG_MSM58321_BUSY_HANDLER(DEVWRITELINE(PIT_TAG, pit68230_device, pb7_w))
+ MCFG_MSM58321_D0_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb0_w))
+ MCFG_MSM58321_D1_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb1_w))
+ MCFG_MSM58321_D2_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb2_w))
+ MCFG_MSM58321_D3_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb3_w))
+ MCFG_MSM58321_BUSY_HANDLER(WRITELINE(PIT_TAG, pit68230_device, pb7_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", micro20_state, micro20_timer, attotime::from_hz(200))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp
index 9ed967156da..f11812a0378 100644
--- a/src/mame/drivers/micro3d.cpp
+++ b/src/mame/drivers/micro3d.cpp
@@ -302,55 +302,55 @@ void micro3d_state::soundmem_io(address_map &map)
MACHINE_CONFIG_START(micro3d_state::micro3d)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(hostmem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", micro3d_state, micro3d_vblank)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(hostmem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", micro3d_state, micro3d_vblank)
- MCFG_CPU_ADD("vgb", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(vgbmem)
+ MCFG_DEVICE_ADD("vgb", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vgbmem)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000) / 8) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(4) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_IND16_CB(micro3d_state, scanline_update) /* scanline updater (indexed16) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(micro3d_state, tms_interrupt))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, micro3d_state, tms_interrupt))
- MCFG_CPU_ADD("drmath", AM29000, XTAL(32'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(drmath_prg)
- MCFG_CPU_DATA_MAP(drmath_data)
+ MCFG_DEVICE_ADD("drmath", AM29000, XTAL(32'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(drmath_prg)
+ MCFG_DEVICE_DATA_MAP(drmath_data)
MCFG_SCC8530_ADD("scc", XTAL(32'000'000) / 2 / 2, 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE("monitor_drmath", rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD("monitor_drmath", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("scc", z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("scc", z80scc_device, dcdb_w)) MCFG_DEVCB_XOR(1)
-
- MCFG_CPU_ADD("audiocpu", I8051, XTAL(11'059'200))
- MCFG_CPU_PROGRAM_MAP(soundmem_prg)
- MCFG_CPU_IO_MAP(soundmem_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(micro3d_state, micro3d_sound_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(micro3d_state, micro3d_sound_p1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(micro3d_state, micro3d_sound_p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(micro3d_state, micro3d_sound_p3_w))
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(micro3d_state, data_from_i8031))
- MCFG_MCS51_SERIAL_RX_CB(READ8(micro3d_state, data_to_i8031))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE("monitor_drmath", rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD("monitor_drmath", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("scc", z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("scc", z80scc_device, dcdb_w)) MCFG_DEVCB_XOR(1)
+
+ MCFG_DEVICE_ADD("audiocpu", I8051, XTAL(11'059'200))
+ MCFG_DEVICE_PROGRAM_MAP(soundmem_prg)
+ MCFG_DEVICE_IO_MAP(soundmem_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, micro3d_state, micro3d_sound_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, micro3d_state, micro3d_sound_p1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, micro3d_state, micro3d_sound_p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, micro3d_state, micro3d_sound_p3_w))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, micro3d_state, data_from_i8031))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, micro3d_state, data_to_i8031))
MCFG_DEVICE_ADD("duart", MC68681, XTAL(3'686'400))
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(micro3d_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("monitor_host", rs232_port_device, write_txd))
- MCFG_MC68681_B_TX_CALLBACK(WRITELINE(micro3d_state, duart_txb))
- MCFG_MC68681_INPORT_CALLBACK(READ8(micro3d_state, duart_input_r))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(micro3d_state, duart_output_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, micro3d_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("monitor_host", rs232_port_device, write_txd))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE(*this, micro3d_state, duart_txb))
+ MCFG_MC68681_INPORT_CALLBACK(READ8(*this, micro3d_state, duart_input_r))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, micro3d_state, duart_output_w))
MCFG_DEVICE_ADD("mfp", MC68901, 4000000)
MCFG_MC68901_TIMER_CLOCK(4000000)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
MCFG_MC68901_OUT_IRQ_CB(INPUTLINE("maincpu", M68K_IRQ_4))
- //MCFG_MC68901_OUT_TAO_CB(DEVWRITELINE("mfp", mc68901_device, rc_w))
- //MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mfp", mc68901_device, tc_w))
- MCFG_MC68901_OUT_TCO_CB(DEVWRITELINE("mfp", mc68901_device, tbi_w))
+ //MCFG_MC68901_OUT_TAO_CB(WRITELINE("mfp", mc68901_device, rc_w))
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mfp", mc68901_device, tc_w))
+ MCFG_MC68901_OUT_TCO_CB(WRITELINE("mfp", mc68901_device, tbi_w))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_QUANTUM_TIME(attotime::from_hz(3000))
@@ -364,23 +364,23 @@ MACHINE_CONFIG_START(micro3d_state::micro3d)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("uart", MC2661, XTAL(40'000'000) / 8) // actually SCN2651
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("monitor_vgb", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("monitor_vgb", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("monitor_vgb", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", mc2661_device, rx_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", mc2661_device, dsr_w))
+ MCFG_DEVICE_ADD("monitor_vgb", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", mc2661_device, rx_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", mc2661_device, dsr_w))
- MCFG_RS232_PORT_ADD("monitor_host", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", mc68681_device, rx_a_w))
+ MCFG_DEVICE_ADD("monitor_host", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", mc68681_device, rx_a_w))
MCFG_ADC0844_ADD("adc")
- MCFG_ADC0844_INTR_CB(DEVWRITELINE("mfp", mc68901_device, i3_w))
+ MCFG_ADC0844_INTR_CB(WRITELINE("mfp", mc68901_device, i3_w))
MCFG_ADC0844_CH1_CB(IOPORT("THROTTLE"))
- MCFG_ADC0844_CH2_CB(READ8(micro3d_state, adc_volume_r))
+ MCFG_ADC0844_CH2_CB(READ8(*this, micro3d_state, adc_volume_r))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("upd7759", UPD7759, XTAL(640'000))
+ MCFG_DEVICE_ADD("upd7759", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
@@ -388,11 +388,11 @@ MACHINE_CONFIG_START(micro3d_state::micro3d)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
- MCFG_SOUND_ADD("noise_1", MICRO3D, 0)
+ MCFG_DEVICE_ADD("noise_1", MICRO3D_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("noise_2", MICRO3D, 0)
+ MCFG_DEVICE_ADD("noise_2", MICRO3D_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp
index 80d3f3a48c5..eca7afa3619 100644
--- a/src/mame/drivers/microdec.cpp
+++ b/src/mame/drivers/microdec.cpp
@@ -189,36 +189,36 @@ DRIVER_INIT_MEMBER( microdec_state, microdec )
MACHINE_CONFIG_START(microdec_state::microdec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(microdec_mem)
- MCFG_CPU_IO_MAP(microdec_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(microdec_mem)
+ MCFG_DEVICE_IO_MAP(microdec_io)
/* video hardware */
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
MCFG_DEVICE_ADD("uart2", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", i8251_device, write_cts))
MCFG_UPD765A_ADD("fdc", true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp
index 445814b69ce..98870841c50 100644
--- a/src/mame/drivers/microkit.cpp
+++ b/src/mame/drivers/microkit.cpp
@@ -120,14 +120,14 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(microkit_state::microkit)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", CDP1802, 1750000)
- MCFG_CPU_PROGRAM_MAP(microkit_mem)
- MCFG_CPU_IO_MAP(microkit_io)
+ MCFG_DEVICE_ADD("maincpu", CDP1802, 1750000)
+ MCFG_DEVICE_PROGRAM_MAP(microkit_mem)
+ MCFG_DEVICE_IO_MAP(microkit_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(microkit_state, clear_r))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, microkit_state, clear_r))
/* video hardware */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
MCFG_RS232_RXD_HANDLER(INPUTLINE("maincpu", COSMAC_INPUT_LINE_EF4))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", serial_keyb)
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp
index 29c66ab1e3a..bfa5c494cc8 100644
--- a/src/mame/drivers/micronic.cpp
+++ b/src/mame/drivers/micronic.cpp
@@ -352,9 +352,9 @@ WRITE_LINE_MEMBER( micronic_state::mc146818_irq )
MACHINE_CONFIG_START(micronic_state::micronic)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(micronic_mem)
- MCFG_CPU_IO_MAP(micronic_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(micronic_mem)
+ MCFG_DEVICE_IO_MAP(micronic_io)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, LCD)
@@ -373,7 +373,7 @@ MACHINE_CONFIG_START(micronic_state::micronic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 0 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
/* ram banks */
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(micronic_state::micronic)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram2", micronic_state, nvram_init) // additional ram banks
MCFG_MC146818_ADD( MC146818_TAG, XTAL(32'768) )
- MCFG_MC146818_IRQ_HANDLER(WRITELINE(micronic_state, mc146818_irq))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(*this, micronic_state, mc146818_irq))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index 1ee008db974..0d4ac2c7e72 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -297,9 +297,9 @@ DRIVER_INIT_MEMBER( micropin_state, micropin )
MACHINE_CONFIG_START(micropin_state::micropin)
/* basic machine hardware */
- MCFG_CPU_ADD("v1cpu", M6800, XTAL(2'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(micropin_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(micropin_state, irq0_line_hold, 500)
+ MCFG_DEVICE_ADD("v1cpu", M6800, XTAL(2'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(micropin_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(micropin_state, irq0_line_hold, 500)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -309,35 +309,35 @@ MACHINE_CONFIG_START(micropin_state::micropin)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 387)
+ MCFG_DEVICE_ADD("beeper", BEEP, 387)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_DEVICE_ADD("pia50", PIA6821, 0)
- //MCFG_PIA_READPA_HANDLER(READ8(micropin_state, p50a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(micropin_state, p50a_w))
- //MCFG_PIA_READPB_HANDLER(READ8(micropin_state, p50b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(micropin_state, p50b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(micropin_state, p50ca2_w))
- //MCFG_PIA_CB2_HANDLER(WRITELINE(micropin_state, p50cb2_w))
+ //MCFG_PIA_READPA_HANDLER(READ8(*this, micropin_state, p50a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, micropin_state, p50a_w))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, micropin_state, p50b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, micropin_state, p50b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, micropin_state, p50ca2_w))
+ //MCFG_PIA_CB2_HANDLER(WRITELINE(*this, micropin_state, p50cb2_w))
MCFG_DEVICE_ADD("pia51", PIA6821, 0)
- //MCFG_PIA_READPA_HANDLER(READ8(micropin_state, p51a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(micropin_state, p51a_w))
- MCFG_PIA_READPB_HANDLER(READ8(micropin_state, p51b_r))
- //MCFG_PIA_WRITEPB_HANDLER(WRITE8(micropin_state, p51b_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(micropin_state, p51ca2_w))
- //MCFG_PIA_CB2_HANDLER(WRITELINE(micropin_state, p51cb2_w))
+ //MCFG_PIA_READPA_HANDLER(READ8(*this, micropin_state, p51a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, micropin_state, p51a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, micropin_state, p51b_r))
+ //MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, micropin_state, p51b_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, micropin_state, p51ca2_w))
+ //MCFG_PIA_CB2_HANDLER(WRITELINE(*this, micropin_state, p51cb2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", micropin_state, timer_a, attotime::from_hz(100))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(micropin_state::pentacup2)
/* basic machine hardware */
- MCFG_CPU_ADD("v2cpu", I8085A, 2000000)
- MCFG_CPU_PROGRAM_MAP(pentacup2_map)
- MCFG_CPU_IO_MAP(pentacup2_io)
- //MCFG_CPU_PERIODIC_INT_DRIVER(micropin_state, irq2_line_hold, 50)
+ MCFG_DEVICE_ADD("v2cpu", I8085A, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(pentacup2_map)
+ MCFG_DEVICE_IO_MAP(pentacup2_io)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(micropin_state, irq2_line_hold, 50)
//MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp
index 448a9a9a95a..c1847759071 100644
--- a/src/mame/drivers/microtan.cpp
+++ b/src/mame/drivers/microtan.cpp
@@ -212,9 +212,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(microtan_state::microtan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(6'000'000) / 8) // 750 kHz
- MCFG_CPU_PROGRAM_MAP(microtan_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", microtan_state, microtan_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(6'000'000) / 8) // 750 kHz
+ MCFG_DEVICE_PROGRAM_MAP(microtan_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", microtan_state, microtan_interrupt)
/* video hardware - include overscan */
@@ -234,9 +234,9 @@ MACHINE_CONFIG_START(microtan_state::microtan)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910.1", AY8910, 1000000)
+ MCFG_DEVICE_ADD("ay8910.1", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay8910.2", AY8910, 1000000)
+ MCFG_DEVICE_ADD("ay8910.2", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
/* snapshot/quickload */
@@ -252,19 +252,19 @@ MACHINE_CONFIG_START(microtan_state::microtan)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(6'000'000) / 8)
- MCFG_VIA6522_READPA_HANDLER(READ8(microtan_state, via_0_in_a))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(microtan_state, via_0_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(microtan_state, via_0_out_b))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(microtan_state, via_0_out_ca2))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(microtan_state, via_0_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(microtan_state, via_0_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, microtan_state, via_0_in_a))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, microtan_state, via_0_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, microtan_state, via_0_out_b))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, microtan_state, via_0_out_ca2))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, microtan_state, via_0_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, microtan_state, via_0_irq))
MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(6'000'000) / 8)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(microtan_state, via_1_out_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(microtan_state, via_1_out_b))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(microtan_state, via_1_out_ca2))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(microtan_state, via_1_out_cb2))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(microtan_state, via_1_irq))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, microtan_state, via_1_out_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, microtan_state, via_1_out_b))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, microtan_state, via_1_out_ca2))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, microtan_state, via_1_out_cb2))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, microtan_state, via_1_irq))
MACHINE_CONFIG_END
ROM_START( microtan )
diff --git a/src/mame/drivers/microterm.cpp b/src/mame/drivers/microterm.cpp
index bfc33ebaee4..c85fae23dd1 100644
--- a/src/mame/drivers/microterm.cpp
+++ b/src/mame/drivers/microterm.cpp
@@ -93,20 +93,20 @@ static INPUT_PORTS_START( microterm )
INPUT_PORTS_END
MACHINE_CONFIG_START(microterm_state::mt420)
- MCFG_CPU_ADD("maincpu", Z80, 4'000'000)
- MCFG_CPU_PROGRAM_MAP(mt420_mem_map)
- MCFG_CPU_IO_MAP(mt420_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4'000'000)
+ MCFG_DEVICE_PROGRAM_MAP(mt420_mem_map)
+ MCFG_DEVICE_IO_MAP(mt420_io_map)
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) // MC2681
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_MC68681_OUTPORT_CALLBACK(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
MCFG_DEVICE_ADD("aci", MC2661, XTAL(3'686'400)) // SCN2641
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
- MCFG_EEPROM_SERIAL_DO_CALLBACK(DEVWRITELINE("duart", scn2681_device, ip6_w))
+ MCFG_EEPROM_SERIAL_DO_CALLBACK(WRITELINE("duart", scn2681_device, ip6_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(9'877'680), 612, 0, 480, 269, 0, 250)
@@ -122,24 +122,24 @@ MACHINE_CONFIG_START(microterm_state::mt420)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(microterm_state::mt5510)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(mt5510_mem_map)
- MCFG_CPU_IO_MAP(mt5510_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mt5510_mem_map)
+ MCFG_DEVICE_IO_MAP(mt5510_io_map)
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", 0))
- MCFG_MC68681_OUTPORT_CALLBACK(DEVWRITELINE("eeprom1", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom2", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom1", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom2", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom1", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom2", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITELINE("eeprom1", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom2", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom1", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom2", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom1", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom2", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(3)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom1")
- MCFG_EEPROM_SERIAL_DO_CALLBACK(DEVWRITELINE("duart", scn2681_device, ip6_w))
+ MCFG_EEPROM_SERIAL_DO_CALLBACK(WRITELINE("duart", scn2681_device, ip6_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom2")
- MCFG_EEPROM_SERIAL_DO_CALLBACK(DEVWRITELINE("duart", scn2681_device, ip5_w))
+ MCFG_EEPROM_SERIAL_DO_CALLBACK(WRITELINE("duart", scn2681_device, ip5_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(45'830'400) / 2, 1120, 0, 960, 341, 0, 300) // wild guess at resolution
diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp
index b53b9690918..245864f2280 100644
--- a/src/mame/drivers/microvsn.cpp
+++ b/src/mame/drivers/microvsn.cpp
@@ -634,18 +634,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(microvision_state::microvision)
- MCFG_CPU_ADD("maincpu1", I8021, 2000000) // approximately
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(microvision_state, i8021_p0_write))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(microvision_state, i8021_p1_write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(microvision_state, i8021_p2_write))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(microvision_state, i8021_t1_read))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(microvision_state, i8021_bus_read))
-
- MCFG_CPU_ADD("maincpu2", TMS1100, 500000) // most games seem to be running at approximately this speed
+ MCFG_DEVICE_ADD("maincpu1", I8021, 2000000) // approximately
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, microvision_state, i8021_p0_write))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, microvision_state, i8021_p1_write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, microvision_state, i8021_p2_write))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, microvision_state, i8021_t1_read))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, microvision_state, i8021_bus_read))
+
+ MCFG_DEVICE_ADD("maincpu2", TMS1100, 500000) // most games seem to be running at approximately this speed
MCFG_TMS1XXX_OUTPUT_PLA( microvision_output_pla_0 )
- MCFG_TMS1XXX_READ_K_CB( READ8( microvision_state, tms1100_read_k ) )
- MCFG_TMS1XXX_WRITE_O_CB( WRITE16( microvision_state, tms1100_write_o ) )
- MCFG_TMS1XXX_WRITE_R_CB( WRITE16( microvision_state, tms1100_write_r ) )
+ MCFG_TMS1XXX_READ_K_CB( READ8( *this, microvision_state, tms1100_read_k ) )
+ MCFG_TMS1XXX_WRITE_O_CB( WRITE16( *this, microvision_state, tms1100_write_o ) )
+ MCFG_TMS1XXX_WRITE_R_CB( WRITE16( *this, microvision_state, tms1100_write_r ) )
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -656,7 +656,7 @@ MACHINE_CONFIG_START(microvision_state::microvision)
MCFG_MACHINE_RESET_OVERRIDE(microvision_state, microvision )
MCFG_SCREEN_UPDATE_DRIVER(microvision_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(microvision_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, microvision_state, screen_vblank))
MCFG_SCREEN_SIZE(16, 16)
MCFG_SCREEN_VISIBLE_AREA(0, 15, 0, 15)
MCFG_SCREEN_PALETTE("palette")
@@ -668,7 +668,7 @@ MACHINE_CONFIG_START(microvision_state::microvision)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_2BIT_BINARY_WEIGHTED_ONES_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_BINARY_WEIGHTED_ONES_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp
index ad9e325581a..b2f80e648a3 100644
--- a/src/mame/drivers/midas.cpp
+++ b/src/mame/drivers/midas.cpp
@@ -631,9 +631,9 @@ WRITE_LINE_MEMBER(midas_state::screen_vblank_midas)
MACHINE_CONFIG_START(midas_state::livequiz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(livequiz_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", midas_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(livequiz_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midas_state, irq1_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(midas_state::livequiz)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(midas_state, screen_update_midas)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(midas_state, screen_vblank_midas))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, midas_state, screen_vblank_midas))
MCFG_DEVICE_ADD("spritegen", NEOGEO_SPRITE_MIDAS, 0)
@@ -651,7 +651,7 @@ MACHINE_CONFIG_START(midas_state::livequiz)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -659,9 +659,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(midas_state::hammer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(hammer_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", midas_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(hammer_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midas_state, irq1_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -673,7 +673,7 @@ MACHINE_CONFIG_START(midas_state::hammer)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(midas_state, screen_update_midas)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(midas_state, screen_vblank_midas))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, midas_state, screen_vblank_midas))
MCFG_DEVICE_ADD("spritegen", NEOGEO_SPRITE_MIDAS, 0)
@@ -684,7 +684,7 @@ MACHINE_CONFIG_START(midas_state::hammer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midqslvr.cpp b/src/mame/drivers/midqslvr.cpp
index 6b37760bc8b..afb96a7ff23 100644
--- a/src/mame/drivers/midqslvr.cpp
+++ b/src/mame/drivers/midqslvr.cpp
@@ -416,10 +416,10 @@ void midqslvr_state::machine_reset()
}
MACHINE_CONFIG_START(midqslvr_state::midqslvr)
- MCFG_CPU_ADD("maincpu", PENTIUM, 333000000) // actually Celeron 333
- MCFG_CPU_PROGRAM_MAP(midqslvr_map)
- MCFG_CPU_IO_MAP(midqslvr_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 333000000) // actually Celeron 333
+ MCFG_DEVICE_PROGRAM_MAP(midqslvr_map)
+ MCFG_DEVICE_IO_MAP(midqslvr_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
@@ -428,7 +428,7 @@ MACHINE_CONFIG_START(midqslvr_state::midqslvr)
MCFG_PCI_BUS_LEGACY_DEVICE(31, DEVICE_SELF, midqslvr_state, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
/* video hardware */
pcvideo_vga(config);
diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp
index 349a6d7859c..67a51269282 100644
--- a/src/mame/drivers/midtunit.cpp
+++ b/src/mame/drivers/midtunit.cpp
@@ -594,8 +594,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midtunit_state::tunit_core)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(PIXEL_CLOCK) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
@@ -627,7 +627,7 @@ MACHINE_CONFIG_START(midtunit_state::tunit_adpcm)
/* basic machine hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("adpcm", WILLIAMS_ADPCM_SOUND, 0)
+ MCFG_DEVICE_ADD("adpcm", WILLIAMS_ADPCM_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index 6e0197d0674..d9668b2e9f6 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -1073,8 +1073,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midvunit_state::midvcommon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS32031, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(midvunit_map)
+ MCFG_DEVICE_ADD("maincpu", TMS32031, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(midvunit_map)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1126,9 +1126,9 @@ MACHINE_CONFIG_START(midvunit_state::midvplus)
midvcommon(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(midvplus_map)
- MCFG_TMS3203X_XF1_CB(WRITE8(midvunit_state, midvplus_xf1_w))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(midvplus_map)
+ MCFG_TMS3203X_XF1_CB(WRITE8(*this, midvunit_state, midvplus_xf1_w))
MCFG_MACHINE_RESET_OVERRIDE(midvunit_state,midvplus)
MCFG_DEVICE_REMOVE("nvram")
diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp
index 607790f85d1..ebfa63d7b73 100644
--- a/src/mame/drivers/midwunit.cpp
+++ b/src/mame/drivers/midwunit.cpp
@@ -623,8 +623,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midwunit_state::wunit)
- MCFG_CPU_ADD("maincpu", TMS34010, 50000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, 50000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(PIXEL_CLOCK) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp
index 8ee4e04846c..942ff9ead1a 100644
--- a/src/mame/drivers/midxunit.cpp
+++ b/src/mame/drivers/midxunit.cpp
@@ -244,8 +244,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midxunit_state::midxunit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34020, 40000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34020, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(PIXEL_CLOCK) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -271,7 +271,7 @@ MACHINE_CONFIG_START(midxunit_state::midxunit)
MCFG_MIDWAY_SERIAL_PIC_UPPER(419);
MCFG_ADC0848_ADD("adc")
- MCFG_ADC0848_INTR_CB(WRITELINE(midxunit_state, adc_int_w)) // ADC INT passed through PLSI1032
+ MCFG_ADC0848_INTR_CB(WRITELINE(*this, midxunit_state, adc_int_w)) // ADC INT passed through PLSI1032
MCFG_ADC0848_CH1_CB(IOPORT("AN0"))
MCFG_ADC0848_CH2_CB(IOPORT("AN1"))
MCFG_ADC0848_CH3_CB(IOPORT("AN2"))
diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp
index 217af978c03..04fdcf0d119 100644
--- a/src/mame/drivers/midyunit.cpp
+++ b/src/mame/drivers/midyunit.cpp
@@ -1102,8 +1102,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midyunit_state::zunit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(MEDRES_PIXEL_CLOCK) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
@@ -1128,7 +1128,7 @@ MACHINE_CONFIG_START(midyunit_state::zunit)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("narcsnd", WILLIAMS_NARC_SOUND, 0)
+ MCFG_DEVICE_ADD("narcsnd", WILLIAMS_NARC_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1144,8 +1144,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(midyunit_state::yunit_core)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(STDRES_PIXEL_CLOCK) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
@@ -1176,7 +1176,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_cvsd_4bit_slow)
yunit_core(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* video hardware */
@@ -1190,10 +1190,10 @@ MACHINE_CONFIG_START(midyunit_state::yunit_cvsd_4bit_fast)
yunit_core(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(FAST_MASTER_CLOCK)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(FAST_MASTER_CLOCK)
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* video hardware */
@@ -1207,7 +1207,7 @@ MACHINE_CONFIG_START(midyunit_state::yunit_cvsd_6bit_slow)
yunit_core(config);
/* basic machine hardware */
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* video hardware */
@@ -1221,10 +1221,10 @@ MACHINE_CONFIG_START(midyunit_state::yunit_adpcm_6bit_fast)
yunit_core(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(FAST_MASTER_CLOCK)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(FAST_MASTER_CLOCK)
- MCFG_SOUND_ADD("adpcm", WILLIAMS_ADPCM_SOUND, 0)
+ MCFG_DEVICE_ADD("adpcm", WILLIAMS_ADPCM_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* video hardware */
@@ -1238,10 +1238,10 @@ MACHINE_CONFIG_START(midyunit_state::yunit_adpcm_6bit_faster)
yunit_core(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(FASTER_MASTER_CLOCK)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(FASTER_MASTER_CLOCK)
- MCFG_SOUND_ADD("adpcm", WILLIAMS_ADPCM_SOUND, 0)
+ MCFG_DEVICE_ADD("adpcm", WILLIAMS_ADPCM_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* video hardware */
@@ -1266,8 +1266,8 @@ MACHINE_CONFIG_START(midyunit_state::mkyawdim)
/* basic machine hardware */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(yawdim_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(yawdim_sound_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index 5fdd0e4594b..5d8a715849a 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -1266,9 +1266,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(midzeus_state::midzeus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(zeus_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", midzeus_state, display_irq)
+ MCFG_DEVICE_ADD("maincpu", TMS32032, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(zeus_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midzeus_state, display_irq)
MCFG_MACHINE_START_OVERRIDE(midzeus_state,midzeus)
MCFG_MACHINE_RESET_OVERRIDE(midzeus_state,midzeus)
@@ -1301,7 +1301,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(midzeus_state::invasn)
midzeus(config);
- MCFG_CPU_ADD("pic", PIC16C57, 8000000) /* ? */
+ MCFG_DEVICE_ADD("pic", PIC16C57, 8000000) /* ? */
MCFG_DEVICE_MODIFY("ioasic")
MCFG_MIDWAY_IOASIC_UPPER(468/* or 488 */)
@@ -1310,9 +1310,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(midzeus2_state::midzeus2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(zeus2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", midzeus2_state, display_irq)
+ MCFG_DEVICE_ADD("maincpu", TMS32032, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(zeus2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", midzeus2_state, display_irq)
MCFG_MACHINE_START_OVERRIDE(midzeus2_state,midzeus)
MCFG_MACHINE_RESET_OVERRIDE(midzeus2_state,midzeus)
@@ -1324,7 +1324,7 @@ MACHINE_CONFIG_START(midzeus2_state::midzeus2)
MCFG_SCREEN_UPDATE_DEVICE("zeus2", zeus2_device, screen_update)
MCFG_DEVICE_ADD("zeus2", ZEUS2, ZEUS2_VIDEO_CLOCK)
- MCFG_ZEUS2_IRQ_CB(WRITELINE(midzeus2_state, zeus_irq))
+ MCFG_ZEUS2_IRQ_CB(WRITELINE(*this, midzeus2_state, zeus_irq))
/* sound hardware */
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
diff --git a/src/mame/drivers/mightyframe.cpp b/src/mame/drivers/mightyframe.cpp
index ba6b41fd050..0c8ce77c26c 100644
--- a/src/mame/drivers/mightyframe.cpp
+++ b/src/mame/drivers/mightyframe.cpp
@@ -39,8 +39,8 @@ static INPUT_PORTS_START( mightyframe )
INPUT_PORTS_END
MACHINE_CONFIG_START(mightyframe_state::mightyframe)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // no idea of clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) // no idea of clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
ROM_START( mightyframe )
diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp
index f9c90ce44be..1fc6df3e2ea 100644
--- a/src/mame/drivers/mikie.cpp
+++ b/src/mame/drivers/mikie.cpp
@@ -261,19 +261,19 @@ WRITE_LINE_MEMBER(mikie_state::vblank_irq)
MACHINE_CONFIG_START(mikie_state::mikie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, OSC/12) // 9A (surface scratched)
- MCFG_CPU_PROGRAM_MAP(mikie_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, OSC/12) // 9A (surface scratched)
+ MCFG_DEVICE_PROGRAM_MAP(mikie_map)
- MCFG_CPU_ADD("audiocpu", Z80, CLK) // 4E (surface scratched)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, CLK) // 4E (surface scratched)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 6I
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mikie_state, coin_counter_1_w)) // COIN1
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mikie_state, coin_counter_2_w)) // COIN2
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mikie_state, sh_irqtrigger_w)) // SOUNDON
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mikie_state, coin_counter_1_w)) // COIN1
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mikie_state, coin_counter_2_w)) // COIN2
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mikie_state, sh_irqtrigger_w)) // SOUNDON
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // END (not used?)
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mikie_state, flipscreen_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mikie_state, irq_mask_w)) // INT
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, mikie_state, flipscreen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, mikie_state, irq_mask_w)) // INT
MCFG_WATCHDOG_ADD("watchdog")
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(mikie_state::mikie)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mikie_state, screen_update_mikie)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mikie_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mikie_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mikie)
MCFG_PALETTE_ADD("palette", 16*8*16+16*8*16)
@@ -297,10 +297,10 @@ MACHINE_CONFIG_START(mikie_state::mikie)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL/8)
+ MCFG_DEVICE_ADD("sn1", SN76489A, XTAL/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("sn2", SN76489A, CLK)
+ MCFG_DEVICE_ADD("sn2", SN76489A, CLK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp
index 3d25513ec17..326ca3c52a6 100644
--- a/src/mame/drivers/mikro80.cpp
+++ b/src/mame/drivers/mikro80.cpp
@@ -166,14 +166,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(mikro80_state::mikro80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(mikro80_mem)
- MCFG_CPU_IO_MAP(mikro80_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(mikro80_mem)
+ MCFG_DEVICE_IO_MAP(mikro80_io)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mikro80_state, mikro80_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mikro80_state, mikro80_8255_portb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(mikro80_state, mikro80_8255_portc_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mikro80_state, mikro80_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mikro80_state, mikro80_8255_portb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mikro80_state, mikro80_8255_portc_r))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -203,18 +203,18 @@ MACHINE_CONFIG_START(mikro80_state::radio99)
mikro80(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(radio99_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(radio99_io)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.12)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.12)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mikro80_state::kristall)
mikro80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(kristall_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(kristall_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp
index 0811bbb61ad..7a9d040b249 100644
--- a/src/mame/drivers/mikromik.cpp
+++ b/src/mame/drivers/mikromik.cpp
@@ -459,60 +459,60 @@ void mm1_state::machine_reset()
MACHINE_CONFIG_START(mm1_state::mm1)
// basic system hardware
- MCFG_CPU_ADD(I8085A_TAG, I8085A, 6.144_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mm1_map)
- MCFG_I8085A_SID(READLINE(mm1_state, dsra_r))
- MCFG_I8085A_SOD(DEVWRITELINE(KB_TAG, mm1_keyboard_device, bell_w))
+ MCFG_DEVICE_ADD(I8085A_TAG, I8085A, 6.144_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mm1_map)
+ MCFG_I8085A_SID(READLINE(*this, mm1_state, dsra_r))
+ MCFG_I8085A_SOD(WRITELINE(KB_TAG, mm1_keyboard_device, bell_w))
MCFG_QUANTUM_PERFECT_CPU(I8085A_TAG)
// peripheral hardware
MCFG_DEVICE_ADD(I8212_TAG, I8212, 0)
MCFG_I8212_INT_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST65_LINE))
- MCFG_I8212_DI_CALLBACK(DEVREAD8(KB_TAG, mm1_keyboard_device, read))
+ MCFG_I8212_DI_CALLBACK(READ8(KB_TAG, mm1_keyboard_device, read))
MCFG_DEVICE_ADD(I8237_TAG, AM9517A, 6.144_MHz_XTAL/2)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(mm1_state, dma_hrq_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(mm1_state, dma_eop_w))
- MCFG_I8237_IN_MEMR_CB(READ8(mm1_state, read))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(mm1_state, write))
- MCFG_I8237_IN_IOR_2_CB(READ8(mm1_state, mpsc_dack_r))
- MCFG_I8237_IN_IOR_3_CB(DEVREAD8(UPD765_TAG, upd765_family_device, mdma_r))
- MCFG_I8237_OUT_IOW_0_CB(DEVWRITE8(I8275_TAG, i8275_device, dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(mm1_state, mpsc_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(DEVWRITE8(UPD765_TAG, upd765_family_device, mdma_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(mm1_state, dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, mm1_state, dma_hrq_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, mm1_state, dma_eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, mm1_state, read))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, mm1_state, write))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, mm1_state, mpsc_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(UPD765_TAG, upd765_family_device, mdma_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(I8275_TAG, i8275_device, dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, mm1_state, mpsc_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(UPD765_TAG, upd765_family_device, mdma_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, mm1_state, dack3_w))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(6.144_MHz_XTAL/2/2)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mm1_state, itxc_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, mm1_state, itxc_w))
MCFG_PIT8253_CLK1(6.144_MHz_XTAL/2/2)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(mm1_state, irxc_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, mm1_state, irxc_w))
MCFG_PIT8253_CLK2(6.144_MHz_XTAL/2/2)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mm1_state, auxc_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, mm1_state, auxc_w))
MCFG_UPD765A_ADD(UPD765_TAG, /* 16_MHz_XTAL/2/2 */ true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST55_LINE))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq3_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(I8237_TAG, am9517a_device, dreq3_w))
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", mm1_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", mm1_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, 6.144_MHz_XTAL/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_RXDRQA_CB(WRITELINE(mm1_state, drq2_w))
- MCFG_Z80DART_OUT_TXDRQA_CB(WRITELINE(mm1_state, drq1_w))
-
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, rxa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, ctsb_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_RXDRQA_CB(WRITELINE(*this, mm1_state, drq2_w))
+ MCFG_Z80DART_OUT_TXDRQA_CB(WRITELINE(*this, mm1_state, drq1_w))
+
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_C_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, ctsb_w))
MCFG_DEVICE_ADD(KB_TAG, MM1_KEYBOARD, 2500) // actual KBCLK is 6.144_MHz_XTAL/2/16
- MCFG_MM1_KEYBOARD_KBST_CALLBACK(DEVWRITELINE(I8212_TAG, i8212_device, stb_w))
+ MCFG_MM1_KEYBOARD_KBST_CALLBACK(WRITELINE(I8212_TAG, i8212_device, stb_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp
index 033c45e69ee..aa006ad2de1 100644
--- a/src/mame/drivers/mikrosha.cpp
+++ b/src/mame/drivers/mikrosha.cpp
@@ -207,31 +207,31 @@ GFXDECODE_END
MACHINE_CONFIG_START(mikrosha_state::mikrosha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
- MCFG_CPU_PROGRAM_MAP(mikrosha_mem)
- MCFG_CPU_IO_MAP(mikrosha_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(mikrosha_mem)
+ MCFG_DEVICE_IO_MAP(mikrosha_io)
MCFG_MACHINE_RESET_OVERRIDE(mikrosha_state, mikrosha)
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(radio86_state, mikrosha_8255_font_page_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, radio86_state, mikrosha_8255_font_page_w))
MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(mikrosha_state, display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257",i8257_device, dreq2_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
MCFG_PIT8253_CLK1(0)
MCFG_PIT8253_CLK2(2000000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mikrosha_state, mikrosha_pit_out2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, mikrosha_state, mikrosha_pit_out2))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -249,10 +249,10 @@ MACHINE_CONFIG_START(mikrosha_state::mikrosha)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("i8275", i8275_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, radio86_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, radio86_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, radio86_state, memory_write_byte))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("i8275", i8275_device, dack_w))
MCFG_I8257_REVERSE_RW_MODE(1)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index 83b240a8996..07b1f37fb29 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -560,10 +560,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(mil4000_state::mil4000)
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mil4000_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mil4000_map)
// irq 2/4/5 point to the same place, others invalid
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mil4000_state, irq5_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mil4000_state, irq5_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -588,9 +588,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mil4000_state::chewheel)
mil4000(config);
- MCFG_CPU_REPLACE("maincpu", M68000, CPU_CLOCK) /* 2MHz */
- MCFG_CPU_PROGRAM_MAP(chewheel_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mil4000_state, irq5_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, CPU_CLOCK) /* 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(chewheel_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mil4000_state, irq5_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/milton6805.cpp b/src/mame/drivers/milton6805.cpp
index 14a85fdf0fe..d0e0c7750b9 100644
--- a/src/mame/drivers/milton6805.cpp
+++ b/src/mame/drivers/milton6805.cpp
@@ -118,8 +118,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(milton_state::milton)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6805, 3120000) // MC6805P2, needs a CPU core
- MCFG_CPU_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_ADD("maincpu", M6805, 3120000) // MC6805P2, needs a CPU core
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
MCFG_DEVICE_ADD("grom3", TMC0430, 3120000 / 8)
downcast<tmc0430_device &>(*device).set_region_and_ident("groms", 0x0000, 0);
@@ -128,7 +128,7 @@ MACHINE_CONFIG_START(milton_state::milton)
downcast<tmc0430_device &>(*device).set_region_and_ident("groms", 0x2000, 1);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("sp0250", SP0250, 3120000)
+ MCFG_DEVICE_ADD("sp0250", SP0250, 3120000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/milwaukee.cpp b/src/mame/drivers/milwaukee.cpp
index 637dd79d4f5..2a950c2eed9 100644
--- a/src/mame/drivers/milwaukee.cpp
+++ b/src/mame/drivers/milwaukee.cpp
@@ -53,14 +53,14 @@ static INPUT_PORTS_START( milwaukee )
INPUT_PORTS_END
MACHINE_CONFIG_START(milwaukee_state::milwaukee)
- MCFG_CPU_ADD("maincpu", M6502, XTAL(16'000'000) / 16)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(16'000'000) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000) / 16 / 4) // 250 kHz
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pit", pit8253_device, write_gate0)) MCFG_DEVCB_INVERT
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pit", pit8253_device, write_gate0)) MCFG_DEVCB_INVERT
MCFG_PIT8253_CLK1(XTAL(16'000'000) / 2 / 13 / 2048 / 5) // 60.09 Hz?
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk2)) MCFG_DEVCB_INVERT
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pit", pit8253_device, write_clk2)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
@@ -68,16 +68,16 @@ MACHINE_CONFIG_START(milwaukee_state::milwaukee)
MCFG_DEVICE_ADD("ssda", MC6852, 0)
MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(16'000'000) / 2 / 13 / 4)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("acia1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia1", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia1", acia6850_device, write_cts))
MACHINE_CONFIG_END
ROM_START( mc1200 )
diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp
index 4f53a249620..efc38f87cee 100644
--- a/src/mame/drivers/mini2440.cpp
+++ b/src/mame/drivers/mini2440.cpp
@@ -223,8 +223,8 @@ DRIVER_INIT_MEMBER(mini2440_state,mini2440)
}
MACHINE_CONFIG_START(mini2440_state::mini2440)
- MCFG_CPU_ADD("maincpu", ARM920T, 400000000)
- MCFG_CPU_PROGRAM_MAP(mini2440_map)
+ MCFG_DEVICE_ADD("maincpu", ARM920T, 400000000)
+ MCFG_DEVICE_PROGRAM_MAP(mini2440_map)
MCFG_PALETTE_ADD("palette", 32768)
@@ -238,8 +238,8 @@ MACHINE_CONFIG_START(mini2440_state::mini2440)
MCFG_SCREEN_UPDATE_DEVICE("s3c2440", s3c2440_device, screen_update)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", UDA1341TS, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // uda1341ts.u12
- MCFG_SOUND_ADD("rdac", UDA1341TS, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // uda1341ts.u12
+ MCFG_DEVICE_ADD("ldac", UDA1341TS, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // uda1341ts.u12
+ MCFG_DEVICE_ADD("rdac", UDA1341TS, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // uda1341ts.u12
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -247,19 +247,19 @@ MACHINE_CONFIG_START(mini2440_state::mini2440)
MCFG_DEVICE_ADD("s3c2440", S3C2440, 12000000)
MCFG_S3C2440_PALETTE("palette")
MCFG_S3C2440_SCREEN("screen")
- MCFG_S3C2440_CORE_PIN_R_CB(READ32(mini2440_state, s3c2440_core_pin_r))
- MCFG_S3C2440_GPIO_PORT_R_CB(READ32(mini2440_state, s3c2440_gpio_port_r))
- MCFG_S3C2440_GPIO_PORT_W_CB(WRITE32(mini2440_state, s3c2440_gpio_port_w))
- MCFG_S3C2440_ADC_DATA_R_CB(READ32(mini2440_state, s3c2440_adc_data_r))
- MCFG_S3C2440_I2S_DATA_W_CB(WRITE16(mini2440_state, s3c2440_i2s_data_w))
- MCFG_S3C2440_NAND_COMMAND_W_CB(WRITE8(mini2440_state, s3c2440_nand_command_w))
- MCFG_S3C2440_NAND_ADDRESS_W_CB(WRITE8(mini2440_state, s3c2440_nand_address_w))
- MCFG_S3C2440_NAND_DATA_R_CB(READ8(mini2440_state, s3c2440_nand_data_r))
- MCFG_S3C2440_NAND_DATA_W_CB(WRITE8(mini2440_state, s3c2440_nand_data_w))
+ MCFG_S3C2440_CORE_PIN_R_CB(READ32(*this, mini2440_state, s3c2440_core_pin_r))
+ MCFG_S3C2440_GPIO_PORT_R_CB(READ32(*this, mini2440_state, s3c2440_gpio_port_r))
+ MCFG_S3C2440_GPIO_PORT_W_CB(WRITE32(*this, mini2440_state, s3c2440_gpio_port_w))
+ MCFG_S3C2440_ADC_DATA_R_CB(READ32(*this, mini2440_state, s3c2440_adc_data_r))
+ MCFG_S3C2440_I2S_DATA_W_CB(WRITE16(*this, mini2440_state, s3c2440_i2s_data_w))
+ MCFG_S3C2440_NAND_COMMAND_W_CB(WRITE8(*this, mini2440_state, s3c2440_nand_command_w))
+ MCFG_S3C2440_NAND_ADDRESS_W_CB(WRITE8(*this, mini2440_state, s3c2440_nand_address_w))
+ MCFG_S3C2440_NAND_DATA_R_CB(READ8(*this, mini2440_state, s3c2440_nand_data_r))
+ MCFG_S3C2440_NAND_DATA_W_CB(WRITE8(*this, mini2440_state, s3c2440_nand_data_w))
MCFG_DEVICE_ADD("nand", NAND, 0)
MCFG_NAND_TYPE(K9F1G08U0B)
- MCFG_NAND_RNB_CALLBACK(DEVWRITELINE("s3c2440", s3c2440_device, frnb_w))
+ MCFG_NAND_RNB_CALLBACK(WRITELINE("s3c2440", s3c2440_device, frnb_w))
MACHINE_CONFIG_END
static INPUT_PORTS_START( mini2440 )
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp
index 1b845e4f3c7..643928b3dd8 100644
--- a/src/mame/drivers/miniboy7.cpp
+++ b/src/mame/drivers/miniboy7.cpp
@@ -507,15 +507,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(miniboy7_state::miniboy7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
- MCFG_CPU_PROGRAM_MAP(miniboy7_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(miniboy7_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("INPUT1"))
- MCFG_PIA_READPB_HANDLER(READ8(miniboy7_state, pia_pb_r))
- MCFG_PIA_CA2_HANDLER(WRITELINE(miniboy7_state, pia_ca2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, miniboy7_state, pia_pb_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, miniboy7_state, pia_ca2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", 0))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", 0))
@@ -536,14 +536,14 @@ MACHINE_CONFIG_START(miniboy7_state::miniboy7)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(miniboy7_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE("pia0", pia6821_device, ca1_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE("pia0", pia6821_device, ca1_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK / 8) /* guess */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK / 8) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(miniboy7_state, ay_pa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(miniboy7_state, ay_pb_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, miniboy7_state, ay_pa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, miniboy7_state, ay_pb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp
index d8e69d9e479..e333e3699c9 100644
--- a/src/mame/drivers/minicom.cpp
+++ b/src/mame/drivers/minicom.cpp
@@ -218,13 +218,13 @@ DRIVER_INIT_MEMBER( minicom_state, minicom )
MACHINE_CONFIG_START(minicom_state::minicom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I87C52, XTAL(10'000'000)) /*FIX-ME: verify the correct clock frequency */
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(minicom_state, i87c52_p0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(minicom_state, i87c52_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(minicom_state, i87c52_p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(minicom_state, i87c52_p2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(minicom_state, i87c52_p2_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(minicom_state, i87c52_p3_w))
+ MCFG_DEVICE_ADD("maincpu", I87C52, XTAL(10'000'000)) /*FIX-ME: verify the correct clock frequency */
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, minicom_state, i87c52_p0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, minicom_state, i87c52_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, minicom_state, i87c52_p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, minicom_state, i87c52_p2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, minicom_state, i87c52_p2_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, minicom_state, i87c52_p3_w))
/* video hardware */
/* fluorescent 14-segment display forming a row of 20 characters */
diff --git a/src/mame/drivers/miniforce.cpp b/src/mame/drivers/miniforce.cpp
index a5810112340..471dc063d42 100644
--- a/src/mame/drivers/miniforce.cpp
+++ b/src/mame/drivers/miniforce.cpp
@@ -180,7 +180,7 @@ static void miniforce_vme_cards(device_slot_interface &device)
* Machine configuration
*/
MACHINE_CONFIG_START(miniforce_state::miniforce)
-// MCFG_CPU_PROGRAM_MAP (miniforce_mem)
+// MCFG_DEVICE_PROGRAM_MAP (miniforce_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, miniforce_vme_cards, "fccpu21")
MCFG_VME_SLOT_ADD ("vme", 2, miniforce_vme_cards, nullptr)
diff --git a/src/mame/drivers/miniframe.cpp b/src/mame/drivers/miniframe.cpp
index 0c7218fcc1d..2cd78f60e99 100644
--- a/src/mame/drivers/miniframe.cpp
+++ b/src/mame/drivers/miniframe.cpp
@@ -224,8 +224,8 @@ static void miniframe_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(miniframe_state::miniframe)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68010, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(miniframe_mem)
+ MCFG_DEVICE_ADD("maincpu", M68010, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(miniframe_mem)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -241,19 +241,19 @@ MACHINE_CONFIG_START(miniframe_state::miniframe)
// floppy
MCFG_DEVICE_ADD("wd2797", WD2797, 1000000)
-// MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(miniframe_state, wd2797_intrq_w))
-// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(miniframe_state, wd2797_drq_w))
+// MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, miniframe_state, wd2797_intrq_w))
+// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, miniframe_state, wd2797_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd2797:0", miniframe_floppies, "525dd", floppy_image_device::default_floppy_formats)
// 8263s
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(76800)
MCFG_PIT8253_CLK1(76800)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir4_w))
// chain clock 1 output into clock 2
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk2))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pit8253", pit8253_device, write_clk2))
// and ir4 on the PIC
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("pic8259", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("baudgen", PIT8253, 0)
MCFG_PIT8253_CLK0(1228800)
diff --git a/src/mame/drivers/minitel_2_rpic.cpp b/src/mame/drivers/minitel_2_rpic.cpp
index c95b65eed2e..95c94a8a1ac 100644
--- a/src/mame/drivers/minitel_2_rpic.cpp
+++ b/src/mame/drivers/minitel_2_rpic.cpp
@@ -399,13 +399,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(minitel_state::minitel2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, XTAL(14'318'181)) //verified on pcb
- MCFG_CPU_PROGRAM_MAP(mem_prg)
- MCFG_CPU_IO_MAP(mem_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(minitel_state, port1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(minitel_state, port1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(minitel_state, port3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(minitel_state, port3_w))
+ MCFG_DEVICE_ADD("maincpu", I80C32, XTAL(14'318'181)) //verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(mem_prg)
+ MCFG_DEVICE_IO_MAP(mem_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, minitel_state, port1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, minitel_state, port1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, minitel_state, port3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, minitel_state, port3_w))
MCFG_DEVICE_ADD("ts9347", TS9347, 0)
MCFG_EF9345_PALETTE("palette")
diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp
index 18ceb27eb6c..d5c489c7e3e 100644
--- a/src/mame/drivers/minivadr.cpp
+++ b/src/mame/drivers/minivadr.cpp
@@ -111,9 +111,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(minivadr_state::minivadr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
- MCFG_CPU_PROGRAM_MAP(minivadr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", minivadr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(minivadr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", minivadr_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp
index da340a99984..e29b72c9b2e 100644
--- a/src/mame/drivers/mirage.cpp
+++ b/src/mame/drivers/mirage.cpp
@@ -291,9 +291,9 @@ void miragemj_state::machine_reset()
MACHINE_CONFIG_START(miragemj_state::mirage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
- MCFG_CPU_PROGRAM_MAP(mirage_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", miragemj_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 28000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(mirage_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", miragemj_state, irq6_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") // 93C45
@@ -306,7 +306,7 @@ MACHINE_CONFIG_START(miragemj_state::mirage)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(miragemj_state, screen_update_mirage)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mirage)
diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp
index 945a2fd5745..1673dd61493 100644
--- a/src/mame/drivers/mirax.cpp
+++ b/src/mame/drivers/mirax.cpp
@@ -479,21 +479,21 @@ WRITE_LINE_MEMBER(mirax_state::vblank_irq)
}
MACHINE_CONFIG_START(mirax_state::mirax)
- MCFG_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80
- MCFG_CPU_PROGRAM_MAP(mirax_main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80
+ MCFG_DEVICE_PROGRAM_MAP(mirax_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, 12000000/4)
- MCFG_CPU_PROGRAM_MAP(mirax_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mirax_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/4)
+ MCFG_DEVICE_PROGRAM_MAP(mirax_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mirax_state, irq0_line_hold, 4*60)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // R10
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mirax_state, coin_counter0_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mirax_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mirax_state, coin_counter1_w)) // only used in 'miraxa' - see notes
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mirax_state, coin_counter0_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mirax_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mirax_state, coin_counter1_w)) // only used in 'miraxa' - see notes
// One address flips X, the other flips Y, but I can't tell which is which
// Since the value is the same for the 2 addresses, it doesn't really matter
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mirax_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mirax_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, mirax_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, mirax_state, flip_screen_y_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -503,7 +503,7 @@ MACHINE_CONFIG_START(mirax_state::mirax)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mirax_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mirax_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mirax_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 0x40)
MCFG_PALETTE_INIT_OWNER(mirax_state, mirax)
@@ -513,10 +513,10 @@ MACHINE_CONFIG_START(mirax_state::mirax)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8912, 12000000/4)
+ MCFG_DEVICE_ADD("ay1", AY8912, 12000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ay2", AY8912, 12000000/4)
+ MCFG_DEVICE_ADD("ay2", AY8912, 12000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp
index 73305b41148..b6acdd49384 100644
--- a/src/mame/drivers/missb2.cpp
+++ b/src/mame/drivers/missb2.cpp
@@ -464,17 +464,17 @@ MACHINE_RESET_MEMBER(missb2_state,missb2)
MACHINE_CONFIG_START(missb2_state::missb2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", missb2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", missb2_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, MAIN_XTAL/4) // 6 MHz
- MCFG_CPU_PROGRAM_MAP(subcpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", missb2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("subcpu", Z80, MAIN_XTAL/4) // 6 MHz
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", missb2_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", missb2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MAIN_XTAL/8) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", missb2_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per frame - a high value to ensure proper synchronization of the CPUs
@@ -508,12 +508,12 @@ MACHINE_CONFIG_START(missb2_state::missb2)
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("main_to_sound")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<1>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<1>))
MCFG_GENERIC_LATCH_8_ADD("sound_to_main")
- MCFG_SOUND_ADD("ymsnd", YM3526, MAIN_XTAL/8)
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(missb2_state, irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3526, MAIN_XTAL/8)
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, missb2_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index d94e31d7115..fb5d84770f8 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -1144,8 +1144,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(missile_state::missile)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -1161,7 +1161,7 @@ MACHINE_CONFIG_START(missile_state::missile)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("pokey", POKEY, MASTER_CLOCK/8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("R8"))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.1), 5.0)
@@ -1177,10 +1177,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(missile_state::missileb)
missilea(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_main_map)
- MCFG_SOUND_ADD("ay8912", AY8912, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("ay8912", AY8912, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp
index f23ed14ad78..7de9d91145b 100644
--- a/src/mame/drivers/mitchell.cpp
+++ b/src/mame/drivers/mitchell.cpp
@@ -1164,9 +1164,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(mitchell_state::mitchell_irq)
MACHINE_CONFIG_START(mitchell_state::mgakuen)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* probably same clock as the other mitchell hardware games */
- MCFG_CPU_PROGRAM_MAP(mgakuen_map)
- MCFG_CPU_IO_MAP(mitchell_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* probably same clock as the other mitchell hardware games */
+ MCFG_DEVICE_PROGRAM_MAP(mgakuen_map)
+ MCFG_DEVICE_IO_MAP(mitchell_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell)
@@ -1196,7 +1196,7 @@ MACHINE_CONFIG_START(mitchell_state::mgakuen)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(16'000'000)/4) /* probably same clock as the other mitchell hardware games */
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(16'000'000)/4) /* probably same clock as the other mitchell hardware games */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1204,10 +1204,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mitchell_state::pang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(mitchell_map)
- MCFG_CPU_IO_MAP(mitchell_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(mitchell_map)
+ MCFG_DEVICE_IO_MAP(mitchell_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell)
@@ -1237,7 +1237,7 @@ MACHINE_CONFIG_START(mitchell_state::pang)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ymsnd",YM2413, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd",YM2413, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1280,16 +1280,16 @@ WRITE_LINE_MEMBER(mitchell_state::spangbl_adpcm_int)
MACHINE_CONFIG_START(mitchell_state::spangbl)
pangnv(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spangbl_map)
- MCFG_CPU_IO_MAP(spangbl_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mitchell_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spangbl_map)
+ MCFG_DEVICE_IO_MAP(spangbl_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mitchell_state, irq0_line_hold)
MCFG_DEVICE_REMOVE("scantimer")
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // Z80A CPU; clock unknown
- MCFG_CPU_PROGRAM_MAP(spangbl_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // Z80A CPU; clock unknown
+ MCFG_DEVICE_PROGRAM_MAP(spangbl_sound_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", spangbl)
@@ -1297,19 +1297,19 @@ MACHINE_CONFIG_START(mitchell_state::spangbl)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
MCFG_DEVICE_REMOVE("oki")
- MCFG_SOUND_ADD("msm", MSM5205, 400000) // clock and prescaler unknown
- MCFG_MSM5205_VCLK_CB(WRITELINE(mitchell_state, spangbl_adpcm_int)) // controls music as well as ADCPM rate
+ MCFG_DEVICE_ADD("msm", MSM5205, 400000) // clock and prescaler unknown
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, mitchell_state, spangbl_adpcm_int)) // controls music as well as ADCPM rate
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mitchell_state::pangba)
spangbl(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(pangba_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(pangba_sound_map)
MCFG_DEVICE_REPLACE("ymsnd", YM3812, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1321,14 +1321,14 @@ MACHINE_CONFIG_START(mitchell_state::mstworld)
/* it doesn't glitch with the clock speed set to 4x normal, however this is incorrect..
the interrupt handling (and probably various irq flags / vbl flags handling etc.) is
more likely wrong.. the game appears to run too fast anyway .. */
- MCFG_CPU_ADD("maincpu", Z80, 6000000*4)
- MCFG_CPU_PROGRAM_MAP(mitchell_map)
- MCFG_CPU_IO_MAP(mstworld_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mitchell_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000*4)
+ MCFG_DEVICE_PROGRAM_MAP(mitchell_map)
+ MCFG_DEVICE_IO_MAP(mstworld_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mitchell_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz? */
- MCFG_CPU_PROGRAM_MAP(mstworld_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,6000000) /* 6 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(mstworld_sound_map)
MCFG_MACHINE_START_OVERRIDE(mitchell_state,mitchell)
MCFG_MACHINE_RESET_OVERRIDE(mitchell_state,mitchell)
@@ -1362,10 +1362,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mitchell_state::marukin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(mitchell_map)
- MCFG_CPU_IO_MAP(mitchell_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(mitchell_map)
+ MCFG_DEVICE_IO_MAP(mitchell_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -1392,7 +1392,7 @@ MACHINE_CONFIG_START(mitchell_state::marukin)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(16'000'000)/4) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1417,10 +1417,10 @@ Vsync is 59.09hz
MACHINE_CONFIG_START(mitchell_state::pkladiesbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(mitchell_map)
- MCFG_CPU_IO_MAP(mitchell_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(mitchell_map)
+ MCFG_DEVICE_IO_MAP(mitchell_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mitchell_state, mitchell_irq, "screen", 0, 1)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -1447,7 +1447,7 @@ MACHINE_CONFIG_START(mitchell_state::pkladiesbl)
MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, 3750000) /* verified on pcb, read the comments */
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 3750000) /* verified on pcb, read the comments */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp
index 403d8161ed4..d86912fd011 100644
--- a/src/mame/drivers/mits680b.cpp
+++ b/src/mame/drivers/mits680b.cpp
@@ -65,20 +65,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mits680b_state::mits680b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(1'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(1'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp
index baf56bf7271..9055b4d093b 100644
--- a/src/mame/drivers/mjkjidai.cpp
+++ b/src/mame/drivers/mjkjidai.cpp
@@ -299,20 +299,20 @@ void mjkjidai_state::machine_reset()
MACHINE_CONFIG_START(mjkjidai_state::mjkjidai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(mjkjidai_map)
- MCFG_CPU_IO_MAP(mjkjidai_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(mjkjidai_map)
+ MCFG_DEVICE_IO_MAP(mjkjidai_io_map)
MCFG_NVRAM_ADD_NO_FILL("nvram")
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("KEYBOARD"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mjkjidai_state, keyboard_select_lo_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mjkjidai_state, keyboard_select_hi_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mjkjidai_state, keyboard_select_lo_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mjkjidai_state, keyboard_select_hi_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mjkjidai_state, mjkjidai_ctrl_w)) // rom bank, coin counter, flip screen etc
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mjkjidai_state, mjkjidai_ctrl_w)) // rom bank, coin counter, flip screen etc
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("DSW2"))
@@ -324,7 +324,7 @@ MACHINE_CONFIG_START(mjkjidai_state::mjkjidai)
MCFG_SCREEN_VISIBLE_AREA(3*8, 61*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mjkjidai_state, screen_update_mjkjidai)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mjkjidai_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mjkjidai_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mjkjidai)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 0x100)
@@ -332,14 +332,14 @@ MACHINE_CONFIG_START(mjkjidai_state::mjkjidai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 10000000/4)
+ MCFG_DEVICE_ADD("sn1", SN76489, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489, 10000000/4)
+ MCFG_DEVICE_ADD("sn2", SN76489, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(mjkjidai_state, adpcm_int))
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, mjkjidai_state, adpcm_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp
index 96f501ba674..da82416e289 100644
--- a/src/mame/drivers/mjsenpu.cpp
+++ b/src/mame/drivers/mjsenpu.cpp
@@ -462,10 +462,10 @@ following clocks are on the PCB
MACHINE_CONFIG_START(mjsenpu_state::mjsenpu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E132XT, 27000000*2) /* ?? Mhz */
- MCFG_CPU_PROGRAM_MAP(mjsenpu_32bit_map)
- MCFG_CPU_IO_MAP(mjsenpu_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mjsenpu_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E132XT, 27000000*2) /* ?? Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(mjsenpu_32bit_map)
+ MCFG_DEVICE_IO_MAP(mjsenpu_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mjsenpu_state, irq0_line_hold)
MCFG_NVRAM_ADD_1FILL("nvram")
diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp
index 5c76bd6bed2..c1e50541826 100644
--- a/src/mame/drivers/mjsister.cpp
+++ b/src/mame/drivers/mjsister.cpp
@@ -492,25 +492,25 @@ INTERRUPT_GEN_MEMBER(mjsister_state::interrupt)
MACHINE_CONFIG_START(mjsister_state::mjsister)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
- MCFG_CPU_PROGRAM_MAP(mjsister_map)
- MCFG_CPU_IO_MAP(mjsister_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mjsister_state, interrupt, 2*60)
+ MCFG_DEVICE_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mjsister_map)
+ MCFG_DEVICE_IO_MAP(mjsister_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mjsister_state, interrupt, 2*60)
MCFG_DEVICE_ADD("mainlatch1", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mjsister_state, rombank_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mjsister_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mjsister_state, colorbank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(mjsister_state, colorbank_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(mjsister_state, colorbank_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(mjsister_state, video_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mjsister_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mjsister_state, vrambank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mjsister_state, rombank_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mjsister_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mjsister_state, colorbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, mjsister_state, colorbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, mjsister_state, colorbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, mjsister_state, video_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, mjsister_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, mjsister_state, vrambank_w))
MCFG_DEVICE_ADD("mainlatch2", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mjsister_state, coin_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(mjsister_state, dac_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mjsister_state, rombank_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mjsister_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, mjsister_state, dac_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, mjsister_state, rombank_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -527,12 +527,12 @@ MACHINE_CONFIG_START(mjsister_state::mjsister)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, MCLK/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MCLK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp
index be9b848cbdd..e7ba7a0caf8 100644
--- a/src/mame/drivers/mk1.cpp
+++ b/src/mame/drivers/mk1.cpp
@@ -187,9 +187,9 @@ F3853_INTERRUPT_REQ_CB(mk1_state::mk1_interrupt)
MACHINE_CONFIG_START(mk1_state::mk1)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", F8, MAIN_CLOCK ) /* MK3850 */
- MCFG_CPU_PROGRAM_MAP(mk1_mem)
- MCFG_CPU_IO_MAP(mk1_io)
+ MCFG_DEVICE_ADD( "maincpu", F8, MAIN_CLOCK ) /* MK3850 */
+ MCFG_DEVICE_PROGRAM_MAP(mk1_mem)
+ MCFG_DEVICE_IO_MAP(mk1_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp
index 37f4c4e2bbb..59b462e5125 100644
--- a/src/mame/drivers/mk14.cpp
+++ b/src/mame/drivers/mk14.cpp
@@ -202,9 +202,9 @@ void mk14_state::machine_start()
MACHINE_CONFIG_START(mk14_state::mk14)
/* basic machine hardware */
// IC1 1SP-8A/600 (8060) SC/MP Microprocessor
- MCFG_CPU_ADD("maincpu", INS8060, XTAL(4'433'619))
- MCFG_SCMP_CONFIG(WRITELINE(mk14_state, cass_w), NOOP, READLINE(mk14_state, cass_r), NOOP, READLINE(mk14_state, cass_r), NOOP)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", INS8060, XTAL(4'433'619))
+ MCFG_SCMP_CONFIG(WRITELINE(*this, mk14_state, cass_w), NOOP, READLINE(*this, mk14_state, cass_r), NOOP, READLINE(*this, mk14_state, cass_r), NOOP)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_mk14)
@@ -213,16 +213,16 @@ MACHINE_CONFIG_START(mk14_state::mk14)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05)
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac8", ZN425E, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // Ferranti ZN425E
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac8", ZN425E, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // Ferranti ZN425E
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac8", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac8", -1.0, DAC_VREF_NEG_INPUT)
/* devices */
MCFG_DEVICE_ADD("ic8", INS8154, 0)
- MCFG_INS8154_OUT_A_CB(WRITE8(mk14_state, port_a_w))
- MCFG_INS8154_OUT_B_CB(DEVWRITE8("dac8", dac_byte_interface, write))
+ MCFG_INS8154_OUT_A_CB(WRITE8(*this, mk14_state, port_a_w))
+ MCFG_INS8154_OUT_B_CB(WRITE8("dac8", dac_byte_interface, write))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp
index ac989f96f29..1cda40105f9 100644
--- a/src/mame/drivers/mk2.cpp
+++ b/src/mame/drivers/mk2.cpp
@@ -196,22 +196,22 @@ WRITE8_MEMBER( mk2_state::mk2_write_b )
MACHINE_CONFIG_START(mk2_state::mk2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6504, 1000000)
- MCFG_CPU_PROGRAM_MAP(mk2_mem)
+ MCFG_DEVICE_ADD("maincpu", M6504, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(mk2_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_mk2)
MCFG_DEVICE_ADD("miot", MOS6530, 1000000)
- MCFG_MOS6530_IN_PA_CB(READ8(mk2_state, mk2_read_a))
- MCFG_MOS6530_OUT_PA_CB(WRITE8(mk2_state, mk2_write_a))
- MCFG_MOS6530_IN_PB_CB(READ8(mk2_state, mk2_read_b))
- MCFG_MOS6530_OUT_PB_CB(WRITE8(mk2_state, mk2_write_b))
+ MCFG_MOS6530_IN_PA_CB(READ8(*this, mk2_state, mk2_read_a))
+ MCFG_MOS6530_OUT_PA_CB(WRITE8(*this, mk2_state, mk2_write_a))
+ MCFG_MOS6530_IN_PB_CB(READ8(*this, mk2_state, mk2_read_b))
+ MCFG_MOS6530_OUT_PB_CB(WRITE8(*this, mk2_state, mk2_write_b))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", mk2_state, update_leds, attotime::from_hz(60))
diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp
index f7116ac6fa8..c08cf2cd52f 100644
--- a/src/mame/drivers/mk85.cpp
+++ b/src/mame/drivers/mk85.cpp
@@ -69,9 +69,9 @@ uint32_t mk85_state::screen_update_mk85(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(mk85_state::mk85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", K1801VM2, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("maincpu", K1801VM2, XTAL(4'000'000))
MCFG_T11_INITIAL_MODE(0)
- MCFG_CPU_PROGRAM_MAP(mk85_mem)
+ MCFG_DEVICE_PROGRAM_MAP(mk85_mem)
/* video hardware */
diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp
index eaf92500a3b..f55acb3e112 100644
--- a/src/mame/drivers/mk90.cpp
+++ b/src/mame/drivers/mk90.cpp
@@ -72,9 +72,9 @@ uint32_t mk90_state::screen_update_mk90(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(mk90_state::mk90)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", K1801VM2, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("maincpu", K1801VM2, XTAL(4'000'000))
MCFG_T11_INITIAL_MODE(0x8000)
- MCFG_CPU_PROGRAM_MAP(mk90_mem)
+ MCFG_DEVICE_PROGRAM_MAP(mk90_mem)
/* video hardware */
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index 22a4f2f7c64..4b8a13954e5 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -197,8 +197,8 @@ WRITE8_MEMBER( mkit09_state::pb_w )
MACHINE_CONFIG_START(mkit09_state::mkit09)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mkit09_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mkit09_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_mkit09)
@@ -210,10 +210,10 @@ MACHINE_CONFIG_START(mkit09_state::mkit09)
/* Devices */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mkit09_state, pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(mkit09_state, pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mkit09_state, pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mkit09_state, pb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mkit09_state, pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mkit09_state, pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mkit09_state, pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mkit09_state, pb_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -222,8 +222,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mkit09_state::mkit09a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mkit09a_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mkit09a_mem)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_mkit09)
@@ -235,10 +235,10 @@ MACHINE_CONFIG_START(mkit09_state::mkit09a)
/* Devices */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mkit09_state, pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(mkit09_state, pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mkit09_state, pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mkit09_state, pb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mkit09_state, pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mkit09_state, pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mkit09_state, pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mkit09_state, pb_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp
index d6815a31e43..0eb6b949265 100644
--- a/src/mame/drivers/mlanding.cpp
+++ b/src/mame/drivers/mlanding.cpp
@@ -926,29 +926,29 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mlanding_state::mlanding)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) // Appears to be 68000P8 in PCB photo
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mlanding_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) // Appears to be 68000P8 in PCB photo
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mlanding_state, irq6_line_hold)
- MCFG_CPU_ADD("subcpu", M68000, 8000000) // Appears to be 68000P8 in PCB photo
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("subcpu", M68000, 8000000) // Appears to be 68000P8 in PCB photo
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // ?
- MCFG_CPU_PROGRAM_MAP(audio_map_prog)
- MCFG_CPU_IO_MAP(audio_map_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(audio_map_prog)
+ MCFG_DEVICE_IO_MAP(audio_map_io)
- MCFG_CPU_ADD("mechacpu", Z80, 4000000) // ?
- MCFG_CPU_PROGRAM_MAP(mecha_map_prog)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mlanding_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mechacpu", Z80, 4000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(mecha_map_prog)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mlanding_state, irq0_line_hold)
- MCFG_CPU_ADD("dsp", TMS32025, 32000000) // ?
- MCFG_CPU_PROGRAM_MAP(dsp_map_prog)
- MCFG_CPU_DATA_MAP(dsp_map_data)
- MCFG_TMS32025_HOLD_IN_CB(READ16(mlanding_state, dsp_hold_signal_r))
+ MCFG_DEVICE_ADD("dsp", TMS32025, 32000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(dsp_map_prog)
+ MCFG_DEVICE_DATA_MAP(dsp_map_data)
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, mlanding_state, dsp_hold_signal_r))
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_DEVICE_ADD("ctc", Z80CTC, 4000000)
- MCFG_Z80CTC_ZC0_CB(WRITELINE(mlanding_state, z80ctc_to0))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, mlanding_state, z80ctc_to0))
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
MCFG_PC060HA_MASTER_CPU("maincpu")
@@ -974,16 +974,16 @@ MACHINE_CONFIG_START(mlanding_state::mlanding)
MCFG_YM2151_ADD("ymsnd", 4000000)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(mlanding_state, sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, mlanding_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(mlanding_state, msm5205_1_vck)) // VCK function
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, mlanding_state, msm5205_1_vck)) // VCK function
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8 kHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) // Slave mode, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp
index 1d111de6ba1..c680d4a50b3 100644
--- a/src/mame/drivers/mmagic.cpp
+++ b/src/mame/drivers/mmagic.cpp
@@ -306,9 +306,9 @@ void mmagic_state::machine_start()
MACHINE_CONFIG_START(mmagic_state::mmagic)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) // NEC D8085A
- MCFG_CPU_PROGRAM_MAP(mmagic_mem)
- MCFG_CPU_IO_MAP(mmagic_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6.144_MHz_XTAL) // NEC D8085A
+ MCFG_DEVICE_PROGRAM_MAP(mmagic_mem)
+ MCFG_DEVICE_IO_MAP(mmagic_io)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -319,7 +319,7 @@ MACHINE_CONFIG_START(mmagic_state::mmagic)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(mmagic_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp
index 60d3774896e..aac5562daa6 100644
--- a/src/mame/drivers/mmd1.cpp
+++ b/src/mame/drivers/mmd1.cpp
@@ -493,9 +493,9 @@ We preset all banks here, so that bankswitching will incur no speed penalty.
MACHINE_CONFIG_START(mmd1_state::mmd1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, 6750000 / 9)
- MCFG_CPU_PROGRAM_MAP(mmd1_mem)
- MCFG_CPU_IO_MAP(mmd1_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, 6750000 / 9)
+ MCFG_DEVICE_PROGRAM_MAP(mmd1_mem)
+ MCFG_DEVICE_IO_MAP(mmd1_io)
MCFG_MACHINE_RESET_OVERRIDE(mmd1_state,mmd1)
@@ -505,11 +505,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmd1_state::mmd2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, 6750000 / 9)
- MCFG_CPU_PROGRAM_MAP(mmd2_mem)
- MCFG_CPU_IO_MAP(mmd2_io)
- MCFG_I8085A_STATUS(WRITE8(mmd1_state, mmd2_status_callback))
- MCFG_I8085A_INTE(WRITELINE(mmd1_state, mmd2_inte_callback))
+ MCFG_DEVICE_ADD("maincpu",I8080, 6750000 / 9)
+ MCFG_DEVICE_PROGRAM_MAP(mmd2_mem)
+ MCFG_DEVICE_IO_MAP(mmd2_io)
+ MCFG_I8085A_STATUS(WRITE8(*this, mmd1_state, mmd2_status_callback))
+ MCFG_I8085A_INTE(WRITELINE(*this, mmd1_state, mmd2_inte_callback))
MCFG_MACHINE_RESET_OVERRIDE(mmd1_state,mmd2)
@@ -518,9 +518,9 @@ MACHINE_CONFIG_START(mmd1_state::mmd2)
/* Devices */
MCFG_DEVICE_ADD("i8279", I8279, 400000) // based on divider
- MCFG_I8279_OUT_SL_CB(WRITE8(mmd1_state, mmd2_scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(mmd1_state, mmd2_digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(mmd1_state, mmd2_kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, mmd1_state, mmd2_scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, mmd1_state, mmd2_digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, mmd1_state, mmd2_kbd_r)) // kbd RL lines
MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
diff --git a/src/mame/drivers/mmm.cpp b/src/mame/drivers/mmm.cpp
index 11fb2325545..ca572e9864f 100644
--- a/src/mame/drivers/mmm.cpp
+++ b/src/mame/drivers/mmm.cpp
@@ -173,9 +173,9 @@ static const z80_daisy_config mmm_daisy_chain[] =
MACHINE_CONFIG_START(mmm_state::mmm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,2000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,2000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(mmm_daisy_chain)
MCFG_DEVICE_ADD("ctc", Z80CTC, 2000000)
@@ -183,8 +183,8 @@ MACHINE_CONFIG_START(mmm_state::mmm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(mmm_state, ay_porta_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1000000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, mmm_state, ay_porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp
index 9cc92bacd76..0df5847e738 100644
--- a/src/mame/drivers/mmodular.cpp
+++ b/src/mame/drivers/mmodular.cpp
@@ -251,9 +251,9 @@ DRIVER_INIT_MEMBER(mmodular_state, gen32)
}
MACHINE_CONFIG_START(mmodular_state::alm16)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(alm16_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 600)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(alm16_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 600)
MCFG_MEPHISTO_SENSORS_BOARD_ADD("board")
MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display")
@@ -263,15 +263,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmodular_state::van16)
alm16(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(van16_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(van16_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmodular_state::alm32)
- MCFG_CPU_ADD("maincpu", M68020, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(alm32_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq6_line_hold, 750)
+ MCFG_DEVICE_ADD("maincpu", M68020, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(alm32_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mmodular_state, irq6_line_hold, 750)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -283,15 +283,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmodular_state::van32)
alm32(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(van32_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(van32_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mmodular_state::gen32)
- MCFG_CPU_ADD("maincpu", M68030, XTAL(33'333'000))
- MCFG_CPU_PROGRAM_MAP(gen32_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 375)
+ MCFG_DEVICE_ADD("maincpu", M68030, XTAL(33'333'000))
+ MCFG_DEVICE_PROGRAM_MAP(gen32_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mmodular_state, irq2_line_hold, 375)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -302,9 +302,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(berlinp_state::berlinp)
- MCFG_CPU_ADD("maincpu", M68020, XTAL(24'576'000))
- MCFG_CPU_PROGRAM_MAP(berlinp_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(berlinp_state, irq2_line_hold, 750)
+ MCFG_DEVICE_ADD("maincpu", M68020, XTAL(24'576'000))
+ MCFG_DEVICE_PROGRAM_MAP(berlinp_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(berlinp_state, irq2_line_hold, 750)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/mod8.cpp b/src/mame/drivers/mod8.cpp
index f67c6649b71..89afc296b6a 100644
--- a/src/mame/drivers/mod8.cpp
+++ b/src/mame/drivers/mod8.cpp
@@ -147,10 +147,10 @@ void mod8_state::kbd_put(u8 data)
MACHINE_CONFIG_START(mod8_state::mod8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8008, 800000)
- MCFG_CPU_PROGRAM_MAP(mod8_mem)
- MCFG_CPU_IO_MAP(mod8_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mod8_state,mod8_irq_callback)
+ MCFG_DEVICE_ADD("maincpu",I8008, 800000)
+ MCFG_DEVICE_PROGRAM_MAP(mod8_mem)
+ MCFG_DEVICE_IO_MAP(mod8_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mod8_state,mod8_irq_callback)
/* video hardware */
MCFG_DEVICE_ADD(TELEPRINTER_TAG, TELEPRINTER, 0)
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index e77b109d164..2d3ad3ddd2d 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -1567,10 +1567,10 @@ ROM_START( netmerc )
ROM_END
MACHINE_CONFIG_START(model1_state::model1)
- MCFG_CPU_ADD("maincpu", V60, 16000000)
- MCFG_CPU_PROGRAM_MAP(model1_mem)
- MCFG_CPU_IO_MAP(model1_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(model1_state,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", V60, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(model1_mem)
+ MCFG_DEVICE_IO_MAP(model1_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(model1_state,irq_callback)
MCFG_DEVICE_ADD("copro_fifo_in", GENERIC_FIFO_U32, 0)
MCFG_DEVICE_ADD("copro_fifo_out", GENERIC_FIFO_U32, 0)
@@ -1578,10 +1578,10 @@ MACHINE_CONFIG_START(model1_state::model1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model1_state, model1_interrupt, "screen", 0, 1)
#if 1
- MCFG_CPU_ADD("tgp_copro", MB86233, 16000000)
- MCFG_CPU_PROGRAM_MAP(copro_prog_map)
- MCFG_CPU_DATA_MAP(copro_data_map)
- MCFG_CPU_IO_MAP(copro_io_map)
+ MCFG_DEVICE_ADD("tgp_copro", MB86233, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(copro_prog_map)
+ MCFG_DEVICE_DATA_MAP(copro_data_map)
+ MCFG_DEVICE_IO_MAP(copro_io_map)
MCFG_DEVICE_ADDRESS_MAP(mb86233_device::AS_RF, copro_rf_map)
#endif
@@ -1589,8 +1589,8 @@ MACHINE_CONFIG_START(model1_state::model1)
MCFG_MACHINE_RESET_OVERRIDE(model1_state,model1)
MCFG_DEVICE_ADD("ioboard", SEGA_MODEL1IO, 0)
- MCFG_MODEL1IO_READ_CB(DEVREAD8("dpram", mb8421_device, left_r))
- MCFG_MODEL1IO_WRITE_CB(DEVWRITE8("dpram", mb8421_device, left_w))
+ MCFG_MODEL1IO_READ_CB(READ8("dpram", mb8421_device, left_r))
+ MCFG_MODEL1IO_WRITE_CB(WRITE8("dpram", mb8421_device, left_w))
MCFG_MODEL1IO_IN0_CB(IOPORT("IN.0"))
MCFG_MODEL1IO_IN1_CB(IOPORT("IN.1"))
@@ -1603,7 +1603,7 @@ MACHINE_CONFIG_START(model1_state::model1)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK )
MCFG_SCREEN_RAW_PARAMS(XTAL(16'000'000), 656, 0/*+69*/, 496/*+69*/, 424, 0/*+25*/, 384/*+25*/)
MCFG_SCREEN_UPDATE_DRIVER(model1_state, screen_update_model1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(model1_state, screen_vblank_model1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, model1_state, screen_vblank_model1))
MCFG_PALETTE_ADD("palette", 8192)
MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
@@ -1611,14 +1611,14 @@ MACHINE_CONFIG_START(model1_state::model1)
MCFG_VIDEO_START_OVERRIDE(model1_state,model1)
MCFG_SEGAM1AUDIO_ADD(M1AUDIO_TAG)
- MCFG_SEGAM1AUDIO_RXD_HANDLER(DEVWRITELINE("m1uart", i8251_device, write_rxd))
+ MCFG_SEGAM1AUDIO_RXD_HANDLER(WRITELINE("m1uart", i8251_device, write_rxd))
MCFG_DEVICE_ADD("m1uart", I8251, 8000000) // uPD71051C, clock unknown
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(M1AUDIO_TAG, segam1audio_device, write_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(M1AUDIO_TAG, segam1audio_device, write_txd))
MCFG_CLOCK_ADD("m1uart_clock", 500000) // 16 times 31.25MHz (standard Sega/MIDI sound data rate)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("m1uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("m1uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("m1uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("m1uart", i8251_device, write_rxc))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model1_state::model1_hle)
@@ -1632,7 +1632,7 @@ MACHINE_CONFIG_START(model1_state::vf)
MCFG_DEVICE_MODIFY("ioboard")
MCFG_MODEL1IO_IN2_CB(IOPORT("IN.2"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, vf_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, vf_outputs_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model1_state::vr)
@@ -1642,7 +1642,7 @@ MACHINE_CONFIG_START(model1_state::vr)
MCFG_MODEL1IO_AN0_CB(IOPORT("WHEEL"))
MCFG_MODEL1IO_AN1_CB(IOPORT("ACCEL"))
MCFG_MODEL1IO_AN2_CB(IOPORT("BRAKE"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, vr_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, vr_outputs_w))
MCFG_M1COMM_ADD(M1COMM_TAG)
MCFG_DEVICE_BIOS("epr15112");
@@ -1655,7 +1655,7 @@ MACHINE_CONFIG_START(model1_state::vformula)
MCFG_MODEL1IO_AN0_CB(IOPORT("WHEEL"))
MCFG_MODEL1IO_AN1_CB(IOPORT("ACCEL"))
MCFG_MODEL1IO_AN2_CB(IOPORT("BRAKE"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, vr_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, vr_outputs_w))
MCFG_M1COMM_ADD(M1COMM_TAG)
MCFG_DEVICE_BIOS("epr15624");
@@ -1670,7 +1670,7 @@ MACHINE_CONFIG_START(model1_state::swa)
MCFG_MODEL1IO_AN2_CB(IOPORT("THROTTLE"))
MCFG_MODEL1IO_AN4_CB(IOPORT("STICK2X"))
MCFG_MODEL1IO_AN5_CB(IOPORT("STICK2Y"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, swa_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, swa_outputs_w))
MCFG_SPEAKER_STANDARD_STEREO("dleft", "dright")
MCFG_DSBZ80_ADD(DSBZ80_TAG)
@@ -1679,21 +1679,21 @@ MACHINE_CONFIG_START(model1_state::swa)
// Apparently m1audio has to filter out commands the DSB shouldn't see
MCFG_DEVICE_MODIFY(M1AUDIO_TAG)
- MCFG_SEGAM1AUDIO_RXD_HANDLER(DEVWRITELINE("m1uart", i8251_device, write_rxd))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
+ MCFG_SEGAM1AUDIO_RXD_HANDLER(WRITELINE("m1uart", i8251_device, write_rxd))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model1_state::wingwar)
model1_hle(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model1_comm_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model1_comm_mem)
MCFG_DEVICE_MODIFY("ioboard")
MCFG_MODEL1IO_AN0_CB(IOPORT("STICKX"))
MCFG_MODEL1IO_AN1_CB(IOPORT("STICKY"))
MCFG_MODEL1IO_AN2_CB(IOPORT("THROTTLE"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, wingwar_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, wingwar_outputs_w))
MCFG_M1COMM_ADD(M1COMM_TAG)
MCFG_DEVICE_BIOS("epr15112");
@@ -1703,7 +1703,7 @@ MACHINE_CONFIG_START(model1_state::wingwar360)
wingwar(config);
MCFG_DEVICE_MODIFY("ioboard")
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, wingwar360_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, wingwar360_outputs_w))
MACHINE_CONFIG_END
void model1_state::polhemus_map(address_map &map)
@@ -1715,13 +1715,13 @@ void model1_state::polhemus_map(address_map &map)
MACHINE_CONFIG_START(model1_state::netmerc)
model1_hle(config);
- MCFG_CPU_ADD("polhemus", I386SX, 16000000)
- MCFG_CPU_PROGRAM_MAP(polhemus_map)
+ MCFG_DEVICE_ADD("polhemus", I386SX, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(polhemus_map)
MCFG_DEVICE_MODIFY("ioboard")
MCFG_MODEL1IO_AN0_CB(IOPORT("STICKX"))
MCFG_MODEL1IO_AN2_CB(IOPORT("STICKY"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model1_state, netmerc_outputs_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model1_state, netmerc_outputs_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index ed5ac197b32..29932d28e64 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -2383,8 +2383,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2_state::model2_screen)
MCFG_S24TILE_DEVICE_ADD("tile", 0x3fff)
MCFG_S24TILE_DEVICE_PALETTE("palette")
- MCFG_S24TILE_XHOUT_CALLBACK(WRITE16(model2_state, horizontal_sync_w))
- MCFG_S24TILE_XVOUT_CALLBACK(WRITE16(model2_state, vertical_sync_w))
+ MCFG_S24TILE_XHOUT_CALLBACK(WRITE16(*this, model2_state, horizontal_sync_w))
+ MCFG_S24TILE_XVOUT_CALLBACK(WRITE16(*this, model2_state, vertical_sync_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
@@ -2396,35 +2396,35 @@ MACHINE_CONFIG_START(model2_state::model2_screen)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2_state::model2_scsp)
- MCFG_CPU_ADD("audiocpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(model2_snd)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(model2_snd)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(model2_state,scsp_irq))
+ MCFG_DEVICE_ADD("scsp", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, model2_state,scsp_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
MCFG_DEVICE_ADD("uart", I8251, 8000000) // uPD71051C, clock unknown
-// MCFG_I8251_RXRDY_HANDLER(WRITELINE(model2_state, sound_ready_w))
-// MCFG_I8251_TXRDY_HANDLER(WRITELINE(model2_state, sound_ready_w))
+// MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, model2_state, sound_ready_w))
+// MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, model2_state, sound_ready_w))
MCFG_CLOCK_ADD("uart_clock", 500000) // 16 times 31.25MHz (standard Sega/MIDI sound data rate)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MACHINE_CONFIG_END
/* original Model 2 */
MACHINE_CONFIG_START(model2o_state::model2o)
- MCFG_CPU_ADD("maincpu", I960, 25000000)
- MCFG_CPU_PROGRAM_MAP(model2o_mem)
+ MCFG_DEVICE_ADD("maincpu", I960, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(model2o_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("copro_tgp", MB86234, 16000000)
- MCFG_CPU_PROGRAM_MAP(copro_tgp_prog_map)
- MCFG_CPU_DATA_MAP(copro_tgp_data_map)
- MCFG_CPU_IO_MAP(copro_tgp_io_map)
+ MCFG_DEVICE_ADD("copro_tgp", MB86234, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(copro_tgp_prog_map)
+ MCFG_DEVICE_DATA_MAP(copro_tgp_data_map)
+ MCFG_DEVICE_IO_MAP(copro_tgp_io_map)
MCFG_DEVICE_ADDRESS_MAP(mb86233_device::AS_RF, copro_tgp_rf_map)
MCFG_DEVICE_ADD("copro_tgp_bank", ADDRESS_MAP_BANK, 0)
@@ -2445,8 +2445,8 @@ MACHINE_CONFIG_START(model2o_state::model2o)
MCFG_DEVICE_ADD("ioboard", SEGA_MODEL1IO, 0)
MCFG_DEVICE_BIOS("epr14869c");
- MCFG_MODEL1IO_READ_CB(DEVREAD8("dpram", mb8421_device, left_r))
- MCFG_MODEL1IO_WRITE_CB(DEVWRITE8("dpram", mb8421_device, left_w))
+ MCFG_MODEL1IO_READ_CB(READ8("dpram", mb8421_device, left_r))
+ MCFG_MODEL1IO_WRITE_CB(WRITE8("dpram", mb8421_device, left_w))
MCFG_MODEL1IO_IN0_CB(IOPORT("IN0"))
MCFG_MODEL1IO_IN1_CB(IOPORT("IN1"))
@@ -2456,14 +2456,14 @@ MACHINE_CONFIG_START(model2o_state::model2o)
model2_screen(config);
MCFG_SEGAM1AUDIO_ADD(M1AUDIO_TAG)
- MCFG_SEGAM1AUDIO_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
+ MCFG_SEGAM1AUDIO_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
MCFG_DEVICE_ADD("uart", I8251, 8000000) // uPD71051C, clock unknown
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(M1AUDIO_TAG, segam1audio_device, write_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(M1AUDIO_TAG, segam1audio_device, write_txd))
MCFG_CLOCK_ADD("uart_clock", 500000) // 16 times 31.25MHz (standard Sega/MIDI sound data rate)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_M2COMM_ADD("m2comm")
MACHINE_CONFIG_END
@@ -2500,15 +2500,15 @@ void model2_state::drive_io_map(address_map &map)
}
MACHINE_CONFIG_START(model2_state::sj25_0207_01)
- MCFG_CPU_ADD("drivecpu", Z80, XTAL(8'000'000)/2) // confirmed
- MCFG_CPU_PROGRAM_MAP(drive_map)
- MCFG_CPU_IO_MAP(drive_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", model2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("drivecpu", Z80, XTAL(8'000'000)/2) // confirmed
+ MCFG_DEVICE_PROGRAM_MAP(drive_map)
+ MCFG_DEVICE_IO_MAP(drive_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", model2_state, irq0_line_hold)
MCFG_DEVICE_ADD("driveio1", SEGA_315_5296, 0) // unknown clock
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(model2_state, driveio_port_w))
- MCFG_315_5296_IN_PORTG_CB(READ8(model2_state, driveio_portg_r))
- MCFG_315_5296_IN_PORTH_CB(READ8(model2_state, driveio_porth_r))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, model2_state, driveio_port_w))
+ MCFG_315_5296_IN_PORTG_CB(READ8(*this, model2_state, driveio_portg_r))
+ MCFG_315_5296_IN_PORTH_CB(READ8(*this, model2_state, driveio_porth_r))
MCFG_DEVICE_ADD("driveio2", SEGA_315_5296, 0) // unknown clock
@@ -2520,25 +2520,25 @@ MACHINE_CONFIG_START(model2o_state::daytona)
sj25_0207_01(config);
MCFG_DEVICE_MODIFY("ioboard")
- MCFG_MODEL1IO_DRIVE_WRITE_CB(WRITE8(model2o_state, drive_board_w))
+ MCFG_MODEL1IO_DRIVE_WRITE_CB(WRITE8(*this, model2o_state, drive_board_w))
MCFG_MODEL1IO_AN0_CB(IOPORT("STEER"))
MCFG_MODEL1IO_AN1_CB(IOPORT("ACCEL"))
MCFG_MODEL1IO_AN2_CB(IOPORT("BRAKE"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model2o_state, daytona_output_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model2o_state, daytona_output_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2o_maxx_state::daytona_maxx)
daytona(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model2o_maxx_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model2o_maxx_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2o_gtx_state::daytona_gtx)
daytona(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model2o_gtx_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model2o_gtx_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2o_state::desert)
@@ -2548,7 +2548,7 @@ MACHINE_CONFIG_START(model2o_state::desert)
MCFG_MODEL1IO_AN0_CB(IOPORT("STEER"))
MCFG_MODEL1IO_AN1_CB(IOPORT("ACCEL"))
MCFG_MODEL1IO_AN2_CB(IOPORT("BRAKE"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model2o_state, desert_output_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model2o_state, desert_output_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2o_state::vcop)
@@ -2556,19 +2556,19 @@ MACHINE_CONFIG_START(model2o_state::vcop)
MCFG_DEVICE_MODIFY("ioboard")
MCFG_MODEL1IO_IN2_CB(IOPORT("IN2"))
- MCFG_MODEL1IO_OUTPUT_CB(WRITE8(model2o_state, vcop_output_w))
+ MCFG_MODEL1IO_OUTPUT_CB(WRITE8(*this, model2o_state, vcop_output_w))
MACHINE_CONFIG_END
/* 2A-CRX */
MACHINE_CONFIG_START(model2a_state::model2a)
- MCFG_CPU_ADD("maincpu", I960, 25000000)
- MCFG_CPU_PROGRAM_MAP(model2a_crx_mem)
+ MCFG_DEVICE_ADD("maincpu", I960, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(model2a_crx_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("copro_tgp", MB86234, 16000000)
- MCFG_CPU_PROGRAM_MAP(copro_tgp_prog_map)
- MCFG_CPU_DATA_MAP(copro_tgp_data_map)
- MCFG_CPU_IO_MAP(copro_tgp_io_map)
+ MCFG_DEVICE_ADD("copro_tgp", MB86234, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(copro_tgp_prog_map)
+ MCFG_DEVICE_DATA_MAP(copro_tgp_data_map)
+ MCFG_DEVICE_IO_MAP(copro_tgp_io_map)
MCFG_DEVICE_ADDRESS_MAP(mb86233_device::AS_RF, copro_tgp_rf_map)
MCFG_DEVICE_ADD("copro_tgp_bank", ADDRESS_MAP_BANK, 0)
@@ -2589,8 +2589,8 @@ MACHINE_CONFIG_START(model2a_state::model2a)
MCFG_NVRAM_ADD_1FILL("backup1")
MCFG_DEVICE_ADD("io", SEGA_315_5649, 0)
- MCFG_315_5649_OUT_PA_CB(WRITE8(model2a_state, eeprom_w))
- MCFG_315_5649_IN_PB_CB(READ8(model2a_state, in0_r))
+ MCFG_315_5649_OUT_PA_CB(WRITE8(*this, model2a_state, eeprom_w))
+ MCFG_315_5649_IN_PB_CB(READ8(*this, model2a_state, in0_r))
MCFG_315_5649_IN_PC_CB(IOPORT("IN1"))
MCFG_315_5649_IN_PD_CB(IOPORT("IN2"))
@@ -2614,10 +2614,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2a_state::manxttdx)
manxtt(config);
MCFG_SEGAM1AUDIO_ADD(M1AUDIO_TAG)
- MCFG_SEGAM1AUDIO_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
+ MCFG_SEGAM1AUDIO_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
MCFG_DEVICE_MODIFY("uart")
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(M1AUDIO_TAG, segam1audio_device, write_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(M1AUDIO_TAG, segam1audio_device, write_txd))
MACHINE_CONFIG_END
MACHINE_CONFIG_START( model2a_state::srallyc )
@@ -2625,7 +2625,7 @@ MACHINE_CONFIG_START( model2a_state::srallyc )
sj25_0207_01(config);
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5649_OUT_PE_CB(WRITE8(model2a_state, drive_board_w))
+ MCFG_315_5649_OUT_PE_CB(WRITE8(*this, model2a_state, drive_board_w))
MCFG_315_5649_AN0_CB(IOPORT("STEER"))
MCFG_315_5649_AN1_CB(IOPORT("ACCEL"))
MCFG_315_5649_AN2_CB(IOPORT("BRAKE"))
@@ -2635,8 +2635,8 @@ MACHINE_CONFIG_START( model2a_state::vcop2 )
model2a(config);
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5649_SERIAL_CH2_READ_CB(READ8(model2a_state, lightgun_mux_r))
- MCFG_315_5649_SERIAL_CH2_WRITE_CB(WRITE8(model2a_state, lightgun_mux_w))
+ MCFG_315_5649_SERIAL_CH2_READ_CB(READ8(*this, model2a_state, lightgun_mux_r))
+ MCFG_315_5649_SERIAL_CH2_WRITE_CB(WRITE8(*this, model2a_state, lightgun_mux_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START( model2a_state::skytargt )
@@ -2656,8 +2656,8 @@ uint16_t model2_state::crypt_read_callback(uint32_t addr)
MACHINE_CONFIG_START(model2a_state::model2a_5881)
model2a(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model2a_5881_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model2a_5881_mem)
MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0)
MCFG_SET_READ_CALLBACK(model2_state, crypt_read_callback)
@@ -2678,17 +2678,17 @@ MACHINE_CONFIG_END
/* 2B-CRX */
MACHINE_CONFIG_START(model2b_state::model2b)
- MCFG_CPU_ADD("maincpu", I960, 25000000)
- MCFG_CPU_PROGRAM_MAP(model2b_crx_mem)
+ MCFG_DEVICE_ADD("maincpu", I960, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(model2b_crx_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("copro_adsp", ADSP21062, 40000000)
+ MCFG_DEVICE_ADD("copro_adsp", ADSP21062, 40000000)
MCFG_SHARC_BOOT_MODE(BOOT_MODE_HOST)
- MCFG_CPU_DATA_MAP(copro_sharc_map)
+ MCFG_DEVICE_DATA_MAP(copro_sharc_map)
- //MCFG_CPU_ADD("dsp2", ADSP21062, 40000000)
+ //MCFG_DEVICE_ADD("dsp2", ADSP21062, 40000000)
//MCFG_SHARC_BOOT_MODE(BOOT_MODE_HOST)
- //MCFG_CPU_DATA_MAP(geo_sharc_map)
+ //MCFG_DEVICE_DATA_MAP(geo_sharc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(18000))
@@ -2702,8 +2702,8 @@ MACHINE_CONFIG_START(model2b_state::model2b)
MCFG_NVRAM_ADD_1FILL("backup1")
MCFG_DEVICE_ADD("io", SEGA_315_5649, 0)
- MCFG_315_5649_OUT_PA_CB(WRITE8(model2b_state, eeprom_w))
- MCFG_315_5649_IN_PB_CB(READ8(model2b_state, in0_r))
+ MCFG_315_5649_OUT_PA_CB(WRITE8(*this, model2b_state, eeprom_w))
+ MCFG_315_5649_IN_PB_CB(READ8(*this, model2b_state, in0_r))
MCFG_315_5649_IN_PC_CB(IOPORT("IN1"))
MCFG_315_5649_IN_PD_CB(IOPORT("IN2"))
@@ -2717,8 +2717,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2b_state::model2b_5881)
model2b(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model2b_5881_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model2b_5881_mem)
MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0)
MCFG_SET_READ_CALLBACK(model2_state, crypt_read_callback)
@@ -2755,15 +2755,15 @@ void model2b_state::rchase2_ioport_map(address_map &map)
MACHINE_CONFIG_START( model2b_state::rchase2 )
model2b(config);
- MCFG_CPU_ADD("iocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(rchase2_iocpu_map)
- MCFG_CPU_IO_MAP(rchase2_ioport_map)
+ MCFG_DEVICE_ADD("iocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(rchase2_iocpu_map)
+ MCFG_DEVICE_IO_MAP(rchase2_ioport_map)
MCFG_DEVICE_ADD("ioexp", CXD1095, 0)
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5649_IN_PD_CB(READ8(model2b_state, rchase2_drive_board_r))
- MCFG_315_5649_OUT_PE_CB(WRITE8(model2b_state, rchase2_drive_board_w))
+ MCFG_315_5649_IN_PD_CB(READ8(*this, model2b_state, rchase2_drive_board_r))
+ MCFG_315_5649_OUT_PE_CB(WRITE8(*this, model2b_state, rchase2_drive_board_w))
MCFG_315_5649_AN0_CB(IOPORT("P2_X"))
MCFG_315_5649_AN1_CB(IOPORT("P1_X"))
MCFG_315_5649_AN2_CB(IOPORT("P2_Y"))
@@ -2797,13 +2797,13 @@ MACHINE_CONFIG_END
/* 2C-CRX */
MACHINE_CONFIG_START(model2c_state::model2c)
- MCFG_CPU_ADD("maincpu", I960, 25000000)
- MCFG_CPU_PROGRAM_MAP(model2c_crx_mem)
+ MCFG_DEVICE_ADD("maincpu", I960, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(model2c_crx_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2c_state, model2c_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("copro_tgpx4", MB86235, 40000000)
- MCFG_CPU_PROGRAM_MAP(copro_tgpx4_map)
- MCFG_CPU_DATA_MAP(copro_tgpx4_data_map)
+ MCFG_DEVICE_ADD("copro_tgpx4", MB86235, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(copro_tgpx4_map)
+ MCFG_DEVICE_DATA_MAP(copro_tgpx4_data_map)
MCFG_MB86235_FIFOIN("copro_fifo_in")
MCFG_MB86235_FIFOOUT0("copro_fifo_out")
@@ -2817,8 +2817,8 @@ MACHINE_CONFIG_START(model2c_state::model2c)
MCFG_NVRAM_ADD_1FILL("backup1")
MCFG_DEVICE_ADD("io", SEGA_315_5649, 0)
- MCFG_315_5649_OUT_PA_CB(WRITE8(model2c_state, eeprom_w))
- MCFG_315_5649_IN_PB_CB(READ8(model2c_state, in0_r))
+ MCFG_315_5649_OUT_PA_CB(WRITE8(*this, model2c_state, eeprom_w))
+ MCFG_315_5649_IN_PB_CB(READ8(*this, model2c_state, in0_r))
MCFG_315_5649_IN_PC_CB(IOPORT("IN1"))
MCFG_315_5649_IN_PD_CB(IOPORT("IN2"))
@@ -2850,7 +2850,7 @@ MACHINE_CONFIG_START( model2c_state::stcc )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_MODIFY("uart")
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
MACHINE_CONFIG_END
MACHINE_CONFIG_START( model2c_state::waverunr )
@@ -2877,15 +2877,15 @@ MACHINE_CONFIG_START( model2c_state::hotd )
model2c(config);
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5649_SERIAL_CH2_READ_CB(READ8(model2c_state, lightgun_mux_r))
- MCFG_315_5649_SERIAL_CH2_WRITE_CB(WRITE8(model2c_state, lightgun_mux_w))
+ MCFG_315_5649_SERIAL_CH2_READ_CB(READ8(*this, model2c_state, lightgun_mux_r))
+ MCFG_315_5649_SERIAL_CH2_WRITE_CB(WRITE8(*this, model2c_state, lightgun_mux_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model2c_state::model2c_5881)
model2c(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model2c_5881_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model2c_5881_mem)
MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0)
MCFG_SET_READ_CALLBACK(model2_state, crypt_read_callback)
diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp
index 03226ea2d5b..49de87bc3d7 100644
--- a/src/mame/drivers/model3.cpp
+++ b/src/mame/drivers/model3.cpp
@@ -5746,13 +5746,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(model3_state::model3_interrupt)
}
MACHINE_CONFIG_START(model3_state::model3_10)
- MCFG_CPU_ADD("maincpu", PPC603E, 66000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603E, 66000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 1, Bus = 66MHz, Core = 66MHz */
- MCFG_CPU_PROGRAM_MAP(model3_10_mem)
+ MCFG_DEVICE_PROGRAM_MAP(model3_10_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model3_state, model3_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(model3_snd)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -5775,12 +5775,12 @@ MACHINE_CONFIG_START(model3_state::model3_10)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp1", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(model3_state, scsp_irq))
+ MCFG_DEVICE_ADD("scsp1", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, model3_state, scsp_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_DEVICE_ADD("scsp2", SCSP)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
@@ -5794,13 +5794,13 @@ MACHINE_CONFIG_START(model3_state::model3_10)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model3_state::model3_15)
- MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603E, 100000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
- MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_DEVICE_PROGRAM_MAP(model3_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model3_state, model3_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(model3_snd)
MCFG_MACHINE_START_OVERRIDE(model3_state,model3_15)
MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_15)
@@ -5821,12 +5821,12 @@ MACHINE_CONFIG_START(model3_state::model3_15)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp1", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(model3_state, scsp_irq))
+ MCFG_DEVICE_ADD("scsp1", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, model3_state, scsp_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_DEVICE_ADD("scsp2", SCSP)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
@@ -5848,21 +5848,21 @@ MACHINE_CONFIG_START(model3_state::scud)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("uart", I8251, 8000000) // uPD71051
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
MCFG_CLOCK_ADD("uart_clock", 500000) // 16 times 31.25MHz (standard Sega/MIDI sound data rate)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model3_state::model3_20)
- MCFG_CPU_ADD("maincpu", PPC603R, 166000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603R, 166000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 2.5, Bus = 66MHz, Core = 166MHz */
- MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_DEVICE_PROGRAM_MAP(model3_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model3_state, model3_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(model3_snd)
MCFG_MACHINE_START_OVERRIDE(model3_state, model3_20)
MCFG_MACHINE_RESET_OVERRIDE(model3_state, model3_20)
@@ -5883,12 +5883,12 @@ MACHINE_CONFIG_START(model3_state::model3_20)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp1", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(model3_state, scsp_irq))
+ MCFG_DEVICE_ADD("scsp1", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, model3_state, scsp_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_DEVICE_ADD("scsp2", SCSP)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
@@ -5912,21 +5912,21 @@ uint16_t model3_state::crypt_read_callback(uint32_t addr)
MACHINE_CONFIG_START(model3_state::model3_20_5881)
model3_20(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model3_5881_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model3_5881_mem)
MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0)
MCFG_SET_READ_CALLBACK(model3_state, crypt_read_callback)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(model3_state::model3_21)
- MCFG_CPU_ADD("maincpu", PPC603R, 166000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603R, 166000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 2.5, Bus = 66MHz, Core = 166MHz */
- MCFG_CPU_PROGRAM_MAP(model3_mem)
+ MCFG_DEVICE_PROGRAM_MAP(model3_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model3_state, model3_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(model3_snd)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(model3_snd)
MCFG_MACHINE_START_OVERRIDE(model3_state, model3_21)
MCFG_MACHINE_RESET_OVERRIDE(model3_state, model3_21)
@@ -5947,12 +5947,12 @@ MACHINE_CONFIG_START(model3_state::model3_21)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp1", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(model3_state, scsp_irq))
+ MCFG_DEVICE_ADD("scsp1", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, model3_state, scsp_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
- MCFG_SOUND_ADD("scsp2", SCSP, 0)
+ MCFG_DEVICE_ADD("scsp2", SCSP)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 2.0)
@@ -5962,8 +5962,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(model3_state::model3_21_5881)
model3_21(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model3_5881_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model3_5881_mem)
MCFG_DEVICE_ADD("315_5881", SEGA315_5881_CRYPT, 0)
MCFG_SET_READ_CALLBACK(model3_state, crypt_read_callback)
diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp
index 6df4f38be8a..cff0537c500 100644
--- a/src/mame/drivers/modellot.cpp
+++ b/src/mame/drivers/modellot.cpp
@@ -177,9 +177,9 @@ uint32_t modellot_state::screen_update_modellot(screen_device &screen, bitmap_in
MACHINE_CONFIG_START(modellot_state::modellot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp
index df41dadcbff..6301db597a8 100644
--- a/src/mame/drivers/mogura.cpp
+++ b/src/mame/drivers/mogura.cpp
@@ -210,10 +210,10 @@ void mogura_state::machine_start()
MACHINE_CONFIG_START(mogura_state::mogura)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,3000000) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(mogura_map)
- MCFG_CPU_IO_MAP(mogura_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mogura_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,3000000) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mogura_map)
+ MCFG_DEVICE_IO_MAP(mogura_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mogura_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -230,8 +230,8 @@ MACHINE_CONFIG_START(mogura_state::mogura)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp
index 46dc4281e2c..689f0fda35f 100644
--- a/src/mame/drivers/mole.cpp
+++ b/src/mame/drivers/mole.cpp
@@ -323,9 +323,9 @@ void mole_state::machine_reset()
MACHINE_CONFIG_START(mole_state::mole)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 4000000) // ???
- MCFG_CPU_PROGRAM_MAP(mole_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mole_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M6502, 4000000) // ???
+ MCFG_DEVICE_PROGRAM_MAP(mole_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mole_state, irq0_line_assert)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(mole_state::mole)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp
index 929f7082bbb..43e1ce423a4 100644
--- a/src/mame/drivers/molecular.cpp
+++ b/src/mame/drivers/molecular.cpp
@@ -296,18 +296,18 @@ PALETTE_INIT_MEMBER(molecula_state, molecula)
MACHINE_CONFIG_START(molecula_state::molecula)
/* basic machine hardware */
- MCFG_CPU_ADD("filecpu",Z80,Z80_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(molecula_file_map)
- MCFG_CPU_IO_MAP(molecula_file_io)
+ MCFG_DEVICE_ADD("filecpu",Z80,Z80_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(molecula_file_map)
+ MCFG_DEVICE_IO_MAP(molecula_file_io)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("appcpu",Z80,Z80_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(molecula_app_map)
- MCFG_CPU_IO_MAP(molecula_app_io)
+ MCFG_DEVICE_ADD("appcpu",Z80,Z80_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(molecula_app_map)
+ MCFG_DEVICE_IO_MAP(molecula_app_io)
-// MCFG_CPU_ADD("sub",I8086,I86_CLOCK/2)
-// MCFG_CPU_PROGRAM_MAP(molecula_map)
-// MCFG_CPU_IO_MAP(molecula_io)
+// MCFG_DEVICE_ADD("sub",I8086,I86_CLOCK/2)
+// MCFG_DEVICE_PROGRAM_MAP(molecula_map)
+// MCFG_DEVICE_IO_MAP(molecula_io)
// MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -326,7 +326,7 @@ MACHINE_CONFIG_START(molecula_state::molecula)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp
index dd8b384e52e..f22a7baa2ac 100644
--- a/src/mame/drivers/momoko.cpp
+++ b/src/mame/drivers/momoko.cpp
@@ -258,12 +258,12 @@ void momoko_state::machine_reset()
MACHINE_CONFIG_START(momoko_state::momoko)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/2) /* 5.0MHz */
- MCFG_CPU_PROGRAM_MAP(momoko_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", momoko_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'000'000)/2) /* 5.0MHz */
+ MCFG_DEVICE_PROGRAM_MAP(momoko_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", momoko_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(10'000'000)/4) /* 2.5MHz */
- MCFG_CPU_PROGRAM_MAP(momoko_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(10'000'000)/4) /* 2.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(momoko_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -286,14 +286,14 @@ MACHINE_CONFIG_START(momoko_state::momoko)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(10'000'000)/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(10'000'000)/8)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(10'000'000)/8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(10'000'000)/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp
index 85a5d6bb650..88840cfdca4 100644
--- a/src/mame/drivers/monty.cpp
+++ b/src/mame/drivers/monty.cpp
@@ -267,10 +267,10 @@ SED1520_UPDATE_CB(monty_state::screen_update)
// TODO: Additional machine definition - Master Monty has a different memory layout
MACHINE_CONFIG_START(monty_state::monty)
// Basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 3580000) // Ceramic resonator labeled 3.58MT
- MCFG_CPU_PROGRAM_MAP(monty_mem)
- MCFG_CPU_IO_MAP(monty_io)
- MCFG_Z80_SET_HALT_CALLBACK(WRITELINE(monty_state, halt_changed))
+ MCFG_DEVICE_ADD("maincpu", Z80, 3580000) // Ceramic resonator labeled 3.58MT
+ MCFG_DEVICE_PROGRAM_MAP(monty_mem)
+ MCFG_DEVICE_IO_MAP(monty_io)
+ MCFG_Z80_SET_HALT_CALLBACK(WRITELINE(*this, monty_state, halt_changed))
// Video hardware
MCFG_SCREEN_ADD("screen", LCD)
@@ -282,7 +282,7 @@ MACHINE_CONFIG_START(monty_state::monty)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// LCD controller interfaces
@@ -291,8 +291,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(monty_state::mmonty)
monty(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(mmonty_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(mmonty_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp
index 7c49082a14a..41ed6beb5d1 100644
--- a/src/mame/drivers/monzagp.cpp
+++ b/src/mame/drivers/monzagp.cpp
@@ -494,12 +494,12 @@ static GFXDECODE_START( monzagp )
GFXDECODE_END
MACHINE_CONFIG_START(monzagp_state::monzagp)
- MCFG_CPU_ADD("maincpu", I8035, 12000000/4) /* 400KHz ??? - Main board Crystal is 12MHz */
- MCFG_CPU_PROGRAM_MAP(monzagp_map)
- MCFG_CPU_IO_MAP(monzagp_io)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(monzagp_state, port1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(monzagp_state, port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(monzagp_state, port2_w))
+ MCFG_DEVICE_ADD("maincpu", I8035, 12000000/4) /* 400KHz ??? - Main board Crystal is 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(monzagp_map)
+ MCFG_DEVICE_IO_MAP(monzagp_io)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, monzagp_state, port1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, monzagp_state, port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, monzagp_state, port2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp
index c908922eb33..c8db0a01f52 100644
--- a/src/mame/drivers/moo.cpp
+++ b/src/mame/drivers/moo.cpp
@@ -497,12 +497,12 @@ MACHINE_RESET_MEMBER(moo_state,moo)
MACHINE_CONFIG_START(moo_state::moo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // 16MHz verified
- MCFG_CPU_PROGRAM_MAP(moo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", moo_state, moo_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) // 16MHz verified
+ MCFG_DEVICE_PROGRAM_MAP(moo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", moo_state, moo_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(32'000'000)/4) // 8MHz verified
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(32'000'000)/4) // 8MHz verified
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(moo_state,moo)
MCFG_MACHINE_RESET_OVERRIDE(moo_state,moo)
@@ -559,9 +559,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(moo_state::moobl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16100000)
- MCFG_CPU_PROGRAM_MAP(moobl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", moo_state, moobl_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16100000)
+ MCFG_DEVICE_PROGRAM_MAP(moobl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", moo_state, moobl_interrupt)
MCFG_MACHINE_START_OVERRIDE(moo_state,moo)
MCFG_MACHINE_RESET_OVERRIDE(moo_state,moo)
@@ -609,8 +609,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(moo_state::bucky)
moo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bucky_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bucky_map)
MCFG_K054000_ADD("k054000")
diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp
index 48e5ab509b5..a336d59cbd7 100644
--- a/src/mame/drivers/mosaic.cpp
+++ b/src/mame/drivers/mosaic.cpp
@@ -279,10 +279,10 @@ void mosaic_state::machine_reset()
MACHINE_CONFIG_START(mosaic_state::mosaic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'288'000)/2) /* 6.144MHz */
- MCFG_CPU_PROGRAM_MAP(mosaic_map)
- MCFG_CPU_IO_MAP(mosaic_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mosaic_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'288'000)/2) /* 6.144MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mosaic_map)
+ MCFG_DEVICE_IO_MAP(mosaic_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mosaic_state, irq0_line_hold)
/* video hardware */
@@ -302,16 +302,16 @@ MACHINE_CONFIG_START(mosaic_state::mosaic)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'288'000)/4) /* 3.072MHz or 3.579545MHz (14.31818MHz/4)? */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'288'000)/4) /* 3.072MHz or 3.579545MHz (14.31818MHz/4)? */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mosaic_state::gfire2)
mosaic(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gfire2_map)
- MCFG_CPU_IO_MAP(gfire2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gfire2_map)
+ MCFG_DEVICE_IO_MAP(gfire2_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp
index 19992f2123d..c93d2c2b151 100644
--- a/src/mame/drivers/mouser.cpp
+++ b/src/mame/drivers/mouser.cpp
@@ -193,19 +193,19 @@ void mouser_state::machine_reset()
MACHINE_CONFIG_START(mouser_state::mouser)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(mouser_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(mouser_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ??? */
- MCFG_CPU_PROGRAM_MAP(mouser_sound_map)
- MCFG_CPU_IO_MAP(mouser_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mouser_state, mouser_sound_nmi_assert, 4*60) /* ??? This controls the sound tempo */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(mouser_sound_map)
+ MCFG_DEVICE_IO_MAP(mouser_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mouser_state, mouser_sound_nmi_assert, 4*60) /* ??? This controls the sound tempo */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // type unconfirmed
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mouser_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mouser_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mouser_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, mouser_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, mouser_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, mouser_state, flip_screen_y_w))
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(mouser_state::mouser)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(mouser_state, screen_update_mouser)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mouser_state, mouser_nmi_interrupt))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mouser_state, mouser_nmi_interrupt))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mouser)
MCFG_PALETTE_ADD("palette", 64)
@@ -227,10 +227,10 @@ MACHINE_CONFIG_START(mouser_state::mouser)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 4000000/2)
+ MCFG_DEVICE_ADD("ay1", AY8910, 4000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, 4000000/2)
+ MCFG_DEVICE_ADD("ay2", AY8910, 4000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index 468c9b8af0f..f4b49c2b579 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -358,10 +358,10 @@ void mpf1_state::machine_reset()
MACHINE_CONFIG_START(mpf1_state::mpf1)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2)
- MCFG_CPU_PROGRAM_MAP(mpf1_map)
- MCFG_CPU_OPCODES_MAP(mpf1_step)
- MCFG_CPU_IO_MAP(mpf1_io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2)
+ MCFG_DEVICE_PROGRAM_MAP(mpf1_map)
+ MCFG_DEVICE_OPCODES_MAP(mpf1_step)
+ MCFG_DEVICE_IO_MAP(mpf1_io_map)
MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain)
/* devices */
@@ -372,9 +372,9 @@ MACHINE_CONFIG_START(mpf1_state::mpf1)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mpf1_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mpf1_state, ppi_pb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mpf1_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mpf1_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mpf1_state, ppi_pb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mpf1_state, ppi_pc_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(mpf1_state::mpf1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1))
@@ -392,10 +392,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpf1_state::mpf1b)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2)
- MCFG_CPU_PROGRAM_MAP(mpf1b_map)
- MCFG_CPU_OPCODES_MAP(mpf1_step)
- MCFG_CPU_IO_MAP(mpf1b_io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(3'579'545)/2)
+ MCFG_DEVICE_PROGRAM_MAP(mpf1b_map)
+ MCFG_DEVICE_OPCODES_MAP(mpf1_step)
+ MCFG_DEVICE_IO_MAP(mpf1b_io_map)
MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain)
/* devices */
@@ -406,9 +406,9 @@ MACHINE_CONFIG_START(mpf1_state::mpf1b)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mpf1_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mpf1_state, ppi_pb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mpf1_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mpf1_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mpf1_state, ppi_pb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mpf1_state, ppi_pc_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
@@ -418,10 +418,10 @@ MACHINE_CONFIG_START(mpf1_state::mpf1b)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD(TMS5220_TAG, TMS5220, 680000L)
+ MCFG_DEVICE_ADD(TMS5220_TAG, TMS5220, 680000L)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1))
@@ -429,10 +429,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpf1_state::mpf1p)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(mpf1p_map)
- MCFG_CPU_OPCODES_MAP(mpf1_step)
- MCFG_CPU_IO_MAP(mpf1p_io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(mpf1p_map)
+ MCFG_DEVICE_OPCODES_MAP(mpf1_step)
+ MCFG_DEVICE_IO_MAP(mpf1p_io_map)
MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain)
/* video hardware */
@@ -446,16 +446,16 @@ MACHINE_CONFIG_START(mpf1_state::mpf1p)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mpf1_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mpf1_state, ppi_pb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mpf1_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mpf1_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mpf1_state, ppi_pb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mpf1_state, ppi_pc_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1))
diff --git a/src/mame/drivers/mps1230.cpp b/src/mame/drivers/mps1230.cpp
index 5fa038e0150..1d2abd3f3bb 100644
--- a/src/mame/drivers/mps1230.cpp
+++ b/src/mame/drivers/mps1230.cpp
@@ -138,13 +138,13 @@ static INPUT_PORTS_START( mps1230 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mps1230_state::mps1230)
- MCFG_CPU_ADD(CPU_TAG, UPD7810, 11060000)
- MCFG_CPU_PROGRAM_MAP(mps1230_map)
+ MCFG_DEVICE_ADD(CPU_TAG, UPD7810, 11060000)
+ MCFG_DEVICE_PROGRAM_MAP(mps1230_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mps1230_state::mps1000)
- MCFG_CPU_ADD(CPU_TAG, Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(mps1230_map)
+ MCFG_DEVICE_ADD(CPU_TAG, Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(mps1230_map)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index 4ef71da9b55..2630c7622ed 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -489,8 +489,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(mpu12wbk_state::mpu12wbk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mpu12wbk_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mpu12wbk_map)
// MCFG_NVRAM_ADD_0FILL("nvram")
@@ -515,7 +515,7 @@ MACHINE_CONFIG_START(mpu12wbk_state::mpu12wbk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
+ MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpu2.cpp b/src/mame/drivers/mpu2.cpp
index b5042c0ec39..607ba2118d5 100644
--- a/src/mame/drivers/mpu2.cpp
+++ b/src/mame/drivers/mpu2.cpp
@@ -76,8 +76,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mpu2_state::mpu2)
- MCFG_CPU_ADD("maincpu", M6800, 2000000) // ?
- MCFG_CPU_PROGRAM_MAP(mpu2_basemap)
+ MCFG_DEVICE_ADD("maincpu", M6800, 2000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(mpu2_basemap)
MACHINE_CONFIG_END
// technically not a 'bios' because they're all on the same board.
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index 6aa4658a092..7d648822dbe 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -844,8 +844,8 @@ void mpu3_state::mpu3_basemap(address_map &map)
MCFG_STEPPER_INIT_PHASE(2)
MACHINE_CONFIG_START(mpu3_state::mpu3base)
- MCFG_CPU_ADD("maincpu", M6808, MPU3_MASTER_CLOCK)///4)
- MCFG_CPU_PROGRAM_MAP(mpu3_basemap)
+ MCFG_DEVICE_ADD("maincpu", M6808, MPU3_MASTER_CLOCK)///4)
+ MCFG_DEVICE_PROGRAM_MAP(mpu3_basemap)
MCFG_MSC1937_ADD("vfd",0)
@@ -855,48 +855,48 @@ MACHINE_CONFIG_START(mpu3_state::mpu3base)
/* 6840 PTM */
MCFG_DEVICE_ADD("ptm_ic2", PTM6840, MPU3_MASTER_CLOCK)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(mpu3_state, ic2_o1_callback))
- MCFG_PTM6840_O2_CB(WRITELINE(mpu3_state, ic2_o2_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(mpu3_state, ic2_o3_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, mpu3_state, ic2_o1_callback))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, mpu3_state, ic2_o2_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, mpu3_state, ic2_o3_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic3_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic3_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic3_ca2_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu3_state, pia_ic3_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic3_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic3_ca2_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic4", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic4_porta_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic4_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic4_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic4_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic4_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu3_state, pia_ic4_porta_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu3_state, pia_ic4_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic4_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic4_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic4_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic5", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(mpu3_state, pia_ic5_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic5_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic5_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu3_state, pia_ic5_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu3_state, pia_ic5_cb2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu3_state, pia_ic5_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu3_state, pia_ic5_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic5_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic5_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu3_state, pia_ic5_cb2_w))
MCFG_DEVICE_ADD("pia_ic6", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu3_state, pia_ic6_porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(mpu3_state, pia_ic6_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu3_state, pia_ic6_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu3_state, pia_ic6_portb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu3_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu3_state, pia_ic6_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu3_state, pia_ic6_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu3_state, pia_ic6_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu3_state, pia_ic6_portb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu3_state, cpu0_irq))
MCFG_MPU3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<0>))
MCFG_MPU3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<1>))
MCFG_MPU3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<2>))
MCFG_MPU3_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu3_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu3_state, reel_optic_cb<3>))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp
index 048fc6bab7b..994458f642f 100644
--- a/src/mame/drivers/mpu4dealem.cpp
+++ b/src/mame/drivers/mpu4dealem.cpp
@@ -201,13 +201,13 @@ MACHINE_CONFIG_START(mpu4dealem_state::dealem)
MCFG_MACHINE_START_OVERRIDE(mpu4dealem_state,mod2) /* main mpu4 board initialisation */
MCFG_MACHINE_RESET_OVERRIDE(mpu4dealem_state,dealem_vid)
- MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(dealem_memmap)
+ MCFG_DEVICE_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(dealem_memmap)
mpu4_common(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ay8913",AY8913, MPU4_MASTER_CLOCK/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(820, 0, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -230,7 +230,7 @@ MACHINE_CONFIG_START(mpu4dealem_state::dealem)
MCFG_MC6845_ADD("crtc", HD6845, "screen", MPU4_MASTER_CLOCK / 4 / 8) /* HD68B45 */
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(mpu4dealem_state, dealem_vsync_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, mpu4dealem_state, dealem_vsync_changed))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp
index 746e6744d81..4bcf7d167ee 100644
--- a/src/mame/drivers/mpu4plasma.cpp
+++ b/src/mame/drivers/mpu4plasma.cpp
@@ -88,9 +88,9 @@ uint32_t mpu4plasma_state::screen_update_mpu4plasma(screen_device &screen, bitma
MACHINE_CONFIG_START(mpu4plasma_state::mpu4plasma)
mod2(config);
- MCFG_CPU_ADD("plasmacpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(mpu4plasma_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mpu4plasma_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("plasmacpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(mpu4plasma_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mpu4plasma_state, irq4_line_hold)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp
index a02413ef91a..7ac03061564 100644
--- a/src/mame/drivers/mpu4vid.cpp
+++ b/src/mame/drivers/mpu4vid.cpp
@@ -1275,8 +1275,8 @@ void mpu4_state::mpu4_6809_map(address_map &map)
MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid)
- MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 )
- MCFG_CPU_PROGRAM_MAP(mpu4_6809_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 )
+ MCFG_DEVICE_PROGRAM_MAP(mpu4_6809_map)
MCFG_NVRAM_ADD_0FILL("nvram") /* confirm */
@@ -1299,8 +1299,8 @@ MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid)
MCFG_DEVICE_ADDRESS_MAP(0, mpu4_vram)
- MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK )
- MCFG_CPU_PROGRAM_MAP(mpu4_68k_map)
+ MCFG_DEVICE_ADD("video", M68000, VIDEO_MASTER_CLOCK )
+ MCFG_DEVICE_PROGRAM_MAP(mpu4_68k_map)
// MCFG_QUANTUM_TIME(attotime::from_hz(960))
@@ -1315,10 +1315,10 @@ MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid)
MCFG_DEVICE_ADD("6840ptm_68k", PTM6840, VIDEO_MASTER_CLOCK / 10) /* 68k E clock */
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(mpu4vid_state, vid_o1_callback))
- MCFG_PTM6840_O2_CB(WRITELINE(mpu4vid_state, vid_o2_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(mpu4vid_state, vid_o3_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(mpu4vid_state, cpu1_ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, mpu4vid_state, vid_o1_callback))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, mpu4vid_state, vid_o2_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, mpu4vid_state, vid_o3_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu4vid_state, cpu1_ptm_irq))
/* Present on all video cards */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SAA1099_ADD("saa", 8000000)
@@ -1326,50 +1326,50 @@ MACHINE_CONFIG_START(mpu4vid_state::mpu4_vid)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
MCFG_DEVICE_ADD("acia6850_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_rxd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("acia6850_1", acia6850_device, write_dcd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(mpu4vid_state, m6809_acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_rxd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("acia6850_1", acia6850_device, write_dcd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, mpu4vid_state, m6809_acia_irq))
MCFG_DEVICE_ADD("acia6850_1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("acia6850_0", acia6850_device, write_rxd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("acia6850_0", acia6850_device, write_dcd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(mpu4vid_state, m68k_acia_irq))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("acia6850_0", acia6850_device, write_rxd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("acia6850_0", acia6850_device, write_dcd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, mpu4vid_state, m68k_acia_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4vid_state::crmaze)
mpu4_vid(config);
MCFG_DEVICE_MODIFY("pia_ic5")
- MCFG_PIA_READPA_HANDLER(READ8(mpu4vid_state, pia_ic5_porta_track_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu4vid_state, pia_ic5_porta_track_r))
MCFG_PIA_WRITEPA_HANDLER(NOOP)
MCFG_PIA_WRITEPB_HANDLER(NOOP)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4vid_state::mating)
crmaze(config);
- MCFG_CPU_MODIFY("video")
- MCFG_CPU_PROGRAM_MAP(mpu4oki_68k_map)
+ MCFG_DEVICE_MODIFY("video")
+ MCFG_DEVICE_PROGRAM_MAP(mpu4oki_68k_map)
mpu4_common2(config);
- MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //?
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //?
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4vid_state::bwbvid)
mpu4_vid(config);
- MCFG_CPU_MODIFY("video")
- MCFG_CPU_PROGRAM_MAP(bwbvid_68k_map)
+ MCFG_DEVICE_MODIFY("video")
+ MCFG_DEVICE_PROGRAM_MAP(bwbvid_68k_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4vid_state::bwbvid5)
bwbvid(config);
- MCFG_CPU_MODIFY("video")
- MCFG_CPU_PROGRAM_MAP(bwbvid5_68k_map)
+ MCFG_DEVICE_MODIFY("video")
+ MCFG_DEVICE_PROGRAM_MAP(bwbvid5_68k_map)
mpu4_common2(config);
- MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //?
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //?
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp
index aa218e3125b..75d0b7660f6 100644
--- a/src/mame/drivers/mpu5.cpp
+++ b/src/mame/drivers/mpu5.cpp
@@ -548,8 +548,8 @@ void mpu5_state::machine_start()
MACHINE_CONFIG_START(mpu5_state::mpu5)
- MCFG_CPU_ADD("maincpu", M68340, 16000000) // ?
- MCFG_CPU_PROGRAM_MAP(mpu5_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(mpu5_map)
MCFG_DEFAULT_LAYOUT(layout_mpu5)
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp
index 37d630d5cd3..4a5306dfdb6 100644
--- a/src/mame/drivers/mpz80.cpp
+++ b/src/mame/drivers/mpz80.cpp
@@ -714,14 +714,14 @@ void mpz80_state::machine_reset()
MACHINE_CONFIG_START(mpz80_state::mpz80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mpz80_mem)
- MCFG_CPU_IO_MAP(mpz80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mpz80_mem)
+ MCFG_DEVICE_IO_MAP(mpz80_io)
// S-100
MCFG_DEVICE_ADD(S100_TAG, S100_BUS, XTAL(4'000'000) / 2)
- MCFG_S100_IRQ_CALLBACK(WRITELINE(mpz80_state, s100_pint_w))
- MCFG_S100_NMI_CALLBACK(WRITELINE(mpz80_state, s100_nmi_w))
+ MCFG_S100_IRQ_CALLBACK(WRITELINE(*this, mpz80_state, s100_pint_w))
+ MCFG_S100_NMI_CALLBACK(WRITELINE(*this, mpz80_state, s100_nmi_w))
MCFG_S100_RDY_CALLBACK(INPUTLINE(Z80_TAG, Z80_INPUT_LINE_BOGUSWAIT))
MCFG_S100_SLOT_ADD(S100_TAG ":1", mpz80_s100_cards, "mm65k16s")
MCFG_S100_SLOT_ADD(S100_TAG ":2", mpz80_s100_cards, "wunderbus")
diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp
index 08f5b8b1780..3e6c3b020d4 100644
--- a/src/mame/drivers/mquake.cpp
+++ b/src/mame/drivers/mquake.cpp
@@ -314,8 +314,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mquake_state::mquake)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map)
@@ -337,13 +337,13 @@ MACHINE_CONFIG_START(mquake_state::mquake)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(2, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
- MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w))
+ MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w))
MCFG_ES5503_ADD("es5503", amiga_state::CLK_7M_NTSC) /* ES5503 is likely mono due to channel strobe used as bank select */
MCFG_ES5503_OUTPUT_CHANNELS(1)
@@ -353,19 +353,19 @@ MACHINE_CONFIG_START(mquake_state::mquake)
/* cia */
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA"))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
/* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC)
- MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w))
- MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r))
- MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w))
- MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w))
- MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w))
+ MCFG_AMIGA_FDC_INDEX_CALLBACK(WRITELINE("cia_1", mos8520_device, flag_w))
+ MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w))
+ MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp
index e27d3fcf50d..5da9f1374df 100644
--- a/src/mame/drivers/mrdo.cpp
+++ b/src/mame/drivers/mrdo.cpp
@@ -174,9 +174,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(mrdo_state::mrdo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) /* Verified */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mrdo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/2) /* Verified */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mrdo_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -192,10 +192,10 @@ MACHINE_CONFIG_START(mrdo_state::mrdo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("u8106_1", U8106, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */
+ MCFG_DEVICE_ADD("u8106_1", U8106, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("u8106_2", U8106, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */
+ MCFG_DEVICE_ADD("u8106_2", U8106, MAIN_CLOCK/2) /* sn76489-equivalent?, Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp
index ce0bcb7a30a..41c4b328efa 100644
--- a/src/mame/drivers/mrflea.cpp
+++ b/src/mame/drivers/mrflea.cpp
@@ -258,28 +258,28 @@ void mrflea_state::machine_reset()
MACHINE_CONFIG_START(mrflea_state::mrflea)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(mrflea_master_map)
- MCFG_CPU_IO_MAP(mrflea_master_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mrflea_state, irq0_line_hold) /* NMI resets the game */
-
- MCFG_CPU_ADD("subcpu", Z80, 6000000) // runs in IM 1, so doesn't use 8259 INTA
- MCFG_CPU_PROGRAM_MAP(mrflea_slave_map)
- MCFG_CPU_IO_MAP(mrflea_slave_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(mrflea_master_map)
+ MCFG_DEVICE_IO_MAP(mrflea_master_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mrflea_state, irq0_line_hold) /* NMI resets the game */
+
+ MCFG_DEVICE_ADD("subcpu", Z80, 6000000) // runs in IM 1, so doesn't use 8259 INTA
+ MCFG_DEVICE_PROGRAM_MAP(mrflea_slave_map)
+ MCFG_DEVICE_IO_MAP(mrflea_slave_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mrflea_state, mrflea_slave_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("mainppi", I8255, 0)
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("subppi", i8255_device, pb_r))
- MCFG_I8255_OUT_PORTC_CB(DEVWRITELINE("subppi", i8255_device, pc4_w)) MCFG_DEVCB_BIT(7) // OBFA -> STBA
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("subppi", i8255_device, pc2_w)) MCFG_DEVCB_BIT(1) // IBFB -> ACKB
+ MCFG_I8255_IN_PORTB_CB(READ8("subppi", i8255_device, pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE("subppi", i8255_device, pc4_w)) MCFG_DEVCB_BIT(7) // OBFA -> STBA
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("subppi", i8255_device, pc2_w)) MCFG_DEVCB_BIT(1) // IBFB -> ACKB
MCFG_DEVICE_ADD("subppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("mainppi", i8255_device, pa_r))
- MCFG_I8255_OUT_PORTC_CB(DEVWRITELINE("mainppi", i8255_device, pc6_w)) MCFG_DEVCB_BIT(5) // IBFA -> ACKA
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("pic", pic8259_device, ir0_w)) MCFG_DEVCB_BIT(3) // INTRA
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mainppi", i8255_device, pc2_w)) MCFG_DEVCB_BIT(1) // OBFB -> STBB
+ MCFG_I8255_IN_PORTA_CB(READ8("mainppi", i8255_device, pa_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE("mainppi", i8255_device, pc6_w)) MCFG_DEVCB_BIT(5) // IBFA -> ACKA
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("pic", pic8259_device, ir0_w)) MCFG_DEVCB_BIT(3) // INTRA
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mainppi", i8255_device, pc2_w)) MCFG_DEVCB_BIT(1) // OBFB -> STBB
MCFG_DEVICE_ADD("pic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("subcpu", 0))
@@ -301,23 +301,23 @@ MACHINE_CONFIG_START(mrflea_state::mrflea)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN0"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000) // not used for sound?
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000) // not used for sound?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay3", AY8910, 2000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay4", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay4", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("UNKNOWN"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(mrflea_state, mrflea_data1_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, mrflea_state, mrflea_data1_w))
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp
index fc93b66b788..25222d5a74e 100644
--- a/src/mame/drivers/mrgame.cpp
+++ b/src/mame/drivers/mrgame.cpp
@@ -475,18 +475,18 @@ uint32_t mrgame_state::screen_update_mrgame(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(mrgame_state::mrgame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(mrgame_state, irq1_line_hold, 183)
- MCFG_CPU_ADD("videocpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(video_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mrgame_state, nmi_line_pulse)
- MCFG_CPU_ADD("audiocpu1", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(audio1_map)
- MCFG_CPU_IO_MAP(audio1_io)
- MCFG_CPU_ADD("audiocpu2", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(audio2_map)
- MCFG_CPU_IO_MAP(audio2_io)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mrgame_state, irq1_line_hold, 183)
+ MCFG_DEVICE_ADD("videocpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(video_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mrgame_state, nmi_line_pulse)
+ MCFG_DEVICE_ADD("audiocpu1", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(audio1_map)
+ MCFG_DEVICE_IO_MAP(audio1_io)
+ MCFG_DEVICE_ADD("audiocpu2", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(audio2_map)
+ MCFG_DEVICE_IO_MAP(audio2_io)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -504,15 +504,15 @@ MACHINE_CONFIG_START(mrgame_state::mrgame)
/* Sound */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dacvol", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dacvol", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("tms", TMS5220, 672000) // uses a RC combination. 672k copied from jedi.h
+ MCFG_DEVICE_ADD("tms", TMS5220, 672000) // uses a RC combination. 672k copied from jedi.h
MCFG_TMS52XX_READYQ_HANDLER(INPUTLINE("audiocpu2", Z80_INPUT_LINE_BOGUSWAIT))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -520,9 +520,9 @@ MACHINE_CONFIG_START(mrgame_state::mrgame)
/* Devices */
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", mrgame_state, irq_timer, attotime::from_hz(16000)) //ugh
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mrgame_state, porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mrgame_state, portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(mrgame_state, portc_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mrgame_state, porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mrgame_state, portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mrgame_state, portc_r))
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp
index 86a3a19c0d4..af808707b59 100644
--- a/src/mame/drivers/mrjong.cpp
+++ b/src/mame/drivers/mrjong.cpp
@@ -188,9 +188,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(mrjong_state::mrjong)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */
- MCFG_CPU_PROGRAM_MAP(mrjong_map)
- MCFG_CPU_IO_MAP(mrjong_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */
+ MCFG_DEVICE_PROGRAM_MAP(mrjong_map)
+ MCFG_DEVICE_IO_MAP(mrjong_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -210,10 +210,10 @@ MACHINE_CONFIG_START(mrjong_state::mrjong)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 15468000/6)
+ MCFG_DEVICE_ADD("sn1", SN76489, 15468000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76489, 15468000/6)
+ MCFG_DEVICE_ADD("sn2", SN76489, 15468000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp
index 2dacb5bd90e..43c1ab54a77 100644
--- a/src/mame/drivers/ms0515.cpp
+++ b/src/mame/drivers/ms0515.cpp
@@ -521,15 +521,15 @@ WRITE_LINE_MEMBER(ms0515_state::irq11_w)
MACHINE_CONFIG_START(ms0515_state::ms0515)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", T11, XTAL(15'000'000) / 2) // actual CPU is T11 clone, KR1807VM1
+ MCFG_DEVICE_ADD("maincpu", T11, XTAL(15'000'000) / 2) // actual CPU is T11 clone, KR1807VM1
MCFG_T11_INITIAL_MODE(0xf2ff)
- MCFG_CPU_PROGRAM_MAP(ms0515_mem)
+ MCFG_DEVICE_PROGRAM_MAP(ms0515_mem)
/* video hardware -- 50 Hz refresh rate */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( XTAL(15'000'000), 958,0,640, 313,0,200 )
MCFG_SCREEN_UPDATE_DRIVER(ms0515_state, screen_update_ms0515)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ms0515_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ms0515_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEFAULT_LAYOUT(layout_ms0515)
@@ -543,47 +543,47 @@ MACHINE_CONFIG_START(ms0515_state::ms0515)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ms0515_state, ms0515_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(ms0515_state, ms0515_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(ms0515_state, ms0515_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ms0515_state, ms0515_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ms0515_state, ms0515_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, ms0515_state, ms0515_portc_w))
// serial connection to printer
MCFG_DEVICE_ADD( "i8251line", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(ms0515_state, irq9_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(ms0515_state, irq8_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, ms0515_state, irq9_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, ms0515_state, irq8_w))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251line", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("i8251line", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251line", i8251_device, write_dsr))
// MCFG_DEVICE_ADD("line_clock", CLOCK, 4800*16) // 8251 is set to /16 on the clock input
-// MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ms0515_state, write_line_clock))
+// MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ms0515_state, write_line_clock))
// serial connection to MS7004 keyboard
MCFG_DEVICE_ADD("i8251kbd", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(ms0515_state, irq5_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("ms7004", ms7004_device, write_rxd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, ms0515_state, irq5_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("ms7004", ms7004_device, write_rxd))
MCFG_DEVICE_ADD("ms7004", MS7004, 0)
- MCFG_MS7004_TX_HANDLER(DEVWRITELINE("i8251kbd", i8251_device, write_rxd))
- MCFG_MS7004_RTS_HANDLER(DEVWRITELINE("i8251kbd", i8251_device, write_cts))
+ MCFG_MS7004_TX_HANDLER(WRITELINE("i8251kbd", i8251_device, write_rxd))
+ MCFG_MS7004_RTS_HANDLER(WRITELINE("i8251kbd", i8251_device, write_cts))
// baud rate is supposed to be 4800 but keyboard is slightly faster
MCFG_DEVICE_ADD("keyboard_clock", CLOCK, 4960*16)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ms0515_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ms0515_state, write_keyboard_clock))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(2'000'000))
-// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ms0515_state, write_keyboard_clock))
+// MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ms0515_state, write_keyboard_clock))
MCFG_PIT8253_CLK1(XTAL(2'000'000))
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ms0515_state, write_line_clock))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ms0515_state, write_line_clock))
MCFG_PIT8253_CLK2(XTAL(2'000'000))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ms0515_state, pit8253_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ms0515_state, pit8253_out2_changed))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
/* internal ram */
diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp
index d9c6f66e425..53a1fd34e1c 100644
--- a/src/mame/drivers/ms32.cpp
+++ b/src/mame/drivers/ms32.cpp
@@ -1703,14 +1703,14 @@ void ms32_state::machine_reset()
MACHINE_CONFIG_START(ms32_state::ms32)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
- MCFG_CPU_PROGRAM_MAP(ms32_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(ms32_state,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", V70, 20000000) // 20MHz
+ MCFG_DEVICE_PROGRAM_MAP(ms32_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(ms32_state,irq_callback)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ms32_state, ms32_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // Unverified; it's possibly higher than 4MHz
- MCFG_CPU_PROGRAM_MAP(ms32_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // Unverified; it's possibly higher than 4MHz
+ MCFG_DEVICE_PROGRAM_MAP(ms32_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
@@ -1733,7 +1733,7 @@ MACHINE_CONFIG_START(ms32_state::ms32)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymf", YMF271, 16934400)
+ MCFG_DEVICE_ADD("ymf", YMF271, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
// MCFG_SOUND_ROUTE(2, "lspeaker", 1.0) Output 2/3 not used?
@@ -1744,8 +1744,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ms32_state::f1superb)
ms32(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(f1superb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(f1superb_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", f1superb)
diff --git a/src/mame/drivers/ms6102.cpp b/src/mame/drivers/ms6102.cpp
index 127469cabda..8af4f79ab4a 100644
--- a/src/mame/drivers/ms6102.cpp
+++ b/src/mame/drivers/ms6102.cpp
@@ -305,14 +305,14 @@ void ms6102_state::machine_start()
MACHINE_CONFIG_START(ms6102_state::ms6102)
- MCFG_CPU_ADD("maincpu", I8080, XTAL(18'432'000) / 9)
- MCFG_CPU_PROGRAM_MAP(ms6102_mem)
- MCFG_CPU_IO_MAP(ms6102_io)
- MCFG_I8085A_INTE(DEVWRITELINE("i8214", i8214_device, inte_w))
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(ms6102_state, ms6102_int_ack)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(18'432'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(ms6102_mem)
+ MCFG_DEVICE_IO_MAP(ms6102_io)
+ MCFG_I8085A_INTE(WRITELINE("i8214", i8214_device, inte_w))
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(ms6102_state, ms6102_int_ack)
MCFG_DEVICE_ADD("i8214", I8214, XTAL(18'432'000) / 9)
- MCFG_I8214_INT_CALLBACK(WRITELINE(ms6102_state, irq_w))
+ MCFG_I8214_INT_CALLBACK(WRITELINE(*this, ms6102_state, irq_w))
MCFG_DEVICE_ADD("earom", KR1601RR1, 0)
@@ -324,47 +324,47 @@ MACHINE_CONFIG_START(ms6102_state::ms6102)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_DEVICE_ADD("dma8257", I8257, XTAL(18'432'000) / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(ms6102_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(ms6102_state, memory_read_byte))
- MCFG_I8257_OUT_IOW_2_CB(WRITE8(ms6102_state, vdack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, ms6102_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, ms6102_state, memory_read_byte))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8(*this, ms6102_state, vdack_w))
MCFG_DEVICE_ADD("i8275_1", I8275, XTAL(16'400'000) / 8) // XXX
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ms6102_state, display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257", i8257_device, dreq2_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD("i8275_2", I8275, XTAL(16'400'000) / 8) // XXX
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ms6102_state, display_attr)
- MCFG_I8275_IRQ_CALLBACK(WRITELINE(ms6102_state, irq<5>))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE(*this, ms6102_state, irq<5>))
MCFG_VIDEO_SET_SCREEN("screen")
// keyboard
MCFG_DEVICE_ADD("589wa1", AY31015, 0)
- MCFG_AY31015_WRITE_DAV_CB(WRITELINE(ms6102_state, irq<1>))
+ MCFG_AY31015_WRITE_DAV_CB(WRITELINE(*this, ms6102_state, irq<1>))
MCFG_AY31015_AUTO_RDAV(true)
MCFG_DEVICE_ADD("ie5", RIPPLE_COUNTER, XTAL(16'400'000) / 30)
MCFG_RIPPLE_COUNTER_STAGES(2)
- MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(ms6102_state, kbd_uart_clock_w))
+ MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(*this, ms6102_state, kbd_uart_clock_w))
MCFG_DEVICE_ADD("keyboard", MS7002, 0)
- MCFG_VT100_KEYBOARD_SIGNAL_OUT_CALLBACK(DEVWRITELINE("589wa1", ay31015_device, write_si))
+ MCFG_VT100_KEYBOARD_SIGNAL_OUT_CALLBACK(WRITELINE("589wa1", ay31015_device, write_si))
// serial connection to host
MCFG_DEVICE_ADD("i8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(ms6102_state, irq<3>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, ms6102_state, irq<3>))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251", i8251_device, write_rxd))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'400'000) / 9)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("i8251", i8251_device, write_txc))
MCFG_PIT8253_CLK1(XTAL(16'400'000) / 9)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("i8251", i8251_device, write_rxc))
MACHINE_CONFIG_END
ROM_START( ms6102 )
diff --git a/src/mame/drivers/ms9540.cpp b/src/mame/drivers/ms9540.cpp
index 65041dd56b5..d0b538055a4 100644
--- a/src/mame/drivers/ms9540.cpp
+++ b/src/mame/drivers/ms9540.cpp
@@ -80,8 +80,8 @@ void ms9540_state::kbd_put(u8 data)
MACHINE_CONFIG_START(ms9540_state::ms9540)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/msbc1.cpp b/src/mame/drivers/msbc1.cpp
index 4377e9c13d8..7b0999796d9 100644
--- a/src/mame/drivers/msbc1.cpp
+++ b/src/mame/drivers/msbc1.cpp
@@ -95,8 +95,8 @@ void msbc1_state::machine_reset()
MACHINE_CONFIG_START(msbc1_state::msbc1)
/* basic machine hardware */
- MCFG_CPU_ADD(MC68000R12_TAG, M68000, XTAL(12'500'000))
- MCFG_CPU_PROGRAM_MAP(msbc1_mem)
+ MCFG_DEVICE_ADD(MC68000R12_TAG, M68000, XTAL(12'500'000))
+ MCFG_DEVICE_PROGRAM_MAP(msbc1_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp
index 2529f7a44c5..24241c89f1b 100644
--- a/src/mame/drivers/msisaac.cpp
+++ b/src/mame/drivers/msisaac.cpp
@@ -449,17 +449,17 @@ void msisaac_state::machine_reset()
MACHINE_CONFIG_START(msisaac_state::msisaac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(msisaac_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", msisaac_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(msisaac_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", msisaac_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(msisaac_sound_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", msisaac_state, irq0_line_hold) /* source of IRQs is unknown */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(msisaac_sound_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", msisaac_state, irq0_line_hold) /* source of IRQs is unknown */
#ifdef USE_MCU
- MCFG_CPU_ADD("mcu", M68705,8000000/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+ MCFG_DEVICE_ADD("mcu", M68705,8000000/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(buggychl_mcu_map)
MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
#endif
@@ -484,15 +484,15 @@ MACHINE_CONFIG_START(msisaac_state::msisaac)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_TA7630_ADD("ta7630")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000)
// port A/B likely to be TA7630 filters
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000)
// port A/B likely to be TA7630 filters
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index bab0cac33ce..fd0528bb865 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -445,9 +445,9 @@ PALETTE_INIT_MEMBER(mstation_state, mstation)
MACHINE_CONFIG_START(mstation_state::mstation)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) //unknown clock
- MCFG_CPU_PROGRAM_MAP(mstation_mem)
- MCFG_CPU_IO_MAP(mstation_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) //unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(mstation_mem)
+ MCFG_DEVICE_IO_MAP(mstation_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -472,7 +472,7 @@ MACHINE_CONFIG_START(mstation_state::mstation)
MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer", mstation_state, mstation_kb_timer, attotime::from_hz(50))
MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
- MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(mstation_state, rtc_irq))
+ MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, mstation_state, rtc_irq))
MCFG_DEVICE_ADD("bank0", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(mstation_banked_map)
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index 6802fae7b70..e5295bcc7a7 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -1337,7 +1337,7 @@ MACHINE_CONFIG_START(msx_state::msx_2_35_dd_drive)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx_ym2413)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(21'477'272)/6)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(21'477'272)/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
MACHINE_CONFIG_END
@@ -1348,42 +1348,42 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(msx_memory_map)
- MCFG_CPU_IO_MAP(msx_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", msx_state, msx_interrupt) /* Needed for mouse updates */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(msx_memory_map)
+ MCFG_DEVICE_IO_MAP(msx_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", msx_state, msx_interrupt) /* Needed for mouse updates */
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(msx_state, msx_ppi_port_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(msx_state, msx_ppi_port_b_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, msx_state, msx_ppi_port_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, msx_state, msx_ppi_port_b_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, msx_state, msx_ppi_port_c_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2)
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(msx_state, msx_psg_port_a_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(msx_state, msx_psg_port_b_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(msx_state, msx_psg_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(msx_state, msx_psg_port_b_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, msx_state, msx_psg_port_a_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, msx_state, msx_psg_port_b_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, msx_state, msx_psg_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, msx_state, msx_psg_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("cent_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
@@ -1401,7 +1401,7 @@ MACHINE_CONFIG_START(msx_state::msx_ntsc)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1412,7 +1412,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9118)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9118, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1423,7 +1423,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9128)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1434,7 +1434,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9918)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9918, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1445,7 +1445,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9918a)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1456,7 +1456,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9928)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1467,7 +1467,7 @@ MACHINE_CONFIG_START(msx_state::msx_pal)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1478,7 +1478,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9129)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1489,7 +1489,7 @@ MACHINE_CONFIG_START(msx_state::msx_tms9929)
/* Video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE("tms9928a", tms9928a_device, screen_update)
MACHINE_CONFIG_END
@@ -1497,46 +1497,46 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(msx_memory_map)
- MCFG_CPU_IO_MAP(msx2_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(msx_memory_map)
+ MCFG_DEVICE_IO_MAP(msx2_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(msx_state, msx_ppi_port_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(msx_state, msx_ppi_port_b_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, msx_state, msx_ppi_port_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, msx_state, msx_ppi_port_b_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, msx_state, msx_ppi_port_c_w))
/* video hardware */
MCFG_V9938_ADD("v9938", "screen", 0x20000, XTAL(21'477'272))
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", XTAL(21'477'272))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2)
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(msx_state, msx_psg_port_a_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(msx_state, msx_psg_port_b_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(msx_state, msx_psg_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(msx_state, msx_psg_port_b_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, msx_state, msx_psg_port_a_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, msx_state, msx_psg_port_b_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, msx_state, msx_psg_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, msx_state, msx_psg_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("cent_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
@@ -1555,46 +1555,46 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(msx_state::msx2p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(msx_memory_map)
- MCFG_CPU_IO_MAP(msx2p_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(msx_memory_map)
+ MCFG_DEVICE_IO_MAP(msx2p_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(msx_state, msx_ppi_port_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(msx_state, msx_ppi_port_b_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, msx_state, msx_ppi_port_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, msx_state, msx_ppi_port_b_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, msx_state, msx_ppi_port_c_w))
/* video hardware */
MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272))
- MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_irq_source0))
+ MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, msx_state,msx_irq_source0))
MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9958", XTAL(21'477'272))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2)
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(21'477'272)/6/2)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(msx_state, msx_psg_port_a_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(msx_state, msx_psg_port_b_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(msx_state, msx_psg_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(msx_state, msx_psg_port_b_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, msx_state, msx_psg_port_a_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, msx_state, msx_psg_port_b_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, msx_state, msx_psg_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, msx_state, msx_psg_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit1))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit1))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("cent_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
/* cassette */
MCFG_CASSETTE_ADD( "cassette" )
@@ -8018,7 +8018,7 @@ MACHINE_CONFIG_START(msx_state::fsa1fx)
MCFG_MSX_LAYOUT_ROM("cock", 3, 3, 1, 2, "maincpu", 0x18000)
MCFG_MSX_MATSUSHITA_ADD( "matsushita" )
- MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(msx_state, turbo_w))
+ MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(*this, msx_state, turbo_w))
MCFG_MSX_SYSTEMFLAGS_ADD("sysflags", 0xff)
@@ -8064,7 +8064,7 @@ MACHINE_CONFIG_START(msx_state::fsa1wsx)
MCFG_MSX_LAYOUT_PANASONIC08("firm", 3, 3, 0, 4, "maincpu", 0x1c000)
MCFG_MSX_MATSUSHITA_ADD( "matsushita" )
- MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(msx_state, turbo_w))
+ MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(*this, msx_state, turbo_w))
MCFG_MSX_SYSTEMFLAGS_ADD("sysflags", 0xff)
@@ -8112,7 +8112,7 @@ MACHINE_CONFIG_START(msx_state::fsa1wx)
MCFG_MSX_LAYOUT_PANASONIC08("firm", 3, 3, 0, 4, "maincpu", 0x1c000)
MCFG_MSX_MATSUSHITA_ADD( "matsushita" )
- MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(msx_state, turbo_w))
+ MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(*this, msx_state, turbo_w))
MCFG_MSX_SYSTEMFLAGS_ADD("sysflags", 0xff)
@@ -8158,7 +8158,7 @@ MACHINE_CONFIG_START(msx_state::fsa1wxa)
MCFG_MSX_LAYOUT_PANASONIC08("firm", 3, 3, 0, 4, "maincpu", 0x1c000)
MCFG_MSX_MATSUSHITA_ADD( "matsushita" )
- MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(msx_state, turbo_w))
+ MCFG_MSX_MATSUSHITA_TURBO_CB(WRITELINE(*this, msx_state, turbo_w))
MCFG_MSX_SYSTEMFLAGS_ADD("sysflags", 0xff)
diff --git a/src/mame/drivers/mt735.cpp b/src/mame/drivers/mt735.cpp
index cb095958c25..f010f4f0fc6 100644
--- a/src/mame/drivers/mt735.cpp
+++ b/src/mame/drivers/mt735.cpp
@@ -63,8 +63,8 @@ static INPUT_PORTS_START( mt735 )
INPUT_PORTS_END
MACHINE_CONFIG_START(mt735_state::mt735)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(mt735_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(48'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(mt735_map)
MACHINE_CONFIG_END
ROM_START( mt735 )
diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp
index 5a458dba096..33b3d4a2610 100644
--- a/src/mame/drivers/mtouchxl.cpp
+++ b/src/mame/drivers/mtouchxl.cpp
@@ -209,31 +209,31 @@ MACHINE_CONFIG_END
#endif
MACHINE_CONFIG_START(mtxl_state::at486)
- MCFG_CPU_ADD("maincpu", I486DX4, 33000000)
- MCFG_CPU_PROGRAM_MAP(at32_map)
- MCFG_CPU_IO_MAP(at32_io)
+ MCFG_DEVICE_ADD("maincpu", I486DX4, 33000000)
+ MCFG_DEVICE_PROGRAM_MAP(at32_map)
+ MCFG_DEVICE_IO_MAP(at32_io)
#ifndef REAL_PCI_CHIPSET
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_NVRAM_ADD_0FILL("nvram")
// on board devices
- MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "ide", true)
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ide", true) // FIXME: determine ISA bus clock
MCFG_SLOT_OPTION_MACHINE_CONFIG("ide", cdrom)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "svga_dm", true) // original is a gd-5440
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "svga_dm", true) // original is a gd-5440
MCFG_DEVICE_ADD("ns16550", NS16550, XTAL(1'843'200))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("mb:pic8259_master", pic8259_device, ir4_w))
- MCFG_MICROTOUCH_ADD("microtouch", 9600, DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("mb:pic8259_master", pic8259_device, ir4_w))
+ MCFG_MICROTOUCH_ADD("microtouch", 9600, WRITELINE("ns16550", ins8250_uart_device, rx_w))
- MCFG_SOUND_ADD("cs4231", AD1848, 0)
- MCFG_AD1848_IRQ_CALLBACK(DEVWRITELINE("mb:pic8259_master", pic8259_device, ir5_w))
- MCFG_AD1848_DRQ_CALLBACK(DEVWRITELINE("mb:dma8237_1", am9517a_device, dreq1_w))
+ MCFG_DEVICE_ADD("cs4231", AD1848, 0)
+ MCFG_AD1848_IRQ_CALLBACK(WRITELINE("mb:pic8259_master", pic8259_device, ir5_w))
+ MCFG_AD1848_DRQ_CALLBACK(WRITELINE("mb:dma8237_1", am9517a_device, dreq1_w))
MCFG_DEVICE_MODIFY("mb:dma8237_1")
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8("cs4231", ad1848_device, dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8("cs4231", ad1848_device, dack_w))
// remove the keyboard controller and use the HLE one which allow keys to be unmapped
MCFG_DEVICE_REMOVE("mb:keybc");
@@ -242,10 +242,10 @@ MACHINE_CONFIG_START(mtxl_state::at486)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_AT386)
MCFG_KBDC8042_SYSTEM_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_KBDC8042_GATE_A20_CB(INPUTLINE("maincpu", INPUT_LINE_A20))
- MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(DEVWRITELINE("mb:pic8259_master", pic8259_device, ir1_w))
+ MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE("mb:pic8259_master", pic8259_device, ir1_w))
MCFG_DEVICE_REMOVE("mb:rtc")
MCFG_DS12885_ADD("mb:rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("mb:pic8259_slave", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("mb:pic8259_slave", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
#endif
/* internal ram */
diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp
index f62a6fcc64d..d11adfd920d 100644
--- a/src/mame/drivers/mtx.cpp
+++ b/src/mame/drivers/mtx.cpp
@@ -286,9 +286,9 @@ WRITE_LINE_MEMBER(mtx_state::mtx_tms9929a_interrupt)
MACHINE_CONFIG_START(mtx_state::mtx512)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mtx_mem)
- MCFG_CPU_IO_MAP(mtx_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mtx_mem)
+ MCFG_DEVICE_IO_MAP(mtx_io)
MCFG_Z80_DAISY_CHAIN(mtx_daisy_chain)
MCFG_MACHINE_START_OVERRIDE(mtx_state,mtx512)
@@ -297,28 +297,28 @@ MACHINE_CONFIG_START(mtx_state::mtx512)
/* video hardware */
MCFG_DEVICE_ADD( "tms9929a", TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(mtx_state, mtx_tms9929a_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, mtx_state, mtx_tms9929a_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9929a", tms9929a_device, screen_update )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489A_TAG, SN76489A, XTAL(4'000'000))
+ MCFG_DEVICE_ADD(SN76489A_TAG, SN76489A, XTAL(4'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(mtx_state, ctc_trg1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(mtx_state, ctc_trg2_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, mtx_state, ctc_trg1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, mtx_state, ctc_trg2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("z80ctc_timer", mtx_state, ctc_tick, attotime::from_hz(XTAL(4'000'000)/13))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(mtx_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(mtx_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(mtx_state, write_centronics_perror))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(mtx_state, write_centronics_select))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, mtx_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, mtx_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, mtx_state, write_centronics_perror))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, mtx_state, write_centronics_select))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -371,8 +371,8 @@ MACHINE_CONFIG_START(mtx_state::rs128)
mtx512(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY(Z80_TAG)
- MCFG_CPU_IO_MAP(rs128_io)
+ MCFG_DEVICE_MODIFY(Z80_TAG)
+ MCFG_DEVICE_IO_MAP(rs128_io)
MCFG_Z80_DAISY_CHAIN(rs128_daisy_chain)
/* devices */
diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp
index b8e2f32decd..e34d4257b0b 100644
--- a/src/mame/drivers/mugsmash.cpp
+++ b/src/mame/drivers/mugsmash.cpp
@@ -400,12 +400,12 @@ void mugsmash_state::machine_start()
MACHINE_CONFIG_START(mugsmash_state::mugsmash)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(mugsmash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mugsmash_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(mugsmash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mugsmash_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* Guess */
- MCFG_CPU_PROGRAM_MAP(mugsmash_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* Guess */
+ MCFG_DEVICE_PROGRAM_MAP(mugsmash_sound_map)
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 1a69f29b82e..5d0fc32c812 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -1025,10 +1025,10 @@ void igrosoft_gamble_state::machine_reset()
MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(igrosoft_gamble_map)
- MCFG_CPU_IO_MAP(igrosoft_gamble_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", igrosoft_gamble_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(igrosoft_gamble_map)
+ MCFG_DEVICE_IO_MAP(igrosoft_gamble_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", igrosoft_gamble_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1046,7 +1046,7 @@ MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 6000000/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 6000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_M48T35_ADD( "m48t35" )
@@ -1055,8 +1055,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(igrosoft_gamble_state::rollfr)
igrosoft_gamble(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(rollfr_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(rollfr_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp
index 389e049e76a..f53d27053be 100644
--- a/src/mame/drivers/multi16.cpp
+++ b/src/mame/drivers/multi16.cpp
@@ -137,10 +137,10 @@ void multi16_state::machine_reset()
MACHINE_CONFIG_START(multi16_state::multi16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 8000000)
- MCFG_CPU_PROGRAM_MAP(multi16_map)
- MCFG_CPU_IO_MAP(multi16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(multi16_map)
+ MCFG_DEVICE_IO_MAP(multi16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp
index d32b7ba3634..96e3c0fa815 100644
--- a/src/mame/drivers/multi8.cpp
+++ b/src/mame/drivers/multi8.cpp
@@ -566,9 +566,9 @@ void multi8_state::machine_reset()
MACHINE_CONFIG_START(multi8_state::multi8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(multi8_mem)
- MCFG_CPU_IO_MAP(multi8_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(multi8_mem)
+ MCFG_DEVICE_IO_MAP(multi8_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -583,10 +583,10 @@ MACHINE_CONFIG_START(multi8_state::multi8)
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 1500000) //unknown clock / divider
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(multi8_state, ym2203_porta_w))
+ MCFG_DEVICE_ADD("aysnd", AY8912, 1500000) //unknown clock / divider
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, multi8_state, ym2203_porta_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("beeper", BEEP, 1200) // guesswork
+ MCFG_DEVICE_ADD("beeper", BEEP, 1200) // guesswork
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
/* devices */
@@ -598,13 +598,13 @@ MACHINE_CONFIG_START(multi8_state::multi8)
MCFG_MC6845_UPDATE_ROW_CB(multi8_state, crtc_update_row)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(multi8_state, porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(multi8_state, portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(multi8_state, portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, multi8_state, porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, multi8_state, portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, multi8_state, portc_w))
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart", I8251, 0) // for cassette
MCFG_DEVICE_ADD("pit", PIT8253, 0)
diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp
index 0dd7d9e2f74..69a90357875 100644
--- a/src/mame/drivers/multigam.cpp
+++ b/src/mame/drivers/multigam.cpp
@@ -1226,8 +1226,8 @@ MACHINE_START_MEMBER(multigam_state,supergm3)
MACHINE_CONFIG_START(multigam_state::multigam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(multigam_map)
+ MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(multigam_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1251,8 +1251,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(multigam_state::multigm3)
multigam(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(multigm3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(multigm3_map)
MCFG_MACHINE_START_OVERRIDE(multigam_state, multigm3 )
MCFG_MACHINE_RESET_OVERRIDE(multigam_state, multigm3 )
@@ -1260,14 +1260,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(multigam_state::multigmt)
multigam(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(multigmt_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(multigmt_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(multigam_state::supergm3)
multigam(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(supergm3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(supergm3_map)
MCFG_MACHINE_START_OVERRIDE(multigam_state,supergm3)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp
index d36773e3f5b..ae48787fc6a 100644
--- a/src/mame/drivers/munchmo.cpp
+++ b/src/mame/drivers/munchmo.cpp
@@ -320,22 +320,22 @@ void munchmo_state::machine_start()
MACHINE_CONFIG_START(munchmo_state::mnchmobl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(15'000'000)/4) // from pin 13 of XTAL-driven 163
- MCFG_CPU_PROGRAM_MAP(mnchmobl_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(munchmo_state, generic_irq_ack) // IORQ clears flip-flop at 1-2C
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(15'000'000)/4) // from pin 13 of XTAL-driven 163
+ MCFG_DEVICE_PROGRAM_MAP(mnchmobl_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(munchmo_state, generic_irq_ack) // IORQ clears flip-flop at 1-2C
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(15'000'000)/8) // from pin 12 of XTAL-driven 163
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(munchmo_state, generic_irq_ack) // IORQ clears flip-flop at 1-7H
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(15'000'000)/8) // from pin 12 of XTAL-driven 163
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(munchmo_state, generic_irq_ack) // IORQ clears flip-flop at 1-7H
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 12E
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(munchmo_state, palette_bank_0_w)) // BCL0 2-11E
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(munchmo_state, palette_bank_1_w)) // BCL1 2-11E
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, munchmo_state, palette_bank_0_w)) // BCL0 2-11E
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, munchmo_state, palette_bank_1_w)) // BCL1 2-11E
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // CL2 2-11E
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // CL3 2-11E
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(munchmo_state, flipscreen_w)) // INV
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, munchmo_state, flipscreen_w)) // INV
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // DISP
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(munchmo_state, nmi_enable_w)) // ENI 1-10C
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, munchmo_state, nmi_enable_w)) // ENI 1-10C
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -344,7 +344,7 @@ MACHINE_CONFIG_START(munchmo_state::mnchmobl)
MCFG_SCREEN_SIZE(256+32+32, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 255+32+32,0, 255-16)
MCFG_SCREEN_UPDATE_DRIVER(munchmo_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(munchmo_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, munchmo_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mnchmobl)
@@ -358,11 +358,11 @@ MACHINE_CONFIG_START(munchmo_state::mnchmobl)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(ASSERTLINE("audiocpu", 0))
/* AY clock speeds confirmed to match known recording */
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(15'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(15'000'000)/8)
//MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(15'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(15'000'000)/8)
//MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp
index 9c3697236b3..83d2a2a574f 100644
--- a/src/mame/drivers/murogem.cpp
+++ b/src/mame/drivers/murogem.cpp
@@ -250,9 +250,9 @@ uint32_t murogem_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
MACHINE_CONFIG_START(murogem_state::murogem)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, 8000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(murogem_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", murogem_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6802, 8000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(murogem_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", murogem_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -273,7 +273,7 @@ MACHINE_CONFIG_START(murogem_state::murogem)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.375)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.375)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp
index 130c74e6486..479a69dfc9d 100644
--- a/src/mame/drivers/murogmbl.cpp
+++ b/src/mame/drivers/murogmbl.cpp
@@ -337,8 +337,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(murogmbl_state::murogmbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */
- MCFG_CPU_PROGRAM_MAP(murogmbl_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 1000000) /* Z80? */
+ MCFG_DEVICE_PROGRAM_MAP(murogmbl_map)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", murogmbl)
@@ -356,15 +356,15 @@ MACHINE_CONFIG_START(murogmbl_state::murogmbl)
MCFG_PALETTE_INIT_OWNER(murogmbl_state, murogmbl)
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(slotunbl_state::slotunbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */
- MCFG_CPU_PROGRAM_MAP(slotunbl_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 1000000) /* Z80? */
+ MCFG_DEVICE_PROGRAM_MAP(slotunbl_map)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", slotunbl)
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(slotunbl_state::slotunbl)
MCFG_PALETTE_INIT_OWNER(slotunbl_state, slotunbl)
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("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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp
index 91bcfe11f9d..4ea0e21f5af 100644
--- a/src/mame/drivers/mustache.cpp
+++ b/src/mame/drivers/mustache.cpp
@@ -182,9 +182,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(mustache_state::scanline)
MACHINE_CONFIG_START(mustache_state::mustache)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(memmap)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mustache_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
@@ -208,7 +208,7 @@ MACHINE_CONFIG_START(mustache_state::mustache)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", YM_CLOCK)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("t5182", t5182_device, ym2151_irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp
index 19622f2c960..6667bcb1f42 100644
--- a/src/mame/drivers/mvme147.cpp
+++ b/src/mame/drivers/mvme147.cpp
@@ -650,8 +650,8 @@ static void mvme147_vme_cards(device_slot_interface &device)
*/
MACHINE_CONFIG_START(mvme147_state::mvme147)
/* basic machine hardware */
- MCFG_CPU_ADD ("maincpu", M68030, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP (mvme147_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68030, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP (mvme147_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, mvme147_vme_cards, nullptr)
@@ -659,13 +659,13 @@ MACHINE_CONFIG_START(mvme147_state::mvme147)
/* Terminal Port config */
MCFG_SCC85C30_ADD("scc", SCC_CLOCK, 0, 0, 0, 0 )
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_dtr))
- MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_rts))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE("rs232trm", rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_DTRA_CB(WRITELINE("rs232trm", rs232_port_device, write_dtr))
+ MCFG_Z80SCC_OUT_RTSA_CB(WRITELINE("rs232trm", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc85c30_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc85c30_device, ctsa_w))
+ MCFG_DEVICE_ADD ("rs232trm", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER (WRITELINE ("scc", scc85c30_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (WRITELINE ("scc", scc85c30_device, ctsa_w))
MCFG_SCC85C30_ADD("scc2", SCC_CLOCK, 0, 0, 0, 0 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index b04cf411f75..b2c7444fd85 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -277,10 +277,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mw18w_state::mw18w)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(19'968'000)/8)
- MCFG_CPU_PERIODIC_INT_DRIVER(mw18w_state, irq0_line_assert, 960.516) // 555 IC
- MCFG_CPU_PROGRAM_MAP(mw18w_map)
- MCFG_CPU_IO_MAP(mw18w_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(19'968'000)/8)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mw18w_state, irq0_line_assert, 960.516) // 555 IC
+ MCFG_DEVICE_PROGRAM_MAP(mw18w_map)
+ MCFG_DEVICE_IO_MAP(mw18w_portmap)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp
index 5e7089deb09..34d755bca7d 100644
--- a/src/mame/drivers/mw8080bw.cpp
+++ b/src/mame/drivers/mw8080bw.cpp
@@ -233,8 +233,8 @@ void mw8080bw_state::main_map(address_map &map)
MACHINE_CONFIG_START(mw8080bw_state::mw8080bw_root)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,mw8080bw)
MCFG_MACHINE_RESET_OVERRIDE(mw8080bw_state,mw8080bw)
@@ -411,8 +411,8 @@ MACHINE_CONFIG_START(mw8080bw_state::seawolf)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(seawolf_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(seawolf_io_map)
/* there is no watchdog */
/* add shifter */
@@ -513,8 +513,8 @@ MACHINE_CONFIG_START(mw8080bw_state::gunfight)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(gunfight_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(gunfight_io_map)
/* there is no watchdog */
/* add shifter */
@@ -743,8 +743,8 @@ MACHINE_CONFIG_START(mw8080bw_state::tornbase)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(tornbase_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(tornbase_io_map)
/* there is no watchdog */
/* add shifter */
@@ -852,8 +852,8 @@ MACHINE_CONFIG_START(mw8080bw_state::zzzap)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(zzzap_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(zzzap_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_M(1), CAP_U(1))) /* 1.1s */
@@ -966,8 +966,8 @@ MACHINE_CONFIG_START(mw8080bw_state::maze)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(maze_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(maze_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,maze)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1060,8 +1060,8 @@ MACHINE_CONFIG_START(mw8080bw_state::boothill)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(boothill_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(boothill_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,boothill)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1169,8 +1169,8 @@ MACHINE_CONFIG_START(mw8080bw_state::checkmat)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(checkmat_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(checkmat_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(PERIOD_OF_555_MONOSTABLE(RES_K(270), CAP_U(10))) /* 2.97s */
@@ -1298,8 +1298,8 @@ MACHINE_CONFIG_START(mw8080bw_state::desertgu)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(desertgu_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(desertgu_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,desertgu)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1502,8 +1502,8 @@ MACHINE_CONFIG_START(mw8080bw_state::dplay)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(dplay_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(dplay_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
@@ -1599,8 +1599,8 @@ MACHINE_CONFIG_START(mw8080bw_state::gmissile)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(gmissile_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(gmissile_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,gmissile)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1695,8 +1695,8 @@ MACHINE_CONFIG_START(mw8080bw_state::m4)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(m4_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(m4_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,m4)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1866,8 +1866,8 @@ MACHINE_CONFIG_START(mw8080bw_state::clowns)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(clowns_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(clowns_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,clowns)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1964,8 +1964,8 @@ MACHINE_CONFIG_START(mw8080bw_state::spacwalk)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spacwalk_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spacwalk_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,clowns)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2049,8 +2049,8 @@ MACHINE_CONFIG_START(mw8080bw_state::shuffle)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(shuffle_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(shuffle_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
@@ -2138,8 +2138,8 @@ MACHINE_CONFIG_START(mw8080bw_state::dogpatch)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(dogpatch_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(dogpatch_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
@@ -2290,8 +2290,8 @@ MACHINE_CONFIG_START(mw8080bw_state::spcenctr)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spcenctr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spcenctr_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,spcenctr)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2388,8 +2388,8 @@ MACHINE_CONFIG_START(mw8080bw_state::phantom2)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(phantom2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(phantom2_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,phantom2)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2398,7 +2398,7 @@ MACHINE_CONFIG_START(mw8080bw_state::phantom2)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(mw8080bw_state, screen_update_phantom2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mw8080bw_state, screen_vblank_phantom2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mw8080bw_state, screen_vblank_phantom2))
/* add shifter */
MCFG_MB14241_ADD("mb14241")
@@ -2531,8 +2531,8 @@ MACHINE_CONFIG_START(mw8080bw_state::bowler)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(bowler_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(bowler_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
@@ -2744,8 +2744,8 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(invaders_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(invaders_io_map)
MCFG_MACHINE_START_OVERRIDE(mw8080bw_state,invaders)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2831,8 +2831,8 @@ MACHINE_CONFIG_START(mw8080bw_state::blueshrk)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(blueshrk_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(blueshrk_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
@@ -2935,8 +2935,8 @@ MACHINE_CONFIG_START(mw8080bw_state::invad2ct)
mw8080bw_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(invad2ct_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(invad2ct_io_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(255 * attotime::from_hz(MW8080BW_60HZ))
diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp
index 5fef8f51dab..de60f617755 100644
--- a/src/mame/drivers/mwarr.cpp
+++ b/src/mame/drivers/mwarr.cpp
@@ -570,9 +570,9 @@ void mwarr_state::machine_reset()
MACHINE_CONFIG_START(mwarr_state::mwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mwarr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mwarr_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mwarr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mwarr_state, irq4_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp
index f8b0dd0e88a..a05e8cbfc6c 100644
--- a/src/mame/drivers/mwsub.cpp
+++ b/src/mame/drivers/mwsub.cpp
@@ -225,10 +225,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(submar_state::submar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(19'968'000)/8)
- MCFG_CPU_PERIODIC_INT_DRIVER(submar_state, irq0_line_assert, 124.675) // 555 IC
- MCFG_CPU_PROGRAM_MAP(submar_map)
- MCFG_CPU_IO_MAP(submar_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(19'968'000)/8)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(submar_state, irq0_line_assert, 124.675) // 555 IC
+ MCFG_DEVICE_PROGRAM_MAP(submar_map)
+ MCFG_DEVICE_IO_MAP(submar_portmap)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp
index c0622d679ff..ccebb0b62f2 100644
--- a/src/mame/drivers/mx2178.cpp
+++ b/src/mame/drivers/mx2178.cpp
@@ -130,9 +130,9 @@ void mx2178_state::machine_reset()
MACHINE_CONFIG_START(mx2178_state::mx2178)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'869'600) / 5) // guess
- MCFG_CPU_PROGRAM_MAP(mx2178_mem)
- MCFG_CPU_IO_MAP(mx2178_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'869'600) / 5) // guess
+ MCFG_DEVICE_PROGRAM_MAP(mx2178_mem)
+ MCFG_DEVICE_IO_MAP(mx2178_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -152,28 +152,28 @@ MACHINE_CONFIG_START(mx2178_state::mx2178)
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(18'869'600) / 30)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("acia1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia1", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia1", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia2", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia2", acia6850_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp
index 91406b2dde7..875f73de434 100644
--- a/src/mame/drivers/myb3k.cpp
+++ b/src/mame/drivers/myb3k.cpp
@@ -932,10 +932,10 @@ static void stepone_isa_cards(device_slot_interface &device)
MACHINE_CONFIG_START(myb3k_state::myb3k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181) / 3) /* 14.3182 main crystal divided by three through a 8284A */
- MCFG_CPU_PROGRAM_MAP(myb3k_map)
- MCFG_CPU_IO_MAP(myb3k_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181) / 3) /* 14.3182 main crystal divided by three through a 8284A */
+ MCFG_DEVICE_PROGRAM_MAP(myb3k_map)
+ MCFG_DEVICE_IO_MAP(myb3k_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
/* RAM options */
MCFG_RAM_ADD(RAM_TAG)
@@ -944,41 +944,41 @@ MACHINE_CONFIG_START(myb3k_state::myb3k)
/* Interrupt controller */
MCFG_DEVICE_ADD("pic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(myb3k_state, pic_int_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, myb3k_state, pic_int_w))
/* Parallel port */
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTB_CB(READ8(myb3k_state, ppi_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(myb3k_state, ppi_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, myb3k_state, ppi_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, myb3k_state, ppi_portc_w))
/* DMA controller */
MCFG_DEVICE_ADD("dma", I8257, XTAL(14'318'181) / 6)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(myb3k_state, hrq_w))
- MCFG_I8257_OUT_TC_CB(WRITELINE(myb3k_state, tc_w))
- MCFG_I8257_IN_MEMR_CB(READ8(myb3k_state, dma_memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(myb3k_state, dma_memory_write_byte))
- MCFG_I8257_IN_IOR_0_CB(READ8(myb3k_state, io_dack0_r))
- MCFG_I8257_IN_IOR_1_CB(READ8(myb3k_state, io_dack1_r))
- MCFG_I8257_IN_IOR_2_CB(READ8(myb3k_state, io_dack2_r))
- MCFG_I8257_IN_IOR_3_CB(READ8(myb3k_state, io_dack3_r))
- MCFG_I8257_OUT_IOW_0_CB(WRITE8(myb3k_state, io_dack0_w))
- MCFG_I8257_OUT_IOW_1_CB(WRITE8(myb3k_state, io_dack1_w))
- MCFG_I8257_OUT_IOW_2_CB(WRITE8(myb3k_state, io_dack2_w))
- MCFG_I8257_OUT_IOW_3_CB(WRITE8(myb3k_state, io_dack3_w))
- MCFG_I8257_OUT_DACK_0_CB(WRITELINE(myb3k_state, dack0_w))
- MCFG_I8257_OUT_DACK_1_CB(WRITELINE(myb3k_state, dack1_w))
- MCFG_I8257_OUT_DACK_2_CB(WRITELINE(myb3k_state, dack2_w))
- MCFG_I8257_OUT_DACK_3_CB(WRITELINE(myb3k_state, dack3_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, myb3k_state, hrq_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE(*this, myb3k_state, tc_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, myb3k_state, dma_memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, myb3k_state, dma_memory_write_byte))
+ MCFG_I8257_IN_IOR_0_CB(READ8(*this, myb3k_state, io_dack0_r))
+ MCFG_I8257_IN_IOR_1_CB(READ8(*this, myb3k_state, io_dack1_r))
+ MCFG_I8257_IN_IOR_2_CB(READ8(*this, myb3k_state, io_dack2_r))
+ MCFG_I8257_IN_IOR_3_CB(READ8(*this, myb3k_state, io_dack3_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, myb3k_state, io_dack0_w))
+ MCFG_I8257_OUT_IOW_1_CB(WRITE8(*this, myb3k_state, io_dack1_w))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8(*this, myb3k_state, io_dack2_w))
+ MCFG_I8257_OUT_IOW_3_CB(WRITE8(*this, myb3k_state, io_dack3_w))
+ MCFG_I8257_OUT_DACK_0_CB(WRITELINE(*this, myb3k_state, dack0_w))
+ MCFG_I8257_OUT_DACK_1_CB(WRITELINE(*this, myb3k_state, dack1_w))
+ MCFG_I8257_OUT_DACK_2_CB(WRITELINE(*this, myb3k_state, dack2_w))
+ MCFG_I8257_OUT_DACK_3_CB(WRITELINE(*this, myb3k_state, dack3_w))
/* Timer */
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(14'318'181) / 12.0) /* TIMINT straight into IRQ0 */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(14'318'181) / 12.0) /* speaker if port c bit 5 is low */
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(myb3k_state, pit_out1_changed))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, myb3k_state, pit_out1_changed))
// MCFG_PIT8253_CLK2(XTAL(14'318'181) / 12.0) /* ANDed with port c bit 6 but marked as "not use"*/
- // MCFG_PIT8253_OUT2_HANDLER(WRITELINE(myb3k_state, pit_out2_changed))
+ // MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, myb3k_state, pit_out2_changed))
/* Video controller */
MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(14'318'181) / 16) /* Main crystal divided by 16 through a 74163 4 bit counter */
@@ -989,31 +989,31 @@ MACHINE_CONFIG_START(myb3k_state::myb3k)
/* ISA8+ Expansion bus */
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(WRITELINE(myb3k_state, isa_irq5_w)) // Jumper J4 selectable
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(WRITELINE(myb3k_state, isa_irq7_w)) // Jumper J5 selectable
- //MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE("dma", i8257_device, dreq0_w)) // Part of ISA16 but not ISA8 standard but implemented on ISA8 B8 (SRDY) on this motherboard
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma", i8257_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma", i8257_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma", i8257_device, dreq3_w))
- MCFG_ISA8_SLOT_ADD("isa", "isa1", stepone_isa_cards, "myb3k_fdc4711", false)
- MCFG_ISA8_SLOT_ADD("isa", "isa2", stepone_isa_cards, "myb3k_com", false)
- MCFG_ISA8_SLOT_ADD("isa", "isa3", stepone_isa_cards, nullptr, false)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE(*this, myb3k_state, isa_irq5_w)) // Jumper J4 selectable
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE(*this, myb3k_state, isa_irq7_w)) // Jumper J5 selectable
+ //MCFG_ISA_OUT_DRQ0_CB(WRITELINE("dma", i8257_device, dreq0_w)) // Part of ISA16 but not ISA8 standard but implemented on ISA8 B8 (SRDY) on this motherboard
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma", i8257_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma", i8257_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma", i8257_device, dreq3_w))
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", stepone_isa_cards, "myb3k_fdc4711", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "isa", stepone_isa_cards, "myb3k_com", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "isa", stepone_isa_cards, nullptr, false)
/* Centronics */
MCFG_CENTRONICS_ADD ("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER (WRITELINE (myb3k_state, centronics_ack_w))
- MCFG_CENTRONICS_BUSY_HANDLER (WRITELINE (myb3k_state, centronics_busy_w))
- MCFG_CENTRONICS_PERROR_HANDLER (WRITELINE (myb3k_state, centronics_perror_w))
- MCFG_CENTRONICS_SELECT_HANDLER (WRITELINE (myb3k_state, centronics_select_w))
+ MCFG_CENTRONICS_ACK_HANDLER (WRITELINE (*this, myb3k_state, centronics_ack_w))
+ MCFG_CENTRONICS_BUSY_HANDLER (WRITELINE (*this, myb3k_state, centronics_busy_w))
+ MCFG_CENTRONICS_PERROR_HANDLER (WRITELINE (*this, myb3k_state, centronics_perror_w))
+ MCFG_CENTRONICS_SELECT_HANDLER (WRITELINE (*this, myb3k_state, centronics_select_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD ("cent_data_out", "centronics")
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* Keyboard */
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index 2dd1a851df5..211fb77aeb0 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -505,24 +505,24 @@ DRIVER_INIT_MEMBER(mycom_state,mycom)
MACHINE_CONFIG_START(mycom_state::mycom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(10'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(mycom_map)
- MCFG_CPU_IO_MAP(mycom_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(10'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mycom_map)
+ MCFG_DEVICE_IO_MAP(mycom_io)
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mycom_state, mycom_04_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mycom_state, mycom_05_r))
- MCFG_I8255_IN_PORTC_CB(READ8(mycom_state, mycom_06_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mycom_state, mycom_06_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mycom_state, mycom_04_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mycom_state, mycom_05_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mycom_state, mycom_06_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mycom_state, mycom_06_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mycom_state, mycom_08_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mycom_state, mycom_0a_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mycom_state, mycom_08_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mycom_state, mycom_0a_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("rtc", msm5832_device, data_r))
- MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("rtc", msm5832_device, data_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mycom_state, mycom_rtc_w))
+ MCFG_I8255_IN_PORTB_CB(READ8("rtc", msm5832_device, data_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8("rtc", msm5832_device, data_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mycom_state, mycom_rtc_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -546,7 +546,7 @@ MACHINE_CONFIG_START(mycom_state::mycom)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("sn1", SN76489, XTAL(10'000'000) / 4)
+ MCFG_DEVICE_ADD("sn1", SN76489, XTAL(10'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
/* Devices */
diff --git a/src/mame/drivers/mystston.cpp b/src/mame/drivers/mystston.cpp
index 0c641e2cef8..f5825eb0468 100644
--- a/src/mame/drivers/mystston.cpp
+++ b/src/mame/drivers/mystston.cpp
@@ -195,8 +195,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mystston_state::mystston)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
/* video hardware */
mystston_video(config);
@@ -204,10 +204,10 @@ MACHINE_CONFIG_START(mystston_state::mystston)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, AY8910_CLOCK)
+ MCFG_DEVICE_ADD("ay1", AY8910, AY8910_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, AY8910_CLOCK)
+ MCFG_DEVICE_ADD("ay2", AY8910, AY8910_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index 5a45a540463..824531b8dbb 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -943,12 +943,12 @@ MACHINE_RESET_MEMBER(mystwarr_state,gaiapols)
MACHINE_CONFIG_START(mystwarr_state::mystwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */
- MCFG_CPU_PROGRAM_MAP(mystwarr_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */
+ MCFG_DEVICE_PROGRAM_MAP(mystwarr_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mystwarr_state, mystwarr_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(mystwarr_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(mystwarr_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1920))
@@ -1000,7 +1000,7 @@ MACHINE_CONFIG_START(mystwarr_state::mystwarr)
MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_DEVICE_ADDRESS_MAP(0, mystwarr_k054539_map)
- MCFG_K054539_TIMER_HANDLER(WRITELINE(mystwarr_state, k054539_nmi_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, mystwarr_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
@@ -1019,8 +1019,8 @@ MACHINE_CONFIG_START(mystwarr_state::viostorm)
MCFG_K053252_OFFSETS(40, 16)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(viostorm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(viostorm_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(mystwarr_state, metamrph_interrupt)
@@ -1048,8 +1048,8 @@ MACHINE_CONFIG_START(mystwarr_state::metamrph)
MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,metamrph)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(metamrph_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(metamrph_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(mystwarr_state, metamrph_interrupt)
@@ -1082,9 +1082,9 @@ MACHINE_CONFIG_START(mystwarr_state::dadandrn)
MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,dadandrn)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dadandrn_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mystwarr_state, ddd_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dadandrn_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mystwarr_state, ddd_interrupt)
MCFG_DEVICE_REMOVE("scantimer")
MCFG_DEVICE_MODIFY("k053252")
@@ -1116,9 +1116,9 @@ MACHINE_CONFIG_START(mystwarr_state::gaiapols)
MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,gaiapols)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gaiapols_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mystwarr_state, ddd_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gaiapols_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mystwarr_state, ddd_interrupt)
MCFG_DEVICE_REMOVE("scantimer")
MCFG_DEVICE_MODIFY("k053252")
@@ -1153,13 +1153,13 @@ MACHINE_CONFIG_START(mystwarr_state::martchmp)
MCFG_MACHINE_RESET_OVERRIDE(mystwarr_state,martchmp)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(martchmp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(martchmp_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(mystwarr_state, mchamp_interrupt)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(martchmp_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(martchmp_sound_map)
MCFG_DEVICE_REPLACE("k053252", K053252, 16000000/2)
MCFG_K053252_OFFSETS(32, 24-1)
@@ -1189,7 +1189,7 @@ MACHINE_CONFIG_START(mystwarr_state::martchmp)
MCFG_DEVICE_REMOVE("k054539_2")
MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
- MCFG_K054539_TIMER_HANDLER(WRITELINE(mystwarr_state, k054539_nmi_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, mystwarr_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp
index 2e1a795dfa3..d98b73630a0 100644
--- a/src/mame/drivers/myvision.cpp
+++ b/src/mame/drivers/myvision.cpp
@@ -214,9 +214,9 @@ WRITE8_MEMBER( myvision_state::ay_port_b_w )
MACHINE_CONFIG_START(myvision_state::myvision)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(10'738'635)/3) /* Not verified */
- MCFG_CPU_PROGRAM_MAP(myvision_mem)
- MCFG_CPU_IO_MAP(myvision_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(10'738'635)/3) /* Not verified */
+ MCFG_DEVICE_PROGRAM_MAP(myvision_mem)
+ MCFG_DEVICE_IO_MAP(myvision_io)
/* video hardware */
MCFG_DEVICE_ADD( "tms9918", TMS9918A, XTAL(10'738'635) / 2 ) /* Exact model not verified */
@@ -227,11 +227,11 @@ MACHINE_CONFIG_START(myvision_state::myvision)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) /* Exact model and clock not verified */
- MCFG_AY8910_PORT_A_READ_CB(READ8(myvision_state, ay_port_a_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(myvision_state, ay_port_b_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(myvision_state, ay_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(myvision_state, ay_port_b_w))
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) /* Exact model and clock not verified */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, myvision_state, ay_port_a_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, myvision_state, ay_port_b_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, myvision_state, ay_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, myvision_state, ay_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* cartridge */
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index 23c0620ce9b..f2a69f7ab71 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -874,22 +874,22 @@ static void mz2000_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(mz2000_state::mz2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mz2000_map)
- MCFG_CPU_IO_MAP(mz2000_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mz2000_map)
+ MCFG_DEVICE_IO_MAP(mz2000_io)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mz2000_state, mz2000_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mz2000_state, mz2000_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mz2000_state, mz2000_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mz2000_state, mz2000_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(mz2000_state, mz2000_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mz2000_state, mz2000_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mz2000_state, mz2000_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mz2000_state, mz2000_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mz2000_state, mz2000_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mz2000_state, mz2000_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mz2000_state, mz2000_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mz2000_state, mz2000_portc_w))
MCFG_DEVICE_ADD("z80pio_1", Z80PIO, MASTER_CLOCK)
- MCFG_Z80PIO_IN_PA_CB(READ8(mz2000_state, mz2000_pio1_porta_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(mz2000_state, mz2000_pio1_porta_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(mz2000_state, mz2000_pio1_portb_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, mz2000_state, mz2000_pio1_porta_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mz2000_state, mz2000_pio1_porta_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mz2000_state, mz2000_pio1_portb_r))
/* TODO: clocks aren't known */
MCFG_DEVICE_ADD("pit", PIT8253, 0)
@@ -930,14 +930,14 @@ MACHINE_CONFIG_START(mz2000_state::mz2000)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("beeper", BEEP, 4096)
+ MCFG_DEVICE_ADD("beeper", BEEP, 4096)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mz2000_state::mz80b)
mz2000(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mz80b_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mz80b_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index dbd00b2d8f1..40572af00ce 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -2086,37 +2086,37 @@ static void mz2500_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(mz2500_state::mz2500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(mz2500_map)
- MCFG_CPU_IO_MAP(mz2500_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", mz2500_state, mz2500_vbl)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(mz2500_state,mz2500_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(mz2500_map)
+ MCFG_DEVICE_IO_MAP(mz2500_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", mz2500_state, mz2500_vbl)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(mz2500_state,mz2500_irq_ack)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(mz2500_state, mz2500_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mz2500_state, mz2500_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mz2500_state, mz2500_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mz2500_state, mz2500_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(mz2500_state, mz2500_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mz2500_state, mz2500_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, mz2500_state, mz2500_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mz2500_state, mz2500_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mz2500_state, mz2500_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mz2500_state, mz2500_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mz2500_state, mz2500_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mz2500_state, mz2500_portc_w))
MCFG_DEVICE_ADD("z80pio_1", Z80PIO, 6000000)
- MCFG_Z80PIO_IN_PA_CB(READ8(mz2500_state, mz2500_pio1_porta_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(mz2500_state, mz2500_pio1_porta_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(mz2500_state, mz2500_pio1_porta_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, mz2500_state, mz2500_pio1_porta_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mz2500_state, mz2500_pio1_porta_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, mz2500_state, mz2500_pio1_porta_r))
MCFG_DEVICE_ADD("z80sio", Z80SIO, 6000000)
MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
- MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(mz2500_state, mz2500_rtc_alarm_irq))
+ MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(*this, mz2500_state, mz2500_rtc_alarm_irq))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(31250)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mz2500_state, pit8253_clk0_irq))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, mz2500_state, pit8253_clk0_irq))
// TODO: is this really right?
MCFG_PIT8253_CLK1(0)
MCFG_PIT8253_CLK2(16) //CH2, used by Super MZ demo / The Black Onyx and a few others (TODO: timing of this)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk1))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pit", pit8253_device, write_clk1))
MCFG_MB8877_ADD("mb8877a", XTAL(1'000'000))
@@ -2141,16 +2141,16 @@ MACHINE_CONFIG_START(mz2500_state::mz2500)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2203, 2000000) //unknown clock / divider
- MCFG_AY8910_PORT_A_READ_CB(READ8(mz2500_state, opn_porta_r)) // read A
+ MCFG_DEVICE_ADD("ym", YM2203, 2000000) //unknown clock / divider
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, mz2500_state, opn_porta_r)) // read A
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1")) // read B
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(mz2500_state, opn_porta_w)) // write A
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, mz2500_state, opn_porta_w)) // write A
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("beeper", BEEP, 4096)
+ MCFG_DEVICE_ADD("beeper", BEEP, 4096)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index d9582a9c6a3..5c58a5695c7 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -817,20 +817,20 @@ static void mz3500_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(mz3500_state::mz3500)
/* basic machine hardware */
- MCFG_CPU_ADD("master",Z80,MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(mz3500_master_map)
- MCFG_CPU_IO_MAP(mz3500_master_io)
+ MCFG_DEVICE_ADD("master",Z80,MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(mz3500_master_map)
+ MCFG_DEVICE_IO_MAP(mz3500_master_io)
- MCFG_CPU_ADD("slave",Z80,MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(mz3500_slave_map)
- MCFG_CPU_IO_MAP(mz3500_slave_io)
+ MCFG_DEVICE_ADD("slave",Z80,MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(mz3500_slave_map)
+ MCFG_DEVICE_IO_MAP(mz3500_slave_io)
MCFG_QUANTUM_PERFECT_CPU("master")
MCFG_DEVICE_ADD("i8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mz3500_state, mz3500_pa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(mz3500_state, mz3500_pb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mz3500_state, mz3500_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mz3500_state, mz3500_pa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, mz3500_state, mz3500_pb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mz3500_state, mz3500_pc_w))
MCFG_UPD765A_ADD("upd765a", true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("master", INPUT_LINE_IRQ0))
@@ -842,7 +842,7 @@ MACHINE_CONFIG_START(mz3500_state::mz3500)
MCFG_DEVICE_ADD("upd7220_chr", UPD7220, MAIN_CLOCK/5)
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(mz3500_state, hgdc_draw_text)
- MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_gfx", upd7220_device, ext_sync_w))
+ MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE("upd7220_gfx", upd7220_device, ext_sync_w))
MCFG_DEVICE_ADD("upd7220_gfx", UPD7220, MAIN_CLOCK/5)
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_2_map)
@@ -863,7 +863,7 @@ MACHINE_CONFIG_START(mz3500_state::mz3500)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2400)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index 84f379c0cf4..da6a9a3461e 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -147,9 +147,9 @@ void mz6500_state::upd7220_map(address_map &map)
MACHINE_CONFIG_START(mz6500_state::mz6500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 8000000) //unk clock
- MCFG_CPU_PROGRAM_MAP(mz6500_map)
- MCFG_CPU_IO_MAP(mz6500_io)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000) //unk clock
+ MCFG_DEVICE_PROGRAM_MAP(mz6500_map)
+ MCFG_DEVICE_IO_MAP(mz6500_io)
/* video hardware */
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp
index 73c8a16dcc4..05b4ae525ba 100644
--- a/src/mame/drivers/mz700.cpp
+++ b/src/mame/drivers/mz700.cpp
@@ -375,9 +375,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(mz_state::mz700)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(17'734'470)/5)
- MCFG_CPU_PROGRAM_MAP(mz700_mem)
- MCFG_CPU_IO_MAP(mz700_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(17'734'470)/5)
+ MCFG_DEVICE_PROGRAM_MAP(mz700_mem)
+ MCFG_DEVICE_IO_MAP(mz700_io)
MCFG_DEVICE_ADD("banke", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(mz700_banke)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
@@ -400,7 +400,7 @@ MACHINE_CONFIG_START(mz_state::mz700)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* ne556 timers */
@@ -410,17 +410,17 @@ MACHINE_CONFIG_START(mz_state::mz700)
/* devices */
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(17'734'470)/20)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mz_state, pit_out0_changed))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, mz_state, pit_out0_changed))
MCFG_PIT8253_CLK1(15611.0)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk2))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pit8253", pit8253_device, write_clk2))
MCFG_PIT8253_CLK2(0)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mz_state, pit_irq_2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, mz_state, pit_irq_2))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mz_state, pio_port_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mz_state, pio_port_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(mz_state, pio_port_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mz_state, pio_port_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mz_state, pio_port_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mz_state, pio_port_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mz_state, pio_port_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mz_state, pio_port_c_w))
MCFG_DEVICE_ADD("ls145", TTL74145, 0)
@@ -442,9 +442,9 @@ MACHINE_CONFIG_START(mz_state::mz800)
MCFG_DEVICE_REMOVE("banke")
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mz800_mem)
- MCFG_CPU_IO_MAP(mz800_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mz800_mem)
+ MCFG_DEVICE_IO_MAP(mz800_io)
MCFG_DEVICE_ADD("bankf", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(mz800_bankf)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(mz_state::mz800)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(mz_state, screen_update_mz800)
- MCFG_SOUND_ADD("sn76489n", SN76489, XTAL(17'734'470)/5)
+ MCFG_DEVICE_ADD("sn76489n", SN76489, XTAL(17'734'470)/5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_REMOVE("cass_list")
@@ -469,10 +469,10 @@ MACHINE_CONFIG_START(mz_state::mz800)
MCFG_PIT8253_CLK0(XTAL(17'734'470)/16)
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(17'734'470)/5)
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(mz_state, mz800_z80pio_irq))
- MCFG_Z80PIO_IN_PA_CB(READ8(mz_state, mz800_z80pio_port_a_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(mz_state, mz800_z80pio_port_a_w))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, mz_state, mz800_z80pio_irq))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, mz_state, mz800_z80pio_port_a_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, mz_state, mz800_z80pio_port_a_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp
index 8eaa595c481..234769caf39 100644
--- a/src/mame/drivers/mz80.cpp
+++ b/src/mame/drivers/mz80.cpp
@@ -280,9 +280,9 @@ MACHINE_CONFIG_START(mz80_state::mz80k)
/* basic machine hardware */
/* main CPU */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 4) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(mz80k_mem)
- MCFG_CPU_IO_MAP(mz80k_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 4) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mz80k_mem)
+ MCFG_DEVICE_IO_MAP(mz80k_io)
/* video hardware */
@@ -300,23 +300,23 @@ MACHINE_CONFIG_START(mz80_state::mz80k)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(mz80_state, mz80k_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(mz80_state, mz80k_8255_portb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(mz80_state, mz80k_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(mz80_state, mz80k_8255_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, mz80_state, mz80k_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, mz80_state, mz80k_8255_portb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, mz80_state, mz80k_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, mz80_state, mz80k_8255_portc_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(8'000'000)/4)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mz80_state, pit_out0_changed))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, mz80_state, pit_out0_changed))
MCFG_PIT8253_CLK1(XTAL(8'000'000)/256)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk2))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pit8253", pit8253_device, write_clk2))
MCFG_PIT8253_CLK2(0)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mz80_state, pit_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, mz80_state, pit_out2_changed))
MCFG_TIMER_DRIVER_ADD_PERIODIC("tempo", mz80_state, ne555_tempo_callback, attotime::from_hz(34))
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp
index cb6913718bb..3d3178d748d 100644
--- a/src/mame/drivers/mzr8105.cpp
+++ b/src/mame/drivers/mzr8105.cpp
@@ -208,8 +208,8 @@ static void mzr8105_vme_cards(device_slot_interface &device)
* Machine configuration
*/
MACHINE_CONFIG_START(mzr8105_state::mzr8105)
- MCFG_CPU_ADD ("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP (mzr8105_mem)
+ MCFG_DEVICE_ADD ("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP (mzr8105_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_BUS_OWNER_SPACES()
MCFG_VME_SLOT_ADD ("vme", 1, mzr8105_vme_cards, "mzr8300")
diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp
index 7fc8e8991f9..bb05a3057dd 100644
--- a/src/mame/drivers/n64.cpp
+++ b/src/mame/drivers/n64.cpp
@@ -429,22 +429,22 @@ INTERRUPT_GEN_MEMBER(n64_mess_state::n64_reset_poll)
MACHINE_CONFIG_START(n64_mess_state::n64)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", VR4300BE, 93750000)
+ MCFG_DEVICE_ADD("maincpu", VR4300BE, 93750000)
MCFG_CPU_FORCE_NO_DRC()
//MCFG_MIPS3_ICACHE_SIZE(16384) /* ?? */
//MCFG_MIPS3_DCACHE_SIZE(8192) /* ?? */
//MCFG_MIPS3_SYSTEM_CLOCK(62500000) /* ?? */
- MCFG_CPU_PROGRAM_MAP(n64_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", n64_mess_state, n64_reset_poll)
+ MCFG_DEVICE_PROGRAM_MAP(n64_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", n64_mess_state, n64_reset_poll)
- MCFG_CPU_ADD("rsp", RSP, 62500000)
+ MCFG_DEVICE_ADD("rsp", RSP, 62500000)
MCFG_CPU_FORCE_NO_DRC()
- MCFG_RSP_DP_REG_R_CB(DEVREAD32("rcp",n64_periphs, dp_reg_r))
- MCFG_RSP_DP_REG_W_CB(DEVWRITE32("rcp",n64_periphs, dp_reg_w))
- MCFG_RSP_SP_REG_R_CB(DEVREAD32("rcp",n64_periphs, sp_reg_r))
- MCFG_RSP_SP_REG_W_CB(DEVWRITE32("rcp",n64_periphs, sp_reg_w))
- MCFG_RSP_SP_SET_STATUS_CB(DEVWRITE32("rcp",n64_periphs, sp_set_status))
- MCFG_CPU_PROGRAM_MAP(rsp_map)
+ MCFG_RSP_DP_REG_R_CB(READ32("rcp",n64_periphs, dp_reg_r))
+ MCFG_RSP_DP_REG_W_CB(WRITE32("rcp",n64_periphs, dp_reg_w))
+ MCFG_RSP_SP_REG_R_CB(READ32("rcp",n64_periphs, sp_reg_r))
+ MCFG_RSP_SP_REG_W_CB(WRITE32("rcp",n64_periphs, sp_reg_w))
+ MCFG_RSP_SP_SET_STATUS_CB(WRITE32("rcp",n64_periphs, sp_set_status))
+ MCFG_DEVICE_PROGRAM_MAP(rsp_map)
MCFG_QUANTUM_TIME(attotime::from_hz(500000))
//MCFG_QUANTUM_TIME(attotime::from_hz(1200))
@@ -458,15 +458,15 @@ MACHINE_CONFIG_START(n64_mess_state::n64)
//MCFG_SCREEN_SIZE(640, 525)
//MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
MCFG_SCREEN_UPDATE_DRIVER(n64_state, screen_update_n64)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(n64_state, screen_vblank_n64))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, n64_state, screen_vblank_n64))
MCFG_PALETTE_ADD("palette", 0x1000)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac2", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_DEVICE_ADD("dac1", DMADAC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_N64_PERIPHS_ADD("rcp");
@@ -483,8 +483,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(n64_mess_state::n64dd)
n64(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(n64dd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(n64dd_map)
MCFG_MACHINE_START_OVERRIDE(n64_mess_state, n64dd)
diff --git a/src/mame/drivers/n8080.cpp b/src/mame/drivers/n8080.cpp
index 4f5a540b3c6..49750b7d885 100644
--- a/src/mame/drivers/n8080.cpp
+++ b/src/mame/drivers/n8080.cpp
@@ -506,11 +506,11 @@ MACHINE_RESET_MEMBER(n8080_state,helifire)
MACHINE_CONFIG_START(n8080_state::spacefev)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
- MCFG_I8085A_STATUS(WRITE8(n8080_state,n8080_status_callback))
- MCFG_I8085A_INTE(WRITELINE(n8080_state,n8080_inte_callback))
- MCFG_CPU_PROGRAM_MAP(main_cpu_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK / 10)
+ MCFG_I8085A_STATUS(WRITE8(*this, n8080_state,n8080_status_callback))
+ MCFG_I8085A_INTE(WRITELINE(*this, n8080_state,n8080_inte_callback))
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
MCFG_MACHINE_RESET_OVERRIDE(n8080_state,spacefev)
@@ -537,11 +537,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(n8080_state::sheriff)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
- MCFG_I8085A_STATUS(WRITE8(n8080_state,n8080_status_callback))
- MCFG_I8085A_INTE(WRITELINE(n8080_state,n8080_inte_callback))
- MCFG_CPU_PROGRAM_MAP(main_cpu_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK / 10)
+ MCFG_I8085A_STATUS(WRITE8(*this, n8080_state,n8080_status_callback))
+ MCFG_I8085A_INTE(WRITELINE(*this, n8080_state,n8080_inte_callback))
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
MCFG_MACHINE_RESET_OVERRIDE(n8080_state,sheriff)
@@ -569,11 +569,11 @@ MACHINE_CONFIG_START(n8080_state::westgun2)
sheriff(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, XTAL(19'968'000) / 10)
- MCFG_I8085A_STATUS(WRITE8(n8080_state,n8080_status_callback))
- MCFG_I8085A_INTE(WRITELINE(n8080_state,n8080_inte_callback))
- MCFG_CPU_PROGRAM_MAP(main_cpu_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, XTAL(19'968'000) / 10)
+ MCFG_I8085A_STATUS(WRITE8(*this, n8080_state,n8080_status_callback))
+ MCFG_I8085A_INTE(WRITELINE(*this, n8080_state,n8080_inte_callback))
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
MACHINE_CONFIG_END
@@ -581,11 +581,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(n8080_state::helifire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
- MCFG_I8085A_STATUS(WRITE8(n8080_state,n8080_status_callback))
- MCFG_I8085A_INTE(WRITELINE(n8080_state,n8080_inte_callback))
- MCFG_CPU_PROGRAM_MAP(helifire_main_cpu_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK / 10)
+ MCFG_I8085A_STATUS(WRITE8(*this, n8080_state,n8080_status_callback))
+ MCFG_I8085A_INTE(WRITELINE(*this, n8080_state,n8080_inte_callback))
+ MCFG_DEVICE_PROGRAM_MAP(helifire_main_cpu_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
MCFG_MACHINE_RESET_OVERRIDE(n8080_state,helifire)
@@ -595,7 +595,7 @@ MACHINE_CONFIG_START(n8080_state::helifire)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 239)
MCFG_SCREEN_UPDATE_DRIVER(n8080_state, screen_update_helifire)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(n8080_state, screen_vblank_helifire))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, n8080_state, screen_vblank_helifire))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 8 + 0x400)
diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp
index 0829a3b0502..e1471531172 100644
--- a/src/mame/drivers/nakajies.cpp
+++ b/src/mame/drivers/nakajies.cpp
@@ -746,9 +746,9 @@ static GFXDECODE_START( drwrt400 )
GFXDECODE_END
MACHINE_CONFIG_START(nakajies_state::nakajies210)
- MCFG_CPU_ADD( "v20hl", V20, X301 / 2 )
- MCFG_CPU_PROGRAM_MAP( nakajies_map)
- MCFG_CPU_IO_MAP( nakajies_io_map)
+ MCFG_DEVICE_ADD( "v20hl", V20, X301 / 2 )
+ MCFG_DEVICE_PROGRAM_MAP( nakajies_map)
+ MCFG_DEVICE_IO_MAP( nakajies_io_map)
MCFG_SCREEN_ADD( "screen", LCD )
MCFG_SCREEN_REFRESH_RATE( 50 ) /* Wild guess */
@@ -764,7 +764,7 @@ MACHINE_CONFIG_START(nakajies_state::nakajies210)
/* sound */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "speaker", SPEAKER_SOUND, 0 )
+ MCFG_DEVICE_ADD( "speaker", SPEAKER_SOUND )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
/* rtc */
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index a376a201612..6ad00f8c438 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -581,12 +581,12 @@ MACHINE_RESET_MEMBER(namcofl_state,namcofl)
MACHINE_CONFIG_START(namcofl_state::namcofl)
- MCFG_CPU_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
- MCFG_CPU_PROGRAM_MAP(namcofl_mem)
+ MCFG_DEVICE_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
+ MCFG_DEVICE_PROGRAM_MAP(namcofl_mem)
- MCFG_CPU_ADD("mcu", NAMCO_C75, 48384000/3)
- MCFG_CPU_PROGRAM_MAP(namcoc75_am)
- MCFG_CPU_IO_MAP(namcoc75_io)
+ MCFG_DEVICE_ADD("mcu", NAMCO_C75, 48384000/3)
+ MCFG_DEVICE_PROGRAM_MAP(namcoc75_am)
+ MCFG_DEVICE_IO_MAP(namcoc75_io)
/* TODO: irq generation for these */
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq0", namcofl_state, mcu_irq0_cb, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq2", namcofl_state, mcu_irq2_cb, attotime::from_hz(60))
diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp
index dde78db24eb..232c7a02525 100644
--- a/src/mame/drivers/namcona1.cpp
+++ b/src/mame/drivers/namcona1.cpp
@@ -961,12 +961,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcona1_state::interrupt)
MACHINE_CONFIG_START(namcona1_state::namcona1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(namcona1_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(namcona1_main_map)
- MCFG_CPU_ADD("mcu", NAMCO_C69, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(namcona1_mcu_map)
- MCFG_CPU_IO_MAP( namcona1_mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", NAMCO_C69, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(namcona1_mcu_map)
+ MCFG_DEVICE_IO_MAP( namcona1_mcu_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scan_main", namcona1_state, interrupt, "screen", 0, 1)
@@ -1000,18 +1000,18 @@ MACHINE_CONFIG_START(namcona2_state::namcona2)
namcona1(config);
/* basic machine hardware */
-// MCFG_CPU_MODIFY("maincpu")
-// MCFG_CPU_PROGRAM_MAP(namcona2_main_map)
+// MCFG_DEVICE_MODIFY("maincpu")
+// MCFG_DEVICE_PROGRAM_MAP(namcona2_main_map)
- MCFG_CPU_REPLACE("mcu", NAMCO_C70, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(namcona1_mcu_map)
- MCFG_CPU_IO_MAP( namcona1_mcu_io_map)
+ MCFG_DEVICE_REPLACE("mcu", NAMCO_C70, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(namcona1_mcu_map)
+ MCFG_DEVICE_IO_MAP( namcona1_mcu_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(xday2_namcona2_state::xday2)
namcona2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(xday2_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(xday2_main_map)
MCFG_DEVICE_REMOVE("eeprom")
MCFG_EEPROM_2864_ADD("eeprom")
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index a82b42f2f2f..d6cbae41459 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -1069,12 +1069,12 @@ MACHINE_RESET_MEMBER(namconb1_state, namconb)
/***************************************************************/
MACHINE_CONFIG_START(namconb1_state::namconb1)
- MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(namconb1_am)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(namconb1_am)
- MCFG_CPU_ADD("mcu", NAMCO_C75, MASTER_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(namcoc75_am)
- MCFG_CPU_IO_MAP(namcoc75_io)
+ MCFG_DEVICE_ADD("mcu", NAMCO_C75, MASTER_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(namcoc75_am)
+ MCFG_DEVICE_IO_MAP(namcoc75_io)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_MACHINE_RESET_OVERRIDE(namconb1_state, namconb)
@@ -1111,12 +1111,12 @@ MACHINE_CONFIG_START(namconb1_state::namconb1)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namconb1_state::namconb2)
- MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(namconb2_am)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(namconb2_am)
- MCFG_CPU_ADD("mcu", NAMCO_C75, MASTER_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(namcoc75_am)
- MCFG_CPU_IO_MAP(namcoc75_io)
+ MCFG_DEVICE_ADD("mcu", NAMCO_C75, MASTER_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(namcoc75_am)
+ MCFG_DEVICE_IO_MAP(namcoc75_io)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_MACHINE_RESET_OVERRIDE(namconb1_state, namconb)
diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp
index 72898dbaaf7..0079764c5c2 100644
--- a/src/mame/drivers/namcond1.cpp
+++ b/src/mame/drivers/namcond1.cpp
@@ -350,22 +350,22 @@ WRITE_LINE_MEMBER( namcond1_state::raster_irq_w )
MACHINE_CONFIG_START(namcond1_state::namcond1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(49'152'000)/4)
- MCFG_CPU_PROGRAM_MAP(namcond1_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(49'152'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(namcond1_map)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold)
- MCFG_CPU_ADD("mcu", H83002, XTAL(49'152'000)/3 )
- MCFG_CPU_PROGRAM_MAP( nd1h8rwmap)
- MCFG_CPU_IO_MAP( nd1h8iomap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, mcu_interrupt)
+ MCFG_DEVICE_ADD("mcu", H83002, XTAL(49'152'000)/3 )
+ MCFG_DEVICE_PROGRAM_MAP( nd1h8rwmap)
+ MCFG_DEVICE_IO_MAP( nd1h8iomap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcond1_state, mcu_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_YGV608_ADD("ygv608")
MCFG_YGV608_PALETTE("palette")
- MCFG_YGV608_VBLANK_HANDLER(WRITELINE(namcond1_state, vblank_irq_w))
- MCFG_YGV608_RASTER_HANDLER(WRITELINE(namcond1_state, raster_irq_w))
+ MCFG_YGV608_VBLANK_HANDLER(WRITELINE(*this, namcond1_state, vblank_irq_w))
+ MCFG_YGV608_RASTER_HANDLER(WRITELINE(*this, namcond1_state, raster_irq_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -395,9 +395,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcond1_state::abcheck)
namcond1(config);
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(49'152'000)/4)
- MCFG_CPU_PROGRAM_MAP(abcheck_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(49'152'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(abcheck_map)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcond1_state, irq1_line_hold)
MCFG_NVRAM_ADD_0FILL("zpr1")
MCFG_NVRAM_ADD_0FILL("zpr2")
diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp
index c5679674b21..fa07cb26ea6 100644
--- a/src/mame/drivers/namcops2.cpp
+++ b/src/mame/drivers/namcops2.cpp
@@ -918,10 +918,10 @@ static INPUT_PORTS_START( system246 )
INPUT_PORTS_END
MACHINE_CONFIG_START(namcops2_state::system246)
- MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz
+ MCFG_DEVICE_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_CPU_PROGRAM_MAP(ps2_map)
+ MCFG_DEVICE_PROGRAM_MAP(ps2_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp
index 7b85dc6faec..2b23ca5d4ec 100644
--- a/src/mame/drivers/namcos1.cpp
+++ b/src/mame/drivers/namcos1.cpp
@@ -1031,27 +1031,27 @@ GFXDECODE_END
MACHINE_CONFIG_START(namcos1_state::ns1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
- MCFG_CPU_ADD("subcpu", MC6809E, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("subcpu", MC6809E, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
- MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8)
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_IO_MAP(mcu_port_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("mcu", HD63701, XTAL(49'152'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_port_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos1_state, irq0_line_assert)
MCFG_DEVICE_ADD("c117", NAMCO_C117, 0)
MCFG_DEVICE_PROGRAM_MAP(virtual_map)
MCFG_CUS117_CPUS("maincpu", "subcpu")
- MCFG_CUS117_SUBRES_CB(WRITELINE(namcos1_state, subres_w))
+ MCFG_CUS117_SUBRES_CB(WRITELINE(*this, namcos1_state, subres_w))
// heavy sync required to prevent CPUs from fighting for video RAM access and going into deadlocks
MCFG_QUANTUM_TIME(attotime::from_hz(38400))
@@ -1064,7 +1064,7 @@ MACHINE_CONFIG_START(namcos1_state::ns1)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 9+8*8, 9+44*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos1_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos1_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos1_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos1)
@@ -1083,14 +1083,14 @@ MACHINE_CONFIG_START(namcos1_state::ns1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048/2)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048/2)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("dac0", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // 10-pin 1Kx8R SIP with HC374 latch
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // 10-pin 1Kx8R SIP with HC374 latch
+ MCFG_DEVICE_ADD("dac0", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // 10-pin 1Kx8R SIP with HC374 latch
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // 10-pin 1Kx8R SIP with HC374 latch
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp
index 848a3a2729a..b730472baea 100644
--- a/src/mame/drivers/namcos10.cpp
+++ b/src/mame/drivers/namcos10.cpp
@@ -918,8 +918,8 @@ MACHINE_RESET_MEMBER(namcos10_state,namcos10)
MACHINE_CONFIG_START(namcos10_state::namcos10_memm)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL(101'491'200) )
- MCFG_CPU_PROGRAM_MAP( namcos10_memm_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8606BQ, XTAL(101'491'200) )
+ MCFG_DEVICE_PROGRAM_MAP( namcos10_memm_map )
// The bios first configures the rom window as 80000-big, then
// switches to 400000. If berr is active, the first configuration
@@ -942,8 +942,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos10_state::namcos10_memn)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL(101'491'200) )
- MCFG_CPU_PROGRAM_MAP( namcos10_memn_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8606BQ, XTAL(101'491'200) )
+ MCFG_DEVICE_PROGRAM_MAP( namcos10_memn_map )
// The bios first configures the rom window as 80000-big, then
// switches to 400000. If berr is active, the first configuration
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index 06ab2678968..14e5691ddb6 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -607,16 +607,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_adc_cb)
}
MACHINE_CONFIG_START(namcos11_state::coh110)
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( namcos11_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( namcos11_map )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
/* basic machine hardware */
- MCFG_CPU_ADD("c76", NAMCO_C76, 16934400)
- MCFG_CPU_PROGRAM_MAP(c76_map)
- MCFG_CPU_IO_MAP(c76_io_map)
+ MCFG_DEVICE_ADD("c76", NAMCO_C76, 16934400)
+ MCFG_DEVICE_PROGRAM_MAP(c76_map)
+ MCFG_DEVICE_IO_MAP(c76_io_map)
/* TODO: irq generation for these */
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq0", namcos11_state, mcu_irq0_cb, attotime::from_hz(60))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_irq2", namcos11_state, mcu_irq2_cb, attotime::from_hz(60))
@@ -637,8 +637,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::coh100)
coh110(config);
- MCFG_CPU_REPLACE( "maincpu", CXD8530AQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( namcos11_map )
+ MCFG_DEVICE_REPLACE( "maincpu", CXD8530AQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( namcos11_map )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -648,8 +648,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::tekken)
coh100(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
// TODO: either allow optional devices in memory maps, add another memory map without keycus or add a dummy keycus for tekken
MCFG_DEVICE_ADD( "keycus", KEYCUS_C406, 0 )
@@ -657,64 +657,64 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::tekken2o)
coh100(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C406, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::tekken2)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C406, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::souledge)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C409, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::dunkmnia)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C410, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::primglex)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C411, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::xevi3dg)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C430, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::danceyes)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C431, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::pocketrc)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C432, 0 )
MACHINE_CONFIG_END
@@ -726,16 +726,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::myangel3)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( rom8_64_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( rom8_64_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C443, 0 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos11_state::ptblank2ua)
coh110(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( ptblank2ua_map )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( ptblank2ua_map )
MCFG_DEVICE_ADD( "keycus", KEYCUS_C443, 0 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index 6252add252d..b66e05242ee 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1722,19 +1722,19 @@ DRIVER_INIT_MEMBER(namcos12_state,golgo13)
MACHINE_CONFIG_START(namcos12_state::namcos12_mobo)
/* basic machine hardware */
- MCFG_CPU_ADD("sub", H83002, 16934400) // frequency based on research (superctr)
- MCFG_CPU_PROGRAM_MAP(s12h8rwmap)
- MCFG_CPU_IO_MAP(s12h8iomap)
+ MCFG_DEVICE_ADD("sub", H83002, 16934400) // frequency based on research (superctr)
+ MCFG_DEVICE_PROGRAM_MAP(s12h8rwmap)
+ MCFG_DEVICE_IO_MAP(s12h8iomap)
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
MCFG_RTC4543_ADD("rtc", XTAL(32'768))
- MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("sub:sci1", h8_sci_device, rx_w))
+ MCFG_RTC4543_DATA_CALLBACK(WRITELINE("sub:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("sub:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(":namco_settings", namco_settings_device, clk_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("namco_settings", namco_settings_device, data_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namco_settings", namco_settings_device, clk_w))
MCFG_AT28C16_ADD("at28c16", nullptr)
@@ -1752,8 +1752,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos12_state::coh700)
namcos12_mobo(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CXD8661R, XTAL(100'000'000))
- MCFG_CPU_PROGRAM_MAP( namcos12_map)
+ MCFG_DEVICE_ADD("maincpu", CXD8661R, XTAL(100'000'000))
+ MCFG_DEVICE_PROGRAM_MAP( namcos12_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1769,8 +1769,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos12_state::coh716)
namcos12_mobo(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CXD8606BQ, XTAL(100'000'000))
- MCFG_CPU_PROGRAM_MAP( namcos12_map)
+ MCFG_DEVICE_ADD("maincpu", CXD8606BQ, XTAL(100'000'000))
+ MCFG_DEVICE_PROGRAM_MAP( namcos12_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("16M")
@@ -1786,24 +1786,24 @@ MACHINE_CONFIG_START(namcos12_boothack_state::ptblank2)
coh700(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( ptblank2_map )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( ptblank2_map )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos12_boothack_state::tektagt)
coh700(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( tektagt_map )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( tektagt_map )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos12_boothack_state::golgo13)
coh700(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_IO_MAP(golgo13_h8iomap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_IO_MAP(golgo13_h8iomap)
MACHINE_CONFIG_END
#define JVSCLOCK (XTAL(14'745'600))
@@ -1821,17 +1821,17 @@ void namcos12_state::jvsiomap(address_map &map)
MACHINE_CONFIG_START(namcos12_boothack_state::truckk)
coh700(config);
// Timer at 115200*16 for the jvs serial clock
- MCFG_DEVICE_MODIFY(":sub:sci0")
+ MCFG_DEVICE_MODIFY("sub:sci0")
MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8))
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( jvsmap )
- MCFG_CPU_IO_MAP( jvsiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( jvsmap )
+ MCFG_DEVICE_IO_MAP( jvsiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":sub:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("sub:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("sub:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MCFG_QUANTUM_TIME(attotime::from_hz(2*115200))
MACHINE_CONFIG_END
@@ -1895,22 +1895,22 @@ void namcos12_state::plarailjvsiomap(address_map &map)
MACHINE_CONFIG_START(namcos12_boothack_state::technodr)
coh700(config);
// Timer at 115200*16 for the jvs serial clock
- MCFG_DEVICE_MODIFY(":sub:sci0")
+ MCFG_DEVICE_MODIFY("sub:sci0")
MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8))
// modify H8/3002 map to omit direct-connected controls
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(s12h8rwjvsmap)
- MCFG_CPU_IO_MAP(s12h8jvsiomap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(s12h8rwjvsmap)
+ MCFG_DEVICE_IO_MAP(s12h8jvsiomap)
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( tdjvsmap )
- MCFG_CPU_IO_MAP( tdjvsiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( tdjvsmap )
+ MCFG_DEVICE_IO_MAP( tdjvsiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":sub:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("sub:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("sub:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MCFG_QUANTUM_TIME(attotime::from_hz(2*115200))
MACHINE_CONFIG_END
@@ -1918,22 +1918,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos12_boothack_state::aplarail)
coh700(config);
// Timer at 115200*16 for the jvs serial clock
- MCFG_DEVICE_MODIFY(":sub:sci0")
+ MCFG_DEVICE_MODIFY("sub:sci0")
MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8))
// modify H8/3002 map to omit direct-connected controls
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(s12h8rwjvsmap)
- MCFG_CPU_IO_MAP(s12h8railiomap)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(s12h8rwjvsmap)
+ MCFG_DEVICE_IO_MAP(s12h8railiomap)
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( plarailjvsmap )
- MCFG_CPU_IO_MAP( plarailjvsiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( plarailjvsmap )
+ MCFG_DEVICE_IO_MAP( plarailjvsiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":sub:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("sub:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("sub:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MCFG_QUANTUM_TIME(attotime::from_hz(2*115200))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index 1e0c519b2ca..51c9da74655 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -1703,8 +1703,8 @@ via software as INT1
MACHINE_CONFIG_START(namcos2_state::configure_c148_standard)
MCFG_NAMCO_C148_ADD("master_intc","maincpu",true)
MCFG_NAMCO_C148_LINK("slave_intc")
- MCFG_NAMCO_C148_EXT1_CB(WRITE8(namcos2_state, sound_reset_w))
- MCFG_NAMCO_C148_EXT2_CB(WRITE8(namcos2_state, system_reset_w))
+ MCFG_NAMCO_C148_EXT1_CB(WRITE8(*this, namcos2_state, sound_reset_w))
+ MCFG_NAMCO_C148_EXT2_CB(WRITE8(*this, namcos2_state, system_reset_w))
MCFG_NAMCO_C148_ADD("slave_intc","slave",false)
MCFG_NAMCO_C148_LINK("master_intc")
@@ -1733,21 +1733,21 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos2_state::screen_scanline)
}
MACHINE_CONFIG_START(namcos2_state::base)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_default_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_default_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_default_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_default_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MCFG_CPU_PROGRAM_MAP(mcu_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(12000)) /* CPU slices per frame */
@@ -1807,27 +1807,27 @@ MACHINE_CONFIG_START(namcos2_state::base3)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_SOUND_REPLACE("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, YM2151_SOUND_CLOCK) /* 3.579545MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::gollygho)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_default_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_default_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_default_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_default_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MCFG_CPU_PROGRAM_MAP(mcu_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
@@ -1863,21 +1863,21 @@ MACHINE_CONFIG_START(namcos2_state::gollygho)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::finallap)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_finallap_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_finallap_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_finallap_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_finallap_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MCFG_CPU_PROGRAM_MAP(mcu_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
@@ -1918,21 +1918,21 @@ MACHINE_CONFIG_START(namcos2_state::finallap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::sgunner)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_sgunner_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_sgunner_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_sgunner_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_sgunner_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MCFG_CPU_PROGRAM_MAP(mcu_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
@@ -1970,26 +1970,26 @@ MACHINE_CONFIG_START(namcos2_state::sgunner)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::sgunner2)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_sgunner_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_sgunner_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_sgunner_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_sgunner_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("c68", M37450, C68_CPU_CLOCK) /* C68 @ 8.192MHz (49.152MHz OSC/6) - I/O handling */
+ MCFG_DEVICE_ADD("c68", M37450, C68_CPU_CLOCK) /* C68 @ 8.192MHz (49.152MHz OSC/6) - I/O handling */
MCFG_M3745X_ADC14_CALLBACKS(IOPORT("AN0"), IOPORT("AN1"), IOPORT("AN2"), IOPORT("AN3"))
MCFG_M3745X_ADC58_CALLBACKS(IOPORT("AN4"), IOPORT("AN5"), IOPORT("AN6"), IOPORT("AN7"))
- MCFG_M3745X_PORT3_CALLBACKS(IOPORT("MCUH"), WRITE8(namcos2_state, c68_p3_w)) // coins/test/service
- MCFG_M3745X_PORT5_CALLBACKS(READ8(namcos2_state, c68_p5_r), NOOP) // muxed player 1/2
+ MCFG_M3745X_PORT3_CALLBACKS(IOPORT("MCUH"), WRITE8(*this, namcos2_state, c68_p3_w)) // coins/test/service
+ MCFG_M3745X_PORT5_CALLBACKS(READ8(*this, namcos2_state, c68_p5_r), NOOP) // muxed player 1/2
MCFG_M3745X_PORT6_CALLBACKS(IOPORT("MCUC"), NOOP) // unused in sgunner2
- MCFG_CPU_PROGRAM_MAP(c68_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_assert) // 37450 maps INT1 to irq0 as it's the first external interrupt on that chip
+ MCFG_DEVICE_PROGRAM_MAP(c68_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_assert) // 37450 maps INT1 to irq0 as it's the first external interrupt on that chip
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
@@ -2027,21 +2027,21 @@ MACHINE_CONFIG_START(namcos2_state::sgunner2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::luckywld)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_luckywld_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_luckywld_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_luckywld_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_luckywld_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MCFG_CPU_PROGRAM_MAP(mcu_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
@@ -2082,21 +2082,21 @@ MACHINE_CONFIG_START(namcos2_state::luckywld)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos2_state::metlhawk)
- MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(master_metlhawk_am)
+ MCFG_DEVICE_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(master_metlhawk_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
- MCFG_CPU_PROGRAM_MAP(slave_metlhawk_am)
+ MCFG_DEVICE_ADD("slave", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
+ MCFG_DEVICE_PROGRAM_MAP(slave_metlhawk_am)
- MCFG_CPU_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
- MCFG_CPU_PROGRAM_MAP(sound_default_am)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, M68B09_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - Sound handling */
+ MCFG_DEVICE_PROGRAM_MAP(sound_default_am)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos2_shared_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
- MCFG_CPU_PROGRAM_MAP(mcu_default_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705, C65_CPU_CLOCK) /* 2.048MHz (49.152MHz OSC/24) - I/O handling */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_default_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos2_shared_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* CPU slices per frame */
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index 50e349d594e..4c3c74df433 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -1902,8 +1902,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline)
MACHINE_CONFIG_START(namcos21_state::configure_c148_standard)
MCFG_NAMCO_C148_ADD("master_intc","maincpu",true)
MCFG_NAMCO_C148_LINK("slave_intc")
- MCFG_NAMCO_C148_EXT1_CB(WRITE8(namcos21_state, sound_reset_w))
- MCFG_NAMCO_C148_EXT2_CB(WRITE8(namcos21_state, system_reset_w))
+ MCFG_NAMCO_C148_EXT1_CB(WRITE8(*this, namcos21_state, sound_reset_w))
+ MCFG_NAMCO_C148_EXT2_CB(WRITE8(*this, namcos21_state, system_reset_w))
MCFG_NAMCO_C148_ADD("slave_intc","slave",false)
MCFG_NAMCO_C148_LINK("master_intc")
@@ -1911,37 +1911,37 @@ MACHINE_CONFIG_START(namcos21_state::configure_c148_standard)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos21_state::namcos21)
- MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MCFG_CPU_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,12288000) /* Master */
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000,12288000) /* Slave */
- MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_ADD("slave", M68000,12288000) /* Slave */
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
- MCFG_CPU_ADD("audiocpu", MC6809E, 3072000) /* Sound */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos21_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos21_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, 3072000) /* Sound */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos21_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos21_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos21_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705,2048000) /* IO */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos21_state, irq0_line_hold)
- MCFG_CPU_ADD("dspmaster", TMS32025,24000000) /* 24 MHz? overclocked */
- MCFG_CPU_PROGRAM_MAP(master_dsp_program)
- MCFG_CPU_DATA_MAP(master_dsp_data)
- MCFG_CPU_IO_MAP(master_dsp_io)
+ MCFG_DEVICE_ADD("dspmaster", TMS32025,24000000) /* 24 MHz? overclocked */
+ MCFG_DEVICE_PROGRAM_MAP(master_dsp_program)
+ MCFG_DEVICE_DATA_MAP(master_dsp_data)
+ MCFG_DEVICE_IO_MAP(master_dsp_io)
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
- MCFG_TMS32025_XF_OUT_CB(WRITE16(namcos21_state, dsp_xf_w))
+ MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos21_state, dsp_xf_w))
- MCFG_CPU_ADD("dspslave", TMS32025,24000000*4) /* 24 MHz?; overclocked */
- MCFG_CPU_PROGRAM_MAP(slave_dsp_program)
- MCFG_CPU_DATA_MAP(slave_dsp_data)
- MCFG_CPU_IO_MAP(slave_dsp_io)
+ MCFG_DEVICE_ADD("dspslave", TMS32025,24000000*4) /* 24 MHz?; overclocked */
+ MCFG_DEVICE_PROGRAM_MAP(slave_dsp_program)
+ MCFG_DEVICE_DATA_MAP(slave_dsp_data)
+ MCFG_DEVICE_IO_MAP(slave_dsp_io)
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
- MCFG_TMS32025_XF_OUT_CB(WRITE16(namcos21_state, slave_XF_output_w))
+ MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos21_state, slave_XF_output_w))
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -1978,27 +1978,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos21_state::driveyes)
- MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MCFG_CPU_PROGRAM_MAP(driveyes_master_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,12288000) /* Master */
+ MCFG_DEVICE_PROGRAM_MAP(driveyes_master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000,12288000) /* Slave */
- MCFG_CPU_PROGRAM_MAP(driveyes_slave_map)
+ MCFG_DEVICE_ADD("slave", M68000,12288000) /* Slave */
+ MCFG_DEVICE_PROGRAM_MAP(driveyes_slave_map)
- MCFG_CPU_ADD("audiocpu", MC6809E, 3072000) /* Sound */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos21_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos21_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, 3072000) /* Sound */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos21_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos21_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos21_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705,2048000) /* IO */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos21_state, irq0_line_hold)
- MCFG_CPU_ADD("dsp", TMS32025,24000000*2) /* 24 MHz? overclocked */
- MCFG_CPU_PROGRAM_MAP(winrun_dsp_program)
- MCFG_CPU_DATA_MAP(winrun_dsp_data)
- MCFG_CPU_IO_MAP(winrun_dsp_io)
- MCFG_TMS32025_BIO_IN_CB(READ16(namcos21_state, winrun_poly_reset_r))
+ MCFG_DEVICE_ADD("dsp", TMS32025,24000000*2) /* 24 MHz? overclocked */
+ MCFG_DEVICE_PROGRAM_MAP(winrun_dsp_program)
+ MCFG_DEVICE_DATA_MAP(winrun_dsp_data)
+ MCFG_DEVICE_IO_MAP(winrun_dsp_io)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos21_state, winrun_poly_reset_r))
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_TMS32025_XF_OUT_CB(NOOP)
@@ -2038,33 +2038,33 @@ MACHINE_CONFIG_START(namcos21_state::driveyes)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos21_state::winrun)
- MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
- MCFG_CPU_PROGRAM_MAP(winrun_master_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,12288000) /* Master */
+ MCFG_DEVICE_PROGRAM_MAP(winrun_master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000,12288000) /* Slave */
- MCFG_CPU_PROGRAM_MAP(winrun_slave_map)
+ MCFG_DEVICE_ADD("slave", M68000,12288000) /* Slave */
+ MCFG_DEVICE_PROGRAM_MAP(winrun_slave_map)
- MCFG_CPU_ADD("audiocpu", MC6809E, 3072000) /* Sound */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos21_state, irq0_line_hold, 2*60)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos21_state, irq1_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, 3072000) /* Sound */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos21_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos21_state, irq1_line_hold, 120)
- MCFG_CPU_ADD("mcu", HD63705,2048000) /* IO */
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos21_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("mcu", HD63705,2048000) /* IO */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos21_state, irq0_line_hold)
- MCFG_CPU_ADD("dsp", TMS32025,24000000) /* 24 MHz? overclocked */
- MCFG_CPU_PROGRAM_MAP(winrun_dsp_program)
- MCFG_CPU_DATA_MAP(winrun_dsp_data)
- MCFG_CPU_IO_MAP(winrun_dsp_io)
- MCFG_TMS32025_BIO_IN_CB(READ16(namcos21_state, winrun_poly_reset_r))
+ MCFG_DEVICE_ADD("dsp", TMS32025,24000000) /* 24 MHz? overclocked */
+ MCFG_DEVICE_PROGRAM_MAP(winrun_dsp_program)
+ MCFG_DEVICE_DATA_MAP(winrun_dsp_data)
+ MCFG_DEVICE_IO_MAP(winrun_dsp_io)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos21_state, winrun_poly_reset_r))
MCFG_TMS32025_HOLD_IN_CB(NOOP)
MCFG_TMS32025_HOLD_ACK_OUT_CB(NOOP)
MCFG_TMS32025_XF_OUT_CB(NOOP)
- MCFG_CPU_ADD("gpu", M68000,12288000) /* graphics coprocessor */
- MCFG_CPU_PROGRAM_MAP(winrun_gpu_map)
+ MCFG_DEVICE_ADD("gpu", M68000,12288000) /* graphics coprocessor */
+ MCFG_DEVICE_PROGRAM_MAP(winrun_gpu_map)
configure_c148_standard(config);
MCFG_NAMCO_C148_ADD("gpu_intc","gpu",false)
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index 45d1e79a096..40f0d0f7ee8 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -3753,39 +3753,39 @@ void namcos22_state::machine_start()
MACHINE_CONFIG_START(namcos22_state::namcos22)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
- MCFG_CPU_PROGRAM_MAP(namcos22_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos22_state, namcos22_interrupt)
-
- MCFG_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK) /* ? */
- MCFG_CPU_PROGRAM_MAP(master_dsp_program)
- MCFG_CPU_DATA_MAP(master_dsp_data)
- MCFG_CPU_IO_MAP(master_dsp_io)
- MCFG_TMS32025_BIO_IN_CB(READ16(namcos22_state, pdp_status_r))
- MCFG_TMS32025_HOLD_IN_CB(READ16(namcos22_state, dsp_hold_signal_r))
- MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(namcos22_state, dsp_hold_ack_w))
- MCFG_TMS32025_XF_OUT_CB(WRITE16(namcos22_state, dsp_xf_output_w))
- MCFG_TMS32025_DR_IN_CB(READ16(namcos22_state, master_serial_io_r))
+ MCFG_DEVICE_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(namcos22_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos22_state, namcos22_interrupt)
+
+ MCFG_DEVICE_ADD("master", TMS32025,SS22_MASTER_CLOCK) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(master_dsp_program)
+ MCFG_DEVICE_DATA_MAP(master_dsp_data)
+ MCFG_DEVICE_IO_MAP(master_dsp_io)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos22_state, pdp_status_r))
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, namcos22_state, dsp_hold_signal_r))
+ MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(*this, namcos22_state, dsp_hold_ack_w))
+ MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos22_state, dsp_xf_output_w))
+ MCFG_TMS32025_DR_IN_CB(READ16(*this, namcos22_state, master_serial_io_r))
MCFG_TIMER_DRIVER_ADD_SCANLINE("master_st", namcos22_state, dsp_master_serial_irq, "screen", 0, 1)
- MCFG_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK) /* ? */
- MCFG_CPU_PROGRAM_MAP(slave_dsp_program)
- MCFG_CPU_DATA_MAP(slave_dsp_data)
- MCFG_CPU_IO_MAP(slave_dsp_io)
- MCFG_TMS32025_BIO_IN_CB(READ16(namcos22_state, dsp_bioz_r))
- MCFG_TMS32025_HOLD_IN_CB(READ16(namcos22_state, dsp_hold_signal_r))
- MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(namcos22_state, dsp_hold_ack_w))
- MCFG_TMS32025_XF_OUT_CB(WRITE16(namcos22_state, dsp_xf_output_w))
- MCFG_TMS32025_DX_OUT_CB(WRITE16(namcos22_state, slave_serial_io_w))
+ MCFG_DEVICE_ADD("slave", TMS32025,SS22_MASTER_CLOCK) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(slave_dsp_program)
+ MCFG_DEVICE_DATA_MAP(slave_dsp_data)
+ MCFG_DEVICE_IO_MAP(slave_dsp_io)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos22_state, dsp_bioz_r))
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, namcos22_state, dsp_hold_signal_r))
+ MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(*this, namcos22_state, dsp_hold_ack_w))
+ MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos22_state, dsp_xf_output_w))
+ MCFG_TMS32025_DX_OUT_CB(WRITE16(*this, namcos22_state, slave_serial_io_w))
MCFG_TIMER_DRIVER_ADD_SCANLINE("slave_st", namcos22_state, dsp_slave_serial_irq, "screen", 0, 1)
- MCFG_CPU_ADD("mcu", NAMCO_C74, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0
- MCFG_CPU_PROGRAM_MAP( mcu_s22_program)
- MCFG_CPU_IO_MAP( mcu_s22_io)
+ MCFG_DEVICE_ADD("mcu", NAMCO_C74, SS22_MASTER_CLOCK/3) // C74 on the CPU board has no periodic interrupts, it runs entirely off Timer A0
+ MCFG_DEVICE_PROGRAM_MAP( mcu_s22_program)
+ MCFG_DEVICE_IO_MAP( mcu_s22_io)
- MCFG_CPU_ADD("iomcu", NAMCO_C74, XTAL(6'144'000)) // 6.144MHz XTAL on I/O board, not sure if it has a divider
- MCFG_CPU_PROGRAM_MAP( iomcu_s22_program)
- MCFG_CPU_IO_MAP( iomcu_s22_io)
+ MCFG_DEVICE_ADD("iomcu", NAMCO_C74, XTAL(6'144'000)) // 6.144MHz XTAL on I/O board, not sure if it has a divider
+ MCFG_DEVICE_PROGRAM_MAP( iomcu_s22_program)
+ MCFG_DEVICE_IO_MAP( iomcu_s22_io)
MCFG_EEPROM_2864_ADD("eeprom")
@@ -3811,7 +3811,7 @@ MACHINE_CONFIG_START(namcos22_state::cybrcomm)
MCFG_SPEAKER_STANDARD_STEREO("rear_left","rear_right")
- MCFG_SOUND_MODIFY("c352")
+ MCFG_DEVICE_MODIFY("c352")
MCFG_SOUND_ROUTE(2, "rear_left", 1.00)
MCFG_SOUND_ROUTE(3, "rear_right", 1.00)
MACHINE_CONFIG_END
@@ -3820,35 +3820,35 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos22_state::namcos22s)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(namcos22s_am)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos22_state, namcos22s_interrupt)
-
- MCFG_CPU_ADD("master", TMS32025,SS22_MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(master_dsp_program)
- MCFG_CPU_DATA_MAP(master_dsp_data)
- MCFG_CPU_IO_MAP(master_dsp_io)
- MCFG_TMS32025_BIO_IN_CB(READ16(namcos22_state, pdp_status_r))
- MCFG_TMS32025_HOLD_IN_CB(READ16(namcos22_state, dsp_hold_signal_r))
- MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(namcos22_state, dsp_hold_ack_w))
- MCFG_TMS32025_XF_OUT_CB(WRITE16(namcos22_state, dsp_xf_output_w))
- MCFG_TMS32025_DR_IN_CB(READ16(namcos22_state, master_serial_io_r))
+ MCFG_DEVICE_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(namcos22s_am)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos22_state, namcos22s_interrupt)
+
+ MCFG_DEVICE_ADD("master", TMS32025,SS22_MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(master_dsp_program)
+ MCFG_DEVICE_DATA_MAP(master_dsp_data)
+ MCFG_DEVICE_IO_MAP(master_dsp_io)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos22_state, pdp_status_r))
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, namcos22_state, dsp_hold_signal_r))
+ MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(*this, namcos22_state, dsp_hold_ack_w))
+ MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos22_state, dsp_xf_output_w))
+ MCFG_TMS32025_DR_IN_CB(READ16(*this, namcos22_state, master_serial_io_r))
MCFG_TIMER_DRIVER_ADD_SCANLINE("master_st", namcos22_state, dsp_master_serial_irq, "screen", 0, 1)
- MCFG_CPU_ADD("slave", TMS32025,SS22_MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(slave_dsp_program)
- MCFG_CPU_DATA_MAP(slave_dsp_data)
- MCFG_CPU_IO_MAP(slave_dsp_io)
- MCFG_TMS32025_BIO_IN_CB(READ16(namcos22_state, dsp_bioz_r))
- MCFG_TMS32025_HOLD_IN_CB(READ16(namcos22_state, dsp_hold_signal_r))
- MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(namcos22_state, dsp_hold_ack_w))
- MCFG_TMS32025_XF_OUT_CB(WRITE16(namcos22_state, dsp_xf_output_w))
- MCFG_TMS32025_DX_OUT_CB(WRITE16(namcos22_state, slave_serial_io_w))
+ MCFG_DEVICE_ADD("slave", TMS32025,SS22_MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(slave_dsp_program)
+ MCFG_DEVICE_DATA_MAP(slave_dsp_data)
+ MCFG_DEVICE_IO_MAP(slave_dsp_io)
+ MCFG_TMS32025_BIO_IN_CB(READ16(*this, namcos22_state, dsp_bioz_r))
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, namcos22_state, dsp_hold_signal_r))
+ MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(*this, namcos22_state, dsp_hold_ack_w))
+ MCFG_TMS32025_XF_OUT_CB(WRITE16(*this, namcos22_state, dsp_xf_output_w))
+ MCFG_TMS32025_DX_OUT_CB(WRITE16(*this, namcos22_state, slave_serial_io_w))
MCFG_TIMER_DRIVER_ADD_SCANLINE("slave_st", namcos22_state, dsp_slave_serial_irq, "screen", 0, 1)
- MCFG_CPU_ADD("mcu", M37710S4, SS22_MASTER_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(mcu_program)
- MCFG_CPU_IO_MAP(mcu_io)
+ MCFG_DEVICE_ADD("mcu", M37710S4, SS22_MASTER_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(mcu_program)
+ MCFG_DEVICE_IO_MAP(mcu_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("mcu_st", namcos22_state, mcu_irq, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3877,7 +3877,7 @@ MACHINE_CONFIG_START(namcos22_state::airco22b)
MCFG_SPEAKER_STANDARD_MONO("bodysonic")
- MCFG_SOUND_MODIFY("c352")
+ MCFG_DEVICE_MODIFY("c352")
MCFG_SOUND_ROUTE(2, "bodysonic", 0.50)
MACHINE_CONFIG_END
@@ -3885,8 +3885,8 @@ MACHINE_CONFIG_START(namcos22_state::alpine)
namcos22s(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_IO_MAP(alpine_io_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_IO_MAP(alpine_io_map)
MCFG_TIMER_DRIVER_ADD("motor_timer", namcos22_state, alpine_steplock_callback)
MACHINE_CONFIG_END
@@ -3895,8 +3895,8 @@ MACHINE_CONFIG_START(namcos22_state::alpinesa)
alpine(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(alpinesa_am)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(alpinesa_am)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos22_state::cybrcycc)
@@ -3904,7 +3904,7 @@ MACHINE_CONFIG_START(namcos22_state::cybrcycc)
MCFG_SPEAKER_STANDARD_MONO("tank")
- MCFG_SOUND_MODIFY("c352")
+ MCFG_DEVICE_MODIFY("c352")
MCFG_SOUND_ROUTE(2, "tank", 1.00)
MACHINE_CONFIG_END
@@ -3914,7 +3914,7 @@ MACHINE_CONFIG_START(namcos22_state::dirtdash)
MCFG_SPEAKER_STANDARD_MONO("road")
MCFG_SPEAKER_STANDARD_MONO("under")
- MCFG_SOUND_MODIFY("c352")
+ MCFG_DEVICE_MODIFY("c352")
MCFG_SOUND_ROUTE(2, "road", 1.00)
MCFG_SOUND_ROUTE(3, "under", 0.50) // from sound test
MACHINE_CONFIG_END
@@ -3923,8 +3923,8 @@ MACHINE_CONFIG_START(namcos22_state::timecris)
namcos22s(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(timecris_am)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(timecris_am)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos22_state::tokyowar)
@@ -3933,7 +3933,7 @@ MACHINE_CONFIG_START(namcos22_state::tokyowar)
MCFG_SPEAKER_STANDARD_MONO("seat")
MCFG_SPEAKER_STANDARD_MONO("vibration")
- MCFG_SOUND_MODIFY("c352")
+ MCFG_DEVICE_MODIFY("c352")
MCFG_SOUND_ROUTE(3, "seat", 1.00)
MCFG_SOUND_ROUTE(2, "vibration", 0.50)
MACHINE_CONFIG_END
@@ -3942,8 +3942,8 @@ MACHINE_CONFIG_START(namcos22_state::propcycl)
namcos22s(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_IO_MAP(propcycl_io_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_IO_MAP(propcycl_io_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pc_p_upd", namcos22_state, propcycl_pedal_update, attotime::from_msec(20))
MCFG_TIMER_DRIVER_ADD("pc_p_int", namcos22_state, propcycl_pedal_interrupt)
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 571582f9cf1..86f414b184e 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -3564,40 +3564,40 @@ GFXDECODE_END
MACHINE_CONFIG_START(namcos23_state::gorgon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*4)
+ MCFG_DEVICE_ADD("maincpu", R4650BE, BUSCLOCK*4)
MCFG_MIPS3_ICACHE_SIZE(8192) // VERIFIED
MCFG_MIPS3_DCACHE_SIZE(8192) // VERIFIED
- MCFG_CPU_PROGRAM_MAP(gorgon_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos23_state, interrupt)
+ MCFG_DEVICE_PROGRAM_MAP(gorgon_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos23_state, interrupt)
- MCFG_CPU_ADD("subcpu", H83002, H8CLOCK )
- MCFG_CPU_PROGRAM_MAP( s23h8rwmap )
- MCFG_CPU_IO_MAP( s23h8iomap )
+ MCFG_DEVICE_ADD("subcpu", H83002, H8CLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( s23h8rwmap )
+ MCFG_DEVICE_IO_MAP( s23h8iomap )
// Timer at 115200*16 for the jvs serial clock
- MCFG_DEVICE_MODIFY(":subcpu:sci0")
+ MCFG_DEVICE_MODIFY("subcpu:sci0")
MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8))
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( s23iobrdmap )
- MCFG_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( s23iobrdmap )
+ MCFG_DEVICE_IO_MAP( s23iobrdiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":subcpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("subcpu:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MCFG_QUANTUM_TIME(attotime::from_hz(2*115200))
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
MCFG_RTC4543_ADD("rtc", XTAL(32'768))
- MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("subcpu:sci1", h8_sci_device, rx_w))
+ MCFG_RTC4543_DATA_CALLBACK(WRITELINE("subcpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(":namco_settings", namco_settings_device, clk_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("namco_settings", namco_settings_device, data_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namco_settings", namco_settings_device, clk_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3608,7 +3608,7 @@ MACHINE_CONFIG_START(namcos23_state::gorgon)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
MCFG_SCREEN_UPDATE_DRIVER(namcos23_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos23_state, sub_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos23_state, sub_irq))
MCFG_PALETTE_ADD("palette", 0x8000)
@@ -3630,40 +3630,40 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos23_state::s23)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*4)
+ MCFG_DEVICE_ADD("maincpu", R4650BE, BUSCLOCK*4)
MCFG_MIPS3_ICACHE_SIZE(8192) // VERIFIED
MCFG_MIPS3_DCACHE_SIZE(8192) // VERIFIED
- MCFG_CPU_PROGRAM_MAP(s23_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos23_state, interrupt)
+ MCFG_DEVICE_PROGRAM_MAP(s23_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos23_state, interrupt)
- MCFG_CPU_ADD("subcpu", H83002, H8CLOCK )
- MCFG_CPU_PROGRAM_MAP( s23h8rwmap )
- MCFG_CPU_IO_MAP( s23h8iomap )
+ MCFG_DEVICE_ADD("subcpu", H83002, H8CLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( s23h8rwmap )
+ MCFG_DEVICE_IO_MAP( s23h8iomap )
// Timer at 115200*16 for the jvs serial clock
- MCFG_DEVICE_MODIFY(":subcpu:sci0")
+ MCFG_DEVICE_MODIFY("subcpu:sci0")
MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8))
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( s23iobrdmap )
- MCFG_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( s23iobrdmap )
+ MCFG_DEVICE_IO_MAP( s23iobrdiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":subcpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("subcpu:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MCFG_QUANTUM_TIME(attotime::from_hz(2*115200))
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
MCFG_RTC4543_ADD("rtc", XTAL(32'768))
- MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("subcpu:sci1", h8_sci_device, rx_w))
+ MCFG_RTC4543_DATA_CALLBACK(WRITELINE("subcpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(":namco_settings", namco_settings_device, clk_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("namco_settings", namco_settings_device, data_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namco_settings", namco_settings_device, clk_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3674,7 +3674,7 @@ MACHINE_CONFIG_START(namcos23_state::s23)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
MCFG_SCREEN_UPDATE_DRIVER(namcos23_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos23_state, sub_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos23_state, sub_irq))
MCFG_PALETTE_ADD("palette", 0x8000)
@@ -3696,20 +3696,20 @@ MACHINE_CONFIG_START(namcos23_state::timecrs2)
s23(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("iocpu")
- MCFG_CPU_PROGRAM_MAP( timecrs2iobrdmap )
+ MCFG_DEVICE_MODIFY("iocpu")
+ MCFG_DEVICE_PROGRAM_MAP( timecrs2iobrdmap )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos23_state::gmen)
s23(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(BUSCLOCK*5)
- MCFG_CPU_PROGRAM_MAP(gmen_mips_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(BUSCLOCK*5)
+ MCFG_DEVICE_PROGRAM_MAP(gmen_mips_map)
- MCFG_CPU_ADD("gmen_sh2", SH2, XTAL(28'700'000))
- MCFG_CPU_PROGRAM_MAP(gmen_sh2_map)
+ MCFG_DEVICE_ADD("gmen_sh2", SH2, XTAL(28'700'000))
+ MCFG_DEVICE_PROGRAM_MAP(gmen_sh2_map)
MCFG_MACHINE_RESET_OVERRIDE(namcos23_state,gmen)
MACHINE_CONFIG_END
@@ -3718,18 +3718,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos23_state::ss23)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*5)
+ MCFG_DEVICE_ADD("maincpu", R4650BE, BUSCLOCK*5)
MCFG_MIPS3_ICACHE_SIZE(8192) // VERIFIED
MCFG_MIPS3_DCACHE_SIZE(8192) // VERIFIED
- MCFG_CPU_PROGRAM_MAP(s23_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos23_state, interrupt)
+ MCFG_DEVICE_PROGRAM_MAP(s23_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos23_state, interrupt)
- MCFG_CPU_ADD("subcpu", H83002, H8CLOCK )
- MCFG_CPU_PROGRAM_MAP( s23h8rwmap )
- MCFG_CPU_IO_MAP( s23h8iomap )
+ MCFG_DEVICE_ADD("subcpu", H83002, H8CLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( s23h8rwmap )
+ MCFG_DEVICE_IO_MAP( s23h8iomap )
// Timer at 115200*16 for the jvs serial clock
- MCFG_DEVICE_MODIFY(":subcpu:sci0")
+ MCFG_DEVICE_MODIFY("subcpu:sci0")
MCFG_H8_SCI_SET_EXTERNAL_CLOCK_PERIOD(attotime::from_hz(JVSCLOCK/8))
MCFG_QUANTUM_TIME(attotime::from_hz(2*115200))
@@ -3737,12 +3737,12 @@ MACHINE_CONFIG_START(namcos23_state::ss23)
MCFG_NAMCO_SETTINGS_ADD("namco_settings")
MCFG_RTC4543_ADD("rtc", XTAL(32'768))
- MCFG_RTC4543_DATA_CALLBACK(DEVWRITELINE("subcpu:sci1", h8_sci_device, rx_w))
+ MCFG_RTC4543_DATA_CALLBACK(WRITELINE("subcpu:sci1", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci1")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":namco_settings", namco_settings_device, data_w))
- MCFG_H8_SCI_CLK_CALLBACK(DEVWRITELINE(":rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(":namco_settings", namco_settings_device, clk_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("namco_settings", namco_settings_device, data_w))
+ MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namco_settings", namco_settings_device, clk_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3753,7 +3753,7 @@ MACHINE_CONFIG_START(namcos23_state::ss23)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
MCFG_SCREEN_UPDATE_DRIVER(namcos23_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos23_state, sub_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos23_state, sub_irq))
MCFG_PALETTE_ADD("palette", 0x8000)
@@ -3774,31 +3774,31 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos23_state::timecrs2v4a)
ss23(config);
/* basic machine hardware */
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( timecrs2iobrdmap )
- MCFG_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( timecrs2iobrdmap )
+ MCFG_DEVICE_IO_MAP( s23iobrdiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":subcpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("subcpu:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos23_state::ss23e2)
ss23(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(BUSCLOCK*6)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(BUSCLOCK*6)
- MCFG_CPU_ADD("iocpu", H83334, JVSCLOCK )
- MCFG_CPU_PROGRAM_MAP( s23iobrdmap )
- MCFG_CPU_IO_MAP( s23iobrdiomap )
+ MCFG_DEVICE_ADD("iocpu", H83334, JVSCLOCK )
+ MCFG_DEVICE_PROGRAM_MAP( s23iobrdmap )
+ MCFG_DEVICE_IO_MAP( s23iobrdiomap )
MCFG_DEVICE_MODIFY("iocpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":subcpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("subcpu:sci0", h8_sci_device, rx_w))
MCFG_DEVICE_MODIFY("subcpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":iocpu:sci0", h8_sci_device, rx_w))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("iocpu:sci0", h8_sci_device, rx_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index a0a153bc4b4..e7097351157 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -1063,18 +1063,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(namcos86_state::hopmappy)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu1", MC6809E, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("cpu1", MC6809E, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_assert)
- MCFG_CPU_ADD("cpu2", MC6809E, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(hopmappy_cpu2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("cpu2", MC6809E, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(hopmappy_cpu2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_assert)
- MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* or compatible 6808 with extra instructions */
- MCFG_CPU_PROGRAM_MAP(hopmappy_mcu_map)
- MCFG_CPU_IO_MAP(mcu_port_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_hold) /* ??? */
+ MCFG_DEVICE_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* or compatible 6808 with extra instructions */
+ MCFG_DEVICE_PROGRAM_MAP(hopmappy_mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_port_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", namcos86_state, irq0_line_hold) /* ??? */
MCFG_QUANTUM_TIME(attotime::from_hz(48000)) /* heavy interleaving needed to avoid hangs in rthunder */
@@ -1084,7 +1084,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 3+8*8, 3+44*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(namcos86_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos86_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos86_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", namcos86)
@@ -1098,7 +1098,7 @@ MACHINE_CONFIG_START(namcos86_state::hopmappy)
MCFG_SOUND_ROUTE(0, "mono", 0.0)
MCFG_SOUND_ROUTE(1, "mono", 0.60) /* only right channel is connected */
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1108,11 +1108,11 @@ MACHINE_CONFIG_START(namcos86_state::roishtar)
hopmappy(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PROGRAM_MAP(roishtar_cpu2_map)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PROGRAM_MAP(roishtar_cpu2_map)
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_PROGRAM_MAP(roishtar_mcu_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_PROGRAM_MAP(roishtar_mcu_map)
MACHINE_CONFIG_END
@@ -1120,11 +1120,11 @@ MACHINE_CONFIG_START(namcos86_state::genpeitd)
hopmappy(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PROGRAM_MAP(genpeitd_cpu2_map)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PROGRAM_MAP(genpeitd_cpu2_map)
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_PROGRAM_MAP(genpeitd_mcu_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_PROGRAM_MAP(genpeitd_mcu_map)
/* sound hardware */
MCFG_NAMCO_63701X_ADD("namco2", 6000000)
@@ -1136,11 +1136,11 @@ MACHINE_CONFIG_START(namcos86_state::rthunder)
hopmappy(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PROGRAM_MAP(rthunder_cpu2_map)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PROGRAM_MAP(rthunder_cpu2_map)
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_PROGRAM_MAP(rthunder_mcu_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_PROGRAM_MAP(rthunder_mcu_map)
/* sound hardware */
MCFG_NAMCO_63701X_ADD("namco2", 6000000)
@@ -1152,11 +1152,11 @@ MACHINE_CONFIG_START(namcos86_state::wndrmomo)
hopmappy(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PROGRAM_MAP(wndrmomo_cpu2_map)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PROGRAM_MAP(wndrmomo_cpu2_map)
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_PROGRAM_MAP(wndrmomo_mcu_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_PROGRAM_MAP(wndrmomo_mcu_map)
/* sound hardware */
MCFG_NAMCO_63701X_ADD("namco2", 6000000)
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index 12da909f4c6..7442500e25c 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -462,9 +462,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(nanos_state::nanos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(nanos_mem)
- MCFG_CPU_IO_MAP(nanos_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(nanos_mem)
+ MCFG_DEVICE_IO_MAP(nanos_io)
MCFG_Z80_DAISY_CHAIN(nanos_daisy_chain)
/* video hardware */
@@ -482,15 +482,15 @@ MACHINE_CONFIG_START(nanos_state::nanos)
/* devices */
MCFG_DEVICE_ADD("z80ctc_0", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(nanos_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(nanos_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(nanos_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, nanos_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, nanos_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, nanos_state, ctc_z2_w))
MCFG_DEVICE_ADD("z80ctc_1", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(nanos_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(nanos_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(nanos_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, nanos_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, nanos_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, nanos_state, ctc_z2_w))
MCFG_DEVICE_ADD("z80pio_0", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -499,15 +499,15 @@ MACHINE_CONFIG_START(nanos_state::nanos)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("z80sio_0", Z80SIO, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_INT_CB(WRITELINE(nanos_state, z80daisy_interrupt))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, nanos_state, z80daisy_interrupt))
MCFG_DEVICE_ADD("z80sio_1", Z80SIO, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_INT_CB(WRITELINE(nanos_state, z80daisy_interrupt))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, nanos_state, z80daisy_interrupt))
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_IN_PA_CB(READ8(nanos_state, nanos_port_a_r))
- MCFG_Z80PIO_IN_PB_CB(READ8(nanos_state, nanos_port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(nanos_state, nanos_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, nanos_state, nanos_port_a_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, nanos_state, nanos_port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, nanos_state, nanos_port_b_w))
/* UPD765 */
MCFG_UPD765A_ADD("upd765", false, true)
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index af9ac6829b1..c2f3e331e85 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -2675,7 +2675,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi)
// TODO: merge with Dreamcast base machine
MACHINE_CONFIG_START(dc_state::naomi_aw_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) // SH4!!!
+ MCFG_DEVICE_ADD("maincpu", SH4LE, CPU_CLOCK) // SH4!!!
MCFG_SH4_MD0(1)
MCFG_SH4_MD1(0)
MCFG_SH4_MD2(1)
@@ -2689,8 +2689,8 @@ MACHINE_CONFIG_START(dc_state::naomi_aw_base)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dc_state, dc_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
- MCFG_CPU_PROGRAM_MAP(dc_audio_map)
+ MCFG_DEVICE_ADD("soundcpu", ARM7, ((XTAL(33'868'800)*2)/3)/8) // AICA bus clock is 2/3rds * 33.8688. ARM7 gets 1 bus cycle out of each 8.
+ MCFG_DEVICE_PROGRAM_MAP(dc_audio_map)
MCFG_MAPLE_DC_ADD( "maple_dc", "maincpu", dc_maple_irq )
@@ -2699,13 +2699,13 @@ MACHINE_CONFIG_START(dc_state::naomi_aw_base)
MCFG_SCREEN_RAW_PARAMS(13458568*2, 820, 0, 640, 532, 0, 480) /* TODO: where pclk actually comes? */
MCFG_SCREEN_UPDATE_DEVICE("powervr2", powervr2_device, screen_update)
MCFG_PALETTE_ADD("palette", 0x1000)
- MCFG_POWERVR2_ADD("powervr2", WRITE8(dc_state, pvr_irq))
+ MCFG_POWERVR2_ADD("powervr2", WRITE8(*this, dc_state, pvr_irq))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aica", AICA, 0)
+ MCFG_DEVICE_ADD("aica", AICA, 0)
MCFG_AICA_MASTER
- MCFG_AICA_IRQ_CB(WRITELINE(dc_state, aica_irq))
- MCFG_AICA_MAIN_IRQ_CB(WRITELINE(dc_state, sh4_aica_irq))
+ MCFG_AICA_IRQ_CB(WRITELINE(*this, dc_state, aica_irq))
+ MCFG_AICA_MAIN_IRQ_CB(WRITELINE(*this, dc_state, sh4_aica_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 2.0)
@@ -2716,9 +2716,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomi_base)
naomi_aw_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(naomi_map)
- MCFG_CPU_IO_MAP(naomi_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(naomi_map)
+ MCFG_DEVICE_IO_MAP(naomi_port)
MCFG_EEPROM_SERIAL_93C46_ADD("main_eeprom")
MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0)
@@ -2745,7 +2745,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomi)
naomi_base(config);
- MCFG_NAOMI_ROM_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(dc_state, g1_irq))
+ MCFG_NAOMI_ROM_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(*this, dc_state, g1_irq))
MACHINE_CONFIG_END
/*
@@ -2754,7 +2754,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomigd)
naomi_base(config);
- MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", ":gdrom", ":pic", "naomibd_eeprom", WRITE8(dc_state, g1_irq))
+ MCFG_NAOMI_GDROM_BOARD_ADD("rom_board", ":gdrom", ":pic", "naomibd_eeprom", WRITE8(*this, dc_state, g1_irq))
MACHINE_CONFIG_END
/*
@@ -2763,7 +2763,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomim1)
naomi_base(config);
- MCFG_NAOMI_M1_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(dc_state, g1_irq))
+ MCFG_NAOMI_M1_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(*this, dc_state, g1_irq))
MACHINE_CONFIG_END
/*
@@ -2772,7 +2772,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomim2)
naomi_base(config);
- MCFG_NAOMI_M2_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(dc_state, g1_irq))
+ MCFG_NAOMI_M2_BOARD_ADD("rom_board", "naomibd_eeprom", WRITE8(*this, dc_state, g1_irq))
MACHINE_CONFIG_END
/*
@@ -2781,7 +2781,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naomi_state::naomim4)
naomi_base(config);
- MCFG_NAOMI_M4_BOARD_ADD("rom_board", "pic_readout", "naomibd_eeprom", WRITE8(dc_state, g1_irq))
+ MCFG_NAOMI_M4_BOARD_ADD("rom_board", "pic_readout", "naomibd_eeprom", WRITE8(*this, dc_state, g1_irq))
MACHINE_CONFIG_END
/*
@@ -2790,9 +2790,9 @@ MACHINE_CONFIG_END
/*
MACHINE_CONFIG_START((naomi2_state::naomi2)
naomi(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(naomi2_map)
- MCFG_CPU_IO_MAP(naomi_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(naomi2_map)
+ MCFG_DEVICE_IO_MAP(naomi_port)
MACHINE_CONFIG_END
*/
/*
@@ -2800,7 +2800,7 @@ MACHINE_CONFIG_END
*/
MACHINE_CONFIG_START(naomi2_state::naomi2_base)
- MCFG_POWERVR2_ADD("powervr2_slave", WRITE8(dc_state, pvr_irq))
+ MCFG_POWERVR2_ADD("powervr2_slave", WRITE8(*this, dc_state, pvr_irq))
// TODO: ELAN device
MACHINE_CONFIG_END
@@ -2809,8 +2809,8 @@ MACHINE_CONFIG_START(naomi2_state::naomi2gd)
naomigd(config);
naomi2_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(naomi2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(naomi2_map)
MACHINE_CONFIG_END
/*
@@ -2821,8 +2821,8 @@ MACHINE_CONFIG_START(naomi2_state::naomi2m1)
naomim1(config);
naomi2_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(naomi2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(naomi2_map)
MACHINE_CONFIG_END
/*
@@ -2833,8 +2833,8 @@ MACHINE_CONFIG_START(naomi2_state::naomi2m2)
naomim2(config);
naomi2_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(naomi2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(naomi2_map)
MACHINE_CONFIG_END
/*
@@ -2844,11 +2844,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(atomiswave_state::aw_base)
naomi_aw_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(aw_map)
- MCFG_CPU_IO_MAP(aw_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(aw_map)
+ MCFG_DEVICE_IO_MAP(aw_port)
MCFG_MACRONIX_29L001MC_ADD("awflash")
- MCFG_AW_ROM_BOARD_ADD("rom_board", "rom_key", WRITE8(dc_state, g1_irq))
+ MCFG_AW_ROM_BOARD_ADD("rom_board", "rom_key", WRITE8(*this, dc_state, g1_irq))
MCFG_MACHINE_RESET_OVERRIDE(dc_state,dc_console)
MCFG_NVRAM_ADD_0FILL("sram")
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index a183c9714dc..078d019d634 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -675,8 +675,8 @@ MACHINE_CONFIG_START(nascom_state::nascom)
MCFG_DEVICE_ADD( "hd6402", AY31015, 0 )
MCFG_AY31015_TX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
MCFG_AY31015_RX_CLOCK(( XTAL(16'000'000) / 16 ) / 256)
- MCFG_AY31015_READ_SI_CB(READLINE(nascom_state, nascom1_hd6402_si))
- MCFG_AY31015_WRITE_SO_CB(WRITELINE(nascom_state, nascom1_hd6402_so))
+ MCFG_AY31015_READ_SI_CB(READLINE(*this, nascom_state, nascom1_hd6402_si))
+ MCFG_AY31015_WRITE_SO_CB(WRITELINE(*this, nascom_state, nascom1_hd6402_so))
// cassette is connected to the uart
MCFG_CASSETTE_ADD("cassette")
@@ -695,16 +695,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nascom1_state::nascom1)
nascom(config);
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(nascom1_mem)
- MCFG_CPU_IO_MAP(nascom1_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(nascom1_mem)
+ MCFG_DEVICE_IO_MAP(nascom1_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nascom2_state::nascom2)
nascom(config);
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(nascom2_mem)
- MCFG_CPU_IO_MAP(nascom2_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(nascom2_mem)
+ MCFG_DEVICE_IO_MAP(nascom2_io)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -724,7 +724,7 @@ MACHINE_CONFIG_START(nascom2_state::nascom2)
// nasbus expansion bus
MCFG_NASBUS_ADD(NASBUS_TAG)
- MCFG_NASBUS_RAM_DISABLE_HANDLER(WRITELINE(nascom2_state, ram_disable_w))
+ MCFG_NASBUS_RAM_DISABLE_HANDLER(WRITELINE(*this, nascom2_state, ram_disable_w))
MCFG_NASBUS_SLOT_ADD("nasbus1", nasbus_slot_cards, nullptr)
MCFG_NASBUS_SLOT_ADD("nasbus2", nasbus_slot_cards, nullptr)
MCFG_NASBUS_SLOT_ADD("nasbus3", nasbus_slot_cards, nullptr)
@@ -737,15 +737,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nascom2_state::nascom2c)
nascom2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nascom2c_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nascom2c_mem)
MCFG_DEVICE_REMOVE(RAM_TAG)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("60K")
MCFG_DEVICE_MODIFY(NASBUS_TAG)
- MCFG_NASBUS_RAM_DISABLE_HANDLER(WRITELINE(nascom2_state, ram_disable_cpm_w))
+ MCFG_NASBUS_RAM_DISABLE_HANDLER(WRITELINE(*this, nascom2_state, ram_disable_cpm_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp
index ddb5f65ceeb..d1db25ce37c 100644
--- a/src/mame/drivers/naughtyb.cpp
+++ b/src/mame/drivers/naughtyb.cpp
@@ -411,8 +411,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(naughtyb_state::naughtyb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
- MCFG_CPU_PROGRAM_MAP(naughtyb_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
+ MCFG_DEVICE_PROGRAM_MAP(naughtyb_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -439,7 +439,7 @@ MACHINE_CONFIG_START(naughtyb_state::naughtyb)
// harmonics (5 1/3' and 2 2/3')
MCFG_SOUND_ROUTE(0, "mono", 0.60)
- MCFG_SOUND_ADD("naughtyb_custom", NAUGHTYB, 0)
+ MCFG_DEVICE_ADD("naughtyb_custom", NAUGHTYB_SOUND)
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MACHINE_CONFIG_END
@@ -448,8 +448,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(naughtyb_state::popflame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
- MCFG_CPU_PROGRAM_MAP(popflame_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
+ MCFG_DEVICE_PROGRAM_MAP(popflame_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -476,7 +476,7 @@ MACHINE_CONFIG_START(naughtyb_state::popflame)
// harmonics (5 1/3' and 2 2/3')
MCFG_SOUND_ROUTE(0, "mono", 0.60)
- MCFG_SOUND_ADD("popflame_custom", POPFLAME, 0)
+ MCFG_DEVICE_ADD("popflame_custom", POPFLAME_SOUND)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp
index cc93325b5b1..d252a52c2be 100644
--- a/src/mame/drivers/nbmj8688.cpp
+++ b/src/mame/drivers/nbmj8688.cpp
@@ -2459,8 +2459,8 @@ READ8_MEMBER(nbmj8688_state::dipsw2_r)
MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_4096)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8688_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8688_state, irq0_line_hold)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2482,12 +2482,12 @@ MACHINE_CONFIG_START(nbmj8688_state::NBMJDRV_4096)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("psg", AY8910, 1250000)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nbmj8688_state, dipsw1_r)) // DIPSW-A read
- MCFG_AY8910_PORT_B_READ_CB(READ8(nbmj8688_state, dipsw2_r)) // DIPSW-B read
+ MCFG_DEVICE_ADD("psg", AY8910, 1250000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nbmj8688_state, dipsw1_r)) // DIPSW-A read
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, nbmj8688_state, dipsw2_r)) // DIPSW-B read
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2525,9 +2525,9 @@ MACHINE_CONFIG_START(nbmj8688_state::crystalg)
NBMJDRV_256(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(crystalg_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(crystalg_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_CRYSTALG )
@@ -2551,9 +2551,9 @@ MACHINE_CONFIG_START(nbmj8688_state::apparel)
NBMJDRV_256(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(secolove_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(secolove_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_APPAREL )
@@ -2563,9 +2563,9 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_h12bit)
NBMJDRV_4096(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(secolove_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(secolove_io_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_hybrid_12bit)
@@ -2597,13 +2597,13 @@ MACHINE_CONFIG_START(nbmj8688_state::barline)
mbmj_h12bit(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(barline_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(barline_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_BARLINE )
- MCFG_SOUND_REPLACE("psg", YM3812, 20000000/8)
+ MCFG_DEVICE_REPLACE("psg", YM3812, 20000000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
MCFG_DEVICE_REMOVE("dac")
@@ -2614,9 +2614,9 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit)
NBMJDRV_65536(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(secolove_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(secolove_io_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_pure_16bit)
@@ -2625,11 +2625,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit_LCD)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8688_state, irq0_line_hold)
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(secolove_io_map)
- MCFG_CPU_IO_MAP(p16bit_LCD_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8688_state, irq0_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(secolove_io_map)
+ MCFG_DEVICE_IO_MAP(p16bit_LCD_io_map)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2675,12 +2675,12 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit_LCD)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("psg", AY8910, 1250000)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nbmj8688_state, dipsw1_r)) // DIPSW-A read
- MCFG_AY8910_PORT_B_READ_CB(READ8(nbmj8688_state, dipsw2_r)) // DIPSW-B read
+ MCFG_DEVICE_ADD("psg", AY8910, 1250000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nbmj8688_state, dipsw1_r)) // DIPSW-A read
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, nbmj8688_state, dipsw2_r)) // DIPSW-B read
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2745,9 +2745,9 @@ MACHINE_CONFIG_START(nbmj8688_state::seiha)
NBMJDRV_65536(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(seiha_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(seiha_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_SEIHA )
@@ -2765,9 +2765,9 @@ MACHINE_CONFIG_START(nbmj8688_state::mjgaiden)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ojousan_map)
- MCFG_CPU_IO_MAP(mjgaiden_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ojousan_map)
+ MCFG_DEVICE_IO_MAP(mjgaiden_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OJOUSAN )
@@ -2777,9 +2777,9 @@ MACHINE_CONFIG_START(nbmj8688_state::iemoto)
NBMJDRV_65536(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(iemoto_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(iemoto_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_IEMOTO )
@@ -2789,9 +2789,9 @@ MACHINE_CONFIG_START(nbmj8688_state::ojousan)
NBMJDRV_65536(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ojousan_map)
- MCFG_CPU_IO_MAP(iemoto_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ojousan_map)
+ MCFG_DEVICE_IO_MAP(iemoto_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OJOUSAN )
@@ -2807,9 +2807,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8688_state::swinggal)
ojousan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(iemoto_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(iemoto_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8688_state::iemotom)
@@ -2844,9 +2844,9 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_p12bit)
NBMJDRV_4096(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjsikaku_map)
- MCFG_CPU_IO_MAP(kaguya_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjsikaku_map)
+ MCFG_DEVICE_IO_MAP(kaguya_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8688_state::kaguya)
@@ -2888,15 +2888,15 @@ MACHINE_CONFIG_START(nbmj8688_state::mjsikaku)
NBMJDRV_4096(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjsikaku_map)
- MCFG_CPU_IO_MAP(mjsikaku_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjsikaku_map)
+ MCFG_DEVICE_IO_MAP(mjsikaku_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJSIKAKU )
/* sound hardware */
- MCFG_SOUND_REPLACE("psg", YM3812, 20000000/8)
+ MCFG_DEVICE_REPLACE("psg", YM3812, 20000000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
MACHINE_CONFIG_END
@@ -2904,9 +2904,9 @@ MACHINE_CONFIG_START(nbmj8688_state::mmsikaku)
NBMJDRV_4096(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(secolove_map)
- MCFG_CPU_IO_MAP(mmsikaku_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(secolove_map)
+ MCFG_DEVICE_IO_MAP(mmsikaku_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MMSIKAKU )
@@ -2916,8 +2916,8 @@ MACHINE_CONFIG_START(nbmj8688_state::otonano)
mjsikaku(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(otonano_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(otonano_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OTONANO )
diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp
index 6403adcc65c..fcb928d16a1 100644
--- a/src/mame/drivers/nbmj8891.cpp
+++ b/src/mame/drivers/nbmj8891.cpp
@@ -2203,10 +2203,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nbmj8891_state::gionbana)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(gionbana_map)
- MCFG_CPU_IO_MAP(gionbana_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8891_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(gionbana_map)
+ MCFG_DEVICE_IO_MAP(gionbana_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8891_state, irq0_line_hold)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_GIONBANA )
@@ -2226,10 +2226,10 @@ MACHINE_CONFIG_START(nbmj8891_state::gionbana)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("fmsnd", YM3812, 2500000)
+ MCFG_DEVICE_ADD("fmsnd", YM3812, 2500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.37) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2238,9 +2238,9 @@ MACHINE_CONFIG_START(nbmj8891_state::mgion)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mgion_map)
- MCFG_CPU_IO_MAP(mgion_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mgion_map)
+ MCFG_DEVICE_IO_MAP(mgion_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MGION )
@@ -2252,9 +2252,9 @@ MACHINE_CONFIG_START(nbmj8891_state::omotesnd)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(omotesnd_map)
- MCFG_CPU_IO_MAP(omotesnd_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(omotesnd_map)
+ MCFG_DEVICE_IO_MAP(omotesnd_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OMOTESND )
@@ -2262,7 +2262,7 @@ MACHINE_CONFIG_START(nbmj8891_state::omotesnd)
MCFG_NVRAM_ADD_0FILL("nvram")
/* sound hardware */
- MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_DEVICE_REPLACE("fmsnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
@@ -2280,8 +2280,8 @@ MACHINE_CONFIG_START(nbmj8891_state::mjcamerb)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(hanamomo_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(hanamomo_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJCAMERB )
@@ -2298,8 +2298,8 @@ MACHINE_CONFIG_START(nbmj8891_state::mmcamera)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(hanamomo_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(hanamomo_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MMCAMERA )
@@ -2316,9 +2316,9 @@ MACHINE_CONFIG_START(nbmj8891_state::hanamomo)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hanamomo_map)
- MCFG_CPU_IO_MAP(hanamomo_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hanamomo_map)
+ MCFG_DEVICE_IO_MAP(hanamomo_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HANAMOMO )
@@ -2333,9 +2333,9 @@ MACHINE_CONFIG_START(nbmj8891_state::msjiken)
hanamomo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gionbana_map)
- MCFG_CPU_IO_MAP(msjiken_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gionbana_map)
+ MCFG_DEVICE_IO_MAP(msjiken_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MSJIKEN )
@@ -2392,8 +2392,8 @@ MACHINE_CONFIG_START(nbmj8891_state::mjnanpas)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(club90s_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(club90s_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJNANPAS )
@@ -2403,9 +2403,9 @@ MACHINE_CONFIG_START(nbmj8891_state::maiko)
mjnanpas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(maiko_map)
- MCFG_CPU_IO_MAP(maiko_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(maiko_map)
+ MCFG_DEVICE_IO_MAP(maiko_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MAIKO )
@@ -2415,8 +2415,8 @@ MACHINE_CONFIG_START(nbmj8891_state::mmaiko)
maiko(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mmaiko_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mmaiko_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MMAIKO )
@@ -2428,9 +2428,9 @@ MACHINE_CONFIG_START(nbmj8891_state::lovehous)
mjnanpas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(lovehous_map)
- MCFG_CPU_IO_MAP(lovehous_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(lovehous_map)
+ MCFG_DEVICE_IO_MAP(lovehous_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_LOVEHOUS )
@@ -2442,8 +2442,8 @@ MACHINE_CONFIG_START(nbmj8891_state::hanaoji)
maiko(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hanaoji_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hanaoji_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HANAOJI )
@@ -2455,27 +2455,27 @@ MACHINE_CONFIG_START(nbmj8891_state::hnxmasev)
maiko(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hnxmasev_map)
- MCFG_CPU_IO_MAP(maiko_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hnxmasev_map)
+ MCFG_DEVICE_IO_MAP(maiko_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8891_state::hnageman)
maiko(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hnageman_map)
- MCFG_CPU_IO_MAP(maiko_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hnageman_map)
+ MCFG_DEVICE_IO_MAP(maiko_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8891_state::scandal)
hanamomo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scandalm_map)
- MCFG_CPU_IO_MAP(scandal_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scandalm_map)
+ MCFG_DEVICE_IO_MAP(scandal_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_SCANDAL )
@@ -2485,9 +2485,9 @@ MACHINE_CONFIG_START(nbmj8891_state::bananadr)
mjnanpas(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scandalm_map)
- MCFG_CPU_IO_MAP(bananadr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scandalm_map)
+ MCFG_DEVICE_IO_MAP(bananadr_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_BANANADR )
@@ -2521,9 +2521,9 @@ MACHINE_CONFIG_START(nbmj8891_state::mjfocusm)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scandalm_map)
- MCFG_CPU_IO_MAP(scandalm_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scandalm_map)
+ MCFG_DEVICE_IO_MAP(scandalm_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJFOCUSM )
@@ -2536,7 +2536,7 @@ MACHINE_CONFIG_START(nbmj8891_state::mjfocusm)
MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer)
/* sound hardware */
- MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_DEVICE_REPLACE("fmsnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
@@ -2553,10 +2553,10 @@ MACHINE_CONFIG_START(nbmj8891_state::taiwanmb)
gionbana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(taiwanmb_map)
- MCFG_CPU_IO_MAP(taiwanmb_io_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8891_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(taiwanmb_map)
+ MCFG_DEVICE_IO_MAP(taiwanmb_io_map)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8891_state, irq0_line_hold)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TAIWANMB )
@@ -2569,7 +2569,7 @@ MACHINE_CONFIG_START(nbmj8891_state::taiwanmb)
MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer)
/* sound hardware */
- MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_DEVICE_REPLACE("fmsnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp
index 0cbc3720f9d..3f55a7f8bb9 100644
--- a/src/mame/drivers/nbmj8900.cpp
+++ b/src/mame/drivers/nbmj8900.cpp
@@ -307,10 +307,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nbmj8900_state::ohpaipee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(ohpaipee_map)
- MCFG_CPU_IO_MAP(ohpaipee_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8900_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(ohpaipee_map)
+ MCFG_DEVICE_IO_MAP(ohpaipee_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8900_state, irq0_line_hold)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_OHPAIPEE )
@@ -330,10 +330,10 @@ MACHINE_CONFIG_START(nbmj8900_state::ohpaipee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, 2500000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 2500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.42) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.42) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -342,8 +342,8 @@ MACHINE_CONFIG_START(nbmj8900_state::togenkyo)
ohpaipee(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(togenkyo_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(togenkyo_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TOGENKYO )
diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp
index 1e1fd321370..64c02e436de 100644
--- a/src/mame/drivers/nbmj8991.cpp
+++ b/src/mame/drivers/nbmj8991.cpp
@@ -1332,10 +1332,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv1) // galkoku
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(galkoku_map)
- MCFG_CPU_IO_MAP(galkoku_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8991_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(galkoku_map)
+ MCFG_DEVICE_IO_MAP(galkoku_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8991_state, irq0_line_hold)
MCFG_NB1413M3_ADD("nb1413m3")
@@ -1352,10 +1352,10 @@ MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv1) // galkoku
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("fmsnd", YM3812, 25000000/10)
+ MCFG_DEVICE_ADD("fmsnd", YM3812, 25000000/10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1364,17 +1364,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv2) // pstadium
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */
- MCFG_CPU_PROGRAM_MAP(pstadium_map)
- MCFG_CPU_IO_MAP(pstadium_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nbmj8991_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pstadium_map)
+ MCFG_DEVICE_IO_MAP(pstadium_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nbmj8991_state, irq0_line_hold)
MCFG_NB1413M3_ADD("nb1413m3")
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.00 MHz */
- MCFG_CPU_PROGRAM_MAP(nbmj8991_sound_map)
- MCFG_CPU_IO_MAP(nbmj8991_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nbmj8991_state, irq0_line_hold, 128*60) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(nbmj8991_sound_map)
+ MCFG_DEVICE_IO_MAP(nbmj8991_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nbmj8991_state, irq0_line_hold, 128*60) // ?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1392,11 +1392,11 @@ MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv2) // pstadium
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("fmsnd", YM3812, 25000000/6.25)
+ MCFG_DEVICE_ADD("fmsnd", YM3812, 25000000/6.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -1409,7 +1409,7 @@ MACHINE_CONFIG_START(nbmj8991_state::nbmjdrv3)
/* basic machine hardware */
/* sound hardware */
- MCFG_SOUND_REPLACE("fmsnd", AY8910, 1250000)
+ MCFG_DEVICE_REPLACE("fmsnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
@@ -1431,8 +1431,8 @@ MACHINE_CONFIG_START(nbmj8991_state::galkaika)
nbmjdrv1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(galkaika_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(galkaika_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_GALKAIKA )
@@ -1443,8 +1443,8 @@ MACHINE_CONFIG_START(nbmj8991_state::tokyogal)
nbmjdrv1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tokyogal_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tokyogal_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TOKYOGAL )
@@ -1455,8 +1455,8 @@ MACHINE_CONFIG_START(nbmj8991_state::tokimbsj)
nbmjdrv1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(galkaika_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(galkaika_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TOKIMBSJ )
@@ -1487,8 +1487,8 @@ MACHINE_CONFIG_START(nbmj8991_state::hyouban)
nbmjdrv3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(hyouban_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(hyouban_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_HYOUBAN )
@@ -1510,8 +1510,8 @@ MACHINE_CONFIG_START(nbmj8991_state::triplew1)
nbmjdrv2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(triplew1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(triplew1_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TRIPLEW1 )
@@ -1522,8 +1522,8 @@ MACHINE_CONFIG_START(nbmj8991_state::triplew2)
nbmjdrv2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(triplew2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(triplew2_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_TRIPLEW2 )
@@ -1543,8 +1543,8 @@ MACHINE_CONFIG_START(nbmj8991_state::mjlstory)
nbmjdrv2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjlstory_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjlstory_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJLSTORY )
@@ -1584,8 +1584,8 @@ MACHINE_CONFIG_START(nbmj8991_state::mjgottub)
nbmjdrv2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(triplew1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(triplew1_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_MJGOTTUB )
@@ -1598,9 +1598,9 @@ MACHINE_CONFIG_START(nbmj8991_state::av2mj1bb)
nbmjdrv2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(av2mj1bb_map)
- MCFG_CPU_IO_MAP(av2mj1bb_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(av2mj1bb_map)
+ MCFG_DEVICE_IO_MAP(av2mj1bb_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_AV2MJ1BB )
@@ -1611,9 +1611,9 @@ MACHINE_CONFIG_START(nbmj8991_state::av2mj2rg)
nbmjdrv2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(av2mj2rg_map)
- MCFG_CPU_IO_MAP(av2mj1bb_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(av2mj2rg_map)
+ MCFG_DEVICE_IO_MAP(av2mj1bb_io_map)
MCFG_DEVICE_MODIFY("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_AV2MJ2RG )
diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp
index 46dff69d586..1045f59ad40 100644
--- a/src/mame/drivers/nbmj9195.cpp
+++ b/src/mame/drivers/nbmj9195.cpp
@@ -2516,38 +2516,38 @@ static const z80_daisy_config daisy_chain_sound[] =
#define MSCOUTM_TMZ84C011_MAIN_PORTS \
MCFG_TMPZ84C011_PORTA_READ_CB(IOPORT("SYSTEM")) \
- MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(nbmj9195_state, mscoutm_inputportsel_w)) \
- MCFG_TMPZ84C011_PORTB_READ_CB(READ8(nbmj9195_state, mscoutm_cpu_portb_r)) \
- MCFG_TMPZ84C011_PORTC_READ_CB(READ8(nbmj9195_state, mscoutm_cpu_portc_r)) \
- MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(nbmj9195_state, clutsel_w)) \
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, gfxflag2_w))
+ MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(*this, nbmj9195_state, mscoutm_inputportsel_w)) \
+ MCFG_TMPZ84C011_PORTB_READ_CB(READ8(*this, nbmj9195_state, mscoutm_cpu_portb_r)) \
+ MCFG_TMPZ84C011_PORTC_READ_CB(READ8(*this, nbmj9195_state, mscoutm_cpu_portc_r)) \
+ MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(*this, nbmj9195_state, clutsel_w)) \
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nbmj9195_state, gfxflag2_w))
#define OTHERS_TMZ84C011_MAIN_PORTS \
- MCFG_TMPZ84C011_PORTA_READ_CB(READ8(nbmj9195_state, others_cpu_porta_r)) \
- MCFG_TMPZ84C011_PORTB_READ_CB(READ8(nbmj9195_state, others_cpu_portb_r)) \
- MCFG_TMPZ84C011_PORTC_READ_CB(READ8(nbmj9195_state, others_cpu_portc_r)) \
- MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(nbmj9195_state, dipswbitsel_w)) \
- MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(nbmj9195_state, clutsel_w)) \
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, outcoin_flag_w))
+ MCFG_TMPZ84C011_PORTA_READ_CB(READ8(*this, nbmj9195_state, others_cpu_porta_r)) \
+ MCFG_TMPZ84C011_PORTB_READ_CB(READ8(*this, nbmj9195_state, others_cpu_portb_r)) \
+ MCFG_TMPZ84C011_PORTC_READ_CB(READ8(*this, nbmj9195_state, others_cpu_portc_r)) \
+ MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(*this, nbmj9195_state, dipswbitsel_w)) \
+ MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(*this, nbmj9195_state, clutsel_w)) \
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nbmj9195_state, outcoin_flag_w))
MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV1_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMPZ84C011, 12000000/2) /* TMPZ84C011, 6.00 MHz */
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C011, 12000000/2) /* TMPZ84C011, 6.00 MHz */
MCFG_Z80_DAISY_CHAIN(daisy_chain_main)
- MCFG_CPU_PROGRAM_MAP(sailorws_map)
- MCFG_CPU_IO_MAP(sailorws_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(sailorws_map)
+ MCFG_DEVICE_IO_MAP(sailorws_io_map)
- MCFG_CPU_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */
+ MCFG_DEVICE_ADD("audiocpu", TMPZ84C011, 8000000) /* TMPZ84C011, 8.00 MHz */
MCFG_Z80_DAISY_CHAIN(daisy_chain_sound)
- MCFG_CPU_PROGRAM_MAP(sailorws_sound_map)
- MCFG_CPU_IO_MAP(sailorws_sound_io_map)
- MCFG_TMPZ84C011_ZC0_CB(DEVWRITELINE("audiocpu", tmpz84c011_device, trg3))
- MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(nbmj9195_state, soundbank_w)) \
- MCFG_TMPZ84C011_PORTB_WRITE_CB(DEVWRITE8("dac1", dac_byte_interface, write)) \
- MCFG_TMPZ84C011_PORTC_WRITE_CB(DEVWRITE8("dac2", dac_byte_interface, write)) \
- MCFG_TMPZ84C011_PORTD_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read)) \
- MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, soundcpu_porte_w))
+ MCFG_DEVICE_PROGRAM_MAP(sailorws_sound_map)
+ MCFG_DEVICE_IO_MAP(sailorws_sound_io_map)
+ MCFG_TMPZ84C011_ZC0_CB(WRITELINE("audiocpu", tmpz84c011_device, trg3))
+ MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(*this, nbmj9195_state, soundbank_w)) \
+ MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8("dac1", dac_byte_interface, write)) \
+ MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8("dac2", dac_byte_interface, write)) \
+ MCFG_TMPZ84C011_PORTD_READ_CB(READ8("soundlatch", generic_latch_8_device, read)) \
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nbmj9195_state, soundcpu_porte_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2557,7 +2557,7 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV1_base)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(nbmj9195_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c011_device, trg1)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c011_device, trg1)) MCFG_DEVCB_INVERT
MCFG_PALETTE_ADD("palette", 256)
@@ -2566,11 +2566,11 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV1_base)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.7)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -2580,7 +2580,7 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV1)
NBMJDRV1_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
OTHERS_TMZ84C011_MAIN_PORTS
MACHINE_CONFIG_END
@@ -2589,7 +2589,7 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV2)
NBMJDRV1_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
OTHERS_TMZ84C011_MAIN_PORTS
/* video hardware */
@@ -2601,7 +2601,7 @@ MACHINE_CONFIG_START(nbmj9195_state::NBMJDRV3)
NBMJDRV1_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MSCOUTM_TMZ84C011_MAIN_PORTS
/* video hardware */
@@ -2618,9 +2618,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mjuraden)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjuraden_map)
- MCFG_CPU_IO_MAP(mjuraden_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjuraden_map)
+ MCFG_DEVICE_IO_MAP(mjuraden_io_map)
MACHINE_CONFIG_END
@@ -2628,9 +2628,9 @@ MACHINE_CONFIG_START(nbmj9195_state::koinomp)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(koinomp_map)
- MCFG_CPU_IO_MAP(koinomp_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(koinomp_map)
+ MCFG_DEVICE_IO_MAP(koinomp_io_map)
MACHINE_CONFIG_END
@@ -2638,8 +2638,8 @@ MACHINE_CONFIG_START(nbmj9195_state::patimono)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(patimono_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(patimono_io_map)
MACHINE_CONFIG_END
@@ -2647,8 +2647,8 @@ MACHINE_CONFIG_START(nbmj9195_state::janbari)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(patimono_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(patimono_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2658,9 +2658,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mmehyou)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(koinomp_map)
- MCFG_CPU_IO_MAP(mmehyou_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(koinomp_map)
+ MCFG_DEVICE_IO_MAP(mmehyou_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2670,9 +2670,9 @@ MACHINE_CONFIG_START(nbmj9195_state::ultramhm)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(koinomp_map)
- MCFG_CPU_IO_MAP(koinomp_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(koinomp_map)
+ MCFG_DEVICE_IO_MAP(koinomp_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2682,8 +2682,8 @@ MACHINE_CONFIG_START(nbmj9195_state::gal10ren)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(gal10ren_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(gal10ren_io_map)
MACHINE_CONFIG_END
@@ -2691,8 +2691,8 @@ MACHINE_CONFIG_START(nbmj9195_state::renaiclb)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(renaiclb_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(renaiclb_io_map)
MACHINE_CONFIG_END
@@ -2700,8 +2700,8 @@ MACHINE_CONFIG_START(nbmj9195_state::mjlaman)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjlaman_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjlaman_io_map)
MACHINE_CONFIG_END
@@ -2709,8 +2709,8 @@ MACHINE_CONFIG_START(nbmj9195_state::mkeibaou)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mkeibaou_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mkeibaou_io_map)
MACHINE_CONFIG_END
@@ -2718,8 +2718,8 @@ MACHINE_CONFIG_START(nbmj9195_state::pachiten)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(pachiten_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(pachiten_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2736,8 +2736,8 @@ MACHINE_CONFIG_START(nbmj9195_state::sailorwr)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(sailorwr_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(sailorwr_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2747,8 +2747,8 @@ MACHINE_CONFIG_START(nbmj9195_state::psailor1)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(psailor1_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(psailor1_io_map)
MACHINE_CONFIG_END
@@ -2756,8 +2756,8 @@ MACHINE_CONFIG_START(nbmj9195_state::psailor2)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(psailor2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(psailor2_io_map)
MACHINE_CONFIG_END
@@ -2765,8 +2765,8 @@ MACHINE_CONFIG_START(nbmj9195_state::otatidai)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(otatidai_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(otatidai_io_map)
MACHINE_CONFIG_END
@@ -2774,8 +2774,8 @@ MACHINE_CONFIG_START(nbmj9195_state::yosimoto)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(yosimoto_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(yosimoto_io_map)
MACHINE_CONFIG_END
@@ -2783,8 +2783,8 @@ MACHINE_CONFIG_START(nbmj9195_state::yosimotm)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(yosimotm_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(yosimotm_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
@@ -2794,8 +2794,8 @@ MACHINE_CONFIG_START(nbmj9195_state::jituroku)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(jituroku_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(jituroku_io_map)
MACHINE_CONFIG_END
@@ -2803,9 +2803,9 @@ MACHINE_CONFIG_START(nbmj9195_state::ngpgal)
NBMJDRV2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ngpgal_map)
- MCFG_CPU_IO_MAP(ngpgal_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ngpgal_map)
+ MCFG_DEVICE_IO_MAP(ngpgal_io_map)
MACHINE_CONFIG_END
@@ -2813,9 +2813,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mjgottsu)
NBMJDRV2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ngpgal_map)
- MCFG_CPU_IO_MAP(mjgottsu_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ngpgal_map)
+ MCFG_DEVICE_IO_MAP(mjgottsu_io_map)
MACHINE_CONFIG_END
@@ -2823,9 +2823,9 @@ MACHINE_CONFIG_START(nbmj9195_state::bakuhatu)
NBMJDRV2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ngpgal_map)
- MCFG_CPU_IO_MAP(mjgottsu_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ngpgal_map)
+ MCFG_DEVICE_IO_MAP(mjgottsu_io_map)
MACHINE_CONFIG_END
@@ -2833,9 +2833,9 @@ MACHINE_CONFIG_START(nbmj9195_state::cmehyou)
NBMJDRV2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ngpgal_map)
- MCFG_CPU_IO_MAP(cmehyou_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ngpgal_map)
+ MCFG_DEVICE_IO_MAP(cmehyou_io_map)
MACHINE_CONFIG_END
@@ -2843,9 +2843,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mjkoiura)
NBMJDRV2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjuraden_map)
- MCFG_CPU_IO_MAP(mjkoiura_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjuraden_map)
+ MCFG_DEVICE_IO_MAP(mjkoiura_io_map)
MACHINE_CONFIG_END
@@ -2853,9 +2853,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mkoiuraa)
NBMJDRV2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjuraden_map)
- MCFG_CPU_IO_MAP(mkoiuraa_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjuraden_map)
+ MCFG_DEVICE_IO_MAP(mkoiuraa_io_map)
MACHINE_CONFIG_END
@@ -2863,9 +2863,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mscoutm)
NBMJDRV3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mscoutm_map)
- MCFG_CPU_IO_MAP(mscoutm_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mscoutm_map)
+ MCFG_DEVICE_IO_MAP(mscoutm_io_map)
MACHINE_CONFIG_END
@@ -2873,9 +2873,9 @@ MACHINE_CONFIG_START(nbmj9195_state::imekura)
NBMJDRV3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjegolf_map)
- MCFG_CPU_IO_MAP(imekura_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjegolf_map)
+ MCFG_DEVICE_IO_MAP(imekura_io_map)
MACHINE_CONFIG_END
@@ -2883,9 +2883,9 @@ MACHINE_CONFIG_START(nbmj9195_state::mjegolf)
NBMJDRV3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjegolf_map)
- MCFG_CPU_IO_MAP(mjegolf_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjegolf_map)
+ MCFG_DEVICE_IO_MAP(mjegolf_io_map)
MACHINE_CONFIG_END
@@ -2893,9 +2893,9 @@ MACHINE_CONFIG_START(nbmj9195_state::shabdama)
NBMJDRV1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(shabdama_map)
- MCFG_CPU_IO_MAP(shabdama_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(shabdama_map)
+ MCFG_DEVICE_IO_MAP(shabdama_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp
index 734a5be3e86..036816f3c24 100644
--- a/src/mame/drivers/nc.cpp
+++ b/src/mame/drivers/nc.cpp
@@ -1401,9 +1401,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nc_state::nc100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, /*6000000*/ 4606000) /* Russell Marks says this is more accurate */
- MCFG_CPU_PROGRAM_MAP(nc_map)
- MCFG_CPU_IO_MAP(nc100_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, /*6000000*/ 4606000) /* Russell Marks says this is more accurate */
+ MCFG_DEVICE_PROGRAM_MAP(nc_map)
+ MCFG_DEVICE_IO_MAP(nc100_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -1422,29 +1422,29 @@ MACHINE_CONFIG_START(nc_state::nc100)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep.1", BEEP, 0)
+ MCFG_DEVICE_ADD("beep.1", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("beep.2", BEEP, 0)
+ MCFG_DEVICE_ADD("beep.2", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(nc_state, write_nc100_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(nc_state, write_centronics_busy))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, nc_state, write_nc100_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, nc_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(nc_state,nc100_rxrdy_callback))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(nc_state,nc100_txrdy_callback))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, nc_state,nc100_rxrdy_callback))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, nc_state,nc100_txrdy_callback))
MCFG_DEVICE_ADD("uart_clock", CLOCK, 19200)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(nc_state, write_uart_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, nc_state, write_uart_clock))
/* rtc */
MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
- MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(nc_state, nc100_tc8521_alarm_callback))
+ MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, nc_state, nc100_tc8521_alarm_callback))
/* cartridge */
MCFG_GENERIC_CARTSLOT_ADD("cardslot", generic_plain_slot, nullptr)
@@ -1474,8 +1474,8 @@ static void ibmpc_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(nc_state::nc200)
nc100(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_IO_MAP(nc200_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_IO_MAP(nc200_io)
MCFG_MACHINE_START_OVERRIDE(nc_state, nc200)
MCFG_MACHINE_RESET_OVERRIDE(nc_state, nc200)
@@ -1491,18 +1491,18 @@ MACHINE_CONFIG_START(nc_state::nc200)
/* printer */
MCFG_DEVICE_MODIFY("centronics")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(nc_state, write_nc200_centronics_ack))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, nc_state, write_nc200_centronics_ack))
/* uart */
MCFG_DEVICE_MODIFY("uart")
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(nc_state,nc200_rxrdy_callback))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(nc_state,nc200_txrdy_callback))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, nc_state,nc200_rxrdy_callback))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, nc_state,nc200_txrdy_callback))
/* no rtc */
MCFG_DEVICE_REMOVE("rtc")
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(nc_state, nc200_fdc_interrupt))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, nc_state, nc200_fdc_interrupt))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", ibmpc_floppies, "525dd", ibmpc_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", ibmpc_floppies, "525dd", ibmpc_floppy_formats)
diff --git a/src/mame/drivers/nds.cpp b/src/mame/drivers/nds.cpp
index b7cb4db10b4..e3d017f4c0f 100644
--- a/src/mame/drivers/nds.cpp
+++ b/src/mame/drivers/nds.cpp
@@ -971,12 +971,12 @@ TIMER_CALLBACK_MEMBER(nds_state::timer_expire)
}
MACHINE_CONFIG_START(nds_state::nds)
- MCFG_CPU_ADD("arm7", ARM7, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nds_arm7_map)
+ MCFG_DEVICE_ADD("arm7", ARM7, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nds_arm7_map)
- MCFG_CPU_ADD("arm9", ARM946ES, MASTER_CLOCK*2)
+ MCFG_DEVICE_ADD("arm9", ARM946ES, MASTER_CLOCK*2)
MCFG_ARM_HIGH_VECTORS()
- MCFG_CPU_PROGRAM_MAP(nds_arm9_map)
+ MCFG_DEVICE_PROGRAM_MAP(nds_arm9_map)
// WRAM
MCFG_DEVICE_ADD("nds7wram", ADDRESS_MAP_BANK, 0)
diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp
index a3ae0da673e..f5e0f28d28e 100644
--- a/src/mame/drivers/nemesis.cpp
+++ b/src/mame/drivers/nemesis.cpp
@@ -1461,22 +1461,22 @@ void nemesis_state::machine_reset()
MACHINE_CONFIG_START(nemesis_state::nemesis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
// 14318180/2, /* From schematics, should be accurate */
- MCFG_CPU_PROGRAM_MAP(nemesis_map)
+ MCFG_DEVICE_PROGRAM_MAP(nemesis_map)
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* From schematics, should be accurate */
- MCFG_CPU_PROGRAM_MAP(sound_map) /* fixed */
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4) /* From schematics, should be accurate */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map) /* fixed */
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 13J
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, coin1_lockout_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(nemesis_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, sound_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, coin1_lockout_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, nemesis_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, sound_irq_w))
MCFG_DEVICE_ADD("intlatch", LS259, 0) // 11K
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, gfx_flipx_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(nemesis_state, gfx_flipy_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipx_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipy_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -1488,7 +1488,7 @@ MACHINE_CONFIG_START(nemesis_state::nemesis)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(nemesis_state, nemesis_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1499,25 +1499,25 @@ MACHINE_CONFIG_START(nemesis_state::nemesis)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318180/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nemesis_state, nemesis_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nemesis_state, nemesis_portA_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.20)
- MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_A_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_B_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318180/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_A_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_B_w))
MCFG_SOUND_ROUTE(0, "filter2", 1.00)
MCFG_SOUND_ROUTE(1, "filter3", 1.00)
MCFG_SOUND_ROUTE(2, "filter4", 1.00)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD("filter3", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter4", 0)
+ MCFG_DEVICE_ADD("filter4", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_K005289_ADD("k005289", 3579545)
@@ -1528,24 +1528,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::gx400)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MCFG_CPU_PROGRAM_MAP(gx400_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gx400_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", nemesis_state, gx400_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(gx400_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gx400_sound_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, sound_irq_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(nemesis_state, irq4_enable_w)) // ??
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, sound_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, nemesis_state, irq4_enable_w)) // ??
MCFG_DEVICE_ADD("intlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, irq2_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, irq1_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, gfx_flipx_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(nemesis_state, gfx_flipy_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, irq2_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, irq1_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipx_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipy_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -1568,31 +1568,31 @@ MACHINE_CONFIG_START(nemesis_state::gx400)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318180/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nemesis_state, nemesis_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nemesis_state, nemesis_portA_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.20)
- MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_A_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_B_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318180/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_A_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_B_w))
MCFG_SOUND_ROUTE(0, "filter2", 1.00)
MCFG_SOUND_ROUTE(1, "filter3", 1.00)
MCFG_SOUND_ROUTE(2, "filter4", 1.00)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD("filter3", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter4", 0)
+ MCFG_DEVICE_ADD("filter4", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_K005289_ADD("k005289", 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_DEVICE_ADD("vlm", VLM5030, 3579545)
MCFG_DEVICE_ADDRESS_MAP(0, gx400_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -1601,23 +1601,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::konamigt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MCFG_CPU_PROGRAM_MAP(konamigt_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(konamigt_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", nemesis_state, konamigt_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, sound_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, sound_irq_w))
MCFG_DEVICE_ADD("intlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, irq2_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, gfx_flipx_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(nemesis_state, gfx_flipy_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, irq2_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipx_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipy_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -1639,25 +1639,25 @@ MACHINE_CONFIG_START(nemesis_state::konamigt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318180/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nemesis_state, nemesis_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nemesis_state, nemesis_portA_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.20)
- MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_A_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_B_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318180/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_A_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_B_w))
MCFG_SOUND_ROUTE(0, "filter2", 1.00)
MCFG_SOUND_ROUTE(1, "filter3", 1.00)
MCFG_SOUND_ROUTE(2, "filter4", 1.00)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD("filter3", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter4", 0)
+ MCFG_DEVICE_ADD("filter4", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_K005289_ADD("k005289", 3579545)
@@ -1668,24 +1668,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::rf2_gx400)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MCFG_CPU_PROGRAM_MAP(rf2_gx400_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rf2_gx400_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", nemesis_state, gx400_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(gx400_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gx400_sound_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, sound_irq_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(nemesis_state, irq4_enable_w)) // ??
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, sound_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, nemesis_state, irq4_enable_w)) // ??
MCFG_DEVICE_ADD("intlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, irq2_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, irq1_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, gfx_flipx_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(nemesis_state, gfx_flipy_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, irq2_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, irq1_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipx_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipy_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -1708,31 +1708,31 @@ MACHINE_CONFIG_START(nemesis_state::rf2_gx400)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318180/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nemesis_state, nemesis_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nemesis_state, nemesis_portA_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.20)
- MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_A_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_B_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318180/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_A_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_B_w))
MCFG_SOUND_ROUTE(0, "filter2", 1.00)
MCFG_SOUND_ROUTE(1, "filter3", 1.00)
MCFG_SOUND_ROUTE(2, "filter4", 1.00)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD("filter3", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter4", 0)
+ MCFG_DEVICE_ADD("filter4", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_K005289_ADD("k005289", 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_DEVICE_ADD("vlm", VLM5030, 3579545)
MCFG_DEVICE_ADDRESS_MAP(0, gx400_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -1741,11 +1741,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::salamand)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MCFG_CPU_PROGRAM_MAP(salamand_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_DEVICE_PROGRAM_MAP(salamand_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(sal_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sal_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1758,7 +1758,7 @@ MACHINE_CONFIG_START(nemesis_state::salamand)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(nemesis_state, nemesis_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1770,13 +1770,13 @@ MACHINE_CONFIG_START(nemesis_state::salamand)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_DEVICE_ADD("vlm", VLM5030, 3579545)
MCFG_DEVICE_ADDRESS_MAP(0, salamand_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.50)
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(nemesis_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, nemesis_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.08)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.08)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.08)
@@ -1792,11 +1792,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::blkpnthr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MCFG_CPU_PROGRAM_MAP(blkpnthr_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(blkpnthr_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(blkpnthr_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(blkpnthr_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1809,7 +1809,7 @@ MACHINE_CONFIG_START(nemesis_state::blkpnthr)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(nemesis_state, blkpnthr_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, blkpnthr_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1821,8 +1821,8 @@ MACHINE_CONFIG_START(nemesis_state::blkpnthr)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(nemesis_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, nemesis_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.10)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.10)
@@ -1838,11 +1838,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::citybomb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MCFG_CPU_PROGRAM_MAP(citybomb_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(citybomb_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(city_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(city_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1855,7 +1855,7 @@ MACHINE_CONFIG_START(nemesis_state::citybomb)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(nemesis_state, nemesis_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1867,14 +1867,14 @@ MACHINE_CONFIG_START(nemesis_state::citybomb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(nemesis_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, nemesis_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
// MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -1888,11 +1888,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::nyanpani)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
- MCFG_CPU_PROGRAM_MAP(nyanpani_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(nyanpani_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(city_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(city_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1905,7 +1905,7 @@ MACHINE_CONFIG_START(nemesis_state::nyanpani)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nemesis_state, screen_update_nemesis)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(nemesis_state, nemesis_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nemesis_state, nemesis_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", nemesis)
MCFG_PALETTE_ADD("palette", 2048)
@@ -1917,14 +1917,14 @@ MACHINE_CONFIG_START(nemesis_state::nyanpani)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(nemesis_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, nemesis_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
// MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -1938,16 +1938,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nemesis_state::hcrash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */
- MCFG_CPU_PROGRAM_MAP(hcrash_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hcrash_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", nemesis_state, konamigt_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(sal_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sal_sound_map)
MCFG_DEVICE_ADD("intlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // ?
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, irq2_enable_w)) // or at 0x0c2804 ?
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, irq2_enable_w)) // or at 0x0c2804 ?
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // ?
MCFG_WATCHDOG_ADD("watchdog")
@@ -1971,13 +1971,13 @@ MACHINE_CONFIG_START(nemesis_state::hcrash)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_DEVICE_ADD("vlm", VLM5030, 3579545)
MCFG_DEVICE_ADDRESS_MAP(0, salamand_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
- MCFG_SOUND_ADD("k007232", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(nemesis_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, nemesis_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.10)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.10)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.10)
@@ -2691,25 +2691,25 @@ Manual says SW4, 5, 6, 7 & 8 not used, leave off
MACHINE_CONFIG_START(nemesis_state::bubsys)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
- MCFG_CPU_PROGRAM_MAP(gx400_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gx400_map)
//MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", nemesis_state, gx400_interrupt, "screen", 0, 1)
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(gx400_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(gx400_sound_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, sound_irq_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(nemesis_state, irq4_enable_w)) // ??
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, sound_irq_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, nemesis_state, irq4_enable_w)) // ??
MCFG_DEVICE_ADD("intlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(nemesis_state, irq2_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(nemesis_state, irq1_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(nemesis_state, gfx_flipx_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(nemesis_state, gfx_flipy_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, nemesis_state, irq2_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, nemesis_state, irq1_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipx_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, nemesis_state, gfx_flipy_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -2732,31 +2732,31 @@ MACHINE_CONFIG_START(nemesis_state::bubsys)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318180/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318180/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nemesis_state, nemesis_portA_r))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nemesis_state, nemesis_portA_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.20)
- MCFG_SOUND_ADD("ay2", AY8910, 14318180/8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_A_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("k005289", k005289_device, k005289_control_B_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318180/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_A_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("k005289", k005289_device, k005289_control_B_w))
MCFG_SOUND_ROUTE(0, "filter2", 1.00)
MCFG_SOUND_ROUTE(1, "filter3", 1.00)
MCFG_SOUND_ROUTE(2, "filter4", 1.00)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD("filter3", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter4", 0)
+ MCFG_DEVICE_ADD("filter4", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_K005289_ADD("k005289", 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_DEVICE_ADD("vlm", VLM5030, 3579545)
MCFG_DEVICE_ADDRESS_MAP(0, gx400_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 486631df0d3..9ccee33e219 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -1892,19 +1892,19 @@ INPUT_CHANGED_MEMBER(aes_base_state::aes_jp1)
MACHINE_CONFIG_START(neogeo_base_state::neogeo_base)
/* basic machine hardware */
- MCFG_CPU_ADD(m_maincpu, M68000, NEOGEO_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_ADD(m_maincpu, M68000, NEOGEO_MAIN_CPU_CLOCK)
- MCFG_CPU_ADD(m_audiocpu, Z80, NEOGEO_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_IO_MAP(audio_io_map)
+ MCFG_DEVICE_ADD(m_audiocpu, Z80, NEOGEO_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_IO_MAP(audio_io_map)
MCFG_DEVICE_ADD("systemlatch", HC259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(neogeo_base_state, set_screen_shadow))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(neogeo_base_state, set_use_cart_vectors))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, neogeo_base_state, set_screen_shadow))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, neogeo_base_state, set_use_cart_vectors))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // memory card 1: write enable/disable
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // memory card 2: write disable/enable
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // memory card: register select enable/set to normal (what does it mean?)
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(neogeo_base_state, set_palette_bank))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, neogeo_base_state, set_palette_bank))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_neogeo)
@@ -1924,11 +1924,11 @@ MACHINE_CONFIG_START(neogeo_base_state::neogeo_base)
MCFG_GENERIC_LATCH_8_ADD(m_soundlatch)
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(false)
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE(m_audionmi, input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE(m_audionmi, input_merger_device, in_w<0>))
MCFG_GENERIC_LATCH_8_ADD(m_soundlatch2)
- MCFG_SOUND_ADD(m_ym, YM2610, NEOGEO_YM2610_CLOCK)
+ MCFG_DEVICE_ADD(m_ym, YM2610, NEOGEO_YM2610_CLOCK)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE(m_audiocpu, 0))
MACHINE_CONFIG_END
@@ -1947,12 +1947,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ngarcade_base_state::neogeo_arcade)
neogeo_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(neogeo_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(neogeo_main_map)
MCFG_DEVICE_MODIFY("systemlatch")
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(ngarcade_base_state, set_use_cart_audio))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(ngarcade_base_state, set_save_ram_unlock))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, ngarcade_base_state, set_use_cart_audio))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, ngarcade_base_state, set_save_ram_unlock))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_ticks(3244030, NEOGEO_MASTER_CLOCK))
@@ -2127,8 +2127,8 @@ MACHINE_CONFIG_START(aes_state::aes)
neogeo_base(config);
neogeo_stereo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(aes_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(aes_main_map)
MCFG_NEOGEO_MEMCARD_ADD("memcard")
diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp
index 6fd779f8198..51151b5e50a 100644
--- a/src/mame/drivers/neogeocd.cpp
+++ b/src/mame/drivers/neogeocd.cpp
@@ -1033,13 +1033,13 @@ MACHINE_CONFIG_START(ngcd_state::neocd)
neogeo_base(config);
neogeo_stereo(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(neocd_main_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(ngcd_state,neocd_int_callback)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(neocd_main_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(ngcd_state,neocd_int_callback)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(neocd_audio_map)
- MCFG_CPU_IO_MAP(neocd_audio_io_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(neocd_audio_map)
+ MCFG_DEVICE_IO_MAP(neocd_audio_io_map)
MCFG_DEVICE_MODIFY("systemlatch")
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(LOGGER("NeoCD: write to regular vector change address?")) // what IS going on with "neocdz doubledr" and why do games write here if it's hooked up to nothing?
diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp
index 9fdd574447b..b5831f98dea 100644
--- a/src/mame/drivers/neoprint.cpp
+++ b/src/mame/drivers/neoprint.cpp
@@ -496,14 +496,14 @@ void neoprint_state::machine_start()
}
MACHINE_CONFIG_START(neoprint_state::neoprint)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(neoprint_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", neoprint_state, irq2_line_hold) // lv1,2,3 valid?
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(neoprint_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", neoprint_state, irq2_line_hold) // lv1,2,3 valid?
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(neoprint_audio_map)
- MCFG_CPU_IO_MAP(neoprint_audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(neoprint_audio_map)
+ MCFG_DEVICE_IO_MAP(neoprint_audio_io_map)
MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -525,7 +525,7 @@ MACHINE_CONFIG_START(neoprint_state::neoprint)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2610, 24000000 / 3)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 24000000 / 3)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.60)
@@ -539,14 +539,14 @@ MACHINE_RESET_MEMBER(neoprint_state,nprsp)
}
MACHINE_CONFIG_START(neoprint_state::nprsp)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(nprsp_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", neoprint_state, irq2_line_hold) // lv1,2,3 valid?
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(nprsp_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", neoprint_state, irq2_line_hold) // lv1,2,3 valid?
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(neoprint_audio_map)
- MCFG_CPU_IO_MAP(neoprint_audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(neoprint_audio_map)
+ MCFG_DEVICE_IO_MAP(neoprint_audio_io_map)
MCFG_UPD4990A_ADD("upd4990a", XTAL(32'768), NOOP, NOOP)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -570,7 +570,7 @@ MACHINE_CONFIG_START(neoprint_state::nprsp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2610, 24000000 / 3)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 24000000 / 3)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.60)
diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp
index 280e2311f4a..6e5bdad61ad 100644
--- a/src/mame/drivers/neptunp2.cpp
+++ b/src/mame/drivers/neptunp2.cpp
@@ -100,10 +100,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(neptunp2_state::neptunp2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I80188,20000000) // N80C188-20 AMD
- MCFG_CPU_PROGRAM_MAP(neptunp2_map)
- MCFG_CPU_IO_MAP(neptunp2_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", neptunp2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",I80188,20000000) // N80C188-20 AMD
+ MCFG_DEVICE_PROGRAM_MAP(neptunp2_map)
+ MCFG_DEVICE_IO_MAP(neptunp2_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", neptunp2_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp
index d99a7e27b80..74953435352 100644
--- a/src/mame/drivers/nes.cpp
+++ b/src/mame/drivers/nes.cpp
@@ -57,8 +57,8 @@ void nes_state::ppu_nmi(int *ppu_regs)
MACHINE_CONFIG_START(nes_state::nes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nes_map)
+ MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nes_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60.0988)
@@ -100,9 +100,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_state::nespal)
nes(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(PAL_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(PAL_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nes_map)
MCFG_DEVICE_REMOVE("ppu")
MCFG_PPU2C07_ADD("ppu")
@@ -132,9 +132,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_state::nespalc)
nespal(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_CLOCK(PALC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nes_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_CLOCK(PALC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nes_map)
/* UMC 6538 and friends -- extends time for rendering dummy scanlines */
MCFG_DEVICE_REMOVE("ppu")
diff --git a/src/mame/drivers/nes_vt.cpp b/src/mame/drivers/nes_vt.cpp
index e76ddc7a680..6ba9435b1df 100644
--- a/src/mame/drivers/nes_vt.cpp
+++ b/src/mame/drivers/nes_vt.cpp
@@ -1371,8 +1371,8 @@ static const uint8_t descram_ppu_2012_2017[5][6] = {
MACHINE_CONFIG_START(nes_vt_state::nes_vt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502_VTSCR, NTSC_APU_CLOCK) // selectable speed?
- MCFG_CPU_PROGRAM_MAP(nes_vt_map)
+ MCFG_DEVICE_ADD("maincpu", M6502_VTSCR, NTSC_APU_CLOCK) // selectable speed?
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60.0988)
@@ -1391,8 +1391,8 @@ MACHINE_CONFIG_START(nes_vt_state::nes_vt)
MCFG_PPU_VT03_ADD("ppu")
MCFG_PPU2C0X_CPU("maincpu")
MCFG_PPU2C0X_SET_NMI(nes_vt_state, ppu_nmi)
- MCFG_PPU_VT03_READ_BG_CB(READ8(nes_vt_state,chr_r))
- MCFG_PPU_VT03_READ_SP_CB(READ8(nes_vt_state,spr_r))
+ MCFG_PPU_VT03_READ_BG_CB(READ8(*this, nes_vt_state,chr_r))
+ MCFG_PPU_VT03_READ_SP_CB(READ8(*this, nes_vt_state,spr_r))
MCFG_DEVICE_ADD("prg", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(prg_map)
@@ -1413,16 +1413,16 @@ MACHINE_CONFIG_START(nes_vt_state::nes_vt)
than just using 2 APUs as registers in the 2nd one affect the PCM channel mode but the
DMA control still comes from the 1st, but in the new mode, sound always outputs via the
2nd. Probably need to split the APU into interface and sound gen logic. */
- MCFG_SOUND_ADD("apu", NES_APU, NTSC_APU_CLOCK)
- MCFG_NES_APU_IRQ_HANDLER(WRITELINE(nes_vt_state, apu_irq))
- MCFG_NES_APU_MEM_READ_CALLBACK(READ8(nes_vt_state, apu_read_mem))
+ MCFG_DEVICE_ADD("apu", NES_APU, NTSC_APU_CLOCK)
+ MCFG_NES_APU_IRQ_HANDLER(WRITELINE(*this, nes_vt_state, apu_irq))
+ MCFG_NES_APU_MEM_READ_CALLBACK(READ8(*this, nes_vt_state, apu_read_mem))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_hum)
nes_vt(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_hum_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_hum_map)
MCFG_PPU_VT03_MODIFY("ppu")
MCFG_PPU_VT03_SET_DESCRAMBLE(descram_ppu_2012_2017[3]);
@@ -1430,8 +1430,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_pjoy)
nes_vt(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_pjoy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_pjoy_map)
MCFG_PPU_VT03_MODIFY("ppu")
MCFG_PPU_VT03_SET_DESCRAMBLE(descram_ppu_2012_2017[2]);
@@ -1440,8 +1440,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_sp69)
nes_vt(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_sp69_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_sp69_map)
MCFG_PPU_VT03_MODIFY("ppu")
MCFG_PPU_VT03_SET_DESCRAMBLE(descram_ppu_2012_2017[4]);
@@ -1450,26 +1450,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_xx)
nes_vt(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_xx_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_xx_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_cy)
nes_vt_xx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_cy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_cy_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_bt)
nes_vt_xx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_bt_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_bt_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_dg)
nes_vt_xx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_dg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_dg_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.0070)
@@ -1481,8 +1481,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_vg )
nes_vt_dg(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_hh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_hh_map)
MCFG_PPU_VT03_MODIFY("ppu")
MCFG_PPU_VT03_SET_PAL_MODE(PAL_MODE_NEW_VG);
@@ -1492,8 +1492,8 @@ MACHINE_CONFIG_END
// New mystery handheld architecture, VTxx derived
MACHINE_CONFIG_START(nes_vt_state::nes_vt_hh)
nes_vt_xx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_hh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_hh_map)
MCFG_PPU_VT03_MODIFY("ppu")
MCFG_PPU_VT03_SET_PAL_MODE(PAL_MODE_NEW_RGB);
@@ -1511,8 +1511,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_fp)
nes_vt_xx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_fp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_fp_map)
MCFG_PPU_VT03_MODIFY("ppu")
MCFG_PPU_VT03_SET_PAL_MODE(PAL_MODE_NEW_RGB12);
@@ -1520,8 +1520,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nes_vt_state::nes_vt_fa)
nes_vt_xx(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nes_vt_fa_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nes_vt_fa_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index 7e5444f9157..bc5da61f2cb 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -811,19 +811,19 @@ void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int para
MACHINE_CONFIG_START(newbrain_state::newbrain)
// basic system hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(newbrain_mreq)
- MCFG_CPU_IO_MAP(newbrain_iorq)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(newbrain_mreq)
+ MCFG_DEVICE_IO_MAP(newbrain_iorq)
- MCFG_CPU_ADD(COP420_TAG, COP420, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD(COP420_TAG, COP420, XTAL(16'000'000)/4)
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true)
- MCFG_COP400_READ_G_CB(READ8(newbrain_state, cop_g_r))
- MCFG_COP400_WRITE_G_CB(WRITE8(newbrain_state, cop_g_w))
- MCFG_COP400_WRITE_D_CB(WRITE8(newbrain_state, cop_d_w))
- MCFG_COP400_READ_IN_CB(READ8(newbrain_state, cop_in_r))
- MCFG_COP400_WRITE_SO_CB(WRITELINE(newbrain_state, k1_w))
- MCFG_COP400_WRITE_SK_CB(WRITELINE(newbrain_state, k2_w))
- MCFG_COP400_READ_SI_CB(READLINE(newbrain_state, tdi_r))
+ MCFG_COP400_READ_G_CB(READ8(*this, newbrain_state, cop_g_r))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, newbrain_state, cop_g_w))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, newbrain_state, cop_d_w))
+ MCFG_COP400_READ_IN_CB(READ8(*this, newbrain_state, cop_in_r))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, newbrain_state, k1_w))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, newbrain_state, k2_w))
+ MCFG_COP400_READ_SI_CB(READLINE(*this, newbrain_state, tdi_r))
// video hardware
newbrain_video(config);
@@ -837,8 +837,8 @@ MACHINE_CONFIG_START(newbrain_state::newbrain)
MCFG_CASSETTE_ADD(CASSETTE2_TAG)
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED)
- MCFG_RS232_PORT_ADD(RS232_V24_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD(RS232_PRN_TAG, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_V24_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_PRN_TAG, RS232_PORT, default_rs232_devices, nullptr)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp
index 076e2eb8741..d895786fd64 100644
--- a/src/mame/drivers/news.cpp
+++ b/src/mame/drivers/news.cpp
@@ -132,9 +132,9 @@ void news_state::machine_reset()
MACHINE_CONFIG_START(news_state::news)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(news_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", news_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(news_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", news_state, irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index b497033e50a..2c4ddd71d32 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -998,8 +998,8 @@ void next_state::ncr5390(device_t *device)
devcb_base *devcb;
(void)devcb;
MCFG_DEVICE_CLOCK(10000000)
- MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_irq))
- MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_drq))
+ MCFG_NCR5390_IRQ_HANDLER(WRITELINE(*this, next_state, scsi_irq))
+ MCFG_NCR5390_DRQ_HANDLER(WRITELINE(*this, next_state, scsi_drq))
}
MACHINE_CONFIG_START(next_state::next_base)
@@ -1011,17 +1011,17 @@ MACHINE_CONFIG_START(next_state::next_base)
MCFG_SCREEN_UPDATE_DRIVER(next_state, screen_update)
MCFG_SCREEN_SIZE(1120, 900)
MCFG_SCREEN_VISIBLE_AREA(0, 1120-1, 0, 832-1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(next_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, next_state, vblank_w))
// devices
MCFG_NSCSI_BUS_ADD("scsibus")
MCFG_DEVICE_ADD("rtc", MCCS1850, XTAL(32'768))
MCFG_DEVICE_ADD("scc", SCC8530, XTAL(25'000'000))
- MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(next_state, scc_irq))
+ MCFG_Z8530_INTRQ_CALLBACK(WRITELINE(*this, next_state, scc_irq))
MCFG_DEVICE_ADD("keyboard", NEXTKBD, 0)
- MCFG_NEXTKBD_INT_CHANGE_CALLBACK(WRITELINE(next_state, keyboard_irq))
- MCFG_NEXTKBD_INT_POWER_CALLBACK(WRITELINE(next_state, power_irq))
- MCFG_NEXTKBD_INT_NMI_CALLBACK(WRITELINE(next_state, nmi_irq))
+ MCFG_NEXTKBD_INT_CHANGE_CALLBACK(WRITELINE(*this, next_state, keyboard_irq))
+ MCFG_NEXTKBD_INT_POWER_CALLBACK(WRITELINE(*this, next_state, power_irq))
+ MCFG_NEXTKBD_INT_NMI_CALLBACK(WRITELINE(*this, next_state, nmi_irq))
MCFG_NSCSI_ADD("scsibus:0", next_scsi_devices, "harddisk", false)
MCFG_NSCSI_ADD("scsibus:1", next_scsi_devices, "cdrom", false)
MCFG_NSCSI_ADD("scsibus:2", next_scsi_devices, nullptr, false)
@@ -1030,30 +1030,30 @@ MACHINE_CONFIG_START(next_state::next_base)
MCFG_NSCSI_ADD("scsibus:5", next_scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", next_scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:7", next_scsi_devices, "ncr5390", true)
- MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", ncr5390)
+ MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", [this] (device_t *device) { ncr5390(device); })
MCFG_DEVICE_ADD("net", MB8795, 0)
- MCFG_MB8795_TX_IRQ_CALLBACK(WRITELINE(next_state, net_tx_irq))
- MCFG_MB8795_RX_IRQ_CALLBACK(WRITELINE(next_state, net_rx_irq))
- MCFG_MB8795_TX_DRQ_CALLBACK(WRITELINE(next_state, net_tx_drq))
- MCFG_MB8795_RX_DRQ_CALLBACK(WRITELINE(next_state, net_rx_drq))
+ MCFG_MB8795_TX_IRQ_CALLBACK(WRITELINE(*this, next_state, net_tx_irq))
+ MCFG_MB8795_RX_IRQ_CALLBACK(WRITELINE(*this, next_state, net_rx_irq))
+ MCFG_MB8795_TX_DRQ_CALLBACK(WRITELINE(*this, next_state, net_tx_drq))
+ MCFG_MB8795_RX_DRQ_CALLBACK(WRITELINE(*this, next_state, net_rx_drq))
MCFG_DEVICE_ADD("mo", NEXTMO, 0)
- MCFG_NEXTMO_IRQ_CALLBACK(WRITELINE(next_state, mo_irq))
- MCFG_NEXTMO_DRQ_CALLBACK(WRITELINE(next_state, mo_drq))
+ MCFG_NEXTMO_IRQ_CALLBACK(WRITELINE(*this, next_state, mo_irq))
+ MCFG_NEXTMO_DRQ_CALLBACK(WRITELINE(*this, next_state, mo_drq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::next)
next_base(config);
- MCFG_CPU_ADD("maincpu", M68030, XTAL(25'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0b_m_nofdc_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, XTAL(25'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0b_m_nofdc_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::next_fdc_base)
next_base(config);
MCFG_N82077AA_ADD("fdc", n82077aa_device::MODE_PS2)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(next_state, fdc_irq))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(next_state, fdc_drq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, next_state, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, next_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", next_floppies, "35ed", next_state::floppy_formats)
// software list
@@ -1062,46 +1062,46 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nexts)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(25'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0b_m_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(25'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0b_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nexts2)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(25'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0b_m_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(25'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0b_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nextsc)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(25'000'000))
- MCFG_CPU_PROGRAM_MAP(next_2c_c_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(25'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_2c_c_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nextst)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0b_m_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(33'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0b_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nextstc)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0c_c_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(33'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0c_c_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 832-1, 0, 624-1)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nextct)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0c_m_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(33'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0c_m_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(next_state::nextctc)
next_fdc_base(config);
- MCFG_CPU_ADD("maincpu", M68040, XTAL(33'000'000))
- MCFG_CPU_PROGRAM_MAP(next_0c_c_mem)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(33'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(next_0c_c_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 832-1, 0, 624-1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp
index a4da3b2557c..a06756e6481 100644
--- a/src/mame/drivers/nexus3d.cpp
+++ b/src/mame/drivers/nexus3d.cpp
@@ -121,8 +121,8 @@ void nexus3d_state::machine_reset()
MACHINE_CONFIG_START(nexus3d_state::nexus3d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM920T, 200000000)
- MCFG_CPU_PROGRAM_MAP(nexus3d_map)
+ MCFG_DEVICE_ADD("maincpu", ARM920T, 200000000)
+ MCFG_DEVICE_PROGRAM_MAP(nexus3d_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index 311aa87d137..c47c841f63f 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -928,62 +928,62 @@ static void ngen_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(ngen_state::ngen)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(ngen_mem)
- MCFG_CPU_IO_MAP(ngen_io)
- MCFG_80186_CHIP_SELECT_CB(WRITE16(ngen_state, cpu_peripheral_cb))
- MCFG_80186_TMROUT0_HANDLER(WRITELINE(ngen_state, cpu_timer_w))
- MCFG_80186_IRQ_SLAVE_ACK(READ8(ngen_state, irq_cb))
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(ngen_mem)
+ MCFG_DEVICE_IO_MAP(ngen_io)
+ MCFG_80186_CHIP_SELECT_CB(WRITE16(*this, ngen_state, cpu_peripheral_cb))
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE(*this, ngen_state, cpu_timer_w))
+ MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, ngen_state, irq_cb))
MCFG_DEVICE_ADD("pic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int0_w))
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(78120/4) // 19.53kHz, /4 of the CPU timer output?
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ngen_state, pit_out0_w)) // RS232 channel B baud rate
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ngen_state, pit_out0_w)) // RS232 channel B baud rate
MCFG_PIT8253_CLK1(XTAL(14'745'600)/12) // correct? - based on patent
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ngen_state, pit_out1_w)) // RS232 channel A baud rate
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, ngen_state, pit_out1_w)) // RS232 channel A baud rate
MCFG_PIT8253_CLK2(XTAL(14'745'600)/12)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ngen_state, pit_out2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ngen_state, pit_out2_w))
MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(14'745'600) / 3) // NEC D8237A, divisor unknown
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(ngen_state, dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(ngen_state, dma_eop_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(ngen_state, dma_read_word)) // DMA is always 16-bit
- MCFG_I8237_OUT_MEMW_CB(WRITE8(ngen_state, dma_write_word))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(ngen_state, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(ngen_state, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(ngen_state, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(ngen_state, dack3_w))
- MCFG_I8237_IN_IOR_0_CB(READ8(ngen_state, dma_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(ngen_state, dma_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(ngen_state, dma_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(ngen_state, dma_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(ngen_state, dma_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(ngen_state, dma_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(ngen_state, dma_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(ngen_state, dma_3_dack_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, ngen_state, dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, ngen_state, dma_eop_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, ngen_state, dma_read_word)) // DMA is always 16-bit
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, ngen_state, dma_write_word))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, ngen_state, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, ngen_state, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, ngen_state, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, ngen_state, dack3_w))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, ngen_state, dma_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, ngen_state, dma_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, ngen_state, dma_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, ngen_state, dma_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, ngen_state, dma_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, ngen_state, dma_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, ngen_state, dma_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, ngen_state, dma_3_dack_w))
// I/O board
MCFG_DEVICE_ADD("iouart", UPD7201, 0) // clocked by PIT channel 2?
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("rs232_b", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("rs232_b", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232_b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232_a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("iouart", upd7201_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("iouart", upd7201_device, ctsa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("iouart", upd7201_device, dcda_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("iouart", upd7201_device, ria_w))
-
- MCFG_RS232_PORT_ADD("rs232_b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("iouart", upd7201_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("iouart", upd7201_device, ctsb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("iouart", upd7201_device, dcdb_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("iouart", upd7201_device, rib_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232_a", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("rs232_b", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232_a", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("rs232_b", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232_a", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE("rs232_b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232_a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("iouart", upd7201_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("iouart", upd7201_device, ctsa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("iouart", upd7201_device, dcda_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("iouart", upd7201_device, ria_w))
+
+ MCFG_DEVICE_ADD("rs232_b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("iouart", upd7201_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("iouart", upd7201_device, ctsb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("iouart", upd7201_device, dcdb_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("iouart", upd7201_device, rib_w))
// TODO: SCN2652 MPCC (not implemented), used for RS-422 cluster communications?
@@ -1002,32 +1002,32 @@ MACHINE_CONFIG_START(ngen_state::ngen)
// keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board)
MCFG_DEVICE_ADD("videouart", I8251, 0) // main clock unknown, Rx/Tx clocks are 19.53kHz
-// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("keyboard", keyboard, "ngen")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("videouart", i8251_device, write_rxd))
+// MCFG_I8251_TXEMPTY_HANDLER(WRITELINE("pic",pic8259_device,ir4_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("keyboard", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD("keyboard", RS232_PORT, keyboard, "ngen")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("videouart", i8251_device, write_rxd))
MCFG_DEVICE_ADD("refresh_clock", CLOCK, 19200*16) // should be 19530Hz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ngen_state,timer_clk_out))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ngen_state,timer_clk_out))
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
MCFG_WD2797_ADD("fdc", XTAL(20'000'000) / 20)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu",i80186_cpu_device,drq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, ngen_state,fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu",i80186_cpu_device,drq1_w))
MCFG_WD_FDC_FORCE_READY
MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
MCFG_PIT8253_CLK1(XTAL(20'000'000) / 20)
-// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
+// MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
MCFG_PIT8253_CLK2(XTAL(20'000'000) / 20)
-// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
+// MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic",pic8259_device,ir5_w))
// TODO: WD1010 HDC (not implemented), use WD2010 for now
MCFG_DEVICE_ADD("hdc", WD2010, XTAL(20'000'000) / 4)
- MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("pic",pic8259_device,ir2_w))
- MCFG_WD2010_IN_BCS_CB(READ8(ngen_state,hd_buffer_r))
- MCFG_WD2010_OUT_BCS_CB(WRITE8(ngen_state,hd_buffer_w))
+ MCFG_WD2010_OUT_INTRQ_CB(WRITELINE("pic",pic8259_device,ir2_w))
+ MCFG_WD2010_IN_BCS_CB(READ8(*this, ngen_state,hd_buffer_r))
+ MCFG_WD2010_OUT_BCS_CB(WRITE8(*this, ngen_state,hd_buffer_w))
MCFG_WD2010_IN_DRDY_CB(VCC)
MCFG_WD2010_IN_INDEX_CB(VCC)
MCFG_WD2010_IN_WF_CB(VCC)
@@ -1041,60 +1041,60 @@ MACHINE_CONFIG_START(ngen_state::ngen)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ngen386_state::ngen386)
- MCFG_CPU_ADD("i386cpu", I386, XTAL(50'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(ngen386_mem)
- MCFG_CPU_IO_MAP(ngen386_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("i386cpu", I386, XTAL(50'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(ngen386_mem)
+ MCFG_DEVICE_IO_MAP(ngen386_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("i386cpu", 0))
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(78120/4) // 19.53kHz, /4 of the CPU timer output?
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ngen_state, pit_out0_w)) // RS232 channel B baud rate
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ngen_state, pit_out0_w)) // RS232 channel B baud rate
MCFG_PIT8253_CLK1(XTAL(14'745'600)/12) // correct? - based on patent
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ngen_state, pit_out1_w)) // RS232 channel A baud rate
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, ngen_state, pit_out1_w)) // RS232 channel A baud rate
MCFG_PIT8253_CLK2(XTAL(14'745'600)/12)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ngen_state, pit_out2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ngen_state, pit_out2_w))
MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(14'745'600) / 3) // NEC D8237A, divisor unknown
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(ngen_state, dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(ngen_state, dma_eop_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(ngen_state, dma_read_word)) // DMA is always 16-bit
- MCFG_I8237_OUT_MEMW_CB(WRITE8(ngen_state, dma_write_word))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(ngen_state, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(ngen_state, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(ngen_state, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(ngen_state, dack3_w))
- MCFG_I8237_IN_IOR_0_CB(READ8(ngen_state, dma_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(ngen_state, dma_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(ngen_state, dma_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(ngen_state, dma_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(ngen_state, dma_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(ngen_state, dma_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(ngen_state, dma_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(ngen_state, dma_3_dack_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, ngen_state, dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, ngen_state, dma_eop_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, ngen_state, dma_read_word)) // DMA is always 16-bit
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, ngen_state, dma_write_word))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, ngen_state, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, ngen_state, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, ngen_state, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, ngen_state, dack3_w))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, ngen_state, dma_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, ngen_state, dma_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, ngen_state, dma_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, ngen_state, dma_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, ngen_state, dma_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, ngen_state, dma_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, ngen_state, dma_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, ngen_state, dma_3_dack_w))
// I/O board
MCFG_DEVICE_ADD("iouart", UPD7201, 0) // clocked by PIT channel 2?
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("rs232_b", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("rs232_b", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232_a", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232_b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232_a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("iouart", upd7201_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("iouart", upd7201_device, ctsa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("iouart", upd7201_device, dcda_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("iouart", upd7201_device, ria_w))
-
- MCFG_RS232_PORT_ADD("rs232_b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("iouart", upd7201_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("iouart", upd7201_device, ctsb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("iouart", upd7201_device, dcdb_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("iouart", upd7201_device, rib_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232_a", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("rs232_b", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232_a", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("rs232_b", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232_a", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE("rs232_b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232_a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("iouart", upd7201_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("iouart", upd7201_device, ctsa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("iouart", upd7201_device, dcda_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("iouart", upd7201_device, ria_w))
+
+ MCFG_DEVICE_ADD("rs232_b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("iouart", upd7201_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("iouart", upd7201_device, ctsb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("iouart", upd7201_device, dcdb_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("iouart", upd7201_device, rib_w))
// TODO: SCN2652 MPCC (not implemented), used for RS-422 cluster communications?
@@ -1113,32 +1113,32 @@ MACHINE_CONFIG_START(ngen386_state::ngen386)
// keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board)
MCFG_DEVICE_ADD("videouart", I8251, 0) // main clock unknown, Rx/Tx clocks are 19.53kHz
-// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("keyboard", keyboard, "ngen")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("videouart", i8251_device, write_rxd))
+// MCFG_I8251_TXEMPTY_HANDLER(WRITELINE("pic",pic8259_device,ir4_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("keyboard", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD("keyboard", RS232_PORT, keyboard, "ngen")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("videouart", i8251_device, write_rxd))
MCFG_DEVICE_ADD("refresh_clock", CLOCK, 19200*16) // should be 19530Hz
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ngen_state,timer_clk_out))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, ngen_state,timer_clk_out))
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
MCFG_WD2797_ADD("fdc", XTAL(20'000'000) / 20)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w))
-// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("i386cpu",i80186_cpu_device,drq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, ngen_state,fdc_irq_w))
+// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("i386cpu",i80186_cpu_device,drq1_w))
MCFG_WD_FDC_FORCE_READY
MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // clocked on FDC data register access
MCFG_PIT8253_CLK1(XTAL(20'000'000) / 20)
-// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
+// MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pic",pic8259_device,ir5_w)) // 1MHz
MCFG_PIT8253_CLK2(XTAL(20'000'000) / 20)
-// MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir5_w))
+// MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic",pic8259_device,ir5_w))
// TODO: WD1010 HDC (not implemented), use WD2010 for now
MCFG_DEVICE_ADD("hdc", WD2010, XTAL(20'000'000) / 4)
- MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("pic",pic8259_device,ir2_w))
- MCFG_WD2010_IN_BCS_CB(READ8(ngen_state,hd_buffer_r))
- MCFG_WD2010_OUT_BCS_CB(WRITE8(ngen_state,hd_buffer_w))
+ MCFG_WD2010_OUT_INTRQ_CB(WRITELINE("pic",pic8259_device,ir2_w))
+ MCFG_WD2010_IN_BCS_CB(READ8(*this, ngen_state,hd_buffer_r))
+ MCFG_WD2010_OUT_BCS_CB(WRITE8(*this, ngen_state,hd_buffer_w))
MCFG_WD2010_IN_DRDY_CB(VCC)
MCFG_WD2010_IN_INDEX_CB(VCC)
MCFG_WD2010_IN_WF_CB(VCC)
@@ -1152,8 +1152,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ngen386_state::_386i)
ngen386(config);
- MCFG_CPU_MODIFY("i386cpu")
- MCFG_CPU_PROGRAM_MAP(ngen386i_mem)
+ MCFG_DEVICE_MODIFY("i386cpu")
+ MCFG_DEVICE_PROGRAM_MAP(ngen386i_mem)
MACHINE_CONFIG_END
ROM_START( ngen )
diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp
index e854a072542..0a26c2ce5b2 100644
--- a/src/mame/drivers/ngp.cpp
+++ b/src/mame/drivers/ngp.cpp
@@ -825,14 +825,14 @@ void ngp_state::nvram_write(emu_file &file)
MACHINE_CONFIG_START(ngp_state::ngp_common)
- MCFG_CPU_ADD( "maincpu", TMP95C061, 6.144_MHz_XTAL )
+ MCFG_DEVICE_ADD( "maincpu", TMP95C061, 6.144_MHz_XTAL )
MCFG_TLCS900H_AM8_16(1)
- MCFG_CPU_PROGRAM_MAP( ngp_mem)
- MCFG_TMP95C061_PORTA_WRITE(WRITE8(ngp_state,ngp_tlcs900_porta))
+ MCFG_DEVICE_PROGRAM_MAP( ngp_mem)
+ MCFG_TMP95C061_PORTA_WRITE(WRITE8(*this, ngp_state,ngp_tlcs900_porta))
- MCFG_CPU_ADD( "soundcpu", Z80, 6.144_MHz_XTAL/2 )
- MCFG_CPU_PROGRAM_MAP( z80_mem)
- MCFG_CPU_IO_MAP( z80_io)
+ MCFG_DEVICE_ADD( "soundcpu", Z80, 6.144_MHz_XTAL/2 )
+ MCFG_DEVICE_PROGRAM_MAP( z80_mem)
+ MCFG_DEVICE_IO_MAP( z80_io)
MCFG_SCREEN_ADD( "screen", LCD )
MCFG_SCREEN_RAW_PARAMS( 6.144_MHz_XTAL, 515, 0, 160 /*480*/, 199, 0, 152 )
@@ -843,12 +843,12 @@ MACHINE_CONFIG_START(ngp_state::ngp_common)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO( "lspeaker","rspeaker" )
- MCFG_SOUND_ADD( "t6w28", T6W28, 6.144_MHz_XTAL/2 )
+ MCFG_DEVICE_ADD( "t6w28", T6W28, 6.144_MHz_XTAL/2 )
MCFG_SOUND_ROUTE( 0, "lspeaker", 0.50 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 0.50 )
- MCFG_SOUND_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -858,7 +858,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ngp_state::ngp)
ngp_common(config);
- MCFG_K1GE_ADD( "k1ge", 6.144_MHz_XTAL, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
+ MCFG_K1GE_ADD( "k1ge", 6.144_MHz_XTAL, "screen", WRITELINE( *this, ngp_state, ngp_vblank_pin_w ), WRITELINE( *this, ngp_state, ngp_hblank_pin_w ) )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_PALETTE("k1ge:palette")
@@ -876,7 +876,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ngp_state::ngpc)
ngp_common(config);
- MCFG_K2GE_ADD( "k1ge", 6.144_MHz_XTAL, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) )
+ MCFG_K2GE_ADD( "k1ge", 6.144_MHz_XTAL, "screen", WRITELINE( *this, ngp_state, ngp_vblank_pin_w ), WRITELINE( *this, ngp_state, ngp_hblank_pin_w ) )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_PALETTE("k1ge:palette")
diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp
index 95f54b295db..064becc7caf 100644
--- a/src/mame/drivers/nibble.cpp
+++ b/src/mame/drivers/nibble.cpp
@@ -309,7 +309,7 @@ GFXDECODE_END
MACHINE_CONFIG_START(nibble_state::nibble)
MCFG_TMS99xx_ADD("maincpu", TMS9900, MASTER_CLOCK/4, nibble_map, nibble_cru_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nibble_state, nibble_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nibble_state, nibble_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp
index de272a2dc86..8552f07a6a8 100644
--- a/src/mame/drivers/nightgal.cpp
+++ b/src/mame/drivers/nightgal.cpp
@@ -790,13 +790,13 @@ void nightgal_state::machine_reset()
MACHINE_CONFIG_START(nightgal_state::royalqn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(royalqn_map)
- MCFG_CPU_IO_MAP(royalqn_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(royalqn_map)
+ MCFG_DEVICE_IO_MAP(royalqn_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", NSC8105, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(royalqn_nsc_map)
+ MCFG_DEVICE_ADD("sub", NSC8105, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(royalqn_nsc_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -814,9 +814,9 @@ MACHINE_CONFIG_START(nightgal_state::royalqn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nightgal_state, input_1p_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(nightgal_state, input_2p_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK / 8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nightgal_state, input_1p_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, nightgal_state, input_2p_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -824,36 +824,36 @@ MACHINE_CONFIG_START(nightgal_state::sexygal)
royalqn(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sexygal_map)
- MCFG_CPU_IO_MAP(sexygal_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sexygal_map)
+ MCFG_DEVICE_IO_MAP(sexygal_io)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(sexygal_nsc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(sexygal_nsc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nightgal_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", NSC8105, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(sexygal_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", NSC8105, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sexygal_audio_map)
MCFG_DEVICE_ADD("sampleclk", CLOCK, 6000) // quite a wild guess
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_REMOVE("aysnd")
- MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(nightgal_state, input_1p_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(nightgal_state, input_2p_r))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK / 8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, nightgal_state, input_1p_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, nightgal_state, input_2p_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nightgal_state::sweetgal)
sexygal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sweetgal_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sweetgal_map)
// doesn't have the extra NSC8105 (so how does this play samples?)
MCFG_DEVICE_REMOVE("audiocpu")
@@ -862,19 +862,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nightgal_state::ngalsumr)
royalqn(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
// TODO: happens from protection device
- MCFG_CPU_PERIODIC_INT_DRIVER(nightgal_state, nmi_line_pulse, 60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nightgal_state, nmi_line_pulse, 60)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nightgal_state::sgaltrop)
sexygal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(sgaltrop_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(sgaltrop_io)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(sgaltrop_nsc_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(sgaltrop_nsc_map)
MCFG_DEVICE_REMOVE("audiocpu")
MCFG_DEVICE_REMOVE("sampleclk")
diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp
index 7f683452c5c..3e4f0f2c13c 100644
--- a/src/mame/drivers/ninjakd2.cpp
+++ b/src/mame/drivers/ninjakd2.cpp
@@ -933,12 +933,12 @@ MACHINE_RESET_MEMBER(ninjakd2_state,omegaf)
MACHINE_CONFIG_START(ninjakd2_state::ninjakd2_core)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */
- MCFG_CPU_PROGRAM_MAP(ninjakd2_main_cpu)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */
+ MCFG_DEVICE_PROGRAM_MAP(ninjakd2_main_cpu)
- MCFG_CPU_ADD("soundcpu", Z80, MAIN_CLOCK_5) /* verified */
- MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu)
- MCFG_CPU_IO_MAP(ninjakd2_sound_io)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MAIN_CLOCK_5) /* verified */
+ MCFG_DEVICE_PROGRAM_MAP(ninjakd2_sound_cpu)
+ MCFG_DEVICE_IO_MAP(ninjakd2_sound_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -946,7 +946,7 @@ MACHINE_CONFIG_START(ninjakd2_state::ninjakd2_core)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 4*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(ninjakd2_state, screen_update_ninjakd2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ninjakd2_state, screen_vblank_ninjakd2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ninjakd2_state, screen_vblank_ninjakd2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ninjakd2)
@@ -959,20 +959,20 @@ MACHINE_CONFIG_START(ninjakd2_state::ninjakd2_core)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
+ MCFG_DEVICE_ADD("2203.1", YM2203, MAIN_CLOCK_12/8) /* verified */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("2203.2", YM2203, MAIN_CLOCK_12/8) /* verified */
+ MCFG_DEVICE_ADD("2203.2", YM2203, MAIN_CLOCK_12/8) /* verified */
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("pcm", SAMPLES, 0)
+ MCFG_DEVICE_ADD("pcm", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(ninjakd2_state, ninjakd2_init_samples)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -980,28 +980,28 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ninjakd2_state::ninjakd2)
ninjakd2_core(config);
- MCFG_CPU_REPLACE("soundcpu", MC8123, MAIN_CLOCK_5) /* verified */
- MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu)
- MCFG_CPU_IO_MAP(ninjakd2_sound_io)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("soundcpu", MC8123, MAIN_CLOCK_5) /* verified */
+ MCFG_DEVICE_PROGRAM_MAP(ninjakd2_sound_cpu)
+ MCFG_DEVICE_IO_MAP(ninjakd2_sound_io)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ninjakd2_state::ninjakd2b)
ninjakd2_core(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(ninjakd2_sound_cpu)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(ninjakd2_sound_cpu)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ninjakd2_state::mnight)
ninjakd2_core(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mnight_main_cpu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mnight_main_cpu)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,mnight)
@@ -1013,11 +1013,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ninjakd2_state::arkarea)
ninjakd2_core(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mnight_main_cpu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mnight_main_cpu)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(ninjakd2_state,arkarea)
@@ -1030,11 +1030,11 @@ MACHINE_CONFIG_START(ninjakd2_state::robokid)
mnight(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(robokid_main_cpu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(robokid_main_cpu)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", robokid)
@@ -1052,11 +1052,11 @@ MACHINE_CONFIG_START(ninjakd2_state::omegaf)
robokid(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(omegaf_main_cpu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(omegaf_main_cpu)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(ninjakid_nopcm_sound_cpu)
MCFG_MACHINE_START_OVERRIDE(ninjakd2_state,omegaf)
MCFG_MACHINE_RESET_OVERRIDE(ninjakd2_state,omegaf)
diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp
index f910d98a5f0..ddbd00c0d3b 100644
--- a/src/mame/drivers/ninjaw.cpp
+++ b/src/mame/drivers/ninjaw.cpp
@@ -736,16 +736,16 @@ void ninjaw_state::machine_reset()
MACHINE_CONFIG_START(ninjaw_state::ninjaw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(ninjaw_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(ninjaw_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 16/4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 16/4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
- MCFG_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(ninjaw_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(ninjaw_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
// TODO: if CPUs are unsynched then seldomly stages loads up with no enemies
// Let's use a better timer (was 6000 before) based off actual CPU timing.
@@ -758,7 +758,7 @@ MACHINE_CONFIG_START(ninjaw_state::ninjaw)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(ninjaw_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, ninjaw_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -832,7 +832,7 @@ MACHINE_CONFIG_START(ninjaw_state::ninjaw)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -850,7 +850,7 @@ MACHINE_CONFIG_START(ninjaw_state::ninjaw)
MCFG_FILTER_VOLUME_ADD("2610.2.r", 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-// MCFG_SOUND_ADD("subwoofer", SUBWOOFER, 0)
+// MCFG_DEVICE_ADD("subwoofer", SUBWOOFER, 0)
MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
MCFG_TC0140SYT_MASTER_CPU("maincpu")
@@ -861,16 +861,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ninjaw_state::darius2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(darius2_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(darius2_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
- MCFG_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(darius2_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000,16000000/2) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(darius2_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", ninjaw_state, irq4_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(16000000/1024)) /* CPU slices */
//MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -880,7 +880,7 @@ MACHINE_CONFIG_START(ninjaw_state::darius2)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(ninjaw_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, ninjaw_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -954,7 +954,7 @@ MACHINE_CONFIG_START(ninjaw_state::darius2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -972,7 +972,7 @@ MACHINE_CONFIG_START(ninjaw_state::darius2)
MCFG_FILTER_VOLUME_ADD("2610.2.r", 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-// MCFG_SOUND_ADD("subwoofer", SUBWOOFER, 0)
+// MCFG_DEVICE_ADD("subwoofer", SUBWOOFER, 0)
MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
MCFG_TC0140SYT_MASTER_CPU("maincpu")
diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp
index 927adcdf92d..e58aff21939 100644
--- a/src/mame/drivers/nitedrvr.cpp
+++ b/src/mame/drivers/nitedrvr.cpp
@@ -143,9 +143,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(nitedrvr_state::nitedrvr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000)/12) // 1 MHz
- MCFG_CPU_PROGRAM_MAP(nitedrvr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nitedrvr_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'096'000)/12) // 1 MHz
+ MCFG_DEVICE_PROGRAM_MAP(nitedrvr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nitedrvr_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 3)
@@ -168,7 +168,7 @@ MACHINE_CONFIG_START(nitedrvr_state::nitedrvr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(nitedrvr)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp
index c61f183325e..df1d68ffe6e 100644
--- a/src/mame/drivers/niyanpai.cpp
+++ b/src/mame/drivers/niyanpai.cpp
@@ -694,13 +694,13 @@ WRITE_LINE_MEMBER(niyanpai_state::vblank_irq)
MACHINE_CONFIG_START(niyanpai_state::niyanpai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */
- MCFG_CPU_PROGRAM_MAP(niyanpai_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(niyanpai_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(niyanpai_state, tmp68301_parallel_port_w))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, niyanpai_state, tmp68301_parallel_port_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -713,7 +713,7 @@ MACHINE_CONFIG_START(niyanpai_state::niyanpai)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 240-1)
MCFG_SCREEN_UPDATE_DRIVER(niyanpai_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(niyanpai_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, niyanpai_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 256*3)
@@ -725,8 +725,8 @@ MACHINE_CONFIG_START(niyanpai_state::musobana)
niyanpai(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(musobana_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(musobana_map)
MCFG_MACHINE_START_OVERRIDE(niyanpai_state, musobana)
MACHINE_CONFIG_END
@@ -735,16 +735,16 @@ MACHINE_CONFIG_START(niyanpai_state::mhhonban)
musobana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mhhonban_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mhhonban_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(niyanpai_state::zokumahj)
musobana(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zokumahj_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zokumahj_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp
index 8e285225a27..65569f2ef70 100644
--- a/src/mame/drivers/nmg5.cpp
+++ b/src/mame/drivers/nmg5.cpp
@@ -992,13 +992,13 @@ void nmg5_state::machine_reset()
MACHINE_CONFIG_START(nmg5_state::nmg5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(nmg5_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nmg5_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(nmg5_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nmg5_state, irq6_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(nmg5_sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(nmg5_sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* video hardware */
@@ -1027,7 +1027,7 @@ MACHINE_CONFIG_START(nmg5_state::nmg5)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) /* 4MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 4000000) /* 4MHz */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1040,11 +1040,11 @@ MACHINE_CONFIG_START(nmg5_state::garogun)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pclubys_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pclubys_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(pclubys_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(pclubys_sound_map)
MACHINE_CONFIG_END
@@ -1053,11 +1053,11 @@ MACHINE_CONFIG_START(nmg5_state::pclubys)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pclubys_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pclubys_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(pclubys_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(pclubys_sound_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", pclubys)
MACHINE_CONFIG_END
@@ -1078,8 +1078,8 @@ MACHINE_CONFIG_START(nmg5_state::_7ordi)
/* basic machine hardware */
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(pclubys_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(pclubys_sound_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index 5567d4f580e..5335b155c98 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -3847,13 +3847,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::nmk16_scanline)
MACHINE_CONFIG_START(nmk16_state::tharrier)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(tharrier_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tharrier_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 3000000)
- MCFG_CPU_PROGRAM_MAP(tharrier_sound_map)
- MCFG_CPU_IO_MAP(tharrier_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)
+ MCFG_DEVICE_PROGRAM_MAP(tharrier_sound_map)
+ MCFG_DEVICE_IO_MAP(tharrier_sound_io_map)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
@@ -3871,7 +3871,7 @@ MACHINE_CONFIG_START(nmk16_state::tharrier)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -3890,8 +3890,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::mustang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MCFG_CPU_PROGRAM_MAP(mustang_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(mustang_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -3911,8 +3911,8 @@ MACHINE_CONFIG_START(nmk16_state::mustang)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -3930,12 +3930,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::mustangb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MCFG_CPU_PROGRAM_MAP(mustangb_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(mustangb_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
@@ -3951,8 +3951,8 @@ MACHINE_CONFIG_START(nmk16_state::mustangb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -3961,8 +3961,8 @@ MACHINE_CONFIG_START(nmk16_state::mustangb)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
#define BIOSHIP_CRYSTAL1 10000000
@@ -3971,8 +3971,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::bioship)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
- MCFG_CPU_PROGRAM_MAP(bioship_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
+ MCFG_DEVICE_PROGRAM_MAP(bioship_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -3992,8 +3992,8 @@ MACHINE_CONFIG_START(nmk16_state::bioship)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4011,8 +4011,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::vandyke)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 68000p12 running at 10Mhz, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(vandyke_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* 68000p12 running at 10Mhz, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(vandyke_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4032,8 +4032,8 @@ MACHINE_CONFIG_START(nmk16_state::vandyke)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4051,11 +4051,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::vandykeb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MCFG_CPU_PROGRAM_MAP(vandykeb_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(vandykeb_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("mcu", PIC16C57, 12000000) /* 3MHz */
+ MCFG_DEVICE_ADD("mcu", PIC16C57, 12000000) /* 3MHz */
MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -4080,8 +4080,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::acrobatm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(acrobatm_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(acrobatm_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4101,8 +4101,8 @@ MACHINE_CONFIG_START(nmk16_state::acrobatm)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4121,12 +4121,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound hardware */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(tdragonb_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(tdragonb_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
@@ -4142,8 +4142,8 @@ MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound har
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -4152,15 +4152,15 @@ MACHINE_CONFIG_START(nmk16_state::tdragonb) /* bootleg using Raiden sound har
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::tdragon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tdragon_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tdragon_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4180,8 +4180,8 @@ MACHINE_CONFIG_START(nmk16_state::tdragon)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4204,12 +4204,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::ssmissin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz */
- MCFG_CPU_PROGRAM_MAP(ssmissin_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(ssmissin_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 8000000/2) /* 4 Mhz */
- MCFG_CPU_PROGRAM_MAP(ssmissin_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000/2) /* 4 Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(ssmissin_sound_map)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
@@ -4237,8 +4237,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::strahl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */
- MCFG_CPU_PROGRAM_MAP(strahl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(strahl_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4257,8 +4257,8 @@ MACHINE_CONFIG_START(nmk16_state::strahl)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4276,8 +4276,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::hachamf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MCFG_CPU_PROGRAM_MAP(hachamf_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(hachamf_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4297,8 +4297,8 @@ MACHINE_CONFIG_START(nmk16_state::hachamf)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4322,8 +4322,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::macross)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MCFG_CPU_PROGRAM_MAP(macross_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(macross_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4343,8 +4343,8 @@ MACHINE_CONFIG_START(nmk16_state::macross)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4362,8 +4362,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::blkheart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(macross_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(macross_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4383,8 +4383,8 @@ MACHINE_CONFIG_START(nmk16_state::blkheart)
MCFG_NMK004_ADD("nmk004", 8000000)
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8 ) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/8 ) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4402,8 +4402,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::gunnail)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(gunnail_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(gunnail_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4422,8 +4422,8 @@ MACHINE_CONFIG_START(nmk16_state::gunnail)
MCFG_NMK004_ADD("nmk004", XTAL(16'000'000)/2) /* verified on pcb */
MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -4441,13 +4441,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::macross2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
- MCFG_CPU_PROGRAM_MAP(macross2_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(macross2_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(macross2_sound_map)
- MCFG_CPU_IO_MAP(macross2_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(macross2_sound_map)
+ MCFG_DEVICE_IO_MAP(macross2_sound_io_map)
/* video hardware */
NMK_HACKY_SCREEN_HIRES
@@ -4466,7 +4466,7 @@ MACHINE_CONFIG_START(nmk16_state::macross2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -4487,13 +4487,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::tdragon2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(macross2_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(macross2_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(macross2_sound_map)
- MCFG_CPU_IO_MAP(macross2_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(macross2_sound_map)
+ MCFG_DEVICE_IO_MAP(macross2_sound_io_map)
/* video hardware */
NMK_HACKY_SCREEN_HIRES
@@ -4512,7 +4512,7 @@ MACHINE_CONFIG_START(nmk16_state::tdragon2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -4533,20 +4533,20 @@ MACHINE_CONFIG_END
// TODO : Sound system is different
MACHINE_CONFIG_START(nmk16_state::tdragon3h)
tdragon2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tdragon3h_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tdragon3h_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::raphero)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */
- MCFG_CPU_PROGRAM_MAP(raphero_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */
+ MCFG_DEVICE_PROGRAM_MAP(raphero_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu",TMP90841, 8000000)
- MCFG_CPU_PROGRAM_MAP(raphero_sound_mem_map)
+ MCFG_DEVICE_ADD("audiocpu",TMP90841, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(raphero_sound_mem_map)
/* video hardware */
NMK_HACKY_SCREEN_HIRES
@@ -4565,7 +4565,7 @@ MACHINE_CONFIG_START(nmk16_state::raphero)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -4586,8 +4586,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::bjtwin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(bjtwin_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(bjtwin_map)
NMK_HACKY_INTERRUPT_TIMING
/* video hardware */
@@ -4638,14 +4638,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::manybloc_scanline)
MACHINE_CONFIG_START(nmk16_state::manybloc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */
- MCFG_CPU_PROGRAM_MAP(manybloc_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nmk16_state, irq1_line_hold, 56)/* this needs to equal the framerate on this, rather than being double it .. */
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */
+ MCFG_DEVICE_PROGRAM_MAP(manybloc_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nmk16_state, irq1_line_hold, 56)/* this needs to equal the framerate on this, rather than being double it .. */
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", nmk16_state, manybloc_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 3000000)
- MCFG_CPU_PROGRAM_MAP(tharrier_sound_map)
- MCFG_CPU_IO_MAP(tharrier_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000)
+ MCFG_DEVICE_PROGRAM_MAP(tharrier_sound_map)
+ MCFG_DEVICE_IO_MAP(tharrier_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -4669,7 +4669,7 @@ MACHINE_CONFIG_START(nmk16_state::manybloc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -5157,12 +5157,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(nmk16_state::stagger1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(12'000'000)) /* 68000p10 running at 12mhz, verified on pcb */
- MCFG_CPU_PROGRAM_MAP(afega_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(12'000'000)) /* 68000p10 running at 12mhz, verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(afega_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(afega_sound_cpu)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(afega_sound_cpu)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
@@ -5247,12 +5247,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::firehawk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,12000000)
- MCFG_CPU_PROGRAM_MAP(firehawk_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000)
+ MCFG_DEVICE_PROGRAM_MAP(firehawk_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(firehawk_sound_cpu)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(firehawk_sound_cpu)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
@@ -5280,20 +5280,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::spec2k)
firehawk(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(afega_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(afega_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nmk16_state::twinactn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,12000000)
- MCFG_CPU_PROGRAM_MAP(twinactn_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000)
+ MCFG_DEVICE_PROGRAM_MAP(twinactn_map)
NMK_HACKY_INTERRUPT_TIMING
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(twinactn_sound_cpu)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(twinactn_sound_cpu)
/* video hardware */
NMK_HACKY_SCREEN_LOWRES
diff --git a/src/mame/drivers/nmkmedal.cpp b/src/mame/drivers/nmkmedal.cpp
index 74d5afbc1b6..513327f21f7 100644
--- a/src/mame/drivers/nmkmedal.cpp
+++ b/src/mame/drivers/nmkmedal.cpp
@@ -56,11 +56,11 @@ static INPUT_PORTS_START( trocana )
INPUT_PORTS_END
MACHINE_CONFIG_START(nmkmedal_state::trocana)
- MCFG_CPU_ADD("maincpu", TMP90841, 16500000 / 2) // actually TMP90C041AN
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", TMP90841, 16500000 / 2) // actually TMP90C041AN
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("oki", OKIM6376, 16500000 / 16) // actually MSM6650
+ MCFG_DEVICE_ADD("oki", OKIM6376, 16500000 / 16) // actually MSM6650
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp
index c529781e10f..ad42f956bbf 100644
--- a/src/mame/drivers/nokia_3310.cpp
+++ b/src/mame/drivers/nokia_3310.cpp
@@ -703,8 +703,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(noki3310_state::noki3310)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7_BE, 26000000 / 2) // MAD2WD1 13 MHz, clock internally supplied to ARM core can be divided by 2, in sleep mode a 32768 Hz clock is used
- MCFG_CPU_PROGRAM_MAP(noki3310_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7_BE, 26000000 / 2) // MAD2WD1 13 MHz, clock internally supplied to ARM core can be divided by 2, in sleep mode a 32768 Hz clock is used
+ MCFG_DEVICE_PROGRAM_MAP(noki3310_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", LCD, rgb_t::white())
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index bbbaca9eb41..ca5b4586e9a 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -1243,29 +1243,29 @@ GFXDECODE_END
MACHINE_CONFIG_START(norautp_state::noraut_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, NORAUT_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(norautp_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, NORAUT_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(norautp_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
MCFG_NVRAM_ADD_0FILL("nvram") /* doesn't work if placed at derivative drivers */
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
/* (60-63) Mode 0 - Port A set as input */
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(norautp_state, mainlamps_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(norautp_state, counterlamps_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, norautp_state, mainlamps_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, norautp_state, counterlamps_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
/* (a0-a3) Mode 0 - Ports A & B set as input */
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(norautp_state, soundlamps_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, norautp_state, soundlamps_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
/* (c0-c3) Group A Mode 2 (5-lines handshacked bidirectional port)
Group B Mode 0, output; (see below for lines PC0-PC2) */
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_I8255_OUT_PORTC_CB(WRITELINE(norautp_state, ppi2_obf_w)) MCFG_DEVCB_BIT(7)
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE(*this, norautp_state, ppi2_obf_w)) MCFG_DEVCB_BIT(7)
/* PPI-2 is configured as mixed mode2 and mode0 output.
It means that port A should be bidirectional and port B just as output.
Port C as hshk regs, and P0-P2 as input (norautp, norautjp) or output (other sets). */
@@ -1286,7 +1286,7 @@ MACHINE_CONFIG_START(norautp_state::noraut_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(norautp)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1296,8 +1296,8 @@ MACHINE_CONFIG_START(norautp_state::norautp)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
MACHINE_CONFIG_END
@@ -1305,11 +1305,11 @@ MACHINE_CONFIG_START(norautp_state::norautpl)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(kimble)
MACHINE_CONFIG_END
@@ -1318,9 +1318,9 @@ MACHINE_CONFIG_START(norautp_state::norautxp)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(norautxp_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(norautxp_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
MACHINE_CONFIG_END
@@ -1328,9 +1328,9 @@ MACHINE_CONFIG_START(norautp_state::nortest1)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nortest1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nortest1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
MACHINE_CONFIG_END
@@ -1338,9 +1338,9 @@ MACHINE_CONFIG_START(norautp_state::norautx4)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(norautx4_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(norautx4_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
MACHINE_CONFIG_END
@@ -1349,9 +1349,9 @@ static MACHINE_CONFIG_START( norautx8 )
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(norautx8_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(norautx8_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
MACHINE_CONFIG_END
#endif
@@ -1360,12 +1360,12 @@ MACHINE_CONFIG_START(norautp_state::kimble)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kimble_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kimble_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(kimble)
MACHINE_CONFIG_END
@@ -1373,10 +1373,10 @@ MACHINE_CONFIG_START(norautp_state::newhilop)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(newhilop_map)
-// MCFG_CPU_IO_MAP(newhilop_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(newhilop_map)
+// MCFG_DEVICE_IO_MAP(newhilop_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", norautp_state, irq0_line_hold)
MACHINE_CONFIG_END
/********** 8080 based **********/
@@ -1386,12 +1386,12 @@ MACHINE_CONFIG_START(norautp_state::dphl)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dphl_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dphl_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(dphl)
MACHINE_CONFIG_END
@@ -1400,12 +1400,12 @@ MACHINE_CONFIG_START(norautp_state::dphla)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dphla_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dphla_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(dphl)
MACHINE_CONFIG_END
@@ -1414,12 +1414,12 @@ MACHINE_CONFIG_START(norautp_state::kimbldhl)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(kimbldhl_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(kimbldhl_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(kimble)
MACHINE_CONFIG_END
@@ -1428,12 +1428,12 @@ MACHINE_CONFIG_START(norautp_state::dphltest)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(dphltest_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(dphltest_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(dphl)
MACHINE_CONFIG_END
@@ -1442,12 +1442,12 @@ MACHINE_CONFIG_START(norautp_state::drhl)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(drhl_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(drhl_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(dphl)
MACHINE_CONFIG_END
@@ -1456,12 +1456,12 @@ MACHINE_CONFIG_START(norautp_state::ssjkrpkr)
noraut_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ssjkrpkr_map)
- MCFG_CPU_IO_MAP(norautp_portmap)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, DPHL_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ssjkrpkr_map)
+ MCFG_DEVICE_IO_MAP(norautp_portmap)
/* sound hardware */
- MCFG_SOUND_MODIFY("discrete")
+ MCFG_DEVICE_MODIFY("discrete")
MCFG_DISCRETE_INTF(dphl)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/notechan.cpp b/src/mame/drivers/notechan.cpp
index 8d77e85ed67..760f6ae5ac1 100644
--- a/src/mame/drivers/notechan.cpp
+++ b/src/mame/drivers/notechan.cpp
@@ -500,10 +500,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(notechan_state::notechan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // unknown...
- MCFG_CPU_PROGRAM_MAP(notechan_map)
- MCFG_CPU_IO_MAP(notechan_port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(driver_device, irq0_line_hold, 60)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) // unknown...
+ MCFG_DEVICE_PROGRAM_MAP(notechan_map)
+ MCFG_DEVICE_IO_MAP(notechan_port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(driver_device, irq0_line_hold, 60)
/* NO VIDEO */
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index 4e47bf3d669..91e4d317573 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -795,20 +795,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(notetaker_state::notetakr)
/* basic machine hardware */
/* IO CPU: 8086@8MHz */
- MCFG_CPU_ADD("iop_cpu", I8086, XTAL(24'000'000)/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */
- MCFG_CPU_PROGRAM_MAP(iop_mem)
- MCFG_CPU_IO_MAP(iop_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("iop_pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("iop_cpu", I8086, XTAL(24'000'000)/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */
+ MCFG_DEVICE_PROGRAM_MAP(iop_mem)
+ MCFG_DEVICE_IO_MAP(iop_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("iop_pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("iop_pic8259", PIC8259, 0) // iP8259A-2 @ E6
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("iop_cpu", 0))
/* Emulator CPU: 8086@5MHz */
- MCFG_CPU_ADD("ep_cpu", I8086, XTAL(15'000'000)/3)
+ MCFG_DEVICE_ADD("ep_cpu", I8086, XTAL(15'000'000)/3)
MCFG_DEVICE_DISABLE() // TODO: implement the cpu control bits so this doesn't execute garbage/zeroes before its firmware gets loaded
- MCFG_CPU_PROGRAM_MAP(ep_mem)
- MCFG_CPU_IO_MAP(ep_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("ep_pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_PROGRAM_MAP(ep_mem)
+ MCFG_DEVICE_IO_MAP(ep_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("ep_pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("ep_pic8259", PIC8259, 0) // iP8259A-2 @ E6
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("ep_cpu", 0))
@@ -838,7 +838,7 @@ MACHINE_CONFIG_START(notetaker_state::notetakr)
// TODO: for now, we just hack it to the latter setting from start; this should be handled correctly in iop_reset();
MCFG_TMS9927_CHAR_WIDTH(8) //(8 pixels per column/halfword, 16 pixels per fullword)
// TODO: below is HACKED to trigger the odd/even int ir4 instead of vblank int ir7 since ir4 is required for anything to be drawn to screen! hence with the hack this interrupt triggers twice as often as it should
- MCFG_TMS9927_VSYN_CALLBACK(DEVWRITELINE("iop_pic8259", pic8259_device, ir4_w)) // note this triggers interrupts on both the iop (ir7) and emulatorcpu (ir4)
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE("iop_pic8259", pic8259_device, ir4_w)) // note this triggers interrupts on both the iop (ir7) and emulatorcpu (ir4)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD( "kbduart", AY31015, 0 ) // HD6402, == AY-3-1015D
@@ -856,7 +856,7 @@ MACHINE_CONFIG_START(notetaker_state::notetakr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
// TODO: hook DAC up to two HA2425 (sample and hold) chips and hook those up to the speakers
- MCFG_SOUND_ADD("dac", DAC1200, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC1200, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp
index da0f88bdc64..3bff2515e6b 100644
--- a/src/mame/drivers/nova2001.cpp
+++ b/src/mame/drivers/nova2001.cpp
@@ -649,9 +649,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(nova2001_state::nova2001)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
- MCFG_CPU_PROGRAM_MAP(nova2001_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
+ MCFG_DEVICE_PROGRAM_MAP(nova2001_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -673,12 +673,12 @@ MACHINE_CONFIG_START(nova2001_state::nova2001)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/6) // 2 MHz verified on schematics
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nova2001_state, nova2001_scroll_x_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nova2001_state, nova2001_scroll_y_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK/6) // 2 MHz verified on schematics
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nova2001_state, nova2001_scroll_x_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nova2001_state, nova2001_scroll_y_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("ay2", AY8910, MAIN_CLOCK/6)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -687,13 +687,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nova2001_state::ninjakun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(ninjakun_cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(ninjakun_cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(ninjakun_cpu2_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nova2001_state, irq0_line_hold, 4*60) /* ? */
+ MCFG_DEVICE_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(ninjakun_cpu2_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nova2001_state, irq0_line_hold, 4*60) /* ? */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
@@ -717,24 +717,24 @@ MACHINE_CONFIG_START(nova2001_state::ninjakun)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/4) // 3 MHz
+ MCFG_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK/4) // 3 MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/4) // 3 MHz
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nova2001_state, nova2001_scroll_x_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nova2001_state, nova2001_scroll_y_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, MAIN_CLOCK/4) // 3 MHz
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nova2001_state, nova2001_scroll_x_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nova2001_state, nova2001_scroll_y_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nova2001_state::pkunwar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(pkunwar_map)
- MCFG_CPU_IO_MAP(pkunwar_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(pkunwar_map)
+ MCFG_DEVICE_IO_MAP(pkunwar_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -754,12 +754,12 @@ MACHINE_CONFIG_START(nova2001_state::pkunwar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz (correct?)
+ MCFG_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz (correct?)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, MAIN_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -768,14 +768,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nova2001_state::raiders5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(raiders5_cpu1_map)
- MCFG_CPU_IO_MAP(raiders5_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(raiders5_cpu1_map)
+ MCFG_DEVICE_IO_MAP(raiders5_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nova2001_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
- MCFG_CPU_PROGRAM_MAP(raiders5_cpu2_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nova2001_state, irq0_line_hold, 4*60) /* ? */
+ MCFG_DEVICE_ADD("sub", Z80, MAIN_CLOCK/4) // 3 MHz
+ MCFG_DEVICE_PROGRAM_MAP(raiders5_cpu2_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nova2001_state, irq0_line_hold, 4*60) /* ? */
MCFG_QUANTUM_TIME(attotime::from_hz(24000))
@@ -796,12 +796,12 @@ MACHINE_CONFIG_START(nova2001_state::raiders5)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz
+ MCFG_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK/8) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, MAIN_CLOCK/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, MAIN_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index 50f83a0f975..f38a0df4169 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -868,9 +868,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(novag6502_state::supercon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 8_MHz_XTAL/2)
- MCFG_CPU_PERIODIC_INT_DRIVER(novag6502_state, irq0_line_hold, 600) // guessed
- MCFG_CPU_PROGRAM_MAP(supercon_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 8_MHz_XTAL/2)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(novag6502_state, irq0_line_hold, 600) // guessed
+ MCFG_DEVICE_PROGRAM_MAP(supercon_map)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -879,15 +879,15 @@ MACHINE_CONFIG_START(novag6502_state::supercon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1024) // guessed
+ MCFG_DEVICE_ADD("beeper", BEEP, 1024) // guessed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(novag6502_state::cforte)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R65C02, 10_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(cforte_map)
+ MCFG_DEVICE_ADD("maincpu", R65C02, 10_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(cforte_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(32.768_kHz_XTAL/128)) // 256Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_usec(11)) // active for 11us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag6502_state, irq_off, attotime::from_hz(32.768_kHz_XTAL/128))
@@ -896,22 +896,22 @@ MACHINE_CONFIG_START(novag6502_state::cforte)
/* video hardware */
MCFG_DEVICE_ADD("hlcd0538", HLCD0538, 0)
- MCFG_HLCD0538_WRITE_COLS_CB(WRITE64(novag6502_state, cforte_lcd_output_w))
+ MCFG_HLCD0538_WRITE_COLS_CB(WRITE64(*this, novag6502_state, cforte_lcd_output_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_novag_cforte)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 32.768_kHz_XTAL/32) // 1024Hz
+ MCFG_DEVICE_ADD("beeper", BEEP, 32.768_kHz_XTAL/32) // 1024Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(novag6502_state::sexpert)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, 10_MHz_XTAL/2) // or 12_MHz_XTAL/2
- MCFG_CPU_PROGRAM_MAP(sexpert_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 10_MHz_XTAL/2) // or 12_MHz_XTAL/2
+ MCFG_DEVICE_PROGRAM_MAP(sexpert_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag6502_state, irq_on, attotime::from_hz(32.768_kHz_XTAL/128)) // 256Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_nsec(21500)) // active for 21.5us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag6502_state, irq_off, attotime::from_hz(32.768_kHz_XTAL/128))
@@ -919,12 +919,12 @@ MACHINE_CONFIG_START(novag6502_state::sexpert)
MCFG_DEVICE_ADD("acia", MOS6551, 0) // R65C51P2 - RTS to CTS, DCD to GND
MCFG_MOS6551_XTAL(1.8432_MHz_XTAL)
MCFG_MOS6551_IRQ_HANDLER(INPUTLINE("maincpu", M6502_NMI_LINE))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE("acia", mos6551_device, write_cts))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE("acia", mos6551_device, write_cts))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -950,7 +950,7 @@ MACHINE_CONFIG_START(novag6502_state::sexpert)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 32.768_kHz_XTAL/32) // 1024Hz
+ MCFG_DEVICE_ADD("beeper", BEEP, 32.768_kHz_XTAL/32) // 1024Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -958,8 +958,8 @@ MACHINE_CONFIG_START(novag6502_state::sforte)
sexpert(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sforte_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sforte_map)
MCFG_TIMER_MODIFY("irq_on")
MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_usec(11)) // active for ?us (assume same as cforte)
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index d87424337f3..69875bedad1 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -236,8 +236,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(novag68k_state::diablo68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(diablo68k_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(diablo68k_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_on", novag68k_state, irq_on, attotime::from_hz(32.768_kHz_XTAL/128)) // 256Hz
MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_nsec(1100)) // active for 1.1us
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", novag68k_state, irq_off, attotime::from_hz(32.768_kHz_XTAL/128))
@@ -267,7 +267,7 @@ MACHINE_CONFIG_START(novag68k_state::diablo68k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 32.768_kHz_XTAL/32) // 1024Hz
+ MCFG_DEVICE_ADD("beeper", BEEP, 32.768_kHz_XTAL/32) // 1024Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -275,8 +275,8 @@ MACHINE_CONFIG_START(novag68k_state::scorpio68k)
diablo68k(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scorpio68k_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scorpio68k_map)
//MCFG_DEFAULT_LAYOUT(layout_novag_scorpio68k)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/novagf8.cpp b/src/mame/drivers/novagf8.cpp
index ca545ff2bba..c4bc005ace6 100644
--- a/src/mame/drivers/novagf8.cpp
+++ b/src/mame/drivers/novagf8.cpp
@@ -193,9 +193,9 @@ F3853_INTERRUPT_REQ_CB(novagf8_state::f3853_interrupt)
MACHINE_CONFIG_START(novagf8_state::delta1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", F8, 2000000) // LC circuit, measured 2MHz
- MCFG_CPU_PROGRAM_MAP(delta1_map)
- MCFG_CPU_IO_MAP(delta1_io)
+ MCFG_DEVICE_ADD("maincpu", F8, 2000000) // LC circuit, measured 2MHz
+ MCFG_DEVICE_PROGRAM_MAP(delta1_map)
+ MCFG_DEVICE_IO_MAP(delta1_io)
MCFG_DEVICE_ADD("f3853", F3853, 2000000)
MCFG_F3853_EXT_INPUT_CB(novagf8_state, f3853_interrupt)
diff --git a/src/mame/drivers/novagmcs48.cpp b/src/mame/drivers/novagmcs48.cpp
index 0f14c0bb638..a7de38af76a 100644
--- a/src/mame/drivers/novagmcs48.cpp
+++ b/src/mame/drivers/novagmcs48.cpp
@@ -147,17 +147,17 @@ INPUT_CHANGED_MEMBER(novagmcs48_state::octo_cpu_freq)
MACHINE_CONFIG_START(novagmcs48_state::presto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8049, 6000000) // LC circuit, measured 6MHz
- MCFG_MCS48_PORT_P1_IN_CB(READ8(novagmcs48_state, presto_input_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(novagmcs48_state, presto_control_w))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(novagmcs48_state, presto_mux_w))
+ MCFG_DEVICE_ADD("maincpu", I8049, 6000000) // LC circuit, measured 6MHz
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, novagmcs48_state, presto_input_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, novagmcs48_state, presto_control_w))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, novagmcs48_state, presto_mux_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_novag_presto)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
@@ -166,7 +166,7 @@ MACHINE_CONFIG_START(novagmcs48_state::octo)
presto(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(12000000) // LC circuit, measured, see octo_set_cpu_freq
MCFG_MACHINE_RESET_OVERRIDE(novagmcs48_state, octo)
diff --git a/src/mame/drivers/nsg6809.cpp b/src/mame/drivers/nsg6809.cpp
index f816857eb69..2e47b9f4d4f 100644
--- a/src/mame/drivers/nsg6809.cpp
+++ b/src/mame/drivers/nsg6809.cpp
@@ -73,15 +73,15 @@ static INPUT_PORTS_START( pitchhit )
INPUT_PORTS_END
MACHINE_CONFIG_START(nsg6809_state::pitchhit)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000)) // clock buffered through 74HC4060
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) // clock buffered through 74HC4060
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("acia", MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
MCFG_WATCHDOG_ADD("deadman")
diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp
index 8bf496b22a9..b6f8c1f9d12 100644
--- a/src/mame/drivers/nsm.cpp
+++ b/src/mame/drivers/nsm.cpp
@@ -134,9 +134,9 @@ MACHINE_CONFIG_START(nsm_state::nsm)
/* Sound */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ay1", AY8912, 11052000/8)
+ MCFG_DEVICE_ADD("ay1", AY8912, 11052000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MCFG_SOUND_ADD("ay2", AY8912, 11052000/8)
+ MCFG_DEVICE_ADD("ay2", AY8912, 11052000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp
index c452f4f77d2..1a740271aaf 100644
--- a/src/mame/drivers/nsmpoker.cpp
+++ b/src/mame/drivers/nsmpoker.cpp
@@ -418,7 +418,7 @@ MACHINE_CONFIG_START(nsmpoker_state::nsmpoker)
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, MASTER_CLOCK/2, nsmpoker_map, nsmpoker_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nsmpoker_state, nsmpoker_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nsmpoker_state, nsmpoker_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp
index 0a06a8339df..21e83165d3c 100644
--- a/src/mame/drivers/nss.cpp
+++ b/src/mame/drivers/nss.cpp
@@ -831,19 +831,19 @@ void nss_state::machine_reset()
MACHINE_CONFIG_START(nss_state::nss)
/* base snes hardware */
- MCFG_CPU_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68Mhz, also 3.58Mhz */
- MCFG_CPU_PROGRAM_MAP(snes_map)
+ MCFG_DEVICE_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68Mhz, also 3.58Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(snes_map)
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
- MCFG_CPU_PROGRAM_MAP(spc_mem)
+ MCFG_DEVICE_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
+ MCFG_DEVICE_PROGRAM_MAP(spc_mem)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
/* nss hardware */
- MCFG_CPU_ADD("bios", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(bios_map)
- MCFG_CPU_IO_MAP(bios_io_map)
+ MCFG_DEVICE_ADD("bios", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(bios_map)
+ MCFG_DEVICE_IO_MAP(bios_io_map)
MCFG_M50458_ADD("m50458", 4000000, "osd") /* TODO: correct clock */
MCFG_S3520CF_ADD("s3520cf") /* RTC */
@@ -852,7 +852,7 @@ MACHINE_CONFIG_START(nss_state::nss)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_DEVICE_ADD("spc700", SNES_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
@@ -864,10 +864,10 @@ MACHINE_CONFIG_START(nss_state::nss)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC)
MCFG_SCREEN_UPDATE_DRIVER( snes_state, screen_update )
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(nss_state, nss_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, nss_state, nss_vblank_irq))
MCFG_DEVICE_ADD("ppu", SNES_PPU, 0)
- MCFG_SNES_PPU_OPENBUS_CB(READ8(snes_state, snes_open_bus_r))
+ MCFG_SNES_PPU_OPENBUS_CB(READ8(*this, snes_state, snes_open_bus_r))
MCFG_VIDEO_SET_SCREEN("screen")
// NSS
diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp
index 268330a2ccc..e67f3ba69a5 100644
--- a/src/mame/drivers/nwk-tr.cpp
+++ b/src/mame/drivers/nwk-tr.cpp
@@ -825,19 +825,19 @@ void nwktr_state::machine_reset()
MACHINE_CONFIG_START(nwktr_state::nwktr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
- MCFG_CPU_PROGRAM_MAP(nwktr_map)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
+ MCFG_DEVICE_PROGRAM_MAP(nwktr_map)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc0_map)
+ MCFG_DEVICE_DATA_MAP(sharc0_map)
- MCFG_CPU_ADD("dsp2", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp2", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc1_map)
+ MCFG_DEVICE_DATA_MAP(sharc1_map)
MCFG_QUANTUM_TIME(attotime::from_hz(9000))
@@ -858,14 +858,14 @@ MACHINE_CONFIG_START(nwktr_state::nwktr)
MCFG_VOODOO_TMUMEM(2,2)
MCFG_VOODOO_SCREEN_TAG("lscreen")
MCFG_VOODOO_CPU_TAG("dsp")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(nwktr_state,voodoo_vblank_0))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, nwktr_state,voodoo_vblank_0))
MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK)
MCFG_VOODOO_FBMEM(2)
MCFG_VOODOO_TMUMEM(2, 2)
MCFG_VOODOO_SCREEN_TAG("rscreen")
MCFG_VOODOO_CPU_TAG("dsp2")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(nwktr_state, voodoo_vblank_1))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, nwktr_state, voodoo_vblank_1))
MCFG_SCREEN_ADD("lscreen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp
index 282dbbcc17f..7e95342636d 100644
--- a/src/mame/drivers/nycaptor.cpp
+++ b/src/mame/drivers/nycaptor.cpp
@@ -735,17 +735,17 @@ void nycaptor_state::machine_reset()
MACHINE_CONFIG_START(nycaptor_state::nycaptor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
- MCFG_CPU_PROGRAM_MAP(nycaptor_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(nycaptor_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(nycaptor_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(nycaptor_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold) /* IRQ generated by ??? */
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60) /* IRQ generated by ??? */
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,2000000)
@@ -770,24 +770,24 @@ MACHINE_CONFIG_START(nycaptor_state::nycaptor)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -803,24 +803,24 @@ MACHINE_CONFIG_START(nycaptor_state::nycaptor)
// Does the DAC also exist on this board? nycaptor writes 0x80 to 0xd600
// Update: of course it exists, sound board seems common Taito design.
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(nycaptor_state::cyclshtg)
- MCFG_CPU_ADD("maincpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(cyclshtg_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cyclshtg_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(cyclshtg_slave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(cyclshtg_slave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
#ifdef USE_MCU
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU,2000000)
@@ -844,24 +844,24 @@ MACHINE_CONFIG_START(nycaptor_state::cyclshtg)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -875,7 +875,7 @@ MACHINE_CONFIG_START(nycaptor_state::cyclshtg)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -883,18 +883,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nycaptor_state::bronx)
- MCFG_CPU_ADD("maincpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(bronx_master_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(bronx_master_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(bronx_slave_map)
- MCFG_CPU_IO_MAP(bronx_slave_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(bronx_slave_map)
+ MCFG_DEVICE_IO_MAP(bronx_slave_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nycaptor_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nycaptor_state, irq0_line_hold, 2*60)
MCFG_QUANTUM_TIME(attotime::from_hz(120))
@@ -913,24 +913,24 @@ MACHINE_CONFIG_START(nycaptor_state::bronx)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 8000000/4)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nycaptor_state, unk_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(nycaptor_state, unk_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 8000000/4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, nycaptor_state, unk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("msm", MSM5232, 2000000)
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000)
MCFG_MSM5232_SET_CAPACITORS(0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6, 0.65e-6) /* 0.65 (???) uF capacitors (match the sample, not verified) */
MCFG_SOUND_ROUTE(0, "speaker", 1.0) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "speaker", 1.0) // pin 29 4'-1
@@ -944,7 +944,7 @@ MACHINE_CONFIG_START(nycaptor_state::bronx)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index a03016a1931..f185af5aa2e 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -595,15 +595,15 @@ void nyny_state::machine_reset()
MACHINE_CONFIG_START(nyny_state::nyny)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, 5600000) /* 1.40 MHz? The clock signal is generated by analog chips */
- MCFG_CPU_PROGRAM_MAP(nyny_main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(nyny_state, update_pia_1, 25)
+ MCFG_DEVICE_ADD("maincpu", MC6809, 5600000) /* 1.40 MHz? The clock signal is generated by analog chips */
+ MCFG_DEVICE_PROGRAM_MAP(nyny_main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(nyny_state, update_pia_1, 25)
- MCFG_CPU_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nyny_audio_1_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, AUDIO_CPU_1_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nyny_audio_1_map)
- MCFG_CPU_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nyny_audio_2_map)
+ MCFG_DEVICE_ADD("audio2", M6802, AUDIO_CPU_2_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nyny_audio_2_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -619,7 +619,7 @@ MACHINE_CONFIG_START(nyny_state::nyny)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(nyny_state, crtc_update_row)
MCFG_MC6845_END_UPDATE_CB(nyny_state, crtc_end_update)
- MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("ic48_1", ttl74123_device, a_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE("ic48_1", ttl74123_device, a_w))
/* 74LS123 */
MCFG_DEVICE_ADD("ic48_1", TTL74123, 0)
@@ -629,20 +629,20 @@ MACHINE_CONFIG_START(nyny_state::nyny)
MCFG_TTL74123_A_PIN_VALUE(1) /* A pin - driven by the CRTC */
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(nyny_state, ic48_1_74123_output_changed))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, nyny_state, ic48_1_74123_output_changed))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(nyny_state, main_cpu_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(nyny_state, main_cpu_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, nyny_state, main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, nyny_state, main_cpu_irq))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(nyny_state,pia_2_port_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(nyny_state,pia_2_port_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(nyny_state,flipscreen_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(nyny_state,main_cpu_firq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(nyny_state,main_cpu_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, nyny_state,pia_2_port_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, nyny_state,pia_2_port_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, nyny_state,flipscreen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, nyny_state,main_cpu_firq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, nyny_state,main_cpu_irq))
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -651,20 +651,20 @@ MACHINE_CONFIG_START(nyny_state::nyny)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
- MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(nyny_state, nyny_ay8910_37_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_DEVICE_ADD("ay1", AY8910, AUDIO_CPU_1_CLOCK)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, nyny_state, nyny_ay8910_37_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK)
+ MCFG_DEVICE_ADD("ay2", AY8910, AUDIO_CPU_1_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("SW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK)
+ MCFG_DEVICE_ADD("ay3", AY8910, AUDIO_CPU_2_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.03)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp
index a1bdd89f76a..dc9321b0372 100644
--- a/src/mame/drivers/ob68k1a.cpp
+++ b/src/mame/drivers/ob68k1a.cpp
@@ -195,8 +195,8 @@ void ob68k1a_state::machine_reset()
MACHINE_CONFIG_START(ob68k1a_state::ob68k1a)
// basic machine hardware
- MCFG_CPU_ADD(MC68000L10_TAG, M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(ob68k1a_mem)
+ MCFG_DEVICE_ADD(MC68000L10_TAG, M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ob68k1a_mem)
// devices
MCFG_DEVICE_ADD(MC6821_0_TAG, PIA6821, 0)
@@ -205,28 +205,28 @@ MACHINE_CONFIG_START(ob68k1a_state::ob68k1a)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
MCFG_DEVICE_ADD(MC6850_0_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC6850_0_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MC6850_0_TAG, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MC6850_0_TAG, acia6850_device, write_cts))
MCFG_DEVICE_ADD(MC6850_1_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_cts))
MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(MC6850_0_TAG, acia6850_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(MC6850_1_TAG, acia6850_device, write_rxc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(MC6850_0_TAG, acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(MC6850_0_TAG, acia6850_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(MC6850_1_TAG, acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(MC6850_1_TAG, acia6850_device, write_rxc))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp
index 933fe8f83ee..51086e32d22 100644
--- a/src/mame/drivers/octopus.cpp
+++ b/src/mame/drivers/octopus.cpp
@@ -881,19 +881,19 @@ void octopus_centronics_devices(device_slot_interface &device)
MACHINE_CONFIG_START(octopus_state::octopus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8088, XTAL(24'000'000) / 3) // 8MHz
- MCFG_CPU_PROGRAM_MAP(octopus_mem)
- MCFG_CPU_IO_MAP(octopus_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(octopus_state, x86_irq_cb)
+ MCFG_DEVICE_ADD("maincpu",I8088, XTAL(24'000'000) / 3) // 8MHz
+ MCFG_DEVICE_PROGRAM_MAP(octopus_mem)
+ MCFG_DEVICE_IO_MAP(octopus_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(octopus_state, x86_irq_cb)
- MCFG_CPU_ADD("subcpu",Z80, XTAL(24'000'000) / 4) // 6MHz
- MCFG_CPU_PROGRAM_MAP(octopus_sub_mem)
- MCFG_CPU_IO_MAP(octopus_sub_io)
+ MCFG_DEVICE_ADD("subcpu",Z80, XTAL(24'000'000) / 4) // 6MHz
+ MCFG_DEVICE_PROGRAM_MAP(octopus_sub_mem)
+ MCFG_DEVICE_IO_MAP(octopus_sub_io)
MCFG_DEVICE_ADD("dma1", AM9517A, XTAL(24'000'000) / 6) // 4MHz
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma2", am9517a_device, dreq0_w))
- MCFG_I8237_IN_MEMR_CB(READ8(octopus_state,dma_read))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(octopus_state,dma_write))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma2", am9517a_device, dreq0_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, octopus_state,dma_read))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, octopus_state,dma_write))
//MCFG_I8237_IN_IOR_0_CB(NOOP)
//MCFG_I8237_IN_IOR_1_CB(NOOP) // HDC
//MCFG_I8237_IN_IOR_2_CB(NOOP) // RAM Refresh
@@ -902,97 +902,97 @@ MACHINE_CONFIG_START(octopus_state::octopus)
//MCFG_I8237_OUT_IOW_1_CB(NOOP) // HDC
//MCFG_I8237_OUT_IOW_2_CB(NOOP) // RAM Refresh
//MCFG_I8237_OUT_IOW_3_CB(NOOP)
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(octopus_state, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(octopus_state, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(octopus_state, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(octopus_state, dack3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, octopus_state, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, octopus_state, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, octopus_state, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, octopus_state, dack3_w))
MCFG_DEVICE_ADD("dma2", AM9517A, XTAL(24'000'000) / 6) // 4MHz
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(octopus_state, dma_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(octopus_state,dma_read))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(octopus_state,dma_write))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, octopus_state, dma_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, octopus_state,dma_read))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, octopus_state,dma_write))
//MCFG_I8237_IN_IOR_0_CB(NOOP)
- MCFG_I8237_IN_IOR_1_CB(DEVREAD8("fdc",fd1793_device,data_r)) // FDC
+ MCFG_I8237_IN_IOR_1_CB(READ8("fdc",fd1793_device,data_r)) // FDC
//MCFG_I8237_IN_IOR_2_CB(NOOP)
//MCFG_I8237_IN_IOR_3_CB(NOOP)
//MCFG_I8237_OUT_IOW_0_CB(NOOP)
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8("fdc",fd1793_device,data_w)) // FDC
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8("fdc",fd1793_device,data_w)) // FDC
//MCFG_I8237_OUT_IOW_2_CB(NOOP)
//MCFG_I8237_OUT_IOW_3_CB(NOOP)
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(octopus_state, dack4_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(octopus_state, dack5_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(octopus_state, dack6_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(octopus_state, dack7_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, octopus_state, dack4_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, octopus_state, dack5_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, octopus_state, dack6_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, octopus_state, dack7_w))
MCFG_DEVICE_ADD("pic_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(octopus_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, octopus_state, get_slave_ack))
MCFG_DEVICE_ADD("pic_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic_master", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic_master", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
// RTC (MC146818 via i8255 PPI)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(octopus_state,rtc_r))
- MCFG_I8255_IN_PORTB_CB(READ8(octopus_state,cntl_r))
- MCFG_I8255_IN_PORTC_CB(READ8(octopus_state,gpo_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(octopus_state,rtc_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(octopus_state,cntl_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(octopus_state,gpo_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, octopus_state,rtc_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, octopus_state,cntl_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, octopus_state,gpo_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, octopus_state,rtc_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, octopus_state,cntl_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, octopus_state,gpo_w))
MCFG_MC146818_ADD("rtc", XTAL(32'768))
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic_slave",pic8259_device, ir2_w)) MCFG_DEVCB_INVERT
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic_slave",pic8259_device, ir2_w)) MCFG_DEVCB_INVERT
// Keyboard UART
MCFG_DEVICE_ADD("keyboard", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic_slave",pic8259_device, ir4_w))
- MCFG_I8251_DTR_HANDLER(WRITELINE(octopus_state,spk_w))
- MCFG_I8251_RTS_HANDLER(WRITELINE(octopus_state,beep_w))
- MCFG_RS232_PORT_ADD("keyboard_port", keyboard, "octopus")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("keyboard", i8251_device, write_rxd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic_slave",pic8259_device, ir4_w))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(*this, octopus_state,spk_w))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(*this, octopus_state,beep_w))
+ MCFG_DEVICE_ADD("keyboard_port", RS232_PORT, keyboard, "octopus")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("keyboard", i8251_device, write_rxd))
MCFG_DEVICE_ADD("keyboard_clock_rx", CLOCK, 9600 * 64)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("keyboard",i8251_device,write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("keyboard",i8251_device,write_rxc))
MCFG_DEVICE_ADD("keyboard_clock_tx", CLOCK, 1200 * 64)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("keyboard",i8251_device,write_txc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("keyboard",i8251_device,write_txc))
MCFG_FD1793_ADD("fdc",XTAL(16'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic_master",pic8259_device, ir5_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma2",am9517a_device, dreq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic_master",pic8259_device, ir5_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma2",am9517a_device, dreq1_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", octopus_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", octopus_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("fd_list","octopus")
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(2457500) // DART channel A
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(octopus_state,serial_clock_w)) // being able to write both Rx and Tx clocks at one time would be nice
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, octopus_state,serial_clock_w)) // being able to write both Rx and Tx clocks at one time would be nice
MCFG_PIT8253_CLK1(2457500) // DART channel B
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("serial",z80sio_device,rxtxcb_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("serial",z80sio_device,rxtxcb_w))
MCFG_PIT8253_CLK2(2457500) // speaker frequency
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(octopus_state,spk_freq_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, octopus_state,spk_freq_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("serial", Z80SIO, XTAL(16'000'000) / 4) // clock rate not mentioned in tech manual
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("pic_master",pic8259_device, ir1_w))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("serial_a",rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("serial_b",rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("serial_a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio_device, ctsa_w)) MCFG_DEVCB_INVERT
- //MCFG_RS232_RI_HANDLER(DEVWRITELINE("serial",z80sio_device, ria_w)) MCFG_DEVCB_INVERT
- MCFG_RS232_PORT_ADD("serial_b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("serial",z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("serial",z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
- //MCFG_RS232_RI_HANDLER(DEVWRITELINE("serial",z80sio_device, rib_w)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("pic_master",pic8259_device, ir1_w))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("serial_a",rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("serial_b",rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("serial_a",rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("serial_b",rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("serial_a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("serial",z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("serial",z80sio_device, ctsa_w)) MCFG_DEVCB_INVERT
+ //MCFG_RS232_RI_HANDLER(WRITELINE("serial",z80sio_device, ria_w)) MCFG_DEVCB_INVERT
+ MCFG_DEVICE_ADD("serial_b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("serial",z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("serial",z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
+ //MCFG_RS232_RI_HANDLER(WRITELINE("serial",z80sio_device, rib_w)) MCFG_DEVCB_INVERT
MCFG_CENTRONICS_ADD("parallel", octopus_centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(octopus_state, parallel_busy_w))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(octopus_state, parallel_slctout_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, octopus_state, parallel_busy_w))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, octopus_state, parallel_slctout_w))
// TODO: Winchester HD controller (Xebec/SASI compatible? uses TTL logic)
/* video hardware */
@@ -1006,7 +1006,7 @@ MACHINE_CONFIG_START(octopus_state::octopus)
// MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("crtc", SCN2674, 0) // character clock can be selectable, either 16MHz or 17.6MHz
- MCFG_SCN2674_INTR_CALLBACK(DEVWRITELINE("pic_slave", pic8259_device, ir0_w))
+ MCFG_SCN2674_INTR_CALLBACK(WRITELINE("pic_slave", pic8259_device, ir0_w))
MCFG_SCN2674_CHARACTER_WIDTH(8)
MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(octopus_state, display_pixels)
MCFG_DEVICE_ADDRESS_MAP(0, octopus_vram)
diff --git a/src/mame/drivers/odyssey.cpp b/src/mame/drivers/odyssey.cpp
index 85c053945bb..48dd937fd90 100644
--- a/src/mame/drivers/odyssey.cpp
+++ b/src/mame/drivers/odyssey.cpp
@@ -134,8 +134,8 @@ void odyssey_state::machine_reset()
MACHINE_CONFIG_START(odyssey_state::odyssey)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // a Celeron at 1.70 GHz on the MB I checked.
- MCFG_CPU_PROGRAM_MAP(odyssey_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 133000000) // a Celeron at 1.70 GHz on the MB I checked.
+ MCFG_DEVICE_PROGRAM_MAP(odyssey_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp
index c55d2f6173e..e6fdd1a0067 100644
--- a/src/mame/drivers/odyssey2.cpp
+++ b/src/mame/drivers/odyssey2.cpp
@@ -670,17 +670,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(odyssey2_state::odyssey2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, ( ( XTAL(7'159'090) * 3 ) / 4 ) )
- MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
- MCFG_CPU_IO_MAP(odyssey2_io)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(odyssey2_state, p1_read))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(odyssey2_state, p1_write))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(odyssey2_state, p2_read))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(odyssey2_state, p2_write))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(odyssey2_state, bus_read))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(odyssey2_state, bus_write))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("cartslot", o2_cart_slot_device, t0_read))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(odyssey2_state, t1_read))
+ MCFG_DEVICE_ADD("maincpu", I8048, ( ( XTAL(7'159'090) * 3 ) / 4 ) )
+ MCFG_DEVICE_PROGRAM_MAP(odyssey2_mem)
+ MCFG_DEVICE_IO_MAP(odyssey2_io)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, odyssey2_state, p1_read))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, odyssey2_state, p1_write))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, odyssey2_state, p2_read))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, odyssey2_state, p2_write))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, odyssey2_state, bus_read))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, odyssey2_state, bus_write))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("cartslot", o2_cart_slot_device, t0_read))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, odyssey2_state, t1_read))
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -695,7 +695,7 @@ MACHINE_CONFIG_START(odyssey2_state::odyssey2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_I8244_ADD( "i8244", XTAL(7'159'090)/2 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( odyssey2_state, scanline_postprocess ) )
+ MCFG_I8244_ADD( "i8244", XTAL(7'159'090)/2 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( *this, odyssey2_state, scanline_postprocess ) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
odyssey2_cartslot(config);
@@ -704,9 +704,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(odyssey2_state::videopac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, ( XTAL(17'734'470) / 3 ) )
- MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
- MCFG_CPU_IO_MAP(odyssey2_io)
+ MCFG_DEVICE_ADD("maincpu", I8048, ( XTAL(17'734'470) / 3 ) )
+ MCFG_DEVICE_PROGRAM_MAP(odyssey2_mem)
+ MCFG_DEVICE_IO_MAP(odyssey2_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -721,7 +721,7 @@ MACHINE_CONFIG_START(odyssey2_state::videopac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_I8245_ADD( "i8244", XTAL(17'734'470)/5 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( odyssey2_state, scanline_postprocess ) )
+ MCFG_I8245_ADD( "i8244", XTAL(17'734'470)/5 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( *this, odyssey2_state, scanline_postprocess ) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
odyssey2_cartslot(config);
@@ -730,18 +730,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(g7400_state::g7400)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, XTAL(5'911'000) )
- MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
- MCFG_CPU_IO_MAP(g7400_io)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(g7400_state, p1_read))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(g7400_state, p1_write))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(g7400_state, p2_read))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(g7400_state, p2_write))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(g7400_state, bus_read))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(g7400_state, bus_write))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("cartslot", o2_cart_slot_device, t0_read))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(g7400_state, t1_read))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
+ MCFG_DEVICE_ADD("maincpu", I8048, XTAL(5'911'000) )
+ MCFG_DEVICE_PROGRAM_MAP(odyssey2_mem)
+ MCFG_DEVICE_IO_MAP(g7400_io)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, g7400_state, p1_read))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, g7400_state, p1_write))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, g7400_state, p2_read))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, g7400_state, p2_write))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, g7400_state, bus_read))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, g7400_state, bus_write))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("cartslot", o2_cart_slot_device, t0_read))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, g7400_state, t1_read))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("i8243", i8243_device, prog_w))
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -754,12 +754,12 @@ MACHINE_CONFIG_START(g7400_state::g7400)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(g7400_state, g7400)
- MCFG_I8243_ADD( "i8243", NOOP, WRITE8(g7400_state,i8243_port_w))
+ MCFG_I8243_ADD( "i8243", NOOP, WRITE8(*this, g7400_state,i8243_port_w))
MCFG_EF9340_1_ADD( "ef9340_1", 3540000, "screen" )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_I8245_ADD( "i8244", 3540000 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( g7400_state, scanline_postprocess ) )
+ MCFG_I8245_ADD( "i8244", 3540000 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( *this, g7400_state, scanline_postprocess ) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
odyssey2_cartslot(config);
@@ -771,18 +771,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(g7400_state::odyssey3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8048, XTAL(5'911'000) )
- MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
- MCFG_CPU_IO_MAP(g7400_io)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(g7400_state, p1_read))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(g7400_state, p1_write))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(g7400_state, p2_read))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(g7400_state, p2_write))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(g7400_state, bus_read))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(g7400_state, bus_write))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("cartslot", o2_cart_slot_device, t0_read))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(g7400_state, t1_read))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
+ MCFG_DEVICE_ADD("maincpu", I8048, XTAL(5'911'000) )
+ MCFG_DEVICE_PROGRAM_MAP(odyssey2_mem)
+ MCFG_DEVICE_IO_MAP(g7400_io)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, g7400_state, p1_read))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, g7400_state, p1_write))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, g7400_state, p2_read))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, g7400_state, p2_write))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, g7400_state, bus_read))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, g7400_state, bus_write))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("cartslot", o2_cart_slot_device, t0_read))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, g7400_state, t1_read))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("i8243", i8243_device, prog_w))
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -795,12 +795,12 @@ MACHINE_CONFIG_START(g7400_state::odyssey3)
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(g7400_state, g7400)
- MCFG_I8243_ADD( "i8243", NOOP, WRITE8(g7400_state,i8243_port_w))
+ MCFG_I8243_ADD( "i8243", NOOP, WRITE8(*this, g7400_state,i8243_port_w))
MCFG_EF9340_1_ADD( "ef9340_1", 3540000, "screen" )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_I8244_ADD( "i8244", 3540000 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( g7400_state, scanline_postprocess ) )
+ MCFG_I8244_ADD( "i8244", 3540000 * 2, "screen", INPUTLINE( "maincpu", 0 ), WRITE16( *this, g7400_state, scanline_postprocess ) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
odyssey2_cartslot(config);
diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp
index 2869a62d376..a86eaa42fd3 100644
--- a/src/mame/drivers/offtwall.cpp
+++ b/src/mame/drivers/offtwall.cpp
@@ -338,8 +338,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(offtwall_state::offtwall)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp
index 45dc4ccb283..1e68ea15ac6 100644
--- a/src/mame/drivers/ohmygod.cpp
+++ b/src/mame/drivers/ohmygod.cpp
@@ -323,9 +323,9 @@ void ohmygod_state::machine_reset()
MACHINE_CONFIG_START(ohmygod_state::ohmygod)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(ohmygod_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ohmygod_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(ohmygod_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ohmygod_state, irq1_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp
index 00cc6ff306d..35fa4e506dd 100644
--- a/src/mame/drivers/ojankohs.cpp
+++ b/src/mame/drivers/ojankohs.cpp
@@ -715,10 +715,10 @@ void ojankohs_state::machine_reset()
MACHINE_CONFIG_START(ojankohs_state::ojankohs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(ojankohs_map)
- MCFG_CPU_IO_MAP(ojankohs_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(ojankohs_map)
+ MCFG_DEVICE_IO_MAP(ojankohs_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankohs)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -742,13 +742,13 @@ MACHINE_CONFIG_START(ojankohs_state::ojankohs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, 12000000/6)
- MCFG_AY8910_PORT_A_READ_CB(READ8(ojankohs_state, ojankohs_dipsw1_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(ojankohs_state, ojankohs_dipsw2_r))
+ MCFG_DEVICE_ADD("aysnd", YM2149, 12000000/6)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, ojankohs_state, ojankohs_dipsw1_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, ojankohs_state, ojankohs_dipsw2_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -756,10 +756,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ojankohs_state::ojankoy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(ojankoy_map)
- MCFG_CPU_IO_MAP(ojankoy_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(ojankoy_map)
+ MCFG_DEVICE_IO_MAP(ojankoy_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankoy)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -782,13 +782,13 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 12000000/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 12000000/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("dsw1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("dsw2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -796,10 +796,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ojankohs_state::ccasino)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(ojankoy_map)
- MCFG_CPU_IO_MAP(ccasino_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(ojankoy_map)
+ MCFG_DEVICE_IO_MAP(ccasino_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankohs)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -823,13 +823,13 @@ MACHINE_CONFIG_START(ojankohs_state::ccasino)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 12000000/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 12000000/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("dsw1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("dsw2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -837,10 +837,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ojankohs_state::ojankoc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */
- MCFG_CPU_PROGRAM_MAP(ojankoc_map)
- MCFG_CPU_IO_MAP(ojankoc_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ojankoc_map)
+ MCFG_DEVICE_IO_MAP(ojankoc_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold)
MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankoc)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -861,13 +861,13 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 8000000/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("dsw1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("dsw2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("msm", MSM5205, 8000000/22)
- MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 8000000/22)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index a5452dbac9a..dc15047bf44 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -505,34 +505,34 @@ GFXDECODE_END
MACHINE_CONFIG_START(okean240_state::okean240t)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(12'000'000) / 6)
- MCFG_CPU_PROGRAM_MAP(okean240_mem)
- MCFG_CPU_IO_MAP(okean240t_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(12'000'000) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(okean240_mem)
+ MCFG_DEVICE_IO_MAP(okean240t_io)
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MCFG_DEVICE_ADD("ppikbd", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(okean240_state, okean240_port40_r))
- MCFG_I8255_IN_PORTB_CB(READ8(okean240_state, okean240_port41_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(okean240_state, okean240_port42_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, okean240_state, okean240_port40_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, okean240_state, okean240_port41_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, okean240_state, okean240_port42_w))
MCFG_DEVICE_ADD("ppic", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(okean240_state, scroll_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, okean240_state, scroll_w))
MCFG_DEVICE_ADD("ppie", I8255, 0)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK1(3072000) // artificial rate
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("pic", PIC8259, 0)
@@ -550,19 +550,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(okean240_state::okean240a)
okean240t(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(okean240a_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(okean240a_io)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240a)
MCFG_DEVICE_REMOVE("rs232")
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MCFG_DEVICE_MODIFY("ppikbd")
- MCFG_I8255_IN_PORTA_CB(READ8(okean240_state, okean240a_port40_r))
- MCFG_I8255_IN_PORTB_CB(READ8(okean240_state, okean240a_port41_r))
- MCFG_I8255_IN_PORTC_CB(READ8(okean240_state, okean240a_port42_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, okean240_state, okean240a_port40_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, okean240_state, okean240a_port41_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, okean240_state, okean240a_port42_r))
MCFG_DEVICE_MODIFY("pit")
MCFG_PIT8253_CLK1(1536000) // artificial rate
@@ -570,8 +570,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(okean240_state::okean240)
okean240t(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(okean240_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(okean240_io)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240)
MCFG_DEVICE_REMOVE("uart")
MCFG_DEVICE_REMOVE("rs232")
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index dc256e266c7..8c206b35af7 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -465,13 +465,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(olibochu_state::olibochu_scanline)
MACHINE_CONFIG_START(olibochu_state::olibochu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */
- MCFG_CPU_PROGRAM_MAP(olibochu_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */
+ MCFG_DEVICE_PROGRAM_MAP(olibochu_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", olibochu_state, olibochu_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ?? */
- MCFG_CPU_PROGRAM_MAP(olibochu_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(olibochu_state, irq0_line_hold, 60) //???
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ?? */
+ MCFG_DEVICE_PROGRAM_MAP(olibochu_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(olibochu_state, irq0_line_hold, 60) //???
// MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -494,7 +494,7 @@ MACHINE_CONFIG_START(olibochu_state::olibochu)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/olyboss.cpp b/src/mame/drivers/olyboss.cpp
index 8fb0f7aff5e..afe04edbf52 100644
--- a/src/mame/drivers/olyboss.cpp
+++ b/src/mame/drivers/olyboss.cpp
@@ -430,10 +430,10 @@ static void bosscd_floppies(device_slot_interface &device)
//**************************************************************************
MACHINE_CONFIG_START( olyboss_state::olybossd )
- MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(olyboss_mem)
- MCFG_CPU_IO_MAP(olyboss_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("uic", am9519_device, iack_cb)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(olyboss_mem)
+ MCFG_DEVICE_IO_MAP(olyboss_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("uic", am9519_device, iack_cb)
/* video hardware */
@@ -449,30 +449,30 @@ MACHINE_CONFIG_START( olyboss_state::olybossd )
MCFG_AM9519_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_UPD765A_ADD("fdc", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("uic", am9519_device, ireq2_w)) MCFG_DEVCB_INVERT
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("uic", am9519_device, ireq2_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bosscd_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000))
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(olyboss_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(olyboss_state, dma_mem_r))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(olyboss_state, dma_mem_w))
- MCFG_I8257_IN_IOR_0_CB(READ8(olyboss_state, fdcdma_r))
- MCFG_I8257_OUT_IOW_0_CB(WRITE8(olyboss_state, fdcdma_w))
- MCFG_I8257_OUT_IOW_2_CB(WRITE8(olyboss_state, crtcdma_w))
- MCFG_I8257_OUT_TC_CB(WRITELINE(olyboss_state, tc_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, olyboss_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, olyboss_state, dma_mem_r))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, olyboss_state, dma_mem_w))
+ MCFG_I8257_IN_IOR_0_CB(READ8(*this, olyboss_state, fdcdma_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, olyboss_state, fdcdma_w))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8(*this, olyboss_state, crtcdma_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE(*this, olyboss_state, tc_w))
MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181))
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(olyboss_state, olyboss_display_pixels)
- MCFG_UPD3301_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
- MCFG_UPD3301_INT_CALLBACK(DEVWRITELINE("uic", am9519_device, ireq0_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w))
+ MCFG_UPD3301_INT_CALLBACK(WRITELINE("uic", am9519_device, ireq0_w)) MCFG_DEVCB_INVERT
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(olyboss_state, keyboard_read))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(olyboss_state, ppic_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, olyboss_state, keyboard_read))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, olyboss_state, ppic_w))
/* keyboard */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
@@ -495,11 +495,11 @@ MACHINE_CONFIG_START( olyboss_state::olybossc )
MACHINE_CONFIG_END
MACHINE_CONFIG_START( olyboss_state::bossb85 )
- MCFG_CPU_ADD("maincpu", I8085A, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(olyboss_mem)
- MCFG_CPU_IO_MAP(olyboss85_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(olyboss_state, irq_cb)
- MCFG_I8085A_SOD(WRITELINE(olyboss_state, romdis_w))
+ MCFG_DEVICE_ADD("maincpu", I8085A, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(olyboss_mem)
+ MCFG_DEVICE_IO_MAP(olyboss85_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(olyboss_state, irq_cb)
+ MCFG_I8085A_SOD(WRITELINE(*this, olyboss_state, romdis_w))
/* video hardware */
@@ -516,25 +516,25 @@ MACHINE_CONFIG_START( olyboss_state::bossb85 )
MCFG_UPD765A_ADD("fdc", true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("maincpu", I8085_RST65_LINE))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq0_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", bossb_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", bossb_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000))
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(olyboss_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(olyboss_state, dma_mem_r))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(olyboss_state, dma_mem_w))
- MCFG_I8257_IN_IOR_0_CB(READ8(olyboss_state, fdcdma_r))
- MCFG_I8257_OUT_IOW_0_CB(WRITE8(olyboss_state, fdcdma_w))
- MCFG_I8257_OUT_IOW_2_CB(WRITE8(olyboss_state, crtcdma_w))
- MCFG_I8257_OUT_TC_CB(WRITELINE(olyboss_state, tc_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, olyboss_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, olyboss_state, dma_mem_r))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, olyboss_state, dma_mem_w))
+ MCFG_I8257_IN_IOR_0_CB(READ8(*this, olyboss_state, fdcdma_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8(*this, olyboss_state, fdcdma_w))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8(*this, olyboss_state, crtcdma_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE(*this, olyboss_state, tc_w))
MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181))
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(olyboss_state, olyboss_display_pixels)
- MCFG_UPD3301_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
+ MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w))
MCFG_UPD3301_INT_CALLBACK(INPUTLINE("maincpu", I8085_RST75_LINE))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index ea3074311e5..331fb19100f 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -512,19 +512,19 @@ MACHINE_CONFIG_START(omegrace_state::omegrace)
/* main CPU */
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 13 = divide by 4 */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(omegrace_state, irq0_line_hold, 250)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(omegrace_state, irq0_line_hold, 250)
/* audio CPU */
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 12 = divide by 8 */
/* Fed to CPU as 1.5mhz though line J4-D */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_port)
- MCFG_CPU_PERIODIC_INT_DRIVER(omegrace_state, nmi_line_pulse, 250)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_port)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(omegrace_state, nmi_line_pulse, 250)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -548,10 +548,10 @@ MACHINE_CONFIG_START(omegrace_state::omegrace)
/* XTAL101 Crystal @ 12mhz */
/* through 74LS92, Pin 8 = divide by 12 */
- MCFG_SOUND_ADD("ay1", AY8912, XTAL(12'000'000)/12)
+ MCFG_DEVICE_ADD("ay1", AY8912, XTAL(12'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8912, XTAL(12'000'000)/12)
+ MCFG_DEVICE_ADD("ay2", AY8912, XTAL(12'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp
index 7e59755e6e2..d275f9b8a2a 100644
--- a/src/mame/drivers/ondra.cpp
+++ b/src/mame/drivers/ondra.cpp
@@ -123,9 +123,9 @@ WRITE_LINE_MEMBER(ondra_state::vblank_irq)
/* Machine driver */
MACHINE_CONFIG_START(ondra_state::ondra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2000000)
- MCFG_CPU_PROGRAM_MAP(ondra_mem)
- MCFG_CPU_IO_MAP(ondra_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(ondra_mem)
+ MCFG_DEVICE_IO_MAP(ondra_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -135,7 +135,7 @@ MACHINE_CONFIG_START(ondra_state::ondra)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(ondra_state, screen_update_ondra)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ondra_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ondra_state, vblank_irq))
MCFG_PALETTE_ADD_MONOCHROME("palette")
diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp
index 93d59f3c8f3..3b02695157f 100644
--- a/src/mame/drivers/oneshot.cpp
+++ b/src/mame/drivers/oneshot.cpp
@@ -365,12 +365,12 @@ void oneshot_state::machine_reset()
MACHINE_CONFIG_START(oneshot_state::oneshot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(oneshot_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", oneshot_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(oneshot_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", oneshot_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 5000000)
- MCFG_CPU_PROGRAM_MAP(oneshot_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(oneshot_sound_map)
/* video hardware */
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(oneshot_state::oneshot)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 3500000)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3500000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index 521be6eaeeb..6b2fff082d0 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -360,14 +360,14 @@ void onetwo_state::machine_start()
MACHINE_CONFIG_START(onetwo_state::onetwo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(main_cpu)
- MCFG_CPU_IO_MAP(main_cpu_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", onetwo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu)
+ MCFG_DEVICE_IO_MAP(main_cpu_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", onetwo_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,MASTER_CLOCK) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_cpu)
- MCFG_CPU_IO_MAP(sound_cpu_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80,MASTER_CLOCK) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu)
+ MCFG_DEVICE_IO_MAP(sound_cpu_io)
MCFG_WATCHDOG_ADD("watchdog")
@@ -391,7 +391,7 @@ MACHINE_CONFIG_START(onetwo_state::onetwo)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM3812, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, MASTER_CLOCK)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp
index 1a6be042567..1179790efd9 100644
--- a/src/mame/drivers/onyx.cpp
+++ b/src/mame/drivers/onyx.cpp
@@ -133,21 +133,21 @@ void onyx_state::subio(address_map &map)
MACHINE_CONFIG_START(onyx_state::c8002)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8002, XTAL(4'000'000) )
+ MCFG_DEVICE_ADD("maincpu", Z8002, XTAL(4'000'000) )
//MCFG_Z80_DAISY_CHAIN(main_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(c8002_mem)
- //MCFG_CPU_DATA_MAP(c8002_data)
- MCFG_CPU_IO_MAP(c8002_io)
+ MCFG_DEVICE_PROGRAM_MAP(c8002_mem)
+ //MCFG_DEVICE_DATA_MAP(c8002_data)
+ MCFG_DEVICE_IO_MAP(c8002_io)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(4'000'000) )
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(4'000'000) )
//MCFG_Z80_DAISY_CHAIN(sub_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(submem)
- MCFG_CPU_IO_MAP(subio)
+ MCFG_DEVICE_PROGRAM_MAP(submem)
+ MCFG_DEVICE_IO_MAP(subio)
MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002)
MCFG_DEVICE_ADD("sio1_clock", CLOCK, 307200)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1" ,z80sio_device, txca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio1", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1" ,z80sio_device, txca_w))
/* peripheral hardware */
MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000)/4)
@@ -158,35 +158,35 @@ MACHINE_CONFIG_START(onyx_state::c8002)
MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) /4)
MCFG_DEVICE_ADD("ctc3", Z80CTC, XTAL(16'000'000) /4)
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) /4)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) /4)
MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL(16'000'000) /4)
MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL(16'000'000) /4)
MCFG_DEVICE_ADD("sio5", Z80SIO, XTAL(16'000'000) /4)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80sio_device, ctsa_w))
MCFG_DEVICE_ADD("pio1s", Z80PIO, XTAL(16'000'000)/4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("subcpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("sio1s_clock", CLOCK, 614400)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio1s", z80sio_device, rxtxcb_w))
- //MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1s" ,z80sio_device, txca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio1s", z80sio_device, rxtxcb_w))
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1s" ,z80sio_device, txca_w))
MCFG_DEVICE_ADD("sio1s", Z80SIO, XTAL(16'000'000) /4)
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232s", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232s", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232s", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232s", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1s", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1s", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1s", z80sio_device, ctsb_w))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232s", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232s", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232s", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232s", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1s", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1s", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1s", z80sio_device, ctsb_w))
MACHINE_CONFIG_END
/* ROM definition */
@@ -245,15 +245,15 @@ void onyx_state::c5000_io(address_map &map)
MACHINE_CONFIG_START(onyx_state::c5000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4 )
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4 )
//MCFG_Z80_DAISY_CHAIN(sub_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(c5000_mem)
- MCFG_CPU_IO_MAP(c5000_io)
+ MCFG_DEVICE_PROGRAM_MAP(c5000_mem)
+ MCFG_DEVICE_IO_MAP(c5000_io)
//MCFG_MACHINE_RESET_OVERRIDE(onyx_state, c8002)
MCFG_DEVICE_ADD("sio1_clock", CLOCK, 614400)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w))
- //MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1" ,z80sio_device, txca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio1", z80sio_device, rxtxcb_w))
+ //MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1" ,z80sio_device, txca_w))
/* peripheral hardware */
//MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(16'000'000)/4)
@@ -264,14 +264,14 @@ MACHINE_CONFIG_START(onyx_state::c5000)
//MCFG_DEVICE_ADD("ctc2", Z80CTC, XTAL(16'000'000) /4)
//MCFG_DEVICE_ADD("ctc3", Z80CTC, XTAL(16'000'000) /4)
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(16'000'000) /4)
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsb_w))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80sio_device, ctsb_w))
//MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(16'000'000) /4)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp
index 59fdaa1492b..02545ddcdb6 100644
--- a/src/mame/drivers/opwolf.cpp
+++ b/src/mame/drivers/opwolf.cpp
@@ -785,12 +785,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(opwolf_state::opwolf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(opwolf_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", opwolf_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(opwolf_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", opwolf_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(opwolf_sound_z80_map)
MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)) /* 12MHz measured on pin 20 */
@@ -824,18 +824,18 @@ MACHINE_CONFIG_START(opwolf_state::opwolf)
MCFG_YM2151_ADD("ymsnd", SOUND_CPU_CLOCK ) /* 4 MHz */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(opwolf_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, opwolf_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_1)) /* VCK function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, opwolf_state, opwolf_msm5205_vck_1)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_2)) /* VCK function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, opwolf_state, opwolf_msm5205_vck_2)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
@@ -850,8 +850,8 @@ MACHINE_CONFIG_START(opwolf_state::opwolfp)
opwolf(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(opwolfp_map)
+ MCFG_DEVICE_MODIFY("maincpu") /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(opwolfp_map)
MCFG_DEVICE_REMOVE("cchip")
MACHINE_CONFIG_END
@@ -861,16 +861,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(opwolf_state::opwolfb) /* OSC clocks unknown for the bootleg, but changed to match original sets */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(opwolfb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", opwolf_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(opwolfb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", opwolf_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(opwolf_sound_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(opwolf_sound_z80_map)
- MCFG_CPU_ADD("sub", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(opwolfb_sub_z80_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", opwolf_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, SOUND_CPU_CLOCK ) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(opwolfb_sub_z80_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", opwolf_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -901,18 +901,18 @@ MACHINE_CONFIG_START(opwolf_state::opwolfb) /* OSC clocks unknown for the bootle
MCFG_YM2151_ADD("ymsnd", SOUND_CPU_CLOCK )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(opwolf_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, opwolf_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_1)) /* VCK function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, opwolf_state, opwolf_msm5205_vck_1)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_2)) /* VCK function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, opwolf_state, opwolf_msm5205_vck_2)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp
index 13fb13fa31a..81a86f2f96c 100644
--- a/src/mame/drivers/orao.cpp
+++ b/src/mame/drivers/orao.cpp
@@ -172,8 +172,8 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(orao_state::orao)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1000000)
- MCFG_CPU_PROGRAM_MAP(orao_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(orao_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -189,7 +189,7 @@ MACHINE_CONFIG_START(orao_state::orao)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp
index de928acae4b..51e424e7588 100644
--- a/src/mame/drivers/orbit.cpp
+++ b/src/mame/drivers/orbit.cpp
@@ -267,9 +267,9 @@ void orbit_state::machine_reset()
MACHINE_CONFIG_START(orbit_state::orbit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK / 16)
- MCFG_CPU_PROGRAM_MAP(orbit_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", orbit_state, orbit_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6800, MASTER_CLOCK / 16)
+ MCFG_DEVICE_PROGRAM_MAP(orbit_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", orbit_state, orbit_interrupt)
MCFG_TIMER_DRIVER_ADD_SCANLINE("32v", orbit_state, nmi_32v, "screen", 0, 32)
@@ -282,10 +282,10 @@ MACHINE_CONFIG_START(orbit_state::orbit)
/* BIT5 => PANEL STROBE */
/* BIT6 => HYPER LED */
/* BIT7 => WARNING SND */
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(orbit_state, coin_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, orbit_state, coin_lockout_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led0"))
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(OUTPUT("led1"))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ORBIT_WARNING_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ORBIT_WARNING_EN>))
MCFG_WATCHDOG_ADD("watchdog")
@@ -302,7 +302,7 @@ MACHINE_CONFIG_START(orbit_state::orbit)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(orbit)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index 32a332be02f..594ec4265fa 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -776,15 +776,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(oric_state::oric)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/12)
- MCFG_CPU_PROGRAM_MAP(oric_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000)/12)
+ MCFG_DEVICE_PROGRAM_MAP(oric_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2, 64*6, 0, 40*6, 312, 0, 28*8) // 260 lines in 60 Hz mode
MCFG_SCREEN_UPDATE_DRIVER(oric_state, screen_update_oric)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(oric_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, oric_state, vblank_w))
MCFG_PALETTE_ADD_3BIT_RGB("palette")
@@ -792,15 +792,15 @@ MACHINE_CONFIG_START(oric_state::oric)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8912", AY8912, XTAL(12'000'000)/12)
+ MCFG_DEVICE_ADD("ay8912", AY8912, XTAL(12'000'000)/12)
MCFG_AY8910_OUTPUT_TYPE(AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(4700, 4700, 4700)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(oric_state, psg_a_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, oric_state, psg_a_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("via6522", via6522_device, write_ca1))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("via6522", via6522_device, write_ca1))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* cassette */
@@ -812,14 +812,14 @@ MACHINE_CONFIG_START(oric_state::oric)
/* via */
MCFG_DEVICE_ADD( "via6522", VIA6522, XTAL(12'000'000)/12 )
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(oric_state, via_a_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(oric_state, via_b_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(oric_state, via_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(oric_state, via_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(oric_state, via_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, oric_state, via_a_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, oric_state, via_b_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, oric_state, via_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, oric_state, via_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, oric_state, via_irq_w))
/* extension port */
- MCFG_ORICEXT_ADD( "ext", oricext_intf, nullptr, "maincpu", WRITELINE(oric_state, ext_irq_w))
+ MCFG_ORICEXT_ADD( "ext", oricext_intf, nullptr, "maincpu", WRITELINE(*this, oric_state, ext_irq_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(oric_state::prav8d)
@@ -837,27 +837,27 @@ static void telestrat_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(telestrat_state::telstrat)
oric(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(telestrat_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(telestrat_mem)
/* acia */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(telestrat_state, acia_irq_w))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, telestrat_state, acia_irq_w))
/* via */
MCFG_DEVICE_ADD( "via6522_2", VIA6522, XTAL(12'000'000)/12 )
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(telestrat_state, via2_a_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(telestrat_state, via2_b_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(telestrat_state, via2_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(telestrat_state, via2_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(telestrat_state, via2_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, telestrat_state, via2_a_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, telestrat_state, via2_b_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, telestrat_state, via2_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, telestrat_state, via2_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, telestrat_state, via2_irq_w))
/* microdisc */
MCFG_FD1793_ADD("fdc", XTAL(8'000'000)/8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(telestrat_state, fdc_irq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(telestrat_state, fdc_drq_w))
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(telestrat_state, fdc_hld_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, telestrat_state, fdc_irq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, telestrat_state, fdc_drq_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, telestrat_state, fdc_hld_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", telestrat_floppies, "3dsdd", telestrat_state::floppy_formats)
diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp
index bb786b54536..e406596ecaf 100644
--- a/src/mame/drivers/orion.cpp
+++ b/src/mame/drivers/orion.cpp
@@ -93,23 +93,23 @@ static void orion_floppies(device_slot_interface &device)
/* Machine driver */
MACHINE_CONFIG_START(orion_state::orion128)
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(orion128_mem)
- MCFG_CPU_IO_MAP(orion128_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(orion128_mem)
+ MCFG_DEVICE_IO_MAP(orion128_io)
MCFG_MACHINE_START_OVERRIDE(orion_state, orion128 )
MCFG_MACHINE_RESET_OVERRIDE(orion_state, orion128 )
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(orion_state, orion_romdisk_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(orion_state, orion_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(orion_state, orion_romdisk_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, orion_state, orion_romdisk_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, orion_state, orion_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, orion_state, orion_romdisk_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -158,32 +158,32 @@ MACHINE_CONFIG_START(orion_state::orion128ms)
orion128(config);
MCFG_DEVICE_REMOVE("ppi8255_2")
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, rk7007_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, rk7007_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(orion_state::orionz80)
- MCFG_CPU_ADD("maincpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(orionz80_mem)
- MCFG_CPU_IO_MAP(orionz80_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", orion_state, orionz80_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(orionz80_mem)
+ MCFG_DEVICE_IO_MAP(orionz80_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", orion_state, orionz80_interrupt)
MCFG_MACHINE_START_OVERRIDE(orion_state, orionz80 )
MCFG_MACHINE_RESET_OVERRIDE(orion_state, orionz80 )
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(orion_state, orion_romdisk_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(orion_state, orion_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(orion_state, orion_romdisk_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, orion_state, orion_romdisk_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, orion_state, orion_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, orion_state, orion_romdisk_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -202,11 +202,11 @@ MACHINE_CONFIG_START(orion_state::orionz80)
MCFG_MC146818_ADD( "rtc", XTAL(4'194'304) )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8912", AY8912, 1773400)
+ MCFG_DEVICE_ADD("ay8912", AY8912, 1773400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CASSETTE_ADD( "cassette" )
@@ -239,29 +239,29 @@ MACHINE_CONFIG_START(orion_state::orionz80ms)
MCFG_DEVICE_REMOVE("ppi8255_2")
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, rk7007_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, rk7007_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(orion_state::orionpro)
- MCFG_CPU_ADD("maincpu", Z80, 5000000)
- MCFG_CPU_PROGRAM_MAP(orionpro_mem)
- MCFG_CPU_IO_MAP(orionpro_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(orionpro_mem)
+ MCFG_DEVICE_IO_MAP(orionpro_io)
MCFG_MACHINE_RESET_OVERRIDE(orion_state, orionpro )
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(orion_state, orion_romdisk_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(orion_state, orion_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(orion_state, orion_romdisk_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, orion_state, orion_romdisk_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, orion_state, orion_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, orion_state, orion_romdisk_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -278,11 +278,11 @@ MACHINE_CONFIG_START(orion_state::orionpro)
MCFG_VIDEO_START_OVERRIDE(orion_state,orion128)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay8912", AY8912, 1773400)
+ MCFG_DEVICE_ADD("ay8912", AY8912, 1773400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index e784675a78f..f02b3f9a860 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -34,17 +34,17 @@ class osbexec_state : public driver_device
{
public:
osbexec_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu( *this, "maincpu" ),
- m_screen( *this, "screen" ),
- m_mb8877( *this, "mb8877" ),
- m_messram( *this, RAM_TAG ),
- m_pia_0( *this, "pia_0" ),
- m_pia_1( *this, "pia_1" ),
- m_sio( *this, "sio" ),
- m_speaker( *this, "speaker" ),
- m_floppy0( *this, "mb8877:0:525ssdd" ),
- m_floppy1( *this, "mb8877:1:525ssdd" )
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_screen(*this, "screen")
+ , m_mb8877(*this, "mb8877")
+ , m_messram( *this, RAM_TAG)
+ , m_pia_0(*this, "pia_0")
+ , m_pia_1(*this, "pia_1")
+ , m_sio(*this, "sio")
+ , m_speaker(*this, "speaker")
+ , m_floppy0(*this, "mb8877:0:525ssdd")
+ , m_floppy1(*this, "mb8877:1:525ssdd")
{ }
required_device<cpu_device> m_maincpu;
@@ -566,69 +566,69 @@ static const z80_daisy_config osbexec_daisy_config[] =
MACHINE_CONFIG_START(osbexec_state::osbexec)
- MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK/6 )
- MCFG_CPU_PROGRAM_MAP( osbexec_mem)
- MCFG_CPU_IO_MAP( osbexec_io)
- MCFG_Z80_DAISY_CHAIN( osbexec_daisy_config )
+ MCFG_DEVICE_ADD(m_maincpu, Z80, MAIN_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(osbexec_mem)
+ MCFG_DEVICE_IO_MAP(osbexec_io)
+ MCFG_Z80_DAISY_CHAIN(osbexec_daisy_config)
- MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
+ MCFG_SCREEN_ADD_MONOCHROME(m_screen, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(osbexec_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK/2, 768, 0, 640, 260, 0, 240 ) /* May not be correct */
+ MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK/2, 768, 0, 640, 260, 0, 240) /* May not be correct */
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
- MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_DEVICE_ADD(m_speaker, SPEAKER_SOUND)
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
- MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(osbexec_state, osbexec_pia0_a_r))
- MCFG_PIA_READPB_HANDLER(READ8(osbexec_state, osbexec_pia0_b_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(osbexec_state, osbexec_pia0_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(osbexec_state, osbexec_pia0_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(osbexec_state, osbexec_pia0_cb2_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_DEVICE_ADD(m_pia_0, PIA6821, 0)
+ MCFG_PIA_READPA_HANDLER(READ8(*this, osbexec_state, osbexec_pia0_a_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, osbexec_state, osbexec_pia0_b_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, osbexec_state, osbexec_pia0_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, osbexec_state, osbexec_pia0_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, osbexec_state, osbexec_pia0_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, osbexec_state, osbexec_pia0_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
- MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<2>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<3>))
+ MCFG_DEVICE_ADD(m_pia_1, PIA6821, 0)
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<2>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<3>))
MCFG_INPUT_MERGER_ANY_HIGH("mainirq")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", 0))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE(m_maincpu, 0))
- MCFG_DEVICE_ADD("sio", Z80SIO, MAIN_CLOCK/6)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE(MODEM_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("mainirq", input_merger_device, in_w<4>))
+ MCFG_DEVICE_ADD(m_sio, Z80SIO, MAIN_CLOCK/6)
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE(MODEM_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE(MODEM_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE(MODEM_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_txd)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_dtr)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE(PRINTER_PORT_TAG, rs232_port_device, write_rts)) MCFG_DEVCB_INVERT
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("mainirq", input_merger_device, in_w<4>))
MCFG_DEVICE_ADD("ctc", PIT8253, 0)
MCFG_PIT8253_CLK0(MAIN_CLOCK / 13) // divided by 74S161 @ UC25
MCFG_PIT8253_CLK1(MAIN_CLOCK / 13) // divided by 74S161 @ UC25
MCFG_PIT8253_CLK2(MAIN_CLOCK / 12)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(osbexec_state, comm_clk_a_w))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
- //MCFG_PIT8253_OUT2_HANDLER(WRITELINE(osbexec_state, spindle_clk_w))
-
- MCFG_RS232_PORT_ADD(MODEM_PORT_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w)) MCFG_DEVCB_INVERT
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcda_w)) MCFG_DEVCB_INVERT
- MCFG_RS232_DSR_HANDLER(WRITELINE(osbexec_state, modem_dsr_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(osbexec_state, modem_ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w)) MCFG_DEVCB_INVERT
-
- MCFG_RS232_PORT_ADD(PRINTER_PORT_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w)) MCFG_DEVCB_INVERT
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio", z80sio_device, dcdb_w)) MCFG_DEVCB_INVERT
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, osbexec_state, comm_clk_a_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(m_sio, z80sio_device, rxtxcb_w))
+ //MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, osbexec_state, spindle_clk_w))
+
+ MCFG_DEVICE_ADD(MODEM_PORT_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_sio, z80sio_device, rxa_w)) MCFG_DEVCB_INVERT
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_sio, z80sio_device, dcda_w)) MCFG_DEVCB_INVERT
+ MCFG_RS232_DSR_HANDLER(WRITELINE(*this, osbexec_state, modem_dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(*this, osbexec_state, modem_ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_sio, z80sio_device, ctsa_w)) MCFG_DEVCB_INVERT
+
+ MCFG_DEVICE_ADD(PRINTER_PORT_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_sio, z80sio_device, rxb_w)) MCFG_DEVCB_INVERT
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_sio, z80sio_device, dcdb_w)) MCFG_DEVCB_INVERT
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_sio, z80sio_device, ctsb_w)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("mb8877", MB8877, MAIN_CLOCK/24)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pia_1", pia6821_device, cb1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(m_pia_1, pia6821_device, cb1_w))
MCFG_FLOPPY_DRIVE_ADD("mb8877:0", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("mb8877:1", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp
index 0e97320c190..ce51554daed 100644
--- a/src/mame/drivers/osborne1.cpp
+++ b/src/mame/drivers/osborne1.cpp
@@ -284,11 +284,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(osborne1_state::osborne1)
- MCFG_CPU_ADD(m_maincpu, Z80, MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(osborne1_mem)
- MCFG_CPU_OPCODES_MAP(osborne1_op)
- MCFG_CPU_IO_MAP(osborne1_io)
- MCFG_Z80_SET_IRQACK_CALLBACK(WRITELINE(osborne1_state, irqack_w))
+ MCFG_DEVICE_ADD(m_maincpu, Z80, MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(osborne1_mem)
+ MCFG_DEVICE_OPCODES_MAP(osborne1_op)
+ MCFG_DEVICE_IO_MAP(osborne1_io)
+ MCFG_Z80_SET_IRQACK_CALLBACK(WRITELINE(*this, osborne1_state, irqack_w))
MCFG_SCREEN_ADD_MONOCHROME(m_screen, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(osborne1_state, screen_update)
@@ -298,37 +298,37 @@ MACHINE_CONFIG_START(osborne1_state::osborne1)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(m_speaker, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(m_speaker, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD(m_pia0, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(DEVREAD8(m_ieee, ieee488_device, dio_r))
- MCFG_PIA_READPB_HANDLER(READ8(osborne1_state, ieee_pia_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8(m_ieee, ieee488_device, dio_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(osborne1_state, ieee_pia_pb_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE(m_ieee, ieee488_device, ifc_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE(m_ieee, ieee488_device, ren_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(osborne1_state, ieee_pia_irq_a_func))
+ MCFG_PIA_READPA_HANDLER(READ8(m_ieee, ieee488_device, dio_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, osborne1_state, ieee_pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, dio_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, osborne1_state, ieee_pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, ifc_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, ren_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, osborne1_state, ieee_pia_irq_a_func))
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(m_pia0, pia6821_device, ca2_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(m_pia0, pia6821_device, ca2_w))
MCFG_DEVICE_ADD(m_pia1, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(osborne1_state, video_pia_port_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(osborne1_state, video_pia_port_b_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(osborne1_state, video_pia_out_cb2_dummy))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(osborne1_state, video_pia_irq_a_func))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, osborne1_state, video_pia_port_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, osborne1_state, video_pia_port_b_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, osborne1_state, video_pia_out_cb2_dummy))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, osborne1_state, video_pia_irq_a_func))
MCFG_DEVICE_ADD(m_acia, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(osborne1_state, serial_acia_irq_func))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, osborne1_state, serial_acia_irq_func))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(m_acia, acia6850_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(m_acia, acia6850_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(m_acia, acia6850_device, write_cts))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(m_pia1, pia6821_device, ca2_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_acia, acia6850_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_acia, acia6850_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_acia, acia6850_device, write_cts))
+ MCFG_RS232_RI_HANDLER(WRITELINE(m_pia1, pia6821_device, ca2_w))
MCFG_DEVICE_ADD(m_fdc, MB8877, MAIN_CLOCK/16)
MCFG_WD_FDC_FORCE_READY
@@ -344,8 +344,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(osborne1nv_state::osborne1nv)
osborne1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(osborne1nv_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(osborne1nv_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_NO_PALETTE
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index f76d91ee4e5..d3439a12e24 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -713,8 +713,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(sb2m600_state::osi600)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
- MCFG_CPU_PROGRAM_MAP(osi600_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
+ MCFG_DEVICE_PROGRAM_MAP(osi600_mem)
/* video hardware */
osi600_video(config);
@@ -722,16 +722,16 @@ MACHINE_CONFIG_START(sb2m600_state::osi600)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(osi600_discrete_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* cassette ACIA */
MCFG_DEVICE_ADD("acia_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(sb2m600_state, cassette_tx))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, sb2m600_state, cassette_tx))
MCFG_DEVICE_ADD("cassette_clock", CLOCK, X1/32)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sb2m600_state, write_cassette_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, sb2m600_state, write_cassette_clock))
/* cassette */
MCFG_CASSETTE_ADD("cassette")
@@ -744,8 +744,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(uk101_state::uk101)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, UK101_X1/8) // 1 MHz
- MCFG_CPU_PROGRAM_MAP(uk101_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, UK101_X1/8) // 1 MHz
+ MCFG_DEVICE_PROGRAM_MAP(uk101_mem)
/* video hardware */
uk101_video(config);
@@ -753,10 +753,10 @@ MACHINE_CONFIG_START(uk101_state::uk101)
/* cassette ACIA */
MCFG_DEVICE_ADD("acia_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(sb2m600_state, cassette_tx))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, sb2m600_state, cassette_tx))
MCFG_DEVICE_ADD("cassette_clock", CLOCK, 500000)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sb2m600_state, write_cassette_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, sb2m600_state, write_cassette_clock))
/* cassette */
MCFG_CASSETTE_ADD("cassette")
@@ -769,8 +769,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1p_state::c1p)
/* basic machine hardware */
- MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
- MCFG_CPU_PROGRAM_MAP(c1p_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
+ MCFG_DEVICE_PROGRAM_MAP(c1p_mem)
/* video hardware */
osi630_video(config);
@@ -778,10 +778,10 @@ MACHINE_CONFIG_START(c1p_state::c1p)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(osi600c_discrete_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("beeper", BEEP, 300)
+ MCFG_DEVICE_ADD("beeper", BEEP, 300)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
@@ -790,10 +790,10 @@ MACHINE_CONFIG_START(c1p_state::c1p)
/* cassette ACIA */
MCFG_DEVICE_ADD("acia_0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(sb2m600_state, cassette_tx))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, sb2m600_state, cassette_tx))
MCFG_DEVICE_ADD("cassette_clock", CLOCK, X1/32)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sb2m600_state, write_cassette_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, sb2m600_state, write_cassette_clock))
/* cassette */
MCFG_CASSETTE_ADD("cassette")
@@ -806,20 +806,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c1pmf_state::c1pmf)
c1p(config);
- MCFG_CPU_MODIFY(M6502_TAG)
- MCFG_CPU_PROGRAM_MAP(c1pmf_mem)
+ MCFG_DEVICE_MODIFY(M6502_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(c1pmf_mem)
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(c1pmf_state, osi470_pia_pa_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(c1pmf_state, osi470_pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(c1pmf_state, osi470_pia_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(c1pmf_state, osi470_pia_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, c1pmf_state, osi470_pia_pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, c1pmf_state, osi470_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, c1pmf_state, osi470_pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, c1pmf_state, osi470_pia_cb2_w))
/* floppy ACIA */
MCFG_DEVICE_ADD("acia_1", ACIA6850, 0)
MCFG_DEVICE_ADD("floppy_clock", CLOCK, XTAL(4'000'000)/8) // 250 kHz
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia_1", acia6850_device, write_txc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia_1", acia6850_device, write_txc))
MCFG_FLOPPY_DRIVE_ADD("floppy0", osi_floppies, "ssdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("floppy1", osi_floppies, nullptr, floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp
index 4132ad69575..b50b34feba4 100644
--- a/src/mame/drivers/othello.cpp
+++ b/src/mame/drivers/othello.cpp
@@ -401,24 +401,24 @@ void othello_state::machine_reset()
MACHINE_CONFIG_START(othello_state::othello)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", othello_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", othello_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu",Z80,XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_IO_MAP(audio_portmap)
+ MCFG_DEVICE_ADD("audiocpu",Z80,XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_IO_MAP(audio_portmap)
- MCFG_CPU_ADD("n7751", N7751, XTAL(6'000'000))
+ MCFG_DEVICE_ADD("n7751", N7751, XTAL(6'000'000))
MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground
- MCFG_MCS48_PORT_P2_IN_CB(READ8(othello_state, n7751_command_r))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(othello_state, n7751_rom_r))
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(othello_state, n7751_p2_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("n7751_8243", i8243_device, prog_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, othello_state, n7751_command_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, othello_state, n7751_rom_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, othello_state, n7751_p2_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("n7751_8243", i8243_device, prog_w))
- MCFG_I8243_ADD("n7751_8243", NOOP, WRITE8(othello_state,n7751_rom_control_w))
+ MCFG_I8243_ADD("n7751_8243", NOOP, WRITE8(*this, othello_state,n7751_rom_control_w))
/* video hardware */
@@ -442,13 +442,13 @@ MACHINE_CONFIG_START(othello_state::othello)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp
index 1efab164363..e80b180e7a0 100644
--- a/src/mame/drivers/othunder.cpp
+++ b/src/mame/drivers/othunder.cpp
@@ -607,16 +607,16 @@ void othunder_state::machine_start()
MACHINE_CONFIG_START(othunder_state::othunder)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(othunder_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(othunder_map)
- MCFG_CPU_ADD("audiocpu", Z80, 16_MHz_XTAL/2/2)
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16_MHz_XTAL/2/2)
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_DEVICE_ADD("adc", ADC0808, 16_MHz_XTAL/2/2/8)
- MCFG_ADC0808_EOC_CB(WRITELINE(othunder_state, adc_eoc_w))
+ MCFG_ADC0808_EOC_CB(WRITELINE(*this, othunder_state, adc_eoc_w))
MCFG_ADC0808_IN0_CB(IOPORT("P1X"))
MCFG_ADC0808_IN1_CB(IOPORT("P1Y"))
MCFG_ADC0808_IN2_CB(IOPORT("P2X"))
@@ -626,9 +626,9 @@ MACHINE_CONFIG_START(othunder_state::othunder)
MCFG_TC0220IOC_READ_0_CB(IOPORT("DSWA"))
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
- MCFG_TC0220IOC_READ_3_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
- MCFG_TC0220IOC_WRITE_3_CB(WRITE8(othunder_state, eeprom_w))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(othunder_state, coins_w))
+ MCFG_TC0220IOC_READ_3_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_TC0220IOC_WRITE_3_CB(WRITE8(*this, othunder_state, eeprom_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, othunder_state, coins_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -639,7 +639,7 @@ MACHINE_CONFIG_START(othunder_state::othunder)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(othunder_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(othunder_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, othunder_state, vblank_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", othunder)
MCFG_PALETTE_ADD("palette", 4096)
@@ -657,7 +657,7 @@ MACHINE_CONFIG_START(othunder_state::othunder)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "2610.0l", 0.25)
MCFG_SOUND_ROUTE(0, "2610.0r", 0.25)
diff --git a/src/mame/drivers/otomedius.cpp b/src/mame/drivers/otomedius.cpp
index b7164140027..90645e5513a 100644
--- a/src/mame/drivers/otomedius.cpp
+++ b/src/mame/drivers/otomedius.cpp
@@ -68,8 +68,8 @@ void konami_pc_state::machine_reset()
MACHINE_CONFIG_START(konami_pc_state::konami_pc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // not correct, but why bother?
- MCFG_CPU_PROGRAM_MAP(konami_pc_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 100000000) // not correct, but why bother?
+ MCFG_DEVICE_PROGRAM_MAP(konami_pc_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index 39b541642b8..830172c02c0 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -326,18 +326,18 @@ void overdriv_state::machine_reset()
MACHINE_CONFIG_START(overdriv_state::overdriv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(overdriv_master_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(overdriv_master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", overdriv_state, overdriv_cpuA_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(overdriv_slave_map)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", overdriv_state, cpuB_interrupt)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(overdriv_slave_map)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", overdriv_state, cpuB_interrupt)
/* IRQ 5 and 6 are generated by the main CPU. */
/* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(3'579'545)) /* 1.789 MHz?? This might be the right speed, but ROM testing */
- MCFG_CPU_PROGRAM_MAP(overdriv_sound_map) /* takes a little too much (the counter wraps from 0000 to 9999). */
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(3'579'545)) /* 1.789 MHz?? This might be the right speed, but ROM testing */
+ MCFG_DEVICE_PROGRAM_MAP(overdriv_sound_map) /* takes a little too much (the counter wraps from 0000 to 9999). */
/* This might just mean that the video refresh rate is less than */
/* 60 fps, that's how I fixed it for now. */
diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp
index dfb80728991..37ff6e900d8 100644
--- a/src/mame/drivers/p112.cpp
+++ b/src/mame/drivers/p112.cpp
@@ -88,9 +88,9 @@ uint32_t p112_state::screen_update_p112(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(p112_state::p112)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z180, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(p112_mem)
- MCFG_CPU_IO_MAP(p112_io)
+ MCFG_DEVICE_ADD("maincpu",Z180, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(p112_mem)
+ MCFG_DEVICE_IO_MAP(p112_io)
/* video hardware */
diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp
index d62bdc661d4..b804320399a 100644
--- a/src/mame/drivers/p2000t.cpp
+++ b/src/mame/drivers/p2000t.cpp
@@ -224,10 +224,10 @@ READ8_MEMBER( p2000t_state::videoram_r )
/* Machine definition */
MACHINE_CONFIG_START(p2000t_state::p2000t)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(p2000t_mem)
- MCFG_CPU_IO_MAP(p2000t_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", p2000t_state, p2000_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(p2000t_mem)
+ MCFG_DEVICE_IO_MAP(p2000t_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", p2000t_state, p2000_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -238,12 +238,12 @@ MACHINE_CONFIG_START(p2000t_state::p2000t)
MCFG_SCREEN_UPDATE_DEVICE("saa5050", saa5050_device, screen_update)
MCFG_DEVICE_ADD("saa5050", SAA5050, 6000000)
- MCFG_SAA5050_D_CALLBACK(READ8(p2000t_state, videoram_r))
+ MCFG_SAA5050_D_CALLBACK(READ8(*this, p2000t_state, videoram_r))
MCFG_SAA5050_SCREEN_SIZE(40, 24, 80)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -251,10 +251,10 @@ MACHINE_CONFIG_END
/* Machine definition */
MACHINE_CONFIG_START(p2000m_state::p2000m)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(p2000m_mem)
- MCFG_CPU_IO_MAP(p2000t_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", p2000m_state, p2000_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(p2000m_mem)
+ MCFG_DEVICE_IO_MAP(p2000t_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", p2000m_state, p2000_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -272,7 +272,7 @@ MACHINE_CONFIG_START(p2000m_state::p2000m)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index c6f42338f57..57b34ac95b2 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -414,24 +414,24 @@ GFXDECODE_END
MACHINE_CONFIG_START(p8k_state::p8k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000) )
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000) )
MCFG_Z80_DAISY_CHAIN(p8k_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(p8k_memmap)
- MCFG_CPU_IO_MAP(p8k_iomap)
+ MCFG_DEVICE_PROGRAM_MAP(p8k_memmap)
+ MCFG_DEVICE_IO_MAP(p8k_iomap)
MCFG_MACHINE_RESET_OVERRIDE(p8k_state,p8k)
/* peripheral hardware */
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(4'000'000))
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(p8k_state, p8k_dma_irq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, p8k_state, p8k_dma_irq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(p8k_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(p8k_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(p8k_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(p8k_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, p8k_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, p8k_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, p8k_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, p8k_state, io_write_byte))
MCFG_DEVICE_ADD("uart_clock", CLOCK, 307200)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio", z80sio_device, txcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxcb_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio", z80sio_device, txcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxcb_w))
MCFG_DEVICE_ADD("ctc0", Z80CTC, 1229000) /* 1.22MHz clock */
// to implement: callbacks!
@@ -446,14 +446,14 @@ MACHINE_CONFIG_START(p8k_state::p8k)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -469,64 +469,64 @@ MACHINE_CONFIG_START(p8k_state::p8k)
MCFG_Z80PIO_IN_PA_CB(IOPORT("DSW"))
MCFG_I8272A_ADD("i8272", true)
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("i8272:0", p8k_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("i8272:1", p8k_floppies, "525hd", floppy_image_device::default_floppy_formats)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(p8k_state::p8k_16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z8001, XTAL(4'000'000) )
- MCFG_CPU_PROGRAM_MAP(p8k_16_memmap)
- MCFG_CPU_DATA_MAP(p8k_16_datamap)
- MCFG_CPU_IO_MAP(p8k_16_iomap)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("p8k_16_daisy", p8k_16_daisy_device, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z8001, XTAL(4'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(p8k_16_memmap)
+ MCFG_DEVICE_DATA_MAP(p8k_16_datamap)
+ MCFG_DEVICE_IO_MAP(p8k_16_iomap)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("p8k_16_daisy", p8k_16_daisy_device, irq_callback)
MCFG_DEVICE_ADD("p8k_16_daisy", P8K_16_DAISY, 0)
MCFG_Z80_DAISY_CHAIN(p8k_16_daisy_chain)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 307200)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio", z80sio_device, txcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxcb_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio", z80sio_device, txcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxcb_w))
/* peripheral hardware */
MCFG_DEVICE_ADD("ctc0", Z80CTC, XTAL(4'000'000))
- MCFG_Z80CTC_INTR_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80CTC_INTR_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(4'000'000))
- MCFG_Z80CTC_INTR_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80CTC_INTR_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(4'000'000))
- MCFG_Z80SIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
MCFG_DEVICE_ADD("pio0", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
MCFG_DEVICE_ADD("pio1", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
MCFG_DEVICE_ADD("pio2", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(p8k_state, p8k_16_daisy_interrupt))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, p8k_state, p8k_16_daisy_interrupt))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp
index 3bfd1d93389..e0778b365fb 100644
--- a/src/mame/drivers/pachifev.cpp
+++ b/src/mame/drivers/pachifev.cpp
@@ -357,19 +357,19 @@ MACHINE_CONFIG_START(pachifev_state::pachifev)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pachifev_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pachifev_state, vblank_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
#if USE_MSM
- MCFG_SOUND_ADD("adpcm", MSM5205, XTAL(384'000)) /* guess */
- MCFG_MSM5205_VCLK_CB(WRITELINE(pachifev_state,pf_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("adpcm", MSM5205, XTAL(384'000)) /* guess */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, pachifev_state,pf_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
#endif
- MCFG_SOUND_ADD("y2404_1", Y2404, XTAL(10'738'635)/3) /* guess */
+ MCFG_DEVICE_ADD("y2404_1", Y2404, XTAL(10'738'635)/3) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("y2404_2", Y2404, XTAL(10'738'635)/3) /* guess */
+ MCFG_DEVICE_ADD("y2404_2", Y2404, XTAL(10'738'635)/3) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index 60171975a92..07e2e7271ba 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -428,12 +428,12 @@ WRITE_LINE_MEMBER(pacland_state::vblank_irq)
MACHINE_CONFIG_START(pacland_state::pacland)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) /* 1.536 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(49'152'000)/32) /* 1.536 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* 6.144 MHz? */
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_DEVICE_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* 6.144 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_port_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synching between the MCU and the CPU */
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(pacland_state::pacland)
MCFG_SCREEN_RAW_PARAMS(XTAL(49'152'000)/8, 384, 3*8, 39*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(pacland_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pacland_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacland_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pacland)
MCFG_PALETTE_ADD("palette", 256*4+256*4+64*16)
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(pacland_state::pacland)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2/1024)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2/1024)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index e8f2eea7002..c7962ceb1e0 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -3522,18 +3522,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(pacman_state::pacman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(pacman_map)
- MCFG_CPU_IO_MAP(writeport)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(pacman_map)
+ MCFG_DEVICE_IO_MAP(writeport)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 74LS259 at 8K or 4099 at 7K
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pacman_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pacman_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, pacman_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pacman_state, flipscreen_w))
//MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0"))
//MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1"))
- //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pacman_state, coin_lockout_global_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pacman_state, coin_counter_w))
+ //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pacman_state, coin_lockout_global_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pacman_state, coin_counter_w))
// The Pacman code uses $5004 and $5005 for LED's and $5007 for coin lockout. This hardware does not
// exist on any Pacman or Puckman board I have seen. DW
@@ -3550,14 +3550,14 @@ MACHINE_CONFIG_START(pacman_state::pacman)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(pacman_state, screen_update_pacman)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pacman_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, vblank_irq))
MCFG_VIDEO_START_OVERRIDE(pacman_state,pacman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3575,8 +3575,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pacman_state::pengojpm)
pacman(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pengojpm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pengojpm_map)
MACHINE_CONFIG_END
@@ -3584,18 +3584,18 @@ MACHINE_CONFIG_START(pacman_state::birdiy)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(birdiy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(birdiy_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO)
MCFG_DEVICE_REPLACE("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(pacman_state, irq_mask_w))
- //MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pacman_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, pacman_state, irq_mask_w))
+ //MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pacman_state, flipscreen_w))
//MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0"))
//MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1"))
- //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pacman_state, coin_lockout_global_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pacman_state, coin_counter_w))
+ //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pacman_state, coin_lockout_global_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pacman_state, coin_counter_w))
MCFG_VIDEO_START_OVERRIDE(pacman_state,birdiy)
MACHINE_CONFIG_END
@@ -3607,8 +3607,8 @@ MACHINE_CONFIG_START(pacman_state::piranha)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(piranha_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(piranha_portmap)
MACHINE_CONFIG_END
@@ -3616,8 +3616,8 @@ MACHINE_CONFIG_START(pacman_state::nmouse)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(nmouse_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(nmouse_portmap)
MACHINE_CONFIG_END
@@ -3625,11 +3625,11 @@ MACHINE_CONFIG_START(pacman_state::mspacman)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mspacman_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mspacman_map)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pacman_state, coin_lockout_global_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pacman_state, coin_lockout_global_w))
MACHINE_CONFIG_END
@@ -3637,16 +3637,16 @@ MACHINE_CONFIG_START(pacman_state::woodpek)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(woodpek_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(woodpek_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pacman_state::numcrash)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(numcrash_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(numcrash_map)
MCFG_DEVICE_MODIFY("mainlatch")
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // ???
@@ -3657,19 +3657,19 @@ MACHINE_CONFIG_START(pacman_state::alibaba)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(alibaba_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(alibaba_map)
MCFG_DEVICE_REMOVE("mainlatch")
MCFG_DEVICE_ADD("latch1", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0"))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1"))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pacman_state, coin_lockout_global_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pacman_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pacman_state, coin_lockout_global_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pacman_state, coin_counter_w))
MCFG_DEVICE_ADD("latch2", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(pacman_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(pacman_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, pacman_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, pacman_state, irq_mask_w))
MACHINE_CONFIG_END
@@ -3677,16 +3677,16 @@ MACHINE_CONFIG_START(pacman_state::dremshpr)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dremshpr_map)
- MCFG_CPU_IO_MAP(dremshpr_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dremshpr_map)
+ MCFG_DEVICE_IO_MAP(dremshpr_portmap)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pacman_state, vblank_nmi))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, vblank_nmi))
/* sound hardware */
MCFG_DEVICE_REMOVE("namco")
- MCFG_SOUND_ADD("ay8910", AY8910, 14318000/8)
+ MCFG_DEVICE_ADD("ay8910", AY8910, 14318000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_MODIFY("mainlatch")
@@ -3698,9 +3698,9 @@ MACHINE_CONFIG_START(pacman_state::theglobp)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(epos_map)
- MCFG_CPU_IO_MAP(epos_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(epos_map)
+ MCFG_DEVICE_IO_MAP(epos_portmap)
MCFG_MACHINE_START_OVERRIDE(pacman_state,theglobp)
MCFG_MACHINE_RESET_OVERRIDE(pacman_state,theglobp)
@@ -3711,9 +3711,9 @@ MACHINE_CONFIG_START(pacman_state::acitya)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(epos_map)
- MCFG_CPU_IO_MAP(epos_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(epos_map)
+ MCFG_DEVICE_IO_MAP(epos_portmap)
MCFG_MACHINE_START_OVERRIDE(pacman_state,acitya)
MCFG_MACHINE_RESET_OVERRIDE(pacman_state,acitya)
@@ -3724,9 +3724,9 @@ MACHINE_CONFIG_START(pacman_state::eeekk)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(epos_map)
- MCFG_CPU_IO_MAP(epos_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(epos_map)
+ MCFG_DEVICE_IO_MAP(epos_portmap)
MCFG_MACHINE_START_OVERRIDE(pacman_state,eeekk)
MCFG_MACHINE_RESET_OVERRIDE(pacman_state,eeekk)
@@ -3737,21 +3737,21 @@ MACHINE_CONFIG_START(pacman_state::vanvan)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dremshpr_map)
- MCFG_CPU_IO_MAP(vanvan_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dremshpr_map)
+ MCFG_DEVICE_IO_MAP(vanvan_portmap)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1, 0*8, 28*8-1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pacman_state, vblank_nmi))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, vblank_nmi))
/* sound hardware */
MCFG_DEVICE_REMOVE("namco")
- MCFG_SOUND_ADD("sn1", SN76496, 1789750)
+ MCFG_DEVICE_ADD("sn1", SN76496, 1789750)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_SOUND_ADD("sn2", SN76496, 1789750)
+ MCFG_DEVICE_ADD("sn2", SN76496, 1789750)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
@@ -3764,10 +3764,10 @@ MACHINE_CONFIG_START(pacman_state::bigbucks)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bigbucks_map)
- MCFG_CPU_IO_MAP(bigbucks_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(pacman_state, periodic_irq, 20*60)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bigbucks_map)
+ MCFG_DEVICE_IO_MAP(bigbucks_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(pacman_state, periodic_irq, 20*60)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
@@ -3781,20 +3781,20 @@ MACHINE_CONFIG_START(pacman_state::s2650games)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", S2650, MASTER_CLOCK/6/2) /* 2H */
- MCFG_CPU_PROGRAM_MAP(s2650games_map)
- MCFG_CPU_DATA_MAP(s2650games_dataport)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT
+ MCFG_DEVICE_REPLACE("maincpu", S2650, MASTER_CLOCK/6/2) /* 2H */
+ MCFG_DEVICE_PROGRAM_MAP(s2650games_map)
+ MCFG_DEVICE_DATA_MAP(s2650games_dataport)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT
MCFG_DEVICE_MODIFY("mainlatch")
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP)
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP)
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pacman_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pacman_state, flipscreen_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP)
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pacman_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pacman_state, coin_counter_w))
MCFG_GFXDECODE_MODIFY("gfxdecode", s2650games)
@@ -3803,13 +3803,13 @@ MACHINE_CONFIG_START(pacman_state::s2650games)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
MCFG_SCREEN_UPDATE_DRIVER(pacman_state, screen_update_s2650games)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pacman_state, s2650_interrupt))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, s2650_interrupt))
MCFG_VIDEO_START_OVERRIDE(pacman_state,s2650games)
/* sound hardware */
MCFG_DEVICE_REMOVE("namco")
- MCFG_SOUND_ADD("sn1", SN76496, MASTER_CLOCK/6) /* 1H */
+ MCFG_DEVICE_ADD("sn1", SN76496, MASTER_CLOCK/6) /* 1H */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -3818,8 +3818,8 @@ MACHINE_CONFIG_START(pacman_state::drivfrcp)
s2650games(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(drivfrcp_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(drivfrcp_portmap)
MACHINE_CONFIG_END
@@ -3827,8 +3827,8 @@ MACHINE_CONFIG_START(pacman_state::_8bpm )
s2650games(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(_8bpm_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(_8bpm_portmap)
MACHINE_CONFIG_END
@@ -3836,8 +3836,8 @@ MACHINE_CONFIG_START(pacman_state::porky)
s2650games(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(porky_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(porky_portmap)
MACHINE_CONFIG_END
@@ -3845,12 +3845,12 @@ MACHINE_CONFIG_START(pacman_state::rocktrv2)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rocktrv2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rocktrv2_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pacman_state, rocktrv2_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pacman_state, rocktrv2_vblank_irq))
MACHINE_CONFIG_END
@@ -3858,9 +3858,9 @@ MACHINE_CONFIG_START(pacman_state::mschamp)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mschamp_map)
- MCFG_CPU_IO_MAP(mschamp_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mschamp_map)
+ MCFG_DEVICE_IO_MAP(mschamp_portmap)
MCFG_MACHINE_RESET_OVERRIDE(pacman_state,mschamp)
MACHINE_CONFIG_END
@@ -3870,8 +3870,8 @@ MACHINE_CONFIG_START(pacman_state::superabc)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(superabc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(superabc_map)
MCFG_NVRAM_ADD_0FILL("28c16.u17")
@@ -3893,12 +3893,12 @@ MACHINE_CONFIG_START(pacman_state::crushs)
pacman(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(crushs_map)
- MCFG_CPU_IO_MAP(crushs_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(crushs_map)
+ MCFG_DEVICE_IO_MAP(crushs_portmap)
/* sound hardware */
- MCFG_SOUND_ADD("ay8912", AY8912, 1789750)
+ MCFG_DEVICE_ADD("ay8912", AY8912, 1789750)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp
index cee8f9e0d24..67f63ca3005 100644
--- a/src/mame/drivers/palm.cpp
+++ b/src/mame/drivers/palm.cpp
@@ -178,9 +178,9 @@ void palm_state::palm_map(address_map &map)
MACHINE_CONFIG_START(palm_state::palm)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", M68000, 32768*506 ) /* 16.580608 MHz */
- MCFG_CPU_PROGRAM_MAP( palm_map)
- MCFG_CPU_DISASSEMBLE_OVERRIDE(palm_state, palm_dasm_override)
+ MCFG_DEVICE_ADD( "maincpu", M68000, 32768*506 ) /* 16.580608 MHz */
+ MCFG_DEVICE_PROGRAM_MAP( palm_map)
+ MCFG_DEVICE_DISASSEMBLE_OVERRIDE(palm_state, palm_dasm_override)
MCFG_QUANTUM_TIME( attotime::from_hz(60) )
@@ -200,19 +200,19 @@ MACHINE_CONFIG_START(palm_state::palm)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_DEVICE_ADD( MC68328_TAG, MC68328, 0 ) // lsi device
MCFG_MC68328_CPU("maincpu")
- MCFG_MC68328_OUT_PORT_F_CB(WRITE8(palm_state, palm_port_f_out)) // Port F Output
- MCFG_MC68328_IN_PORT_C_CB(READ8(palm_state, palm_port_c_in)) // Port C Input
- MCFG_MC68328_IN_PORT_F_CB(READ8(palm_state, palm_port_f_in)) // Port F Input
- MCFG_MC68328_OUT_PWM_CB(DEVWRITELINE("dac", dac_bit_interface, write))
- MCFG_MC68328_OUT_SPIM_CB(WRITE16(palm_state, palm_spim_out))
- MCFG_MC68328_IN_SPIM_CB(READ16(palm_state, palm_spim_in))
- MCFG_MC68328_SPIM_XCH_TRIGGER_CB(WRITELINE(palm_state, palm_spim_exchange))
+ MCFG_MC68328_OUT_PORT_F_CB(WRITE8(*this, palm_state, palm_port_f_out)) // Port F Output
+ MCFG_MC68328_IN_PORT_C_CB(READ8(*this, palm_state, palm_port_c_in)) // Port C Input
+ MCFG_MC68328_IN_PORT_F_CB(READ8(*this, palm_state, palm_port_f_in)) // Port F Input
+ MCFG_MC68328_OUT_PWM_CB(WRITELINE("dac", dac_bit_interface, write))
+ MCFG_MC68328_OUT_SPIM_CB(WRITE16(*this, palm_state, palm_spim_out))
+ MCFG_MC68328_IN_SPIM_CB(READ16(*this, palm_state, palm_spim_in))
+ MCFG_MC68328_SPIM_XCH_TRIGGER_CB(WRITELINE(*this, palm_state, palm_spim_exchange))
MACHINE_CONFIG_END
static INPUT_PORTS_START( palm )
diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp
index 5829deb7990..61d35935eff 100644
--- a/src/mame/drivers/palmz22.cpp
+++ b/src/mame/drivers/palmz22.cpp
@@ -282,8 +282,8 @@ DRIVER_INIT_MEMBER(palmz22_state,palmz22)
}
MACHINE_CONFIG_START(palmz22_state::palmz22)
- MCFG_CPU_ADD("maincpu", ARM920T, 266000000)
- MCFG_CPU_PROGRAM_MAP(palmz22_map)
+ MCFG_DEVICE_ADD("maincpu", ARM920T, 266000000)
+ MCFG_DEVICE_PROGRAM_MAP(palmz22_map)
MCFG_PALETTE_ADD("palette", 32768)
@@ -299,18 +299,18 @@ MACHINE_CONFIG_START(palmz22_state::palmz22)
MCFG_DEVICE_ADD("s3c2410", S3C2410, 12000000)
MCFG_S3C2410_PALETTE("palette")
MCFG_S3C2410_SCREEN("screen")
- MCFG_S3C2410_CORE_PIN_R_CB(READ32(palmz22_state, s3c2410_core_pin_r))
- MCFG_S3C2410_GPIO_PORT_R_CB(READ32(palmz22_state, s3c2410_gpio_port_r))
- MCFG_S3C2410_GPIO_PORT_W_CB(WRITE32(palmz22_state, s3c2410_gpio_port_w))
- MCFG_S3C2410_ADC_DATA_R_CB(READ32(palmz22_state, s3c2410_adc_data_r))
- MCFG_S3C2410_NAND_COMMAND_W_CB(WRITE8(palmz22_state, s3c2410_nand_command_w))
- MCFG_S3C2410_NAND_ADDRESS_W_CB(WRITE8(palmz22_state, s3c2410_nand_address_w))
- MCFG_S3C2410_NAND_DATA_R_CB(READ8(palmz22_state, s3c2410_nand_data_r))
- MCFG_S3C2410_NAND_DATA_W_CB(WRITE8(palmz22_state, s3c2410_nand_data_w))
+ MCFG_S3C2410_CORE_PIN_R_CB(READ32(*this, palmz22_state, s3c2410_core_pin_r))
+ MCFG_S3C2410_GPIO_PORT_R_CB(READ32(*this, palmz22_state, s3c2410_gpio_port_r))
+ MCFG_S3C2410_GPIO_PORT_W_CB(WRITE32(*this, palmz22_state, s3c2410_gpio_port_w))
+ MCFG_S3C2410_ADC_DATA_R_CB(READ32(*this, palmz22_state, s3c2410_adc_data_r))
+ MCFG_S3C2410_NAND_COMMAND_W_CB(WRITE8(*this, palmz22_state, s3c2410_nand_command_w))
+ MCFG_S3C2410_NAND_ADDRESS_W_CB(WRITE8(*this, palmz22_state, s3c2410_nand_address_w))
+ MCFG_S3C2410_NAND_DATA_R_CB(READ8(*this, palmz22_state, s3c2410_nand_data_r))
+ MCFG_S3C2410_NAND_DATA_W_CB(WRITE8(*this, palmz22_state, s3c2410_nand_data_w))
MCFG_DEVICE_ADD("nand", NAND, 0)
MCFG_NAND_TYPE(K9F5608U0D_J)
- MCFG_NAND_RNB_CALLBACK(DEVWRITELINE("s3c2410", s3c2410_device, frnb_w))
+ MCFG_NAND_RNB_CALLBACK(WRITELINE("s3c2410", s3c2410_device, frnb_w))
MACHINE_CONFIG_END
static INPUT_PORTS_START( palmz22 )
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index 49b9b50797f..06a9c6c496f 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -309,30 +309,30 @@ READ8_MEMBER(pandoras_state::pandoras_portB_r)
MACHINE_CONFIG_START(pandoras_state::pandoras)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/6) /* CPU A */
- MCFG_CPU_PROGRAM_MAP(pandoras_master_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/6) /* CPU A */
+ MCFG_DEVICE_PROGRAM_MAP(pandoras_master_map)
- MCFG_CPU_ADD("sub", MC6809E, MASTER_CLOCK/6) /* CPU B */
- MCFG_CPU_PROGRAM_MAP(pandoras_slave_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, MASTER_CLOCK/6) /* CPU B */
+ MCFG_DEVICE_PROGRAM_MAP(pandoras_slave_map)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(pandoras_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(pandoras_sound_map)
- MCFG_CPU_ADD("mcu", I8039, SOUND_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(pandoras_i8039_map)
- MCFG_CPU_IO_MAP(pandoras_i8039_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pandoras_state, i8039_irqen_and_status_w))
+ MCFG_DEVICE_ADD("mcu", I8039, SOUND_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(pandoras_i8039_map)
+ MCFG_DEVICE_IO_MAP(pandoras_i8039_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pandoras_state, i8039_irqen_and_status_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - needed for correct synchronization of the sound CPUs */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // C3
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pandoras_state, cpua_irq_enable_w)) // ENA
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, pandoras_state, cpua_irq_enable_w)) // ENA
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // OFSET - unknown
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(pandoras_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pandoras_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(pandoras_state, flipscreen_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pandoras_state, cpub_irq_enable_w)) // ENB
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, pandoras_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pandoras_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, pandoras_state, flipscreen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pandoras_state, cpub_irq_enable_w)) // ENB
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // RESETB
MCFG_WATCHDOG_ADD("watchdog")
@@ -345,7 +345,7 @@ MACHINE_CONFIG_START(pandoras_state::pandoras)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(pandoras_state, screen_update_pandoras)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pandoras_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pandoras_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pandoras)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -358,12 +358,12 @@ MACHINE_CONFIG_START(pandoras_state::pandoras)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, SOUND_CLOCK/8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(pandoras_state, pandoras_portA_r)) // not used
- MCFG_AY8910_PORT_B_READ_CB(READ8(pandoras_state, pandoras_portB_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SOUND_CLOCK/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pandoras_state, pandoras_portA_r)) // not used
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pandoras_state, pandoras_portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.12) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.12) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp
index 5a49388de5a..ad756680e26 100644
--- a/src/mame/drivers/pangofun.cpp
+++ b/src/mame/drivers/pangofun.cpp
@@ -178,10 +178,10 @@ void pangofun_state::machine_start()
MACHINE_CONFIG_START(pangofun_state::pangofun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I486, 25000000 ) /* I486 ?? Mhz (25 according to POST) */
- MCFG_CPU_PROGRAM_MAP(pcat_map)
- MCFG_CPU_IO_MAP(pcat_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486, 25000000 ) /* I486 ?? Mhz (25 according to POST) */
+ MCFG_DEVICE_PROGRAM_MAP(pcat_map)
+ MCFG_DEVICE_IO_MAP(pcat_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
/* video hardware */
pcvideo_vga(config);
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index 6069b545f43..0ffd629d38b 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -610,8 +610,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(panicr_state::scanline)
}
MACHINE_CONFIG_START(panicr_state::panicr)
- MCFG_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
- MCFG_CPU_PROGRAM_MAP(panicr_map)
+ MCFG_DEVICE_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
+ MCFG_DEVICE_PROGRAM_MAP(panicr_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", panicr_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("t5182", T5182, 0)
@@ -635,7 +635,7 @@ MACHINE_CONFIG_START(panicr_state::panicr)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK/4) /* 3.579545 MHz */
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("t5182", t5182_device, ym2151_irq_handler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("t5182", t5182_device, ym2151_irq_handler))
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp
index c885bf135d7..8638c18e285 100644
--- a/src/mame/drivers/paradise.cpp
+++ b/src/mame/drivers/paradise.cpp
@@ -734,10 +734,10 @@ INTERRUPT_GEN_MEMBER(paradise_state::irq)
MACHINE_CONFIG_START(paradise_state::paradise)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Z8400B - 6mhz Verified */
- MCFG_CPU_PROGRAM_MAP(paradise_map)
- MCFG_CPU_IO_MAP(paradise_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(paradise_state, irq, 4*54) /* No nmi routine, timing is confirmed (i.e. three timing irqs for each vblank irq */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Z8400B - 6mhz Verified */
+ MCFG_DEVICE_PROGRAM_MAP(paradise_map)
+ MCFG_DEVICE_IO_MAP(paradise_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(paradise_state, irq, 4*54) /* No nmi routine, timing is confirmed (i.e. three timing irqs for each vblank irq */
/* video hardware */
@@ -767,17 +767,17 @@ MACHINE_CONFIG_START(paradise_state::tgtball)
paradise(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tgtball_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tgtball_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(paradise_state::torus)
paradise(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(torus_map)
- MCFG_CPU_IO_MAP(torus_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(torus_map)
+ MCFG_DEVICE_IO_MAP(torus_io_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", torus)
MCFG_SCREEN_MODIFY("screen")
@@ -799,9 +799,9 @@ MACHINE_CONFIG_START(paradise_state::penky)
paradise(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(torus_map)
- MCFG_CPU_IO_MAP(torus_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(torus_map)
+ MCFG_DEVICE_IO_MAP(torus_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp
index b492f78fcf2..1c8d04b15a2 100644
--- a/src/mame/drivers/paranoia.cpp
+++ b/src/mame/drivers/paranoia.cpp
@@ -170,24 +170,24 @@ WRITE_LINE_MEMBER(paranoia_state::i8155_timer_out)
MACHINE_CONFIG_START(paranoia_state::paranoia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(pce_mem)
- MCFG_CPU_IO_MAP(pce_io)
+ MCFG_DEVICE_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(pce_mem)
+ MCFG_DEVICE_IO_MAP(pce_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_ADD("sub", I8085A, 18000000/3)
- MCFG_CPU_PROGRAM_MAP(paranoia_8085_map)
- MCFG_CPU_IO_MAP(paranoia_8085_io_map)
+ MCFG_DEVICE_ADD("sub", I8085A, 18000000/3)
+ MCFG_DEVICE_PROGRAM_MAP(paranoia_8085_map)
+ MCFG_DEVICE_IO_MAP(paranoia_8085_io_map)
- MCFG_CPU_ADD("sub2", Z80, 18000000/6)
- MCFG_CPU_PROGRAM_MAP(paranoia_z80_map)
- MCFG_CPU_IO_MAP(paranoia_z80_io_map)
+ MCFG_DEVICE_ADD("sub2", Z80, 18000000/6)
+ MCFG_DEVICE_PROGRAM_MAP(paranoia_z80_map)
+ MCFG_DEVICE_IO_MAP(paranoia_z80_io_map)
MCFG_DEVICE_ADD("i8155", I8155, 1000000 /*?*/)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(paranoia_state, i8155_a_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(paranoia_state, i8155_b_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(paranoia_state, i8155_c_w))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(paranoia_state, i8155_timer_out))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, paranoia_state, i8155_a_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, paranoia_state, i8155_b_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, paranoia_state, i8155_c_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, paranoia_state, i8155_timer_out))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -196,16 +196,16 @@ MACHINE_CONFIG_START(paranoia_state::paranoia)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD( "huc6260", HUC6260, PCE_MAIN_CLOCK )
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6270", huc6270_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6270", huc6270_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6270", huc6270_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6270", huc6270_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MCFG_C6280_CPU("maincpu")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp
index e70b183e791..1749a32970e 100644
--- a/src/mame/drivers/parodius.cpp
+++ b/src/mame/drivers/parodius.cpp
@@ -231,13 +231,13 @@ WRITE8_MEMBER( parodius_state::banking_callback )
MACHINE_CONFIG_START(parodius_state::parodius)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
- MCFG_CPU_PROGRAM_MAP(parodius_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", parodius_state, parodius_interrupt)
- MCFG_KONAMICPU_LINE_CB(WRITE8(parodius_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, 3000000) /* 053248 */
+ MCFG_DEVICE_PROGRAM_MAP(parodius_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", parodius_state, parodius_interrupt)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, parodius_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(parodius_sound_map) /* NMIs are triggered by the 053260 */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(parodius_sound_map) /* NMIs are triggered by the 053260 */
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp
index a6598df8a8a..1ab8b97dc06 100644
--- a/src/mame/drivers/partner.cpp
+++ b/src/mame/drivers/partner.cpp
@@ -171,21 +171,21 @@ GFXDECODE_END
MACHINE_CONFIG_START(partner_state::partner)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
- MCFG_CPU_PROGRAM_MAP(partner_mem)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(16'000'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(partner_mem)
MCFG_MACHINE_RESET_OVERRIDE(partner_state, partner )
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(partner_state, display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257",i8257_device, dreq2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -203,12 +203,12 @@ MACHINE_CONFIG_START(partner_state::partner)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(partner_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
- MCFG_I8257_IN_IOR_0_CB(DEVREAD8("wd1793", fd1793_device, data_r))
- MCFG_I8257_OUT_IOW_0_CB(DEVWRITE8("wd1793", fd1793_device, data_w))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("i8275", i8275_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, partner_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, radio86_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, radio86_state, memory_write_byte))
+ MCFG_I8257_IN_IOR_0_CB(READ8("wd1793", fd1793_device, data_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8("wd1793", fd1793_device, data_w))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("i8275", i8275_device, dack_w))
MCFG_I8257_REVERSE_RW_MODE(1)
MCFG_CASSETTE_ADD( "cassette" )
@@ -219,7 +219,7 @@ MACHINE_CONFIG_START(partner_state::partner)
MCFG_SOFTWARE_LIST_ADD("cass_list","partner_cass")
MCFG_FD1793_ADD("wd1793", XTAL(16'000'000) / 16)
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq0_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma8257", i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD("wd1793:0", partner_floppies, "525qd", partner_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("wd1793:1", partner_floppies, "525qd", partner_state::floppy_formats)
diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp
index 370b53e962f..ddb88570092 100644
--- a/src/mame/drivers/pasha2.cpp
+++ b/src/mame/drivers/pasha2.cpp
@@ -397,12 +397,12 @@ void pasha2_state::machine_reset()
MACHINE_CONFIG_START(pasha2_state::pasha2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(pasha2_map)
- MCFG_CPU_IO_MAP(pasha2_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pasha2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(pasha2_map)
+ MCFG_DEVICE_IO_MAP(pasha2_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pasha2_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", I80C52, 12000000) /* actually AT89C52; clock from docs */
+ MCFG_DEVICE_ADD("audiocpu", I80C52, 12000000) /* actually AT89C52; clock from docs */
/* TODO : ports are unimplemented; P0,P1,P2,P3 and Serial Port Used */
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp
index 4b331a0bff8..a735b16f4e0 100644
--- a/src/mame/drivers/paso1600.cpp
+++ b/src/mame/drivers/paso1600.cpp
@@ -303,10 +303,10 @@ WRITE8_MEMBER(paso1600_state::pc_dma_write_byte)
MACHINE_CONFIG_START(paso1600_state::paso1600)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, 16000000/2)
- MCFG_CPU_PROGRAM_MAP(paso1600_map)
- MCFG_CPU_IO_MAP(paso1600_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 16000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(paso1600_map)
+ MCFG_DEVICE_IO_MAP(paso1600_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -330,8 +330,8 @@ MACHINE_CONFIG_START(paso1600_state::paso1600)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("8237dma", AM9517A, 16000000/4)
- MCFG_I8237_IN_MEMR_CB(READ8(paso1600_state, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(paso1600_state, pc_dma_write_byte))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, paso1600_state, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, paso1600_state, pc_dma_write_byte))
MACHINE_CONFIG_END
ROM_START( paso1600 )
diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp
index fa2bb491a78..e596185951e 100644
--- a/src/mame/drivers/pasogo.cpp
+++ b/src/mame/drivers/pasogo.cpp
@@ -542,11 +542,11 @@ void pasogo_state::machine_reset()
MACHINE_CONFIG_START(pasogo_state::pasogo)
- MCFG_CPU_ADD("maincpu", V30, XTAL(32'220'000)/2)
- MCFG_CPU_PROGRAM_MAP(pasogo_mem)
- MCFG_CPU_IO_MAP(pasogo_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pasogo_state, pasogo_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", V30, XTAL(32'220'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(pasogo_mem)
+ MCFG_DEVICE_IO_MAP(pasogo_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pasogo_state, pasogo_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("ems", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(emsbank_map)
diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp
index 5d7abc9d806..0a1d99505a7 100644
--- a/src/mame/drivers/pasopia.cpp
+++ b/src/mame/drivers/pasopia.cpp
@@ -284,9 +284,9 @@ We preset all banks here, so that bankswitching will incur no speed penalty.
MACHINE_CONFIG_START(pasopia_state::pasopia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(pasopia_map)
- MCFG_CPU_IO_MAP(pasopia_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(pasopia_map)
+ MCFG_DEVICE_IO_MAP(pasopia_io)
MCFG_Z80_DAISY_CHAIN(pasopia_daisy)
/* video hardware */
@@ -306,28 +306,28 @@ MACHINE_CONFIG_START(pasopia_state::pasopia)
MCFG_MC6845_UPDATE_ROW_CB(pasopia_state, crtc_update_row)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pasopia_state, vram_addr_lo_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pasopia_state, vram_latch_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pasopia_state, vram_latch_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pasopia_state, vram_addr_lo_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pasopia_state, vram_latch_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pasopia_state, vram_latch_r))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pasopia_state, screen_mode_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pasopia_state, portb_1_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pasopia_state, vram_addr_hi_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pasopia_state, screen_mode_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pasopia_state, portb_1_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pasopia_state, vram_addr_hi_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_IN_PORTC_CB(READ8(pasopia_state, rombank_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pasopia_state, rombank_r))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("z80ctc", z80ctc_device, trg2))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(pasopia_state, mux_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(pasopia_state, keyb_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, pasopia_state, mux_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, pasopia_state, keyb_r))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp
index 2ba8578adf4..bfbdd47f406 100644
--- a/src/mame/drivers/pasopia7.cpp
+++ b/src/mame/drivers/pasopia7.cpp
@@ -920,49 +920,49 @@ static void pasopia7_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(pasopia7_state::p7_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(pasopia7_mem)
- MCFG_CPU_IO_MAP(pasopia7_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pasopia7_mem)
+ MCFG_DEVICE_IO_MAP(pasopia7_io)
MCFG_Z80_DAISY_CHAIN(p7_daisy)
/* Audio */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, 1996800) // unknown clock / divider
+ MCFG_DEVICE_ADD("sn1", SN76489A, 1996800) // unknown clock / divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, 1996800) // unknown clock / divider
+ MCFG_DEVICE_ADD("sn2", SN76489A, 1996800) // unknown clock / divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg2)) // beep interface
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("z80ctc", z80ctc_device, trg2)) // beep interface
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(pasopia7_state, mux_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(pasopia7_state, keyb_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, pasopia7_state, mux_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, pasopia7_state, keyb_r))
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pasopia7_state, unk_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pasopia7_state, screen_mode_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pasopia7_state, crtc_portb_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pasopia7_state, unk_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pasopia7_state, screen_mode_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pasopia7_state, crtc_portb_r))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pasopia7_state, plane_reg_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pasopia7_state, video_attr_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pasopia7_state, video_misc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pasopia7_state, plane_reg_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pasopia7_state, video_attr_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pasopia7_state, video_misc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pasopia7_state, nmi_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pasopia7_state, nmi_mask_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pasopia7_state, nmi_portb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(pasopia7_state, nmi_reg_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pasopia7_state, nmi_reg_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pasopia7_state, nmi_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pasopia7_state, nmi_mask_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pasopia7_state, nmi_portb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pasopia7_state, nmi_reg_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pasopia7_state, nmi_reg_w))
MCFG_UPD765A_ADD("fdc", true, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pasopia7_floppies, "525hd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp
index 5d1dbb3a761..6695afc2bea 100644
--- a/src/mame/drivers/pass.cpp
+++ b/src/mame/drivers/pass.cpp
@@ -243,14 +243,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(pass_state::pass)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14318180/2 )
- MCFG_CPU_PROGRAM_MAP(pass_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pass_state, irq1_line_hold) /* all the same */
+ MCFG_DEVICE_ADD("maincpu", M68000, 14318180/2 )
+ MCFG_DEVICE_PROGRAM_MAP(pass_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pass_state, irq1_line_hold) /* all the same */
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4 )
- MCFG_CPU_PROGRAM_MAP(pass_sound_map)
- MCFG_CPU_IO_MAP(pass_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(pass_state, irq0_line_hold, 60) /* probably not accurate, unknown timing and generation (ym2203 sound chip?). */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4 )
+ MCFG_DEVICE_PROGRAM_MAP(pass_sound_map)
+ MCFG_DEVICE_IO_MAP(pass_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(pass_state, irq0_line_hold, 60) /* probably not accurate, unknown timing and generation (ym2203 sound chip?). */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -271,7 +271,7 @@ MACHINE_CONFIG_START(pass_state::pass)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 14318180/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 14318180/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_OKIM6295_ADD("oki", 792000, PIN7_HIGH) // clock frequency & pin 7 not verified
diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp
index 3b0d72d5207..fe507428301 100644
--- a/src/mame/drivers/pastelg.cpp
+++ b/src/mame/drivers/pastelg.cpp
@@ -400,10 +400,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(pastelg_state::pastelg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
- MCFG_CPU_PROGRAM_MAP(pastelg_map)
- MCFG_CPU_IO_MAP(pastelg_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pastelg_state, irq0_line_assert) // nmiclock not written, chip is 1411M1 instead of 1413M3
+ MCFG_DEVICE_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
+ MCFG_DEVICE_PROGRAM_MAP(pastelg_map)
+ MCFG_DEVICE_IO_MAP(pastelg_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pastelg_state, irq0_line_assert) // nmiclock not written, chip is 1411M1 instead of 1413M3
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NB1413M3_TYPE( NB1413M3_PASTELG )
@@ -425,12 +425,12 @@ MACHINE_CONFIG_START(pastelg_state::pastelg)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWB"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWA"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -461,10 +461,10 @@ Note
MACHINE_CONFIG_START(pastelg_state::threeds)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
- MCFG_CPU_PROGRAM_MAP(pastelg_map)
- MCFG_CPU_IO_MAP(threeds_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pastelg_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
+ MCFG_DEVICE_PROGRAM_MAP(pastelg_map)
+ MCFG_DEVICE_IO_MAP(threeds_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pastelg_state, irq0_line_assert)
MCFG_NB1413M3_ADD("nb1413m3")
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -484,12 +484,12 @@ MACHINE_CONFIG_START(pastelg_state::threeds)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, 1250000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1250000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWB"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWA"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.35)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index 84074747888..b0878d0d303 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -286,9 +286,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(patapata_state::scanline)
MACHINE_CONFIG_START(patapata_state::patapata)
- MCFG_CPU_ADD("maincpu", M68000, 16_MHz_XTAL) // 16 MHz XTAL, 16 MHz CPU
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", patapata_state, irq4_line_hold) // 1 + 4 valid? (4 main VBL)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16_MHz_XTAL) // 16 MHz XTAL, 16 MHz CPU
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", patapata_state, irq4_line_hold) // 1 + 4 valid? (4 main VBL)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", patapata_state, scanline, "screen", 0, 1)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", patapata)
diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp
index a58d54d656a..73eebf8a861 100644
--- a/src/mame/drivers/patinho_feio.cpp
+++ b/src/mame/drivers/patinho_feio.cpp
@@ -244,33 +244,33 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(patinho_feio_state::patinho_feio)
/* basic machine hardware */
/* CPU @ approx. 500 kHz (memory cycle time is 2usec) */
- MCFG_CPU_ADD("maincpu", PATO_FEIO_CPU, 500000)
+ MCFG_DEVICE_ADD("maincpu", PATO_FEIO_CPU, 500000)
MCFG_PATINHO_RC_READ_CB(IOPORT("RC"))
MCFG_PATINHO_BUTTONS_READ_CB(IOPORT("BUTTONS"))
/* Printer */
-// MCFG_PATINHO_IODEV_WRITE_CB(0x5, WRITE8(patinho_feio_state, printer_data_w))
+// MCFG_PATINHO_IODEV_WRITE_CB(0x5, WRITE8(*this, patinho_feio_state, printer_data_w))
/* Papertape Puncher */
-// MCFG_PATINHO_IODEV_WRITE_CB(0x8, WRITE8(patinho_feio_state, papertape_punch_data_w))
+// MCFG_PATINHO_IODEV_WRITE_CB(0x8, WRITE8(*this, patinho_feio_state, papertape_punch_data_w))
/* Card Reader */
-// MCFG_PATINHO_IODEV_READ_CB(0x9, READ8(patinho_feio_state, cardreader_data_r))
+// MCFG_PATINHO_IODEV_READ_CB(0x9, READ8(*this, patinho_feio_state, cardreader_data_r))
/* DECWRITER
(max. speed: ?) */
- MCFG_PATINHO_IODEV_WRITE_CB(0xA, WRITE8(patinho_feio_state, decwriter_data_w))
+ MCFG_PATINHO_IODEV_WRITE_CB(0xA, WRITE8(*this, patinho_feio_state, decwriter_data_w))
/* Teleprinter
TeleType ASR33
(max. speed: 10 characteres per second)
with paper tape reading (and optionally punching) capabilities */
- MCFG_PATINHO_IODEV_WRITE_CB(0xB, WRITE8(patinho_feio_state, teletype_data_w))
+ MCFG_PATINHO_IODEV_WRITE_CB(0xB, WRITE8(*this, patinho_feio_state, teletype_data_w))
/* Papertape Reader
Hewlett-Packard HP-2737-A
Optical Papertape Reader (max. speed: 300 characteres per second) */
-// MCFG_PATINHO_IODEV_READ_CB(0xE, READ8(patinho_feio_state, papertapereader_data_r))
+// MCFG_PATINHO_IODEV_READ_CB(0xE, READ8(*this, patinho_feio_state, papertapereader_data_r))
/* DECWRITER */
MCFG_DEVICE_ADD("decwriter", TELEPRINTER, 0)
diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp
index acb6e47e7d0..0583c2a8f11 100644
--- a/src/mame/drivers/pb1000.cpp
+++ b/src/mame/drivers/pb1000.cpp
@@ -482,15 +482,15 @@ void pb1000_state::machine_start()
MACHINE_CONFIG_START(pb1000_state::pb1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD61700, 910000)
- MCFG_CPU_PROGRAM_MAP(pb1000_mem)
- MCFG_HD61700_LCD_CTRL_CB(WRITE8(pb1000_state, lcd_control))
- MCFG_HD61700_LCD_READ_CB(READ8(pb1000_state, lcd_data_r))
- MCFG_HD61700_LCD_WRITE_CB(WRITE8(pb1000_state, lcd_data_w))
- MCFG_HD61700_KB_READ_CB(READ16(pb1000_state, pb1000_kb_r))
- MCFG_HD61700_KB_WRITE_CB(WRITE8(pb1000_state, kb_matrix_w))
- MCFG_HD61700_PORT_READ_CB(READ8(pb1000_state, pb1000_port_r))
- MCFG_HD61700_PORT_WRITE_CB(WRITE8(pb1000_state, port_w))
+ MCFG_DEVICE_ADD("maincpu", HD61700, 910000)
+ MCFG_DEVICE_PROGRAM_MAP(pb1000_mem)
+ MCFG_HD61700_LCD_CTRL_CB(WRITE8(*this, pb1000_state, lcd_control))
+ MCFG_HD61700_LCD_READ_CB(READ8(*this, pb1000_state, lcd_data_r))
+ MCFG_HD61700_LCD_WRITE_CB(WRITE8(*this, pb1000_state, lcd_data_w))
+ MCFG_HD61700_KB_READ_CB(READ16(*this, pb1000_state, pb1000_kb_r))
+ MCFG_HD61700_KB_WRITE_CB(WRITE8(*this, pb1000_state, kb_matrix_w))
+ MCFG_HD61700_PORT_READ_CB(READ8(*this, pb1000_state, pb1000_port_r))
+ MCFG_HD61700_PORT_WRITE_CB(WRITE8(*this, pb1000_state, port_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -514,17 +514,17 @@ MACHINE_CONFIG_START(pb1000_state::pb1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pb1000_state::pb2000c)
pb1000(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pb2000c_mem)
- MCFG_HD61700_KB_READ_CB(READ16(pb1000_state, pb2000c_kb_r))
- MCFG_HD61700_PORT_READ_CB(READ8(pb1000_state, pb2000c_port_r))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pb2000c_mem)
+ MCFG_HD61700_KB_READ_CB(READ16(*this, pb1000_state, pb2000c_kb_r))
+ MCFG_HD61700_PORT_READ_CB(READ8(*this, pb1000_state, pb2000c_port_r))
MCFG_GENERIC_CARTSLOT_ADD("cardslot1", generic_plain_slot, "pb2000c_card")
MCFG_GENERIC_CARTSLOT_ADD("cardslot2", generic_plain_slot, "pb2000c_card")
diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp
index 39f3d817989..638b2d73fb4 100644
--- a/src/mame/drivers/pbaction.cpp
+++ b/src/mame/drivers/pbaction.cpp
@@ -324,12 +324,12 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(pbaction_state::pbaction)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(pbaction_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(pbaction_map)
- MCFG_CPU_ADD("audiocpu", Z80, 3072000)
- MCFG_CPU_PROGRAM_MAP(pbaction_sound_map)
- MCFG_CPU_IO_MAP(pbaction_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3072000)
+ MCFG_DEVICE_PROGRAM_MAP(pbaction_sound_map)
+ MCFG_DEVICE_IO_MAP(pbaction_sound_io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD("ctc", Z80CTC, 3072000)
@@ -343,7 +343,7 @@ MACHINE_CONFIG_START(pbaction_state::pbaction)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(pbaction_state, screen_update_pbaction)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pbaction_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pbaction_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pbaction)
MCFG_PALETTE_ADD("palette", 256)
@@ -354,13 +354,13 @@ MACHINE_CONFIG_START(pbaction_state::pbaction)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay3", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -368,15 +368,15 @@ MACHINE_CONFIG_START(pbaction_state::pbaction2)
pbaction(config);
MCFG_DEVICE_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(pbaction2_sound_map)
- MCFG_Z80_SET_IRQACK_CALLBACK(WRITELINE(pbaction_state, sound_irq_clear))
+ MCFG_DEVICE_PROGRAM_MAP(pbaction2_sound_map)
+ MCFG_Z80_SET_IRQACK_CALLBACK(WRITELINE(*this, pbaction_state, sound_irq_clear))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pbaction_state::pbactionx)
pbaction2(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_CPU_PBACTIO4, 4000000) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(pbaction_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_CPU_PBACTIO4, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(pbaction_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp
index d07882bb3db..19e937f5831 100644
--- a/src/mame/drivers/pc.cpp
+++ b/src/mame/drivers/pc.cpp
@@ -511,10 +511,10 @@ DEVICE_INPUT_DEFAULTS_END
#define MCFG_CPU_PC(mem, port, type, clock) \
- MCFG_CPU_ADD("maincpu", type, clock) \
- MCFG_CPU_PROGRAM_MAP(mem##_map) \
- MCFG_CPU_IO_MAP(port##_io) \
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", type, clock) \
+ MCFG_DEVICE_PROGRAM_MAP(mem##_map) \
+ MCFG_DEVICE_IO_MAP(port##_io) \
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MACHINE_CONFIG_START(pc_state::pccga)
@@ -524,11 +524,12 @@ MACHINE_CONFIG_START(pc_state::pccga)
MCFG_IBM5160_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -611,12 +612,12 @@ MACHINE_CONFIG_START(pc_state::iskr3104)
MCFG_IBM5160_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(iskr3104)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "ega", false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "ega", false) // FIXME: determine ISA bus clock
MCFG_SLOT_OPTION_DEFAULT_BIOS("ega", "iskr3104")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -635,10 +636,10 @@ MACHINE_CONFIG_START(pc_state::poisk2)
MCFG_IBM5160_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga_poisk2", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga_poisk2", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -665,11 +666,11 @@ MACHINE_CONFIG_START(pc_state::zenith)
MCFG_IBM5150_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_dual_720K)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -687,8 +688,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc_state::ncrpc4i)
pccga(config);
//MCFG_DEVICE_MODIFY("mb:isa")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa7", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")
@@ -708,12 +709,13 @@ MACHINE_CONFIG_START(pc_state::siemens)
MCFG_IBM5150_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(siemens)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "hercules", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, "hdc", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "hercules", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "hdc", false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -733,10 +735,11 @@ MACHINE_CONFIG_START(pc_state::ibm5550)
MCFG_IBM5160_MOTHERBOARD_ADD("mb", "maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -789,14 +792,15 @@ MACHINE_CONFIG_START(pc_state::laser_xt3)
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false) // Multi I/O card (includes FDC)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false) // floppy drive A is 5.25" 360K and B is 3.5" 720K
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa8", pc_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false) // Multi I/O card (includes FDC)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false) // floppy drive A is 5.25" 360K and B is 3.5" 720K
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa7", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa8", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
@@ -818,14 +822,15 @@ MACHINE_CONFIG_START(pc_state::laser_turbo_xt)
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
MCFG_DEVICE_INPUT_DEFAULTS(pccga)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "com", false) // Multi I/O card (includes FDC)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "fdc_xt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa7", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa8", pc_isa8_cards, nullptr, false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false) // Multi I/O card (includes FDC)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa7", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa8", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* keyboard */
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index 8b556d2a1cf..4d8204ef4d2 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -499,11 +499,11 @@ static void pc100_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(pc100_state::pc100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(pc100_map)
- MCFG_CPU_IO_MAP(pc100_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pc100_state, pc100_vblank_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(pc100_map)
+ MCFG_DEVICE_IO_MAP(pc100_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc100_state, pc100_vblank_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_TIMER_DRIVER_ADD_PERIODIC("600hz", pc100_state, pc100_600hz_irq, attotime::from_hz(MASTER_CLOCK/600))
MCFG_TIMER_DRIVER_ADD_PERIODIC("100hz", pc100_state, pc100_100hz_irq, attotime::from_hz(MASTER_CLOCK/100))
@@ -511,34 +511,34 @@ MACHINE_CONFIG_START(pc100_state::pc100)
MCFG_TIMER_DRIVER_ADD_PERIODIC("10hz", pc100_state, pc100_10hz_irq, attotime::from_hz(MASTER_CLOCK/10))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pc100_state, rtc_porta_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pc100_state, rtc_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc100_state, rtc_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pc100_state, rtc_porta_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc100_state, rtc_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc100_state, rtc_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pc100_state, lower_mask_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pc100_state, upper_mask_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc100_state, crtc_bank_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pc100_state, lower_mask_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pc100_state, upper_mask_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc100_state, crtc_bank_w))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(GND) // ???
MCFG_DEVICE_ADD("uart8251", I8251, 0)
- //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- //MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
+ //MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ //MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir1_w))
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc100_state, irqnmi_w))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(pc100_state, drqnmi_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pc100_state, irqnmi_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, pc100_state, drqnmi_w))
MCFG_DEVICE_ADD("rtc", MSM58321, XTAL(32'768))
- MCFG_MSM58321_D0_HANDLER(WRITELINE(pc100_state, rtc_portc_0_w))
- MCFG_MSM58321_D1_HANDLER(WRITELINE(pc100_state, rtc_portc_1_w))
- MCFG_MSM58321_D2_HANDLER(WRITELINE(pc100_state, rtc_portc_2_w))
- MCFG_MSM58321_D3_HANDLER(WRITELINE(pc100_state, rtc_portc_3_w))
+ MCFG_MSM58321_D0_HANDLER(WRITELINE(*this, pc100_state, rtc_portc_0_w))
+ MCFG_MSM58321_D1_HANDLER(WRITELINE(*this, pc100_state, rtc_portc_1_w))
+ MCFG_MSM58321_D2_HANDLER(WRITELINE(*this, pc100_state, rtc_portc_2_w))
+ MCFG_MSM58321_D3_HANDLER(WRITELINE(*this, pc100_state, rtc_portc_3_w))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc100_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc100_floppies, "525dd", floppy_image_device::default_floppy_formats)
@@ -556,7 +556,7 @@ MACHINE_CONFIG_START(pc100_state::pc100)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2400)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp
index df6597d8354..961a5ef011c 100644
--- a/src/mame/drivers/pc1500.cpp
+++ b/src/mame/drivers/pc1500.cpp
@@ -268,10 +268,10 @@ PALETTE_INIT_MEMBER(pc1500_state, pc1500)
}
MACHINE_CONFIG_START(pc1500_state::pc1500)
- MCFG_CPU_ADD("maincpu", LH5801, 1300000) //1.3 MHz
- MCFG_CPU_PROGRAM_MAP( pc1500_mem )
- MCFG_CPU_IO_MAP( pc1500_mem_io )
- MCFG_LH5801_IN(READ8(pc1500_state,pc1500_kb_r))
+ MCFG_DEVICE_ADD("maincpu", LH5801, 1300000) //1.3 MHz
+ MCFG_DEVICE_PROGRAM_MAP( pc1500_mem )
+ MCFG_DEVICE_IO_MAP( pc1500_mem_io )
+ MCFG_LH5801_IN(READ8(*this, pc1500_state,pc1500_kb_r))
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -286,10 +286,10 @@ MACHINE_CONFIG_START(pc1500_state::pc1500)
MCFG_PALETTE_INIT_OWNER(pc1500_state, pc1500)
MCFG_DEVICE_ADD("lh5810", LH5810, 0)
- MCFG_LH5810_PORTA_R_CB(READ8(pc1500_state, port_a_r))
- MCFG_LH5810_PORTA_W_CB(WRITE8(pc1500_state, kb_matrix_w))
- MCFG_LH5810_PORTB_R_CB(READ8(pc1500_state, port_b_r))
- MCFG_LH5810_PORTC_W_CB(WRITE8(pc1500_state, port_c_w))
+ MCFG_LH5810_PORTA_R_CB(READ8(*this, pc1500_state, port_a_r))
+ MCFG_LH5810_PORTA_W_CB(WRITE8(*this, pc1500_state, kb_matrix_w))
+ MCFG_LH5810_PORTB_R_CB(READ8(*this, pc1500_state, port_b_r))
+ MCFG_LH5810_PORTC_W_CB(WRITE8(*this, pc1500_state, port_c_w))
MCFG_LH5810_OUT_INT_CB(INPUTLINE("maincpu", LH5801_LINE_MI))
MCFG_UPD1990A_ADD("upd1990a", XTAL(32'768), NOOP, NOOP)
diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp
index 1d4d59b6938..2e506e7266e 100644
--- a/src/mame/drivers/pc1512.cpp
+++ b/src/mame/drivers/pc1512.cpp
@@ -1156,103 +1156,103 @@ void pc1640_state::machine_start()
//-------------------------------------------------
MACHINE_CONFIG_START(pc1512_state::pc1512)
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(24'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(pc1512_mem)
- MCFG_CPU_IO_MAP(pc1512_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A2_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(24'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(pc1512_mem)
+ MCFG_DEVICE_IO_MAP(pc1512_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A2_TAG, pic8259_device, inta_cb)
// video
pc1512_video(config);
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
// devices
MCFG_DEVICE_ADD(PC1512_KEYBOARD_TAG, PC1512_KEYBOARD, 0)
- MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(WRITELINE(pc1512_state, kbclk_w))
- MCFG_PC1512_KEYBOARD_DATA_CALLBACK(WRITELINE(pc1512_state, kbdata_w))
+ MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(WRITELINE(*this, pc1512_state, kbclk_w))
+ MCFG_PC1512_KEYBOARD_DATA_CALLBACK(WRITELINE(*this, pc1512_state, kbdata_w))
MCFG_PC1512_MOUSE_PORT_ADD(PC1512_MOUSE_PORT_TAG, pc1512_mouse_port_devices, "mouse")
- MCFG_PC1512_MOUSE_PORT_X_CB(WRITE8(pc1512_state, mouse_x_w))
- MCFG_PC1512_MOUSE_PORT_Y_CB(WRITE8(pc1512_state, mouse_y_w))
- MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
- MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
+ MCFG_PC1512_MOUSE_PORT_X_CB(WRITE8(*this, pc1512_state, mouse_x_w))
+ MCFG_PC1512_MOUSE_PORT_Y_CB(WRITE8(*this, pc1512_state, mouse_y_w))
+ MCFG_PC1512_MOUSE_PORT_M1_CB(WRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
+ MCFG_PC1512_MOUSE_PORT_M2_CB(WRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL(24'000'000)/6)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc1512_state, hrq_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(pc1512_state, eop_w))
- MCFG_I8237_IN_MEMR_CB(READ8(pc1512_state, memr_r))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(pc1512_state, memw_w))
- MCFG_I8237_IN_IOR_1_CB(READ8(pc1512_state, ior1_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(pc1512_state, ior2_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(pc1512_state, ior3_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(pc1512_state, iow0_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(pc1512_state, iow1_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(pc1512_state, iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(pc1512_state, iow3_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(pc1512_state, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pc1512_state, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pc1512_state, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(pc1512_state, dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, pc1512_state, hrq_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, pc1512_state, eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, pc1512_state, memr_r))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, pc1512_state, memw_w))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, pc1512_state, ior1_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, pc1512_state, ior2_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, pc1512_state, ior3_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, pc1512_state, iow0_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, pc1512_state, iow1_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, pc1512_state, iow2_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, pc1512_state, iow3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, pc1512_state, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, pc1512_state, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, pc1512_state, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, pc1512_state, dack3_w))
MCFG_DEVICE_ADD(I8259A2_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(28'636'363)/24)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259A2_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(28'636'363)/24)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pc1512_state, pit1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, pc1512_state, pit1_w))
MCFG_PIT8253_CLK2(XTAL(28'636'363)/24)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pc1512_state, pit2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, pc1512_state, pit2_w))
MCFG_MC146818_ADD(MC146818_TAG, XTAL(32'768))
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG)
- MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(pc1512_state, fdc_int_w))
- MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(pc1512_state, fdc_drq_w))
+ MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(*this, pc1512_state, fdc_int_w))
+ MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(*this, pc1512_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", pc1512_floppies, "525dd", pc1512_base_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, nullptr, pc1512_base_state::floppy_formats)
MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL(1'843'200))
- 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))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc1512_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc1512_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(pc1512_state, write_centronics_perror))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(pc1512_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(pc1512_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_perror))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, pc1512_state, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, cts_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, cts_w))
// ISA8 bus
MCFG_DEVICE_ADD(ISA_BUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(I8086_TAG)
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE(I8237A5_TAG, am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE(I8237A5_TAG, am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE(I8237A5_TAG, am9517a_device, dreq3_w))
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc_isa8_cards, nullptr, false)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE(I8237A5_TAG, am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE(I8237A5_TAG, am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE(I8237A5_TAG, am9517a_device, dreq3_w))
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false) // FIXME: determine ISA clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -1293,102 +1293,102 @@ MACHINE_CONFIG_END
//-------------------------------------------------
MACHINE_CONFIG_START(pc1640_state::pc1640)
- MCFG_CPU_ADD(I8086_TAG, I8086, XTAL(24'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(pc1640_mem)
- MCFG_CPU_IO_MAP(pc1640_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A2_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, XTAL(24'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(pc1640_mem)
+ MCFG_DEVICE_IO_MAP(pc1640_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A2_TAG, pic8259_device, inta_cb)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
// devices
MCFG_DEVICE_ADD(PC1512_KEYBOARD_TAG, PC1512_KEYBOARD, 0)
- MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(WRITELINE(pc1512_base_state, kbclk_w))
- MCFG_PC1512_KEYBOARD_DATA_CALLBACK(WRITELINE(pc1512_base_state, kbdata_w))
+ MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(WRITELINE(*this, pc1512_base_state, kbclk_w))
+ MCFG_PC1512_KEYBOARD_DATA_CALLBACK(WRITELINE(*this, pc1512_base_state, kbdata_w))
MCFG_PC1512_MOUSE_PORT_ADD(PC1512_MOUSE_PORT_TAG, pc1512_mouse_port_devices, "mouse")
- MCFG_PC1512_MOUSE_PORT_X_CB(WRITE8(pc1512_base_state, mouse_x_w))
- MCFG_PC1512_MOUSE_PORT_Y_CB(WRITE8(pc1512_base_state, mouse_y_w))
- MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
- MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
+ MCFG_PC1512_MOUSE_PORT_X_CB(WRITE8(*this, pc1512_base_state, mouse_x_w))
+ MCFG_PC1512_MOUSE_PORT_Y_CB(WRITE8(*this, pc1512_base_state, mouse_y_w))
+ MCFG_PC1512_MOUSE_PORT_M1_CB(WRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
+ MCFG_PC1512_MOUSE_PORT_M2_CB(WRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL(24'000'000)/6)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc1512_base_state, hrq_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(pc1512_base_state, eop_w))
- MCFG_I8237_IN_MEMR_CB(READ8(pc1512_base_state, memr_r))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(pc1512_base_state, memw_w))
- MCFG_I8237_IN_IOR_1_CB(READ8(pc1512_base_state, ior1_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(pc1512_base_state, ior2_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(pc1512_base_state, ior3_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(pc1512_base_state, iow0_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(pc1512_base_state, iow1_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(pc1512_base_state, iow2_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(pc1512_base_state, iow3_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(pc1512_base_state, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pc1512_base_state, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pc1512_base_state, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(pc1512_base_state, dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, pc1512_base_state, hrq_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, pc1512_base_state, eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, pc1512_base_state, memr_r))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, pc1512_base_state, memw_w))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, pc1512_base_state, ior1_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, pc1512_base_state, ior2_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, pc1512_base_state, ior3_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, pc1512_base_state, iow0_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, pc1512_base_state, iow1_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, pc1512_base_state, iow2_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, pc1512_base_state, iow3_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, pc1512_base_state, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, pc1512_base_state, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, pc1512_base_state, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, pc1512_base_state, dack3_w))
MCFG_DEVICE_ADD(I8259A2_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(28'636'363)/24)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259A2_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(28'636'363)/24)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pc1512_base_state, pit1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, pc1512_base_state, pit1_w))
MCFG_PIT8253_CLK2(XTAL(28'636'363)/24)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pc1512_base_state, pit2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, pc1512_base_state, pit2_w))
MCFG_MC146818_ADD(MC146818_TAG, XTAL(32'768))
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG)
- MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(pc1512_base_state, fdc_int_w))
- MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(pc1512_base_state, fdc_drq_w))
+ MCFG_PC_FDC_INTRQ_CALLBACK(WRITELINE(*this, pc1512_base_state, fdc_int_w))
+ MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(*this, pc1512_base_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", pc1512_floppies, "525dd", pc1512_base_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, nullptr, pc1512_base_state::floppy_formats)
MCFG_DEVICE_ADD(INS8250_TAG, INS8250, XTAL(1'843'200))
- 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))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc1512_base_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc1512_base_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(pc1512_base_state, write_centronics_perror))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(pc1512_base_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(pc1512_base_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_perror))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, pc1512_base_state, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(INS8250_TAG, ins8250_uart_device, cts_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(INS8250_TAG, ins8250_uart_device, cts_w))
// ISA8 bus
MCFG_DEVICE_ADD(ISA_BUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(I8086_TAG)
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE(I8237A5_TAG, am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE(I8237A5_TAG, am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE(I8237A5_TAG, am9517a_device, dreq3_w))
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa2", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa3", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa4", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISA_BUS_TAG, "isa5", pc1640_isa8_cards, "iga", false)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE(I8259A2_TAG, pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE(I8237A5_TAG, am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE(I8237A5_TAG, am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE(I8237A5_TAG, am9517a_device, dreq3_w))
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, ISA_BUS_TAG, pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, ISA_BUS_TAG, pc1640_isa8_cards, "iga", false)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp
index 000b4bd8d29..eaa346721aa 100644
--- a/src/mame/drivers/pc2000.cpp
+++ b/src/mame/drivers/pc2000.cpp
@@ -880,10 +880,10 @@ DEVICE_IMAGE_LOAD_MEMBER( pc2000_state, pc2000_cart )
MACHINE_CONFIG_START(pc2000_state::pc2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) /* probably not accurate */
- MCFG_CPU_PROGRAM_MAP(pc2000_mem)
- MCFG_CPU_IO_MAP(pc2000_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(pc2000_state, irq0_line_hold, 50)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) /* probably not accurate */
+ MCFG_DEVICE_PROGRAM_MAP(pc2000_mem)
+ MCFG_DEVICE_IO_MAP(pc2000_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(pc2000_state, irq0_line_hold, 50)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -904,7 +904,7 @@ MACHINE_CONFIG_START(pc2000_state::pc2000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "genius_cart")
@@ -938,8 +938,8 @@ HD44780_PIXEL_UPDATE(gl4004_state::gl4000_pixel_update)
MACHINE_CONFIG_START(gl3000s_state::gl3000s)
pc2000(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(gl3000s_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(gl3000s_io)
MCFG_DEVICE_REMOVE("hd44780")
MCFG_SED1520_ADD("sed1520_l", UPDATE(gl3000s_state, screen_update_left)) // left panel is 59 pixels (0-58)
@@ -975,10 +975,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1000_state::misterx)
pc2000(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pc1000_mem)
- MCFG_CPU_IO_MAP(pc1000_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(pc1000_state, irq0_line_hold, 10)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pc1000_mem)
+ MCFG_DEVICE_IO_MAP(pc1000_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(pc1000_state, irq0_line_hold, 10)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp
index d820ebb7c4e..bdb2b4734c2 100644
--- a/src/mame/drivers/pc4.cpp
+++ b/src/mame/drivers/pc4.cpp
@@ -220,9 +220,9 @@ void pc4_state::machine_start()
MACHINE_CONFIG_START(pc4_state::pc4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(pc4_mem)
- MCFG_CPU_IO_MAP(pc4_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pc4_mem)
+ MCFG_DEVICE_IO_MAP(pc4_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(pc4_state::pc4)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_DEVICE_ADD("rtc", RP5C01, XTAL(32'768))
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index 58041d7fe55..0bcd3e357b5 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -1486,13 +1486,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(pc6001_state::pc6001)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, PC6001_MAIN_CLOCK / 2) // PD 780C-1, ~4 Mhz
- MCFG_CPU_PROGRAM_MAP(pc6001_map)
- MCFG_CPU_IO_MAP(pc6001_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pc6001_state, vrtc_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu",Z80, PC6001_MAIN_CLOCK / 2) // PD 780C-1, ~4 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(pc6001_map)
+ MCFG_DEVICE_IO_MAP(pc6001_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc6001_state, vrtc_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback)
-// MCFG_CPU_ADD("subcpu", I8049, 7987200)
+// MCFG_DEVICE_ADD("subcpu", I8049, 7987200)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc6001m2)
@@ -1508,12 +1508,12 @@ MACHINE_CONFIG_START(pc6001_state::pc6001)
MCFG_PALETTE_INIT_OWNER(pc6001_state, pc6001)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pc6001_state, ppi_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pc6001_state, ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pc6001_state, ppi_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pc6001_state, ppi_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pc6001_state, ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc6001_state, ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pc6001_state, ppi_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pc6001_state, ppi_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pc6001_state, ppi_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pc6001_state, ppi_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc6001_state, ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc6001_state, ppi_portc_w))
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
@@ -1525,7 +1525,7 @@ MACHINE_CONFIG_START(pc6001_state::pc6001)
MCFG_GENERIC_EXTENSIONS("cas,p6")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, PC6001_MAIN_CLOCK/4)
+ MCFG_DEVICE_ADD("ay8910", AY8910, PC6001_MAIN_CLOCK/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -1542,9 +1542,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc6001mk2_state::pc6001mk2)
pc6001(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pc6001mk2_map)
- MCFG_CPU_IO_MAP(pc6001mk2_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pc6001mk2_map)
+ MCFG_DEVICE_IO_MAP(pc6001mk2_io)
// MCFG_MACHINE_RESET_OVERRIDE(pc6001mk2_state,pc6001mk2)
@@ -1557,7 +1557,7 @@ MACHINE_CONFIG_START(pc6001mk2_state::pc6001mk2)
MCFG_GFXDECODE_MODIFY("gfxdecode", pc6001m2)
- MCFG_SOUND_ADD("upd7752", UPD7752, PC6001_MAIN_CLOCK/4)
+ MCFG_DEVICE_ADD("upd7752", UPD7752, PC6001_MAIN_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -1566,11 +1566,11 @@ MACHINE_CONFIG_START(pc6601_state::pc6601)
pc6001mk2(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", Z80, PC6001_MAIN_CLOCK / 2)
- MCFG_CPU_PROGRAM_MAP(pc6001mk2_map)
- MCFG_CPU_IO_MAP(pc6601_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pc6001_state, vrtc_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, PC6001_MAIN_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(pc6001mk2_map)
+ MCFG_DEVICE_IO_MAP(pc6601_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc6001_state, vrtc_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc6001sr_state::pc6001sr)
@@ -1578,11 +1578,11 @@ MACHINE_CONFIG_START(pc6001sr_state::pc6001sr)
/* basic machine hardware */
//*Yes*, PC-6001 SR Z80 CPU is actually slower than older models (better waitstates tho?)
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(pc6001sr_map)
- MCFG_CPU_IO_MAP(pc6001sr_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pc6001sr_state, sr_vrtc_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(pc6001sr_map)
+ MCFG_DEVICE_IO_MAP(pc6001sr_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc6001sr_state, sr_vrtc_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(pc6001_state, irq_callback)
// MCFG_MACHINE_RESET_OVERRIDE(pc6001sr_state,pc6001sr)
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index 327817557f8..05ce6187a92 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -482,9 +482,9 @@ void pc8001_state::machine_start()
MACHINE_CONFIG_START(pc8001_state::pc8001)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(pc8001_mem)
- MCFG_CPU_IO_MAP(pc8001_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pc8001_mem)
+ MCFG_DEVICE_IO_MAP(pc8001_io)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -495,7 +495,7 @@ MACHINE_CONFIG_START(pc8001_state::pc8001)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -504,21 +504,21 @@ MACHINE_CONFIG_START(pc8001_state::pc8001)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000))
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(pc8001_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(pc8001_state, dma_mem_r))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8(UPD3301_TAG, upd3301_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, pc8001_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, pc8001_state, dma_mem_r))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8(UPD3301_TAG, upd3301_device, dack_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181))
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels)
- MCFG_UPD3301_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
+ MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pc8001_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pc8001_state, write_centronics_busy))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pc8001_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pc8001_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -532,9 +532,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(pc8001mk2_mem)
- MCFG_CPU_IO_MAP(pc8001mk2_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pc8001mk2_mem)
+ MCFG_DEVICE_IO_MAP(pc8001mk2_io)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -545,7 +545,7 @@ MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
@@ -554,16 +554,16 @@ MACHINE_CONFIG_START(pc8001mk2_state::pc8001mk2)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
MCFG_DEVICE_ADD(I8257_TAG, I8257, XTAL(4'000'000))
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(pc8001_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(pc8001_state, dma_mem_r))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8(UPD3301_TAG, upd3301_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, pc8001_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, pc8001_state, dma_mem_r))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8(UPD3301_TAG, upd3301_device, dack_w))
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_ADD(UPD3301_TAG, UPD3301, XTAL(14'318'181))
MCFG_UPD3301_CHARACTER_WIDTH(8)
MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(pc8001_state, pc8001_display_pixels)
- MCFG_UPD3301_DRQ_CALLBACK(DEVWRITELINE(I8257_TAG, i8257_device, dreq2_w))
+ MCFG_UPD3301_DRQ_CALLBACK(WRITELINE(I8257_TAG, i8257_device, dreq2_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp
index af4db125222..021ed9d4b3f 100644
--- a/src/mame/drivers/pc8401a.cpp
+++ b/src/mame/drivers/pc8401a.cpp
@@ -573,9 +573,9 @@ WRITE8_MEMBER( pc8401a_state::ppi_pc_w )
MACHINE_CONFIG_START(pc8401a_state::pc8401a)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C
- MCFG_CPU_PROGRAM_MAP(pc8401a_mem)
- MCFG_CPU_IO_MAP(pc8401a_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C
+ MCFG_DEVICE_PROGRAM_MAP(pc8401a_mem)
+ MCFG_DEVICE_IO_MAP(pc8401a_io)
/* fake keyboard */
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", pc8401a_state, pc8401a_keyboard_tick, attotime::from_hz(64))
@@ -584,17 +584,17 @@ MACHINE_CONFIG_START(pc8401a_state::pc8401a)
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTC_CB(READ8(pc8401a_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc8401a_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc8401a_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc8401a_state, ppi_pc_w))
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
/* video hardware */
pc8401a_video(config);
@@ -615,9 +615,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc8500_state::pc8500)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C
- MCFG_CPU_PROGRAM_MAP(pc8401a_mem)
- MCFG_CPU_IO_MAP(pc8500_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C
+ MCFG_DEVICE_PROGRAM_MAP(pc8401a_mem)
+ MCFG_DEVICE_IO_MAP(pc8500_io)
/* fake keyboard */
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", pc8401a_state, pc8401a_keyboard_tick, attotime::from_hz(64))
@@ -626,17 +626,17 @@ MACHINE_CONFIG_START(pc8500_state::pc8500)
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTC_CB(READ8(pc8401a_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc8401a_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc8401a_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc8401a_state, ppi_pc_w))
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
/* video hardware */
pc8500_video(config);
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index 2c658791750..1eb0b38fe05 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -2583,31 +2583,31 @@ WRITE_LINE_MEMBER( pc8801_state::rxrdy_w )
MACHINE_CONFIG_START(pc8801_state::pc8801)
/* main CPU */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(pc8801_mem)
- MCFG_CPU_IO_MAP(pc8801_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pc8801_state, pc8801_vrtc_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(pc8801_state,pc8801_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pc8801_mem)
+ MCFG_DEVICE_IO_MAP(pc8801_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc8801_state, pc8801_vrtc_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(pc8801_state,pc8801_irq_callback)
/* sub CPU(5 inch floppy drive) */
- MCFG_CPU_ADD("fdccpu", Z80, MASTER_CLOCK) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(pc8801fdc_mem)
- MCFG_CPU_IO_MAP(pc8801fdc_io)
+ MCFG_DEVICE_ADD("fdccpu", Z80, MASTER_CLOCK) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pc8801fdc_mem)
+ MCFG_DEVICE_IO_MAP(pc8801fdc_io)
//MCFG_QUANTUM_TIME(attotime::from_hz(300000))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_DEVICE_ADD("d8255_master", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("d8255_slave", i8255_device, pb_r))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("d8255_slave", i8255_device, pa_r))
- MCFG_I8255_IN_PORTC_CB(READ8(pc8801_state, cpu_8255_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc8801_state, cpu_8255_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("d8255_slave", i8255_device, pb_r))
+ MCFG_I8255_IN_PORTB_CB(READ8("d8255_slave", i8255_device, pa_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc8801_state, cpu_8255_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc8801_state, cpu_8255_c_w))
MCFG_DEVICE_ADD("d8255_slave", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("d8255_master", i8255_device, pb_r))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("d8255_master", i8255_device, pa_r))
- MCFG_I8255_IN_PORTC_CB(READ8(pc8801_state, fdc_8255_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc8801_state, fdc_8255_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("d8255_master", i8255_device, pb_r))
+ MCFG_I8255_IN_PORTB_CB(READ8("d8255_master", i8255_device, pa_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc8801_state, fdc_8255_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc8801_state, fdc_8255_c_w))
MCFG_UPD765A_ADD("upd765", true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("fdccpu", INPUT_LINE_IRQ0))
@@ -2623,8 +2623,8 @@ MACHINE_CONFIG_START(pc8801_state::pc8801)
MCFG_SOFTWARE_LIST_ADD("tape_list","pc8801_cass")
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(pc8801_state, txdata_callback))
- MCFG_I8251_RTS_HANDLER(WRITELINE(pc8801_state, rxrdy_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, pc8801_state, txdata_callback))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(*this, pc8801_state, rxrdy_w))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88_floppies, "525hd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88_floppies, "525hd", floppy_image_device::default_floppy_formats)
@@ -2644,19 +2644,19 @@ MACHINE_CONFIG_START(pc8801_state::pc8801)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("opn", YM2203, MASTER_CLOCK)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(pc8801_state, pc8801_sound_irq))
- MCFG_AY8910_PORT_A_READ_CB(READ8(pc8801_state, opn_porta_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(pc8801_state, opn_portb_r))
+ MCFG_DEVICE_ADD("opn", YM2203, MASTER_CLOCK)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, pc8801_state, pc8801_sound_irq))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc8801_state, opn_porta_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc8801_state, opn_portb_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD("opna", YM2608, MASTER_CLOCK*2)
- MCFG_YM2608_IRQ_HANDLER(WRITELINE(pc8801_state, pc8801_sound_irq))
- MCFG_AY8910_PORT_A_READ_CB(READ8(pc8801_state, opn_porta_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(pc8801_state, opn_portb_r))
+ MCFG_DEVICE_ADD("opna", YM2608, MASTER_CLOCK*2)
+ MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc8801_state, pc8801_sound_irq))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc8801_state, opn_porta_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, pc8801_state, opn_portb_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_SOUND_ADD("beeper", BEEP, 2400)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", pc8801_state, pc8801_rtc_irq, attotime::from_hz(600))
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index a001eedd3b7..a4a5c513098 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -1793,16 +1793,16 @@ printf("%08x %02x\n",offset,data);
MACHINE_CONFIG_START(pc88va_state::pc88va)
- MCFG_CPU_ADD("maincpu", V30, 8000000) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(pc88va_map)
- MCFG_CPU_IO_MAP(pc88va_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pc88va_state, pc88va_vrtc_irq)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", V30, 8000000) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pc88va_map)
+ MCFG_DEVICE_IO_MAP(pc88va_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pc88va_state, pc88va_vrtc_irq)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
#if TEST_SUBFDC
- MCFG_CPU_ADD("fdccpu", Z80, 8000000) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(pc88va_z80_map)
- MCFG_CPU_IO_MAP(pc88va_z80_io_map)
+ MCFG_DEVICE_ADD("fdccpu", Z80, 8000000) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pc88va_z80_map)
+ MCFG_DEVICE_IO_MAP(pc88va_z80_io_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
#endif
@@ -1818,57 +1818,57 @@ MACHINE_CONFIG_START(pc88va_state::pc88va)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc88va )
MCFG_DEVICE_ADD("d8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("d8255_2s", i8255_device, pb_r))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("d8255_2s", i8255_device, pa_r))
- MCFG_I8255_IN_PORTC_CB(READ8(pc88va_state, cpu_8255_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc88va_state, cpu_8255_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("d8255_2s", i8255_device, pb_r))
+ MCFG_I8255_IN_PORTB_CB(READ8("d8255_2s", i8255_device, pa_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc88va_state, cpu_8255_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc88va_state, cpu_8255_c_w))
MCFG_DEVICE_ADD("d8255_3", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pc88va_state, r232_ctrl_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pc88va_state, r232_ctrl_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pc88va_state, r232_ctrl_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pc88va_state, r232_ctrl_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pc88va_state, r232_ctrl_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc88va_state, r232_ctrl_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pc88va_state, r232_ctrl_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pc88va_state, r232_ctrl_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pc88va_state, r232_ctrl_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pc88va_state, r232_ctrl_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc88va_state, r232_ctrl_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc88va_state, r232_ctrl_portc_w))
MCFG_DEVICE_ADD("d8255_2s", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("d8255_2", i8255_device, pb_r))
- MCFG_I8255_IN_PORTB_CB(DEVREAD8("d8255_2", i8255_device, pa_r))
- MCFG_I8255_IN_PORTC_CB(READ8(pc88va_state, fdc_8255_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc88va_state, fdc_8255_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("d8255_2", i8255_device, pb_r))
+ MCFG_I8255_IN_PORTB_CB(READ8("d8255_2", i8255_device, pa_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pc88va_state, fdc_8255_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc88va_state, fdc_8255_c_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(pc88va_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, pc88va_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("dmac", AM9517A, 8000000) /* ch2 is FDC, ch0/3 are "user". ch1 is unused */
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(pc88va_state, pc88va_hlda_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(pc88va_state, pc88va_tc_w))
- MCFG_AM9517A_IN_IOR_2_CB(READ8(pc88va_state, fdc_dma_r))
- MCFG_AM9517A_OUT_IOW_2_CB(WRITE8(pc88va_state, fdc_dma_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(pc88va_state, dma_memr_cb))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(pc88va_state, dma_memw_cb))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, pc88va_state, pc88va_hlda_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, pc88va_state, pc88va_tc_w))
+ MCFG_AM9517A_IN_IOR_2_CB(READ8(*this, pc88va_state, fdc_dma_r))
+ MCFG_AM9517A_OUT_IOW_2_CB(WRITE8(*this, pc88va_state, fdc_dma_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, pc88va_state, dma_memr_cb))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, pc88va_state, dma_memw_cb))
MCFG_UPD765A_ADD("upd765", false, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc88va_state, fdc_irq))
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc88va_state, fdc_drq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pc88va_state, fdc_irq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pc88va_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pc88va_floppies, "525hd", pc88va_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pc88va_floppies, "525hd", pc88va_state::floppy_formats)
MCFG_SOFTWARE_LIST_ADD("disk_list","pc88va")
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(8000000) /* general purpose timer 1 */
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(pc88va_state, pc88va_pit_out0_changed))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, pc88va_state, pc88va_pit_out0_changed))
MCFG_PIT8253_CLK1(8000000) /* BEEP frequency setting */
MCFG_PIT8253_CLK2(8000000) /* RS232C baud rate setting */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2203, 3993600) //unknown clock / divider
+ MCFG_DEVICE_ADD("ym", YM2203, 3993600) //unknown clock / divider
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index 66120b51e7e..051fd37d126 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -2207,17 +2207,17 @@ void pc9801_atapi_devices(device_slot_interface &device)
MACHINE_CONFIG_START(pc9801_state::pc9801_keyboard)
MCFG_DEVICE_ADD("keyb", PC9801_KBD, 53)
- MCFG_PC9801_KBD_IRQ_CALLBACK(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
+ MCFG_PC9801_KBD_IRQ_CALLBACK(WRITELINE("pic8259_master", pic8259_device, ir1_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801_mouse)
MCFG_DEVICE_ADD("ppi8255_mouse", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pc9801_state, ppi_mouse_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pc9801_state, ppi_mouse_porta_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pc9801_state, ppi_mouse_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pc9801_state, ppi_mouse_porta_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW3"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pc9801_state, ppi_mouse_portb_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pc9801_state, ppi_mouse_portb_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("DSW4"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc9801_state, ppi_mouse_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc9801_state, ppi_mouse_portc_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("mouse_timer", pc9801_state, mouse_irq_cb, attotime::from_hz(120))
MACHINE_CONFIG_END
@@ -2231,12 +2231,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801_sasi)
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in")
- MCFG_SCSI_IO_HANDLER(WRITELINE(pc9801_state, write_sasi_io)) // bit2
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit3))
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit4))
- MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit5))
- MCFG_SCSI_ACK_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit6))
- MCFG_SCSI_REQ_HANDLER(WRITELINE(pc9801_state, write_sasi_req))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(*this, pc9801_state, write_sasi_io)) // bit2
+ MCFG_SCSI_CD_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit3))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit4))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit5))
+ MCFG_SCSI_ACK_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit6))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, pc9801_state, write_sasi_req))
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", PC9801_SASI, SCSI_ID_0)
@@ -2245,8 +2245,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801_sasi)
MCFG_DEVICE_ADD("sasi_ctrl_in", INPUT_BUFFER, 0)
MCFG_DEVICE_MODIFY("i8237")
- MCFG_I8237_IN_IOR_0_CB(READ8(pc9801_state, sasi_data_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(pc9801_state, sasi_data_w))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, pc9801_state, sasi_data_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, pc9801_state, sasi_data_w))
MACHINE_CONFIG_END
void pc9801_state::cdrom_headphones(device_t *device)
@@ -2259,14 +2259,14 @@ void pc9801_state::cdrom_headphones(device_t *device)
MACHINE_CONFIG_START(pc9801_state::pc9801_ide)
MCFG_SPEAKER_STANDARD_STEREO("lheadphone", "rheadphone")
MCFG_ATA_INTERFACE_ADD("ide1", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("ideirq", input_merger_device, in_w<0>))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("ideirq", input_merger_device, in_w<0>))
MCFG_ATA_INTERFACE_ADD("ide2", pc9801_atapi_devices, "pc9801_cd", nullptr, false)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("ideirq", input_merger_device, in_w<1>))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("ideirq", input_merger_device, in_w<1>))
MCFG_DEVICE_MODIFY("ide2:0")
MCFG_SLOT_OPTION_MACHINE_CONFIG("pc9801_cd", cdrom_headphones)
MCFG_INPUT_MERGER_ANY_HIGH("ideirq")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir1_w))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir1_w))
MCFG_SOFTWARE_LIST_ADD("cd_list","pc98_cd")
MACHINE_CONFIG_END
@@ -2274,38 +2274,38 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801_common)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(MAIN_CLOCK_X1) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259_master", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(MAIN_CLOCK_X1) /* Memory Refresh */
MCFG_PIT8253_CLK2(MAIN_CLOCK_X1) /* RS-232c */
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(UPD8251_TAG, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(UPD8251_TAG, i8251_device, write_rxc))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(UPD8251_TAG, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(UPD8251_TAG, i8251_device, write_rxc))
MCFG_DEVICE_ADD("i8237", AM9517A, 5000000) // unknown clock, TODO: check channels 0 - 1
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc9801_state, dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(pc9801_state, tc_w))
- MCFG_I8237_IN_MEMR_CB(READ8(pc9801_state, dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(pc9801_state, dma_write_byte))
- MCFG_I8237_IN_IOR_2_CB(DEVREAD8("upd765_2hd", upd765a_device, mdma_r))
- MCFG_I8237_OUT_IOW_2_CB(DEVWRITE8("upd765_2hd", upd765a_device, mdma_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(pc9801_state, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pc9801_state, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pc9801_state, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(pc9801_state, dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, pc9801_state, dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, pc9801_state, tc_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, pc9801_state, dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, pc9801_state, dma_write_byte))
+ MCFG_I8237_IN_IOR_2_CB(READ8("upd765_2hd", upd765a_device, mdma_r))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8("upd765_2hd", upd765a_device, mdma_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, pc9801_state, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, pc9801_state, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, pc9801_state, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, pc9801_state, dack3_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(pc9801_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, pc9801_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w)) // TODO: Check ir7_w
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w)) // TODO: Check ir7_w
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("ppi8255_sys", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW2"))
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW1"))
MCFG_I8255_IN_PORTC_CB(CONSTANT(0xa0)) // 0x80 cpu triple fault reset flag?
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pc9801_state, ppi_sys_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc9801_state, ppi_sys_portc_w))
MCFG_DEVICE_ADD("ppi8255_prn", I8255, 0)
/* TODO: check this one */
@@ -2318,8 +2318,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801_common)
MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0)
MCFG_UPD765A_ADD("upd765_2hd", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq2_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("pic8259_slave", pic8259_device, ir3_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("i8237", am9517a_device, dreq2_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2hd:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats)
@@ -2327,7 +2327,7 @@ MACHINE_CONFIG_START(pc9801_state::pc9801_common)
MCFG_I8255_IN_PORTA_CB(CONSTANT(0xff))
MCFG_I8255_IN_PORTB_CB(CONSTANT(0xff)) //upd765_status_r(machine().device("upd765_2dd"),space, 0);
MCFG_I8255_IN_PORTC_CB(CONSTANT(0xff)) //upd765_data_r(machine().device("upd765_2dd"),space, 0);
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(pc9801_state, ppi_fdd_portc_w)) //upd765_data_w(machine().device("upd765_2dd"),space, 0,data);
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pc9801_state, ppi_fdd_portc_w)) //upd765_data_w(machine().device("upd765_2dd"),space, 0,data);
MCFG_SOFTWARE_LIST_ADD("disk_list","pc98")
@@ -2335,12 +2335,12 @@ MACHINE_CONFIG_START(pc9801_state::pc9801_common)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(21.0526_MHz_XTAL, 848, 0, 640, 440, 0, 400)
MCFG_SCREEN_UPDATE_DRIVER(pc9801_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pc9801_state, vrtc_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pc9801_state, vrtc_irq))
MCFG_DEVICE_ADD("upd7220_chr", UPD7220, 21.0526_MHz_XTAL / 8)
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_1_map)
MCFG_UPD7220_DRAW_TEXT_CALLBACK_OWNER(pc9801_state, hgdc_draw_text)
- MCFG_UPD7220_VSYNC_CALLBACK(DEVWRITELINE("upd7220_btm", upd7220_device, ext_sync_w))
+ MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE("upd7220_btm", upd7220_device, ext_sync_w))
MCFG_DEVICE_ADD("upd7220_btm", UPD7220, 21.0526_MHz_XTAL / 8)
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_2_map)
@@ -2348,16 +2348,16 @@ MACHINE_CONFIG_START(pc9801_state::pc9801_common)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2400)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc9801)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801)
- MCFG_CPU_ADD("maincpu", I8086, 5000000) //unknown clock
- MCFG_CPU_PROGRAM_MAP(pc9801_map)
- MCFG_CPU_IO_MAP(pc9801_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 5000000) //unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(pc9801_map)
+ MCFG_DEVICE_IO_MAP(pc9801_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
pc9801_common(config);
@@ -2370,8 +2370,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801)
MCFG_RAM_EXTRA_OPTIONS("128K,256K,384K,512K")
MCFG_UPD765A_ADD("upd765_2dd", false, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pc9801_state, fdc_2dd_irq))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8237", am9517a_device, dreq3_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pc9801_state, fdc_2dd_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("i8237", am9517a_device, dreq3_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:0", pc9801_floppies, "525dd", pc9801_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765_2dd:1", pc9801_floppies, "525dd", pc9801_state::floppy_formats)
@@ -2379,8 +2379,8 @@ MACHINE_CONFIG_START(pc9801_state::pc9801)
MCFG_UPD1990A_ADD(UPD1990A_TAG, XTAL(32'768), NOOP, NOOP)
MCFG_DEVICE_MODIFY("i8237")
- MCFG_I8237_IN_IOR_3_CB(DEVREAD8("upd765_2dd", upd765a_device, mdma_r))
- MCFG_I8237_OUT_IOW_3_CB(DEVWRITE8("upd765_2dd", upd765a_device, mdma_w))
+ MCFG_I8237_IN_IOR_3_CB(READ8("upd765_2dd", upd765a_device, mdma_r))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8("upd765_2dd", upd765a_device, mdma_w))
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_INIT_OWNER(pc9801_state,pc9801)
@@ -2388,10 +2388,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801rs)
- MCFG_CPU_ADD("maincpu", I386SX, MAIN_CLOCK_X1*8) // unknown clock.
- MCFG_CPU_PROGRAM_MAP(pc9801rs_map)
- MCFG_CPU_IO_MAP(pc9801rs_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I386SX, MAIN_CLOCK_X1*8) // unknown clock.
+ MCFG_DEVICE_PROGRAM_MAP(pc9801rs_map)
+ MCFG_DEVICE_IO_MAP(pc9801rs_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
pc9801_common(config);
@@ -2424,9 +2424,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801vm)
pc9801rs(config);
- MCFG_CPU_REPLACE("maincpu",V30,10000000)
- MCFG_CPU_PROGRAM_MAP(pc9801ux_map)
- MCFG_CPU_IO_MAP(pc9801ux_io)
+ MCFG_DEVICE_REPLACE("maincpu",V30,10000000)
+ MCFG_DEVICE_PROGRAM_MAP(pc9801ux_map)
+ MCFG_DEVICE_IO_MAP(pc9801ux_io)
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")
@@ -2438,30 +2438,30 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801ux)
pc9801rs(config);
- MCFG_CPU_REPLACE("maincpu",I80286,10000000)
- MCFG_CPU_PROGRAM_MAP(pc9801ux_map)
- MCFG_CPU_IO_MAP(pc9801ux_io)
+ MCFG_DEVICE_REPLACE("maincpu",I80286,10000000)
+ MCFG_DEVICE_PROGRAM_MAP(pc9801ux_map)
+ MCFG_DEVICE_IO_MAP(pc9801ux_io)
MCFG_80286_A20(pc9801_state, a20_286)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
// MCFG_DEVICE_MODIFY("i8237", AM9157A, 10000000) // unknown clock
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9801bx2)
pc9801rs(config);
- MCFG_CPU_REPLACE("maincpu",I486,25000000)
- MCFG_CPU_PROGRAM_MAP(pc9821_map)
- MCFG_CPU_IO_MAP(pc9821_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",I486,25000000)
+ MCFG_DEVICE_PROGRAM_MAP(pc9821_map)
+ MCFG_DEVICE_IO_MAP(pc9821_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9801bx2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9821)
pc9801rs(config);
- MCFG_CPU_REPLACE("maincpu", I486, 16000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(pc9821_map)
- MCFG_CPU_IO_MAP(pc9821_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu", I486, 16000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(pc9821_map)
+ MCFG_DEVICE_IO_MAP(pc9821_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_DEVICE_MODIFY("pit8253")
MCFG_PIT8253_CLK0(MAIN_CLOCK_X2)
@@ -2481,20 +2481,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9821ap2)
pc9821(config);
- MCFG_CPU_REPLACE("maincpu", I486, 66666667) // unknown clock
- MCFG_CPU_PROGRAM_MAP(pc9821_map)
- MCFG_CPU_IO_MAP(pc9821_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu", I486, 66666667) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(pc9821_map)
+ MCFG_DEVICE_IO_MAP(pc9821_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MCFG_MACHINE_START_OVERRIDE(pc9801_state,pc9821ap2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc9801_state::pc9821v20)
pc9821(config);
- MCFG_CPU_REPLACE("maincpu",PENTIUM,32000000) /* TODO: clock */
- MCFG_CPU_PROGRAM_MAP(pc9821_map)
- MCFG_CPU_IO_MAP(pc9821_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_REPLACE("maincpu",PENTIUM,32000000) /* TODO: clock */
+ MCFG_DEVICE_PROGRAM_MAP(pc9821_map)
+ MCFG_DEVICE_IO_MAP(pc9821_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
MACHINE_CONFIG_END
/* took from "raw" memory dump, uncomment ROM_FILL if you want to play with it */
diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp
index 73b2cfa5e43..ef554cc23cf 100644
--- a/src/mame/drivers/pcat_dyn.cpp
+++ b/src/mame/drivers/pcat_dyn.cpp
@@ -163,10 +163,10 @@ void pcat_dyn_state::pcat_dyn_sb_conf(device_t *device)
MACHINE_CONFIG_START(pcat_dyn_state::pcat_dyn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I486, 40000000) /* Am486 DX-40 */
- MCFG_CPU_PROGRAM_MAP(pcat_map)
- MCFG_CPU_IO_MAP(pcat_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486, 40000000) /* Am486 DX-40 */
+ MCFG_DEVICE_PROGRAM_MAP(pcat_map)
+ MCFG_DEVICE_IO_MAP(pcat_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
/* video hardware */
pcvideo_trident_vga(config);
@@ -178,45 +178,46 @@ MACHINE_CONFIG_START(pcat_dyn_state::pcat_dyn)
MCFG_DEVICE_REMOVE("rtc")
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
- MCFG_SOUND_ADD("ad1848", AD1848, 0)
- MCFG_AD1848_IRQ_CALLBACK(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w))
- MCFG_AD1848_DRQ_CALLBACK(DEVWRITELINE("dma8237_1", am9517a_device, dreq0_w))
+ MCFG_DEVICE_ADD("ad1848", AD1848, 0)
+ MCFG_AD1848_IRQ_CALLBACK(WRITELINE("pic8259_1", pic8259_device, ir5_w))
+ MCFG_AD1848_DRQ_CALLBACK(WRITELINE("dma8237_1", am9517a_device, dreq0_w))
MCFG_DEVICE_MODIFY("dma8237_1")
- MCFG_I8237_OUT_IOW_0_CB(DEVWRITE8("ad1848", ad1848_device, dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(pcat_dyn_state, dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8("ad1848", ad1848_device, dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, pcat_dyn_state, dma8237_1_dack_w))
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", pcat_dyn_state, nvram_init)
MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- MCFG_RS232_PORT_ADD( "serport", pcat_dyn_com, "msmouse" )
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ MCFG_DEVICE_ADD( "serport", RS232_PORT, pcat_dyn_com, "msmouse" )
MCFG_SLOT_FIXED(true)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, cts_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("ns16550", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ns16550", ins8250_uart_device, cts_w))
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_2", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir3_w))
- //MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- //MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
-
- MCFG_ISA8_SLOT_ADD("isa", "isa1", pcat_dyn_isa8_cards, "sb15", true)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259_2", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259_1", pic8259_device, ir3_w))
+ //MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ //MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259_1", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259_1", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259_1", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237_1", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237_1", am9517a_device, dreq3_w))
+
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", pcat_dyn_isa8_cards, "sb15", true)
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("sb15", pcat_dyn_sb_def)
MCFG_SLOT_OPTION_MACHINE_CONFIG("sb15", pcat_dyn_sb_conf)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pcat_nit.cpp b/src/mame/drivers/pcat_nit.cpp
index a6b072fca12..7acbbc21bc6 100644
--- a/src/mame/drivers/pcat_nit.cpp
+++ b/src/mame/drivers/pcat_nit.cpp
@@ -230,38 +230,38 @@ void pcat_nit_state::machine_start()
MACHINE_CONFIG_START(pcat_nit_state::pcat_nit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
- MCFG_CPU_PROGRAM_MAP(pcat_map)
- MCFG_CPU_IO_MAP(pcat_nit_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(pcat_map)
+ MCFG_DEVICE_IO_MAP(pcat_nit_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
/* video hardware */
pcvideo_vga(config);
pcat_common(config);
MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate?
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ MCFG_MICROTOUCH_ADD( "microtouch", 9600, WRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate?
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcat_nit_state::bonanza)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
- MCFG_CPU_PROGRAM_MAP(bonanza_map)
- MCFG_CPU_IO_MAP(bonanza_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(bonanza_map)
+ MCFG_DEVICE_IO_MAP(bonanza_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
/* video hardware */
pcvideo_cirrus_gd5428(config);
pcat_common(config);
MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w))
- MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate?
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("microtouch", microtouch_device, rx))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir4_w))
+ MCFG_MICROTOUCH_ADD( "microtouch", 9600, WRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate?
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index 83a60167487..b4f59326ce9 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -497,19 +497,19 @@ static INPUT_PORTS_START(pcx)
INPUT_PORTS_END
MACHINE_CONFIG_START(pcd_state::pcd)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(pcd_map)
- MCFG_CPU_IO_MAP(pcd_io)
- MCFG_80186_TMROUT1_HANDLER(WRITELINE(pcd_state, i186_timer1_w))
- MCFG_80186_IRQ_SLAVE_ACK(READ8(pcd_state, irq_callback))
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pcd_map)
+ MCFG_DEVICE_IO_MAP(pcd_io)
+ MCFG_80186_TMROUT1_HANDLER(WRITELINE(*this, pcd_state, i186_timer1_w))
+ MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, pcd_state, irq_callback))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer0_tick", pcd_state, timer0_tick, attotime::from_hz(XTAL(16'000'000) / 24)) // adjusted to pass post
MCFG_DEVICE_ADD("pic1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int0_w))
MCFG_DEVICE_ADD("pic2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int1_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int1_w))
MCFG_DEVICE_ADD("video", PCD_VIDEO, 0)
@@ -521,8 +521,8 @@ MACHINE_CONFIG_START(pcd_state::pcd)
// floppy disk controller
MCFG_WD2793_ADD("fdc", XTAL(16'000'000) / 8)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic1", pic8259_device, ir6_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic1", pic8259_device, ir6_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq1_w))
MCFG_WD_FDC_ENMF_CALLBACK(GND)
// floppy drives
@@ -531,46 +531,46 @@ MACHINE_CONFIG_START(pcd_state::pcd)
// usart
MCFG_DEVICE_ADD("usart1", MC2661, XTAL(4'915'200))
- MCFG_MC2661_RXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir3_w))
- MCFG_MC2661_TXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir3_w))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
+ MCFG_MC2661_RXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir3_w))
+ MCFG_MC2661_TXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir3_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232_1", rs232_port_device, write_txd))
MCFG_DEVICE_ADD("usart2", MC2661, XTAL(4'915'200))
- MCFG_MC2661_RXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir2_w))
- //MCFG_MC2661_TXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir2_w)) // this gets stuck high causing the keyboard to not work
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("keyboard", pcd_keyboard_device, t0_w))
+ MCFG_MC2661_RXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir2_w))
+ //MCFG_MC2661_TXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir2_w)) // this gets stuck high causing the keyboard to not work
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("keyboard", pcd_keyboard_device, t0_w))
MCFG_DEVICE_ADD("usart3", MC2661, XTAL(4'915'200))
- MCFG_MC2661_RXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir4_w))
- MCFG_MC2661_TXRDY_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir4_w))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
+ MCFG_MC2661_RXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir4_w))
+ MCFG_MC2661_TXRDY_HANDLER(WRITELINE("pic1", pic8259_device, ir4_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232_2", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("usart1", mc2661_device, rx_w))
- MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("usart3", mc2661_device, rx_w))
+ MCFG_DEVICE_ADD("rs232_1", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("usart1", mc2661_device, rx_w))
+ MCFG_DEVICE_ADD("rs232_2", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("usart3", mc2661_device, rx_w))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// rtc
MCFG_MC146818_ADD("rtc", XTAL(32'768))
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic1", pic8259_device, ir7_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic1", pic8259_device, ir7_w))
MCFG_MC146818_BINARY(true)
MCFG_MC146818_BINARY_YEAR(true)
MCFG_MC146818_EPOCH(1900)
MCFG_MC146818_24_12(true)
MCFG_DEVICE_ADD("keyboard", PCD_KEYBOARD, 0)
- MCFG_PCD_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE("usart2", mc2661_device, rx_w))
+ MCFG_PCD_KEYBOARD_OUT_TX_HANDLER(WRITELINE("usart2", mc2661_device, rx_w))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
- MCFG_SCSI_MSG_HANDLER(WRITELINE(pcd_state, write_scsi_msg))
- MCFG_SCSI_BSY_HANDLER(WRITELINE(pcd_state, write_scsi_bsy))
- MCFG_SCSI_IO_HANDLER(WRITELINE(pcd_state, write_scsi_io))
- MCFG_SCSI_CD_HANDLER(WRITELINE(pcd_state, write_scsi_cd))
- MCFG_SCSI_REQ_HANDLER(WRITELINE(pcd_state, write_scsi_req))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE(*this, pcd_state, write_scsi_msg))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE(*this, pcd_state, write_scsi_bsy))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(*this, pcd_state, write_scsi_io))
+ MCFG_SCSI_CD_HANDLER(WRITELINE(*this, pcd_state, write_scsi_cd))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, pcd_state, write_scsi_req))
MCFG_SCSI_OUTPUT_LATCH_ADD("scsi_data_out", "scsi")
MCFG_DEVICE_ADD("scsi_data_in", INPUT_BUFFER, 0)
@@ -579,14 +579,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcd_state::pcx)
pcd(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(pcx_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(pcx_io)
MCFG_DEVICE_REPLACE("video", PCX_VIDEO, 0)
- MCFG_PCX_VIDEO_TXD_HANDLER(DEVWRITELINE("keyboard", pcd_keyboard_device, t0_w))
+ MCFG_PCX_VIDEO_TXD_HANDLER(WRITELINE("keyboard", pcd_keyboard_device, t0_w))
MCFG_DEVICE_MODIFY("keyboard")
- MCFG_PCD_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE("video", pcx_video_device, rx_w))
+ MCFG_PCD_KEYBOARD_OUT_TX_HANDLER(WRITELINE("video", pcx_video_device, rx_w))
MCFG_DEVICE_MODIFY("usart2")
MCFG_MC2661_TXD_HANDLER(NOOP)
diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp
index 77b34ea71ff..d23d0342e6a 100644
--- a/src/mame/drivers/pce.cpp
+++ b/src/mame/drivers/pce.cpp
@@ -316,9 +316,9 @@ static void pce_cart(device_slot_interface &device)
MACHINE_CONFIG_START(pce_state::pce_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(pce_mem)
- MCFG_CPU_IO_MAP(pce_io)
+ MCFG_DEVICE_ADD("maincpu", H6280, MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(pce_mem)
+ MCFG_DEVICE_IO_MAP(pce_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_START_OVERRIDE(pce_state, pce )
@@ -331,17 +331,17 @@ MACHINE_CONFIG_START(pce_state::pce_common)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD( "huc6260", HUC6260, MAIN_CLOCK )
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6270", huc6270_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6270", huc6270_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6270", huc6270_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6270", huc6270_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD(C6280_TAG, C6280, MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD(C6280_TAG, C6280, MAIN_CLOCK/6)
MCFG_C6280_CPU("maincpu")
MCFG_SOUND_ROUTE( 0, "lspeaker", 1.00 )
MCFG_SOUND_ROUTE( 1, "rspeaker", 1.00 )
@@ -368,9 +368,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pce_state::sgx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(sgx_mem)
- MCFG_CPU_IO_MAP(sgx_io)
+ MCFG_DEVICE_ADD("maincpu", H6280, MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(sgx_mem)
+ MCFG_DEVICE_IO_MAP(sgx_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_START_OVERRIDE(pce_state, pce )
@@ -383,10 +383,10 @@ MACHINE_CONFIG_START(pce_state::sgx)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD( "huc6260", HUC6260, MAIN_CLOCK )
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6202", huc6202_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6202", huc6202_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6202", huc6202_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6202", huc6202_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6202", huc6202_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6202", huc6202_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6202", huc6202_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6202", huc6202_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270_0", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
@@ -394,21 +394,21 @@ MACHINE_CONFIG_START(pce_state::sgx)
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD( "huc6202", HUC6202, 0 )
- MCFG_HUC6202_NEXT_PIXEL_0_CB(DEVREAD16("huc6270_0", huc6270_device, next_pixel))
- MCFG_HUC6202_TIME_TIL_NEXT_EVENT_0_CB(DEVREAD16("huc6270_0", huc6270_device, time_until_next_event))
- MCFG_HUC6202_VSYNC_CHANGED_0_CB(DEVWRITELINE("huc6270_0", huc6270_device, vsync_changed))
- MCFG_HUC6202_HSYNC_CHANGED_0_CB(DEVWRITELINE("huc6270_0", huc6270_device, hsync_changed))
- MCFG_HUC6202_READ_0_CB(DEVREAD8("huc6270_0", huc6270_device, read))
- MCFG_HUC6202_WRITE_0_CB(DEVWRITE8("huc6270_0", huc6270_device, write))
- MCFG_HUC6202_NEXT_PIXEL_1_CB(DEVREAD16("huc6270_1", huc6270_device, next_pixel))
- MCFG_HUC6202_TIME_TIL_NEXT_EVENT_1_CB(DEVREAD16("huc6270_1", huc6270_device, time_until_next_event))
- MCFG_HUC6202_VSYNC_CHANGED_1_CB(DEVWRITELINE("huc6270_1", huc6270_device, vsync_changed))
- MCFG_HUC6202_HSYNC_CHANGED_1_CB(DEVWRITELINE("huc6270_1", huc6270_device, hsync_changed))
- MCFG_HUC6202_READ_1_CB(DEVREAD8("huc6270_1", huc6270_device, read))
- MCFG_HUC6202_WRITE_1_CB(DEVWRITE8("huc6270_1", huc6270_device, write))
+ MCFG_HUC6202_NEXT_PIXEL_0_CB(READ16("huc6270_0", huc6270_device, next_pixel))
+ MCFG_HUC6202_TIME_TIL_NEXT_EVENT_0_CB(READ16("huc6270_0", huc6270_device, time_until_next_event))
+ MCFG_HUC6202_VSYNC_CHANGED_0_CB(WRITELINE("huc6270_0", huc6270_device, vsync_changed))
+ MCFG_HUC6202_HSYNC_CHANGED_0_CB(WRITELINE("huc6270_0", huc6270_device, hsync_changed))
+ MCFG_HUC6202_READ_0_CB(READ8("huc6270_0", huc6270_device, read))
+ MCFG_HUC6202_WRITE_0_CB(WRITE8("huc6270_0", huc6270_device, write))
+ MCFG_HUC6202_NEXT_PIXEL_1_CB(READ16("huc6270_1", huc6270_device, next_pixel))
+ MCFG_HUC6202_TIME_TIL_NEXT_EVENT_1_CB(READ16("huc6270_1", huc6270_device, time_until_next_event))
+ MCFG_HUC6202_VSYNC_CHANGED_1_CB(WRITELINE("huc6270_1", huc6270_device, vsync_changed))
+ MCFG_HUC6202_HSYNC_CHANGED_1_CB(WRITELINE("huc6270_1", huc6270_device, hsync_changed))
+ MCFG_HUC6202_READ_1_CB(READ8("huc6270_1", huc6270_device, read))
+ MCFG_HUC6202_WRITE_1_CB(WRITE8("huc6270_1", huc6270_device, write))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD(C6280_TAG, C6280, MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD(C6280_TAG, C6280, MAIN_CLOCK/6)
MCFG_C6280_CPU("maincpu")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp
index 8eb486c6d83..7723dcd370f 100644
--- a/src/mame/drivers/pce220.cpp
+++ b/src/mame/drivers/pce220.cpp
@@ -937,9 +937,9 @@ PALETTE_INIT_MEMBER(pce220_state,pce220)
MACHINE_CONFIG_START(pce220_state::pce220)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, 3072000 ) // CMOS-SC7852
- MCFG_CPU_PROGRAM_MAP(pce220_mem)
- MCFG_CPU_IO_MAP(pce220_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, 3072000 ) // CMOS-SC7852
+ MCFG_DEVICE_PROGRAM_MAP(pce220_mem)
+ MCFG_DEVICE_IO_MAP(pce220_io)
/* video hardware */
// 4 lines x 24 characters, resp. 144 x 32 pixel
@@ -957,7 +957,7 @@ MACHINE_CONFIG_START(pce220_state::pce220)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
@@ -973,9 +973,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcg850v_state::pcg815)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000) ) // 3.54MHz
- MCFG_CPU_PROGRAM_MAP(pce220_mem)
- MCFG_CPU_IO_MAP(pcg850v_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000) ) // 3.54MHz
+ MCFG_DEVICE_PROGRAM_MAP(pce220_mem)
+ MCFG_DEVICE_IO_MAP(pcg850v_io)
/* video hardware */
// 4 lines x 24 characters, resp. 144 x 32 pixel
@@ -993,7 +993,7 @@ MACHINE_CONFIG_START(pcg850v_state::pcg815)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
@@ -1009,9 +1009,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcg850v_state::pcg850v)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000) ) // CMOS-SC7852
- MCFG_CPU_PROGRAM_MAP(pce220_mem)
- MCFG_CPU_IO_MAP(pcg850v_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000) ) // CMOS-SC7852
+ MCFG_DEVICE_PROGRAM_MAP(pce220_mem)
+ MCFG_DEVICE_IO_MAP(pcg850v_io)
/* video hardware */
// 6 lines x 24 characters, resp. 144 x 48 pixel
@@ -1029,7 +1029,7 @@ MACHINE_CONFIG_START(pcg850v_state::pcg850v)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp
index cc52e64b9b1..2d92eafd3dd 100644
--- a/src/mame/drivers/pcfx.cpp
+++ b/src/mame/drivers/pcfx.cpp
@@ -416,9 +416,9 @@ uint32_t pcfx_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
MACHINE_CONFIG_START(pcfx_state::pcfx)
- MCFG_CPU_ADD( "maincpu", V810, XTAL(21'477'272) )
- MCFG_CPU_PROGRAM_MAP( pcfx_mem)
- MCFG_CPU_IO_MAP( pcfx_io)
+ MCFG_DEVICE_ADD( "maincpu", V810, XTAL(21'477'272) )
+ MCFG_DEVICE_PROGRAM_MAP( pcfx_mem)
+ MCFG_DEVICE_IO_MAP( pcfx_io)
MCFG_SCREEN_ADD( "screen", RASTER )
MCFG_SCREEN_UPDATE_DRIVER(pcfx_state, screen_update)
@@ -426,11 +426,11 @@ MACHINE_CONFIG_START(pcfx_state::pcfx)
MCFG_DEVICE_ADD( "huc6270_a", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x20000)
- MCFG_HUC6270_IRQ_CHANGED_CB(WRITELINE(pcfx_state, irq12_w))
+ MCFG_HUC6270_IRQ_CHANGED_CB(WRITELINE(*this, pcfx_state, irq12_w))
MCFG_DEVICE_ADD( "huc6270_b", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x20000)
- MCFG_HUC6270_IRQ_CHANGED_CB(WRITELINE(pcfx_state, irq14_w))
+ MCFG_HUC6270_IRQ_CHANGED_CB(WRITELINE(*this, pcfx_state, irq14_w))
MCFG_DEVICE_ADD("huc6261", HUC6261, XTAL(21'477'272))
MCFG_HUC6261_VDC1("huc6270_a")
@@ -438,7 +438,7 @@ MACHINE_CONFIG_START(pcfx_state::pcfx)
MCFG_HUC6261_KING("huc6272")
MCFG_HUC6272_ADD( "huc6272", XTAL(21'477'272) )
- MCFG_HUC6272_IRQ_CHANGED_CB(WRITELINE(pcfx_state, irq13_w))
+ MCFG_HUC6272_IRQ_CHANGED_CB(WRITELINE(*this, pcfx_state, irq13_w))
MCFG_HUC6272_RAINBOW("huc6271")
MCFG_HUC6271_ADD( "huc6271", XTAL(21'477'272) )
diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp
index ec9e792d863..c8ed80af59c 100644
--- a/src/mame/drivers/pcipc.cpp
+++ b/src/mame/drivers/pcipc.cpp
@@ -466,25 +466,25 @@ WRITE8_MEMBER(pcipc_state::boot_state_award_w)
}
MACHINE_CONFIG_START(pcipc_state::pcipc)
- MCFG_CPU_ADD("maincpu", PENTIUM, 90000000)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 90000000)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
MCFG_PCI_ROOT_ADD( ":pci")
MCFG_I82439HX_ADD( ":pci:00.0", ":maincpu", 256*1024*1024)
MCFG_I82371SB_ISA_ADD(":pci:07.0")
- MCFG_I82371SB_BOOT_STATE_HOOK(DEVWRITE8(":", pcipc_state, boot_state_phoenix_ver40_rev6_w))
+ MCFG_I82371SB_BOOT_STATE_HOOK(WRITE8(*this, pcipc_state, boot_state_phoenix_ver40_rev6_w))
// MCFG_IDE_PCI_ADD( ":pci:07.1", 0x80867010, 0x03, 0x00000000)
MCFG_MGA2064W_ADD( ":pci:12.0")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcipc_state::pcipctx)
- MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 60000000)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
MCFG_PCI_ROOT_ADD( ":pci")
MCFG_I82439TX_ADD( ":pci:00.0", ":maincpu", 256*1024*1024)
MCFG_I82371SB_ISA_ADD(":pci:07.0")
- MCFG_I82371SB_BOOT_STATE_HOOK(DEVWRITE8(":", pcipc_state, boot_state_award_w))
+ MCFG_I82371SB_BOOT_STATE_HOOK(WRITE8(*this, pcipc_state, boot_state_award_w))
// MCFG_IDE_PCI_ADD( ":pci:07.1", 0x80867010, 0x03, 0x00000000)
MCFG_MGA2064W_ADD( ":pci:12.0")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp
index ac950e8570a..baa0b6c7a38 100644
--- a/src/mame/drivers/pcktgal.cpp
+++ b/src/mame/drivers/pcktgal.cpp
@@ -226,11 +226,11 @@ void pcktgal_state::machine_start()
MACHINE_CONFIG_START(pcktgal_state::pcktgal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 2000000)
- MCFG_CPU_PROGRAM_MAP(pcktgal_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(pcktgal_map)
- MCFG_CPU_ADD("audiocpu", DECO_222, 1500000)
- MCFG_CPU_PROGRAM_MAP(pcktgal_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", DECO_222, 1500000)
+ MCFG_DEVICE_PROGRAM_MAP(pcktgal_sound_map)
/* IRQs are caused by the ADPCM chip */
/* NMIs are caused by the main CPU */
@@ -258,14 +258,14 @@ MACHINE_CONFIG_START(pcktgal_state::pcktgal)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3812, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(pcktgal_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, pcktgal_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -281,8 +281,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcktgal_state::pcktgal2)
pcktgal(config);
MCFG_DEVICE_REMOVE("audiocpu")
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* doesn't use the encrypted 222 */
- MCFG_CPU_PROGRAM_MAP(pcktgal_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* doesn't use the encrypted 222 */
+ MCFG_DEVICE_PROGRAM_MAP(pcktgal_sound_map)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index c3ea8f809d5..2f99034f0cc 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -255,9 +255,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(pcm_state::pcm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(10'000'000) /4)
- MCFG_CPU_PROGRAM_MAP(pcm_mem)
- MCFG_CPU_IO_MAP(pcm_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(10'000'000) /4)
+ MCFG_DEVICE_PROGRAM_MAP(pcm_mem)
+ MCFG_DEVICE_IO_MAP(pcm_io)
MCFG_Z80_DAISY_CHAIN(pcm_daisy_chain)
/* video hardware */
@@ -276,7 +276,7 @@ MACHINE_CONFIG_START(pcm_state::pcm)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -288,9 +288,9 @@ MACHINE_CONFIG_START(pcm_state::pcm)
MCFG_DEVICE_ADD("pio_s", Z80PIO, XTAL(10'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(DEVREAD8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read))
- MCFG_Z80PIO_IN_PB_CB(READ8(pcm_state, pcm_85_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(pcm_state, pcm_85_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(K7659_KEYBOARD_TAG, k7659_keyboard_device, read))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, pcm_state, pcm_85_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, pcm_state, pcm_85_w))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(10'000'000) /4)
@@ -299,10 +299,10 @@ MACHINE_CONFIG_START(pcm_state::pcm)
MCFG_DEVICE_ADD("ctc_s", Z80CTC, XTAL(10'000'000) /4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio", z80sio_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(pcm_state, pcm_82_w)) // speaker
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, pcm_state, pcm_82_w)) // speaker
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp
index 3468065d24e..cff61739843 100644
--- a/src/mame/drivers/pcw.cpp
+++ b/src/mame/drivers/pcw.cpp
@@ -1248,26 +1248,26 @@ static void pcw_floppies(device_slot_interface &device)
/* PCW8256, PCW8512, PCW9256 */
MACHINE_CONFIG_START(pcw_state::pcw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* clock supplied to chip, but in reality it is 3.4 MHz */
- MCFG_CPU_PROGRAM_MAP(pcw_map)
- MCFG_CPU_IO_MAP(pcw_io)
-
- MCFG_CPU_ADD("printer_mcu", I8041, 11000000) // 11MHz
- MCFG_MCS48_PORT_P2_IN_CB(READ8(pcw_state, mcu_printer_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcw_state, mcu_printer_p2_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(pcw_state, mcu_printer_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pcw_state, mcu_printer_p1_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(pcw_state, mcu_printer_t1_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(pcw_state, mcu_printer_t0_r))
-
- MCFG_CPU_ADD("keyboard_mcu", I8048, 5000000) // 5MHz
- MCFG_MCS48_PORT_P1_IN_CB(READ8(pcw_state, mcu_kb_scan_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pcw_state, mcu_kb_scan_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(pcw_state, mcu_kb_scan_high_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcw_state, mcu_kb_scan_high_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(pcw_state, mcu_kb_t1_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(pcw_state, mcu_kb_t0_r))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(pcw_state, mcu_kb_data_r))
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* clock supplied to chip, but in reality it is 3.4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pcw_map)
+ MCFG_DEVICE_IO_MAP(pcw_io)
+
+ MCFG_DEVICE_ADD("printer_mcu", I8041, 11000000) // 11MHz
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, pcw_state, mcu_printer_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pcw_state, mcu_printer_p2_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, pcw_state, mcu_printer_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, pcw_state, mcu_printer_p1_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, pcw_state, mcu_printer_t1_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, pcw_state, mcu_printer_t0_r))
+
+ MCFG_DEVICE_ADD("keyboard_mcu", I8048, 5000000) // 5MHz
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, pcw_state, mcu_kb_scan_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, pcw_state, mcu_kb_scan_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, pcw_state, mcu_kb_scan_high_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pcw_state, mcu_kb_scan_high_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, pcw_state, mcu_kb_t1_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, pcw_state, mcu_kb_t0_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, pcw_state, mcu_kb_data_r))
// MCFG_QUANTUM_TIME(attotime::from_hz(50))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1287,11 +1287,11 @@ MACHINE_CONFIG_START(pcw_state::pcw)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3750)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3750)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pcw_state, pcw_fdc_interrupt))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pcw_state, pcw_fdc_interrupt))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", pcw_floppies, "3dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", pcw_floppies, "3dsdd", floppy_image_device::default_floppy_formats)
@@ -1337,8 +1337,8 @@ MACHINE_CONFIG_END
/* PCW9512, PCW9512+, PCW10 */
MACHINE_CONFIG_START(pcw_state::pcw9512)
pcw(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_IO_MAP(pcw9512_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_IO_MAP(pcw9512_io)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index 477735fd409..9704bc17e6c 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -1012,34 +1012,34 @@ static void pcw16_com(device_slot_interface &device)
MACHINE_CONFIG_START(pcw16_state::pcw16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 16000000)
- MCFG_CPU_PROGRAM_MAP(pcw16_map)
- MCFG_CPU_IO_MAP(pcw16_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(pcw16_map)
+ MCFG_DEVICE_IO_MAP(pcw16_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD( "ns16550_1", NS16550, XTAL(1'843'200) ) /* TODO: Verify uart model */
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport1", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport1", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport1", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(pcw16_state, pcw16_com_interrupt_1))
- MCFG_RS232_PORT_ADD( "serport1", pcw16_com, "msystems_mouse" )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550_1", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport1", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport1", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport1", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, pcw16_state, pcw16_com_interrupt_1))
+ MCFG_DEVICE_ADD( "serport1", RS232_PORT, pcw16_com, "msystems_mouse" )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ns16550_1", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ns16550_1", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ns16550_1", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("ns16550_1", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ns16550_1", ins8250_uart_device, cts_w))
MCFG_DEVICE_ADD( "ns16550_2", NS16550, XTAL(1'843'200) ) /* TODO: Verify uart model */
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport2", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport2", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport2", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(pcw16_state, pcw16_com_interrupt_2))
- MCFG_RS232_PORT_ADD( "serport2", pcw16_com, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ns16550_2", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ns16550_2", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ns16550_2", ins8250_uart_device, dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550_2", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport2", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport2", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport2", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, pcw16_state, pcw16_com_interrupt_2))
+ MCFG_DEVICE_ADD( "serport2", RS232_PORT, pcw16_com, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ns16550_2", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ns16550_2", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ns16550_2", ins8250_uart_device, dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ns16550_2", ins8250_uart_device, cts_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1055,7 +1055,7 @@ MACHINE_CONFIG_START(pcw16_state::pcw16)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3750)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3750)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* printer */
@@ -1063,7 +1063,7 @@ MACHINE_CONFIG_START(pcw16_state::pcw16)
MCFG_PC_LPT_IRQ_HANDLER(INPUTLINE("maincpu", 0))
MCFG_PC_FDC_SUPERIO_ADD("fdc")
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(pcw16_state, fdc_interrupt))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, pcw16_state, fdc_interrupt))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pcw16_floppies, "35hd", pcw16_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pcw16_floppies, "35hd", pcw16_state::floppy_formats)
@@ -1075,7 +1075,7 @@ MACHINE_CONFIG_START(pcw16_state::pcw16)
MCFG_INTEL_E28F008SA_ADD("flash0")
MCFG_INTEL_E28F008SA_ADD("flash1")
- MCFG_AT_KEYB_ADD("at_keyboard", 3, WRITELINE(pcw16_state, pcw16_keyboard_callback))
+ MCFG_AT_KEYB_ADD("at_keyboard", 3, WRITELINE(*this, pcw16_state, pcw16_keyboard_callback))
/* video ints */
MCFG_TIMER_DRIVER_ADD_PERIODIC("video_timer", pcw16_state, pcw16_timer_callback, attotime::from_usec(5830))
diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp
index 9b814e5895c..04b0fc1f56d 100644
--- a/src/mame/drivers/pcxt.cpp
+++ b/src/mame/drivers/pcxt.cpp
@@ -494,14 +494,14 @@ static void filetto_isa8_cards(device_slot_interface &device)
MACHINE_CONFIG_START(pcxt_state::filetto)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
- MCFG_CPU_PROGRAM_MAP(filetto_map)
- MCFG_CPU_IO_MAP(filetto_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3)
+ MCFG_DEVICE_PROGRAM_MAP(filetto_map)
+ MCFG_DEVICE_IO_MAP(filetto_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb","maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", filetto_isa8_cards, "filetto", true)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", filetto_isa8_cards, "filetto", true) // FIXME: determine ISA bus clock
- MCFG_SOUND_ADD("voice", HC55516, 8000000/4)//8923S-UM5100 is a HC55536 with ROM hook-up
+ MCFG_DEVICE_ADD("voice", HC55516, 8000000/4)//8923S-UM5100 is a HC55536 with ROM hook-up
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mb:mono", 0.60)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")
@@ -515,13 +515,13 @@ MACHINE_CONFIG_START(pcxt_state::filetto)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pcxt_state::tetriskr)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3)
- MCFG_CPU_PROGRAM_MAP(tetriskr_map)
- MCFG_CPU_IO_MAP(tetriskr_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3)
+ MCFG_DEVICE_PROGRAM_MAP(tetriskr_map)
+ MCFG_DEVICE_IO_MAP(tetriskr_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_PCNOPPI_MOTHERBOARD_ADD("mb","maincpu")
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", filetto_isa8_cards, "tetriskr", true)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", filetto_isa8_cards, "tetriskr", true) // FIXME: determine ISA bus clock
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("640K")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp
index 943662b4732..0fd787c5573 100644
--- a/src/mame/drivers/pda600.cpp
+++ b/src/mame/drivers/pda600.cpp
@@ -203,9 +203,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(pda600_state::pda600)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z180, XTAL(14'318'181))
- MCFG_CPU_PROGRAM_MAP(pda600_mem)
- MCFG_CPU_IO_MAP(pda600_io)
+ MCFG_DEVICE_ADD("maincpu",Z180, XTAL(14'318'181))
+ MCFG_DEVICE_PROGRAM_MAP(pda600_mem)
+ MCFG_DEVICE_IO_MAP(pda600_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp
index 7da4491344c..96da2943c8a 100644
--- a/src/mame/drivers/pdp1.cpp
+++ b/src/mame/drivers/pdp1.cpp
@@ -1922,10 +1922,10 @@ MACHINE_CONFIG_START(pdp1_state::pdp1)
/* basic machine hardware */
/* PDP1 CPU @ 200 kHz (no master clock, but the instruction and memory rate is 200 kHz) */
- MCFG_CPU_ADD("maincpu", PDP1, 1000000/*the CPU core uses microsecond counts*/)
+ MCFG_DEVICE_ADD("maincpu", PDP1, 1000000/*the CPU core uses microsecond counts*/)
MCFG_PDP1_RESET_PARAM(pdp1_reset_param)
- MCFG_CPU_PROGRAM_MAP(pdp1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pdp1_state, pdp1_interrupt) /* dummy interrupt: handles input */
+ MCFG_DEVICE_PROGRAM_MAP(pdp1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pdp1_state, pdp1_interrupt) /* dummy interrupt: handles input */
/* video hardware (includes the control panel and typewriter output) */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1934,7 +1934,7 @@ MACHINE_CONFIG_START(pdp1_state::pdp1)
MCFG_SCREEN_SIZE(virtual_width, virtual_height)
MCFG_SCREEN_VISIBLE_AREA(0, virtual_width-1, 0, virtual_height-1)
MCFG_SCREEN_UPDATE_DRIVER(pdp1_state, screen_update_pdp1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pdp1_state, screen_vblank_pdp1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pdp1_state, screen_vblank_pdp1))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crt", CRT, 0)
diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp
index 20be653321a..c39f50e8173 100644
--- a/src/mame/drivers/pdp11.cpp
+++ b/src/mame/drivers/pdp11.cpp
@@ -355,9 +355,9 @@ void pdp11_state::kbd_put(u8 data)
MACHINE_CONFIG_START(pdp11_state::pdp11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, XTAL(4'000'000)) // Need proper CPU here
+ MCFG_DEVICE_ADD("maincpu",T11, XTAL(4'000'000)) // Need proper CPU here
MCFG_T11_INITIAL_MODE(6 << 13)
- MCFG_CPU_PROGRAM_MAP(pdp11_mem)
+ MCFG_DEVICE_PROGRAM_MAP(pdp11_mem)
/* video hardware */
@@ -376,9 +376,9 @@ MACHINE_CONFIG_START(pdp11_state::pdp11qb)
pdp11(config);
MCFG_MACHINE_RESET_OVERRIDE(pdp11_state,pdp11qb)
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_T11_INITIAL_MODE(0 << 13)
- MCFG_CPU_PROGRAM_MAP(pdp11qb_mem)
+ MCFG_DEVICE_PROGRAM_MAP(pdp11qb_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp
index 3c3a292a943..18deed3ad92 100644
--- a/src/mame/drivers/pecom.cpp
+++ b/src/mame/drivers/pecom.cpp
@@ -172,14 +172,14 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(pecom_state::pecom64)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::DOT_CLK_PAL/3)
- MCFG_CPU_PROGRAM_MAP(pecom64_mem)
- MCFG_CPU_IO_MAP(pecom64_io)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, cdp1869_device::DOT_CLK_PAL/3)
+ MCFG_DEVICE_PROGRAM_MAP(pecom64_mem)
+ MCFG_DEVICE_IO_MAP(pecom64_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(pecom_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(pecom_state, ef2_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(pecom_state, q_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(pecom_state, sc_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, pecom_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, pecom_state, ef2_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, pecom_state, q_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, pecom_state, sc_w))
// sound and video hardware
pecom_video(config);
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index b0a2e820eba..1606b14edb3 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -486,8 +486,8 @@ DRIVER_INIT_MEMBER(pegasus_state, pegasus)
MACHINE_CONFIG_START(pegasus_state::pegasus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000)) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally
- MCFG_CPU_PROGRAM_MAP(pegasus_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally
+ MCFG_DEVICE_PROGRAM_MAP(pegasus_mem)
MCFG_TIMER_DRIVER_ADD_PERIODIC("pegasus_firq", pegasus_state, pegasus_firq, attotime::from_hz(400))
@@ -509,13 +509,13 @@ MACHINE_CONFIG_START(pegasus_state::pegasus)
/* devices */
MCFG_DEVICE_ADD("pia_s", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(pegasus_state, pegasus_keyboard_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(pegasus_state, pegasus_cassette_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(pegasus_state, pegasus_keyboard_irq))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(pegasus_state, pegasus_keyboard_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(pegasus_state, pegasus_controls_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(pegasus_state, pegasus_cassette_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(pegasus_state, pegasus_firq_clr))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, pegasus_state, pegasus_keyboard_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, pegasus_state, pegasus_cassette_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, pegasus_state, pegasus_keyboard_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, pegasus_state, pegasus_keyboard_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, pegasus_state, pegasus_controls_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, pegasus_state, pegasus_cassette_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, pegasus_state, pegasus_firq_clr))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -547,8 +547,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pegasus_state::pegasusm)
pegasus(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(pegasusm_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(pegasusm_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index 76af96bdde4..855c8f78798 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -310,9 +310,9 @@ void pencil2_state::machine_start()
MACHINE_CONFIG_START(pencil2_state::pencil2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9929A, XTAL(10'738'635) / 2 )
@@ -322,7 +322,7 @@ MACHINE_CONFIG_START(pencil2_state::pencil2)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL(10'738'635)/3) // guess
+ MCFG_DEVICE_ADD("sn76489a", SN76489A, XTAL(10'738'635)/3) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -336,8 +336,8 @@ MACHINE_CONFIG_START(pencil2_state::pencil2)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(pencil2_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(pencil2_state, write_centronics_busy))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, pencil2_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, pencil2_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp
index 34e01c4a6be..08e2bbd2492 100644
--- a/src/mame/drivers/pengadvb.cpp
+++ b/src/mame/drivers/pengadvb.cpp
@@ -218,9 +218,9 @@ WRITE8_MEMBER(pengadvb_state::pengadvb_ppi_port_c_w)
MACHINE_CONFIG_START(pengadvb_state::pengadvb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(program_mem)
- MCFG_CPU_IO_MAP(io_mem)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(program_mem)
+ MCFG_DEVICE_IO_MAP(io_mem)
// -_-;
MCFG_DEVICE_ADD("page0", ADDRESS_MAP_BANK, 0)
@@ -252,10 +252,10 @@ MACHINE_CONFIG_START(pengadvb_state::pengadvb)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pengadvb_state, pengadvb_ppi_port_a_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pengadvb_state, pengadvb_ppi_port_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pengadvb_state, pengadvb_ppi_port_b_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pengadvb_state, pengadvb_ppi_port_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pengadvb_state, pengadvb_ppi_port_a_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pengadvb_state, pengadvb_ppi_port_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pengadvb_state, pengadvb_ppi_port_b_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pengadvb_state, pengadvb_ppi_port_c_w))
/* video hardware */
MCFG_DEVICE_ADD("tms9128", TMS9128, XTAL(10'738'635)/2)
@@ -266,9 +266,9 @@ MACHINE_CONFIG_START(pengadvb_state::pengadvb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(10'738'635)/6)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(10'738'635)/6)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(pengadvb_state, pengadvb_psg_port_b_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pengadvb_state, pengadvb_psg_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp
index e60be39059a..ffc89216509 100644
--- a/src/mame/drivers/pengo.cpp
+++ b/src/mame/drivers/pengo.cpp
@@ -379,19 +379,19 @@ WRITE_LINE_MEMBER(pengo_state::vblank_irq)
MACHINE_CONFIG_START(pengo_state::pengo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(pengo_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(pengo_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_DEVICE_ADD("latch", LS259, 0) // U27
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pengo_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(pengo_state, pengo_palettebank_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pengo_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(pengo_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(pengo_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pengo_state, pengo_colortablebank_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pengo_state, pengo_gfxbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, pengo_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, pengo_state, pengo_palettebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pengo_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, pengo_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, pengo_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pengo_state, pengo_colortablebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pengo_state, pengo_gfxbank_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -405,14 +405,14 @@ MACHINE_CONFIG_START(pengo_state::pengo)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(pengo_state, screen_update_pacman)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pengo_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pengo_state, vblank_irq))
MCFG_VIDEO_START_OVERRIDE(pengo_state,pengo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32)
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -420,15 +420,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pengo_state::pengou)
pengo(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pengo_state::pengoe)
pengo(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5010, MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(pengo_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5010, MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(pengo_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -436,14 +436,14 @@ MACHINE_CONFIG_START(pengo_state::jrpacmbl)
pengo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jrpacmbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jrpacmbl_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES)
MCFG_DEVICE_MODIFY("latch")
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(pengo_state, jrpacman_bgpriority_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(pengo_state, jrpacman_spritebank_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pengo_state, jrpacman_charbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, pengo_state, jrpacman_bgpriority_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, pengo_state, jrpacman_spritebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pengo_state, jrpacman_charbank_w))
MCFG_VIDEO_START_OVERRIDE(pengo_state,jrpacman)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp
index 73bd073b387..a42c2c6f786 100644
--- a/src/mame/drivers/pentagon.cpp
+++ b/src/mame/drivers/pentagon.cpp
@@ -275,12 +275,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(pentagon_state::pentagon)
spectrum_128(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(14'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(pentagon_mem)
- MCFG_CPU_IO_MAP(pentagon_io)
- MCFG_CPU_OPCODES_MAP(pentagon_switch)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pentagon_state, pentagon_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(14'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(pentagon_mem)
+ MCFG_DEVICE_IO_MAP(pentagon_io)
+ MCFG_DEVICE_OPCODES_MAP(pentagon_switch)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pentagon_state, pentagon_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(pentagon_state, pentagon )
MCFG_SCREEN_MODIFY("screen")
@@ -293,7 +293,7 @@ MACHINE_CONFIG_START(pentagon_state::pentagon)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_REPLACE("ay8912", AY8912, XTAL(14'000'000) / 8)
+ MCFG_DEVICE_REPLACE("ay8912", AY8912, XTAL(14'000'000) / 8)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp
index dbd4d098a3c..7cc2cf9f9af 100644
--- a/src/mame/drivers/peoplepc.cpp
+++ b/src/mame/drivers/peoplepc.cpp
@@ -242,26 +242,26 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(peoplepc_state::olypeopl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600)/3)
- MCFG_CPU_PROGRAM_MAP(peoplepc_map)
- MCFG_CPU_IO_MAP(peoplepc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_0", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(14'745'600)/3)
+ MCFG_DEVICE_PROGRAM_MAP(peoplepc_map)
+ MCFG_DEVICE_IO_MAP(peoplepc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_0", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(14'745'600)/6)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(peoplepc_state, kbd_clock_tick_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, peoplepc_state, kbd_clock_tick_w))
MCFG_PIT8253_CLK1(XTAL(14'745'600)/6)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(peoplepc_state, tty_clock_tick_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, peoplepc_state, tty_clock_tick_w))
MCFG_PIT8253_CLK2(XTAL(14'745'600)/6)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic8259_0", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic8259_0", pic8259_device, ir0_w))
MCFG_DEVICE_ADD("pic8259_0", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(peoplepc_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, peoplepc_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_0", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_0", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
@@ -279,25 +279,25 @@ MACHINE_CONFIG_START(peoplepc_state::olypeopl)
MCFG_MC6845_UPDATE_ROW_CB(peoplepc_state, update_row)
MCFG_DEVICE_ADD("i8257", I8257, XTAL(14'745'600)/3)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(peoplepc_state, hrq_w))
- MCFG_I8257_OUT_TC_CB(WRITELINE(peoplepc_state, tc_w))
- MCFG_I8257_IN_MEMR_CB(READ8(peoplepc_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(peoplepc_state, memory_write_byte))
- MCFG_I8257_IN_IOR_0_CB(DEVREAD8("upd765", upd765a_device, mdma_r))
- MCFG_I8257_OUT_IOW_0_CB(DEVWRITE8("upd765", upd765a_device, mdma_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, peoplepc_state, hrq_w))
+ MCFG_I8257_OUT_TC_CB(WRITELINE(*this, peoplepc_state, tc_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, peoplepc_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, peoplepc_state, memory_write_byte))
+ MCFG_I8257_IN_IOR_0_CB(READ8("upd765", upd765a_device, mdma_r))
+ MCFG_I8257_OUT_IOW_0_CB(WRITE8("upd765", upd765a_device, mdma_w))
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259_0", pic8259_device, ir2_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("i8257", i8257_device, dreq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("pic8259_0", pic8259_device, ir2_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("i8257", i8257_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD("upd765:0", peoplepc_floppies, "525qd", peoplepc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", peoplepc_floppies, "525qd", peoplepc_state::floppy_formats)
MCFG_DEVICE_ADD("i8251_0", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259_1", pic8259_device, ir1_w))
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("kbd", rs232_port_device, write_txd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259_1", pic8259_device, ir1_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("kbd", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("kbd", peoplepc_keyboard_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251_0", i8251_device, write_rxd))
+ MCFG_DEVICE_ADD("kbd", RS232_PORT, peoplepc_keyboard_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251_0", i8251_device, write_rxd))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", keyboard)
MCFG_DEVICE_ADD("i8251_1", I8251, 0)
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index f2b0555752a..171d95c96b1 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -1341,11 +1341,11 @@ void peplus_state::machine_reset()
MACHINE_CONFIG_START(peplus_state::peplus)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I80C32, XTAL(20'000'000)/2) /* 10MHz */
- MCFG_CPU_PROGRAM_MAP(peplus_map)
- MCFG_CPU_IO_MAP(peplus_iomap)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(peplus_state, paldata_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(peplus_state, paldata2_w))
+ MCFG_DEVICE_ADD("maincpu", I80C32, XTAL(20'000'000)/2) /* 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(peplus_map)
+ MCFG_DEVICE_IO_MAP(peplus_iomap)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, peplus_state, paldata_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, peplus_state, paldata2_w))
MCFG_NVRAM_ADD_0FILL("cmos")
@@ -1365,14 +1365,14 @@ MACHINE_CONFIG_START(peplus_state::peplus)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_ADDR_CHANGED_CB(peplus_state, crtc_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(peplus_state, crtc_vsync))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, peplus_state, crtc_vsync))
MCFG_X2404P_ADD("i2cmem")
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL(20'000'000)/12)
+ MCFG_DEVICE_ADD("aysnd", AY8912, XTAL(20'000'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp
index 0bb2aab1e57..fa493d9ccdc 100644
--- a/src/mame/drivers/pes.cpp
+++ b/src/mame/drivers/pes.cpp
@@ -249,15 +249,15 @@ INPUT_PORTS_END
******************************************************************************/
MACHINE_CONFIG_START(pes_state::pes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(i80c31_mem)
- MCFG_CPU_IO_MAP(i80c31_io)
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(pes_state, data_from_i8031))
- MCFG_MCS51_SERIAL_RX_CB(READ8(pes_state, data_to_i8031))
+ MCFG_DEVICE_ADD("maincpu", I80C31, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_mem)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, pes_state, data_from_i8031))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, pes_state, data_to_i8031))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5220", TMS5220C, 720000) /* 720Khz clock, 10khz output */
+ MCFG_DEVICE_ADD("tms5220", TMS5220C, 720000) /* 720Khz clock, 10khz output */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp
index 3ad844da28b..ef726da104b 100644
--- a/src/mame/drivers/pet.cpp
+++ b/src/mame/drivers/pet.cpp
@@ -1782,8 +1782,8 @@ MACHINE_CONFIG_START(pet_state::pet)
MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(pet2001_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(8'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(pet2001_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
// video hardware
@@ -1799,51 +1799,51 @@ MACHINE_CONFIG_START(pet_state::pet)
// devices
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(8'000'000)/8)
- MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(pet_state, via_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(pet_state, via_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(pet_state, via_irq_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, pet_state, via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, pet_state, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, pet_state, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, pet_state, via_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, pet_state, via_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, pet_state, via_irq_w))
MCFG_DEVICE_ADD(M6520_1_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(pet_state, pia1_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(pet_state, pia1_pb_r))
- MCFG_PIA_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, pet_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, pet_state, pia1_pb_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, pet_state, pia1_pa_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, pet_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia1_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia1_irqb_w))
MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia2_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia2_irqb_w))
MCFG_CBM_IEEE488_ADD("c4040")
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, cb1_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, ca1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", WRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, pet_expansion_cards, nullptr)
- MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
+ MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(pet_state, user_diag_w))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
- MCFG_PET_USER_PORT_C_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa0))
- MCFG_PET_USER_PORT_D_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa1))
- MCFG_PET_USER_PORT_E_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa2))
- MCFG_PET_USER_PORT_F_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa3))
- MCFG_PET_USER_PORT_H_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa4))
- MCFG_PET_USER_PORT_J_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa5))
- MCFG_PET_USER_PORT_K_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa6))
- MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa7))
- MCFG_PET_USER_PORT_M_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_cb2))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(*this, pet_state, user_diag_w))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_cb2))
MCFG_QUICKLOAD_ADD("quickload", pet_state, cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
MCFG_QUICKLOAD_INTERFACE("cbm_quik")
@@ -1980,7 +1980,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pet2001b_state::pet2001b)
pet2001n(config);
MCFG_DEVICE_MODIFY(M6520_1_TAG)
- MCFG_PIA_READPB_HANDLER(READ8(pet2001b_state, pia1_pb_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, pet2001b_state, pia1_pb_r))
MACHINE_CONFIG_END
@@ -2089,11 +2089,11 @@ MACHINE_CONFIG_START(pet2001b_state::pet4032f)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(pet_state, pet40_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
_32k(config);
@@ -2165,11 +2165,11 @@ MACHINE_CONFIG_START(pet_state::cbm4032f)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(pet_state, pet40_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
_32k(config);
@@ -2235,8 +2235,8 @@ MACHINE_CONFIG_START(pet80_state::pet80)
MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80)
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
- MCFG_CPU_PROGRAM_MAP(pet2001_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, XTAL(16'000'000)/16)
+ MCFG_DEVICE_PROGRAM_MAP(pet2001_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
// video hardware
@@ -2252,61 +2252,61 @@ MACHINE_CONFIG_START(pet80_state::pet80)
MCFG_MC6845_CHAR_WIDTH(2*8)
MCFG_MC6845_BEGIN_UPDATE_CB(pet_state, pet_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(pet80_state, pet80_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
MCFG_PALETTE_ADD_MONOCHROME("palette")
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_DEVICE_ADD(M6522_TAG, VIA6522, XTAL(16'000'000)/16)
- MCFG_VIA6522_READPB_HANDLER(READ8(pet_state, via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(pet_state, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(pet_state, via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(pet_state, via_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(pet_state, via_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(pet_state, via_irq_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, pet_state, via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, pet_state, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, pet_state, via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, pet_state, via_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, pet_state, via_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, pet_state, via_irq_w))
MCFG_DEVICE_ADD(M6520_1_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(pet_state, pia1_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(pet_state, pia1_pb_r))
- MCFG_PIA_READCA1_HANDLER(DEVREADLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(pet_state, pia1_pa_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(pet_state, pia1_ca2_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia1_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia1_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, pet_state, pia1_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, pet_state, pia1_pb_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, read))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, pet_state, pia1_pa_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, pet_state, pia1_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia1_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia1_irqb_w))
MCFG_DEVICE_ADD(M6520_2_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE(IEEE488_TAG, ieee488_device, dav_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(pet_state, pia2_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(pet_state, pia2_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, ndac_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(IEEE488_TAG, ieee488_device, dav_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, pet_state, pia2_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, pet_state, pia2_irqb_w))
MCFG_CBM_IEEE488_ADD("c8050")
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, cb1_w))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6520_2_TAG, pia6821_device, ca1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", DEVWRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, DEVWRITELINE(M6522_TAG, via6522_device, write_cb1))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, cb1_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(M6520_2_TAG, pia6821_device, ca1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c2n", WRITELINE(M6520_1_TAG, pia6821_device, ca1_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT2_TAG, cbm_datassette_devices, nullptr, WRITELINE(M6522_TAG, via6522_device, write_cb1))
MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, nullptr)
- MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
+ MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, pet_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_ca1))
- MCFG_PET_USER_PORT_C_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa0))
- MCFG_PET_USER_PORT_D_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa1))
- MCFG_PET_USER_PORT_E_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa2))
- MCFG_PET_USER_PORT_F_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa3))
- MCFG_PET_USER_PORT_H_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa4))
- MCFG_PET_USER_PORT_J_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa5))
- MCFG_PET_USER_PORT_K_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa6))
- MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_pa7))
- MCFG_PET_USER_PORT_M_HANDLER(DEVWRITELINE(M6522_TAG, via6522_device, write_cb2))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_ca1))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_pa7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(M6522_TAG, via6522_device, write_cb2))
MCFG_QUICKLOAD_ADD("quickload", pet_state, cbm_pet, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
MCFG_QUICKLOAD_INTERFACE("cbm_quik")
@@ -2344,7 +2344,7 @@ MACHINE_CONFIG_START(superpet_state::superpet)
pet8032(config);
MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "superpet")
- MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
+ MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write))
MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop")
MACHINE_CONFIG_END
@@ -2358,7 +2358,7 @@ MACHINE_CONFIG_START(cbm8096_state::cbm8096)
pet80(config);
MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL(16'000'000)/16, pet_expansion_cards, "64k")
- MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
+ MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(*this, pet_state, read), WRITE8(*this, pet_state, write))
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("96K")
@@ -2376,8 +2376,8 @@ MACHINE_CONFIG_START(cbm8296_state::cbm8296)
MCFG_MACHINE_START_OVERRIDE(cbm8296_state, cbm8296)
MCFG_MACHINE_RESET_OVERRIDE(cbm8296_state, cbm8296)
- MCFG_CPU_MODIFY(M6502_TAG)
- MCFG_CPU_PROGRAM_MAP(cbm8296_mem)
+ MCFG_DEVICE_MODIFY(M6502_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(cbm8296_mem)
MCFG_PLS100_ADD(PLA1_TAG)
MCFG_PLS100_ADD(PLA2_TAG)
@@ -2387,7 +2387,7 @@ MACHINE_CONFIG_START(cbm8296_state::cbm8296)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(2*8)
MCFG_MC6845_UPDATE_ROW_CB(pet80_state, cbm8296_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(M6520_1_TAG, pia6821_device, cb1_w))
MCFG_DEVICE_MODIFY("ieee8")
MCFG_SLOT_DEFAULT_OPTION("c8250")
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp
index 30e5a0a95b7..9aadca36d86 100644
--- a/src/mame/drivers/peyper.cpp
+++ b/src/mame/drivers/peyper.cpp
@@ -605,10 +605,10 @@ void peyper_state::machine_reset()
MACHINE_CONFIG_START(peyper_state::peyper)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2'500'000)
- MCFG_CPU_PROGRAM_MAP(peyper_map)
- MCFG_CPU_IO_MAP(peyper_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(peyper_state, irq0_line_hold, 1250)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2'500'000)
+ MCFG_DEVICE_PROGRAM_MAP(peyper_map)
+ MCFG_DEVICE_IO_MAP(peyper_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(peyper_state, irq0_line_hold, 1250)
MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
@@ -617,20 +617,20 @@ MACHINE_CONFIG_START(peyper_state::peyper)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("ayvol")
- MCFG_SOUND_ADD("ay1", AY8910, 2500000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(peyper_state, p1a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(peyper_state, p1b_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 2500000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, peyper_state, p1a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, peyper_state, p1b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
- MCFG_SOUND_ADD("ay2", AY8910, 2500000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(peyper_state, p2a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(peyper_state, p2b_w))
+ MCFG_DEVICE_ADD("ay2", AY8910, 2500000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, peyper_state, p2a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, peyper_state, p2b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
/* Devices */
MCFG_DEVICE_ADD("i8279", I8279, 2500000)
- MCFG_I8279_OUT_SL_CB(WRITE8(peyper_state, col_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(peyper_state, disp_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(peyper_state, sw_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, peyper_state, col_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, peyper_state, disp_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, peyper_state, sw_r)) // kbd RL lines
MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp
index 8c13f539e1b..a80de142168 100644
--- a/src/mame/drivers/pg685.cpp
+++ b/src/mame/drivers/pg685.cpp
@@ -411,7 +411,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg685_module)
MCFG_DEVICE_ADD("fdc", FD1797, XTAL(4'000'000) / 2) // divider guessed
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("mainpic", pic8259_device, ir4_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("mainpic", pic8259_device, ir4_w))
MCFG_DEVICE_ADD("modppi1", I8255, 0)
MCFG_DEVICE_ADD("modppi2", I8255, 0)
@@ -424,9 +424,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg675)
// main cpu
- MCFG_CPU_ADD("maincpu", I8088, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(pg675_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(pg675_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mainpic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
@@ -457,13 +457,13 @@ MACHINE_CONFIG_START(pg685_state::pg675)
// keyboard
MCFG_DEVICE_ADD("kbdc", I8279, XTAL(12'288'000) / 6) // divider guessed
- MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir0_w))
+ MCFG_I8279_OUT_IRQ_CB(WRITELINE("mainpic", pic8259_device, ir0_w))
// printer
// floppy
- // MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(zorba_state, fdc_intrq_w))
- // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(zorba_state, fdc_drq_w))
+ // MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, zorba_state, fdc_intrq_w))
+ // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, zorba_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pg675_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pg675_floppies, "525dd", floppy_image_device::default_floppy_formats)
@@ -473,9 +473,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg685)
// main cpu
- MCFG_CPU_ADD("maincpu", V20, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(pg685_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", V20, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(pg685_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mainpic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
@@ -507,26 +507,26 @@ MACHINE_CONFIG_START(pg685_state::pg685)
// keyboard
MCFG_DEVICE_ADD("kbdc", I8279, XTAL(12'288'000) / 6) // divider guessed
- MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir0_w))
+ MCFG_I8279_OUT_IRQ_CB(WRITELINE("mainpic", pic8259_device, ir0_w))
// printer
// floppy
- // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(zorba_state, fdc_drq_w))
+ // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, zorba_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pg685_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
// harddisk
MCFG_DEVICE_ADD("hdc", WD2010, XTAL(10'000'000) / 2) // divider guessed
- MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir3_w))
+ MCFG_WD2010_OUT_INTRQ_CB(WRITELINE("mainpic", pic8259_device, ir3_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pg685_state::pg685oua12)
// main cpu
- MCFG_CPU_ADD("maincpu", I80286, XTAL(20'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(pg685oua12_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I80286, XTAL(20'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(pg685oua12_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mainpic", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mainpic", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
@@ -558,19 +558,19 @@ MACHINE_CONFIG_START(pg685_state::pg685oua12)
// keyboard
MCFG_DEVICE_ADD("kbdc", I8279, 12288000 / 6) // wrong
- MCFG_I8279_OUT_IRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir0_w))
+ MCFG_I8279_OUT_IRQ_CB(WRITELINE("mainpic", pic8259_device, ir0_w))
// printer
// floppy
- // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(zorba_state, fdc_drq_w))
+ // MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, zorba_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pg685_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
// harddisk
MCFG_DEVICE_ADD("hdc", WD2010, XTAL(10'000'000) / 2) // divider guessed
- MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir3_w))
+ MCFG_WD2010_OUT_INTRQ_CB(WRITELINE("mainpic", pic8259_device, ir3_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index 75d01ac28cb..bc3d5ec9c82 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -490,7 +490,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(pgm_state::pgm_interrupt)
{
int scanline = param;
-// already being generated by MCFG_CPU_VBLANK_INT_DRIVER("screen", pgm_state, irq6_line_hold)
+// already being generated by MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pgm_state, irq6_line_hold)
// if(scanline == 224)
// m_maincpu->set_input_line(6, HOLD_LINE);
@@ -510,14 +510,14 @@ MACHINE_RESET_MEMBER(pgm_state,pgm)
MACHINE_CONFIG_START(pgm_state::pgmbase)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */
- MCFG_CPU_PROGRAM_MAP(pgm_basic_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pgm_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20000000) /* 20 mhz! verified on real board */
+ MCFG_DEVICE_PROGRAM_MAP(pgm_basic_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pgm_state, irq6_line_hold)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", pgm_state, pgm_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", Z80, 33868800/4)
- MCFG_CPU_PROGRAM_MAP(pgm_z80_mem)
- MCFG_CPU_IO_MAP(pgm_z80_io)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 33868800/4)
+ MCFG_DEVICE_PROGRAM_MAP(pgm_z80_mem)
+ MCFG_DEVICE_IO_MAP(pgm_z80_io)
MCFG_MACHINE_START_OVERRIDE(pgm_state, pgm )
MCFG_MACHINE_RESET_OVERRIDE(pgm_state, pgm )
@@ -532,7 +532,7 @@ MACHINE_CONFIG_START(pgm_state::pgmbase)
MCFG_SCREEN_SIZE(64*8, 64*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 56*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(pgm_state, screen_update_pgm)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pgm_state, screen_vblank_pgm))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pgm_state, screen_vblank_pgm))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pgm)
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index f92f37405a5..d72880243e8 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -773,14 +773,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(pgm2_state::pgm2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", IGS036, 100000000) // ?? ARM based CPU, has internal ROM.
- MCFG_CPU_PROGRAM_MAP(pgm2_rom_map)
+ MCFG_DEVICE_ADD("maincpu", IGS036, 100000000) // ?? ARM based CPU, has internal ROM.
+ MCFG_DEVICE_PROGRAM_MAP(pgm2_rom_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pgm2_state, igs_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pgm2_state, igs_interrupt)
MCFG_TIMER_DRIVER_ADD("mcu_timer", pgm2_state, igs_interrupt2)
MCFG_ARM_AIC_ADD("arm_aic")
- MCFG_IRQ_LINE_CB(WRITELINE(pgm2_state, irq))
+ MCFG_IRQ_LINE_CB(WRITELINE(*this, pgm2_state, irq))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -789,7 +789,7 @@ MACHINE_CONFIG_START(pgm2_state::pgm2)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 448-1, 0, 224-1)
MCFG_SCREEN_UPDATE_DRIVER(pgm2_state, screen_update_pgm2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pgm2_state, screen_vblank_pgm2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pgm2_state, screen_vblank_pgm2))
MCFG_GFXDECODE_ADD("gfxdecode2", "tx_palette", pgm2_tx)
@@ -826,16 +826,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pgm2_state::pgm2_hires)
pgm2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pgm2_module_rom_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pgm2_module_rom_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pgm2_state::pgm2_ramrom)
pgm2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pgm2_ram_rom_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pgm2_ram_rom_map)
MACHINE_CONFIG_END
/* using macros for the video / sound roms because the locations never change between sets, and
diff --git a/src/mame/drivers/pgm3.cpp b/src/mame/drivers/pgm3.cpp
index f623db40d60..a66d1340305 100644
--- a/src/mame/drivers/pgm3.cpp
+++ b/src/mame/drivers/pgm3.cpp
@@ -103,8 +103,8 @@ void pgm3_state::machine_reset()
MACHINE_CONFIG_START(pgm3_state::pgm3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM9, 800000000) // wrong, see notes at top of driver
- MCFG_CPU_PROGRAM_MAP(pgm3_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 800000000) // wrong, see notes at top of driver
+ MCFG_DEVICE_PROGRAM_MAP(pgm3_map)
MCFG_DEVICE_DISABLE()
/* video hardware */
@@ -114,7 +114,7 @@ MACHINE_CONFIG_START(pgm3_state::pgm3)
MCFG_SCREEN_SIZE(1280, 720)
MCFG_SCREEN_VISIBLE_AREA(0, 1280-1, 0, 720-1)
MCFG_SCREEN_UPDATE_DRIVER(pgm3_state, screen_update_pgm3)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pgm3_state, screen_vblank_pgm3))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pgm3_state, screen_vblank_pgm3))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 0x1000)
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index c56ae2b29c2..680ce64a934 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -310,13 +310,13 @@ void phc25_state::video_start()
MACHINE_CONFIG_START(phc25_state::phc25)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(phc25_mem)
- MCFG_CPU_IO_MAP(phc25_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(phc25_mem)
+ MCFG_DEVICE_IO_MAP(phc25_io)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, 1996750)
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, 1996750)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JOY0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("JOY1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -330,7 +330,7 @@ MACHINE_CONFIG_START(phc25_state::phc25)
MCFG_CASSETTE_INTERFACE("phc25_cass")
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(phc25_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, phc25_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -348,8 +348,8 @@ MACHINE_CONFIG_START(phc25_state::pal)
MCFG_SCREEN_MC6847_PAL_ADD(SCREEN_TAG, MC6847_TAG)
MCFG_DEVICE_ADD(MC6847_TAG, MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(phc25_state, irq_w))
- MCFG_MC6847_INPUT_CALLBACK(READ8(phc25_state, video_ram_r))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, phc25_state, irq_w))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, phc25_state, video_ram_r))
MCFG_MC6847_CHARROM_CALLBACK(phc25_state, pal_char_rom_r)
MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM2 | mc6847_pal_device::MODE_GM1 | mc6847_pal_device::MODE_INTEXT)
// other lines not connected
@@ -361,8 +361,8 @@ MACHINE_CONFIG_START(phc25_state::ntsc)
MCFG_SCREEN_MC6847_NTSC_ADD(SCREEN_TAG, MC6847_TAG)
MCFG_DEVICE_ADD(MC6847_TAG, MC6847_NTSC, XTAL(3'579'545))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(phc25_state, irq_w))
- MCFG_MC6847_INPUT_CALLBACK(READ8(phc25_state, video_ram_r))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, phc25_state, irq_w))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, phc25_state, video_ram_r))
MCFG_MC6847_CHARROM_CALLBACK(phc25_state, ntsc_char_rom_r)
MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1 | mc6847_ntsc_device::MODE_INTEXT)
// other lines not connected
diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp
index 8eda01f47bd..330307d0f9c 100644
--- a/src/mame/drivers/phoenix.cpp
+++ b/src/mame/drivers/phoenix.cpp
@@ -443,8 +443,8 @@ MACHINE_RESET_MEMBER(phoenix_state,phoenix)
MACHINE_CONFIG_START(phoenix_state::phoenix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */
- MCFG_CPU_PROGRAM_MAP(phoenix_memory_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(phoenix_memory_map)
MCFG_MACHINE_RESET_OVERRIDE(phoenix_state,phoenix)
@@ -469,10 +469,10 @@ MACHINE_CONFIG_START(phoenix_state::phoenix)
MCFG_TMS36XX_TUNE_SPEED(0.21)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("cust", PHOENIX, 0)
+ MCFG_DEVICE_ADD("cust", PHOENIX_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MCFG_SOUND_ADD("discrete", DISCRETE, 120000)
+ MCFG_DEVICE_ADD("discrete", DISCRETE, 120000)
MCFG_DISCRETE_INTF(phoenix)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_CONFIG_END
@@ -482,8 +482,8 @@ MACHINE_CONFIG_START(phoenix_state::pleiads)
phoenix(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pleiads_memory_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pleiads_memory_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", pleiads)
@@ -501,7 +501,7 @@ MACHINE_CONFIG_START(phoenix_state::pleiads)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_DEVICE_REMOVE("cust")
- MCFG_SOUND_ADD("pleiads_custom", PLEIADS, 0)
+ MCFG_DEVICE_ADD("pleiads_custom", PLEIADS_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_REMOVE("discrete")
@@ -513,9 +513,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(phoenix_state::survival)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 5.50 MHz */
- MCFG_I8085A_SID(READLINE(phoenix_state, survival_sid_callback))
- MCFG_CPU_PROGRAM_MAP(survival_memory_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, CPU_CLOCK) /* 5.50 MHz */
+ MCFG_I8085A_SID(READLINE(*this, phoenix_state, survival_sid_callback))
+ MCFG_DEVICE_PROGRAM_MAP(survival_memory_map)
MCFG_MACHINE_RESET_OVERRIDE(phoenix_state,phoenix)
@@ -539,8 +539,8 @@ MACHINE_CONFIG_START(phoenix_state::survival)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* FIXME: check clock */
- MCFG_SOUND_ADD("aysnd", AY8910, 11000000/4)
- MCFG_AY8910_PORT_B_READ_CB(READ8(phoenix_state, survival_protection_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 11000000/4)
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, phoenix_state, survival_protection_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -551,8 +551,8 @@ MACHINE_CONFIG_START(phoenix_state::condor)
/* basic machine hardware */
/* FIXME: Verify clock. This is most likely 11MHz/2 */
- MCFG_CPU_REPLACE("maincpu", Z80, 11000000/4) /* 2.75 MHz??? */
- MCFG_CPU_PROGRAM_MAP(phoenix_memory_map)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, 11000000/4) /* 2.75 MHz??? */
+ MCFG_DEVICE_PROGRAM_MAP(phoenix_memory_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp
index cd489014942..f62f68a919d 100644
--- a/src/mame/drivers/photon.cpp
+++ b/src/mame/drivers/photon.cpp
@@ -203,11 +203,11 @@ uint32_t photon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
MACHINE_CONFIG_START(photon_state::photon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, 1780000)
- MCFG_CPU_PROGRAM_MAP(pk8000_mem)
- MCFG_CPU_IO_MAP(pk8000_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", photon_state, interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(photon_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu",I8080, 1780000)
+ MCFG_DEVICE_PROGRAM_MAP(pk8000_mem)
+ MCFG_DEVICE_IO_MAP(pk8000_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", photon_state, interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(photon_state, irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -222,18 +222,18 @@ MACHINE_CONFIG_START(photon_state::photon)
MCFG_PALETTE_INIT_OWNER(pk8000_base_state, pk8000)
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(photon_state, _80_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(photon_state, _80_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(photon_state, _80_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, photon_state, _80_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, photon_state, _80_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, photon_state, _80_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pk8000_base_state, _84_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pk8000_base_state, _84_porta_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pk8000_base_state, _84_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pk8000_base_state, _84_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pk8000_base_state, _84_porta_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pk8000_base_state, _84_portc_w))
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp
index d68c3a713aa..1665abde18e 100644
--- a/src/mame/drivers/photon2.cpp
+++ b/src/mame/drivers/photon2.cpp
@@ -354,9 +354,9 @@ void photon2_state::machine_start()
MACHINE_CONFIG_START(photon2_state::photon2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3500000) /* 3.5 MHz */
- MCFG_CPU_PROGRAM_MAP(spectrum_mem)
- MCFG_CPU_IO_MAP(spectrum_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3500000) /* 3.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(spectrum_mem)
+ MCFG_DEVICE_IO_MAP(spectrum_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", photon2_state, spec_interrupt_hack, "screen", 0, 1)
@@ -367,7 +367,7 @@ MACHINE_CONFIG_START(photon2_state::photon2)
MCFG_SCREEN_SIZE(SPEC_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, SPEC_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(photon2_state, screen_update_spectrum)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(photon2_state, screen_vblank_spectrum))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, photon2_state, screen_vblank_spectrum))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 16)
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(photon2_state::photon2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp
index b98a52b4536..dbabfd91dcf 100644
--- a/src/mame/drivers/photoply.cpp
+++ b/src/mame/drivers/photoply.cpp
@@ -300,20 +300,20 @@ GFXDECODE_END
MACHINE_CONFIG_START(photoply_state::photoply)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I486DX4, 75000000) /* I486DX4, 75 or 100 Mhz */
- MCFG_CPU_PROGRAM_MAP(photoply_map)
- MCFG_CPU_IO_MAP(photoply_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486DX4, 75000000) /* I486DX4, 75 or 100 Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(photoply_map)
+ MCFG_DEVICE_IO_MAP(photoply_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
MCFG_GFXDECODE_ADD("gfxdecode", "vga", photoply )
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_IDE_CONTROLLER_32_ADD("ide2", ata_devices, nullptr, nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir7_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir7_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(5, DEVICE_SELF, photoply_state, sis_pcm_r, sis_pcm_w)
diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp
index c4d63a902b2..4f2d9e46361 100644
--- a/src/mame/drivers/phunsy.cpp
+++ b/src/mame/drivers/phunsy.cpp
@@ -339,12 +339,12 @@ DRIVER_INIT_MEMBER( phunsy_state, phunsy )
MACHINE_CONFIG_START(phunsy_state::phunsy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(phunsy_mem)
- MCFG_CPU_IO_MAP(phunsy_io)
- MCFG_CPU_DATA_MAP(phunsy_data)
- MCFG_S2650_SENSE_INPUT(READLINE(phunsy_state, cass_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(phunsy_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu",S2650, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(phunsy_mem)
+ MCFG_DEVICE_IO_MAP(phunsy_io)
+ MCFG_DEVICE_DATA_MAP(phunsy_data)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, phunsy_state, cass_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, phunsy_state, cass_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -366,7 +366,7 @@ MACHINE_CONFIG_START(phunsy_state::phunsy)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
diff --git a/src/mame/drivers/picno.cpp b/src/mame/drivers/picno.cpp
index 6b67a51aa59..74f1c44011b 100644
--- a/src/mame/drivers/picno.cpp
+++ b/src/mame/drivers/picno.cpp
@@ -66,9 +66,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(picno_state::picno)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type (H8/532), crystal is a guess, divided by 2 in the cpu */
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type (H8/532), crystal is a guess, divided by 2 in the cpu */
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
//MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // no speaker in the unit, but there's a couple of sockets on the back
//MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp
index 93eaf604116..daa1412cf80 100644
--- a/src/mame/drivers/piggypas.cpp
+++ b/src/mame/drivers/piggypas.cpp
@@ -203,13 +203,13 @@ HD44780_PIXEL_UPDATE(piggypas_state::piggypas_pixel_update)
MACHINE_CONFIG_START(piggypas_state::piggypas)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(8'448'000)) // OKI M80C31F or M80C154S
- MCFG_CPU_PROGRAM_MAP(piggypas_map)
- MCFG_CPU_IO_MAP(piggypas_io)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(piggypas_state, led_strobe_w))
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(8'448'000)) // OKI M80C31F or M80C154S
+ MCFG_DEVICE_PROGRAM_MAP(piggypas_map)
+ MCFG_DEVICE_IO_MAP(piggypas_io)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, piggypas_state, led_strobe_w))
MCFG_MCS51_PORT_P3_IN_CB(IOPORT("IN2"))
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(piggypas_state, mcs51_tx_callback))
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", piggypas_state, irq0_line_hold)
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, piggypas_state, mcs51_tx_callback))
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", piggypas_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram") // DS1220AD
@@ -235,7 +235,7 @@ MACHINE_CONFIG_START(piggypas_state::piggypas)
MCFG_DEVICE_ADD("ppi", I8255A, 0) // OKI M82C55A-2
MCFG_I8255_IN_PORTA_CB(IOPORT("IN1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(piggypas_state, ctrl_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, piggypas_state, ctrl_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN0"))
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
@@ -244,12 +244,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(piggypas_state::fidlstix)
piggypas(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(fidlstix_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(fidlstix_io)
MCFG_MCS51_SERIAL_TX_CB(NOOP)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(piggypas_state, lcd_latch_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(piggypas_state, lcd_latch_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(piggypas_state, lcd_control_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, piggypas_state, lcd_latch_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, piggypas_state, lcd_latch_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, piggypas_state, lcd_control_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp
index de99b376419..4f8ef02538f 100644
--- a/src/mame/drivers/pimps.cpp
+++ b/src/mame/drivers/pimps.cpp
@@ -129,36 +129,36 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(pimps_state::pimps)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) // must be exactly here
MCFG_DEVICE_ADD("uart2", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", i8251_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp
index 17cc793e586..94df7eab2ab 100644
--- a/src/mame/drivers/pinball2k.cpp
+++ b/src/mame/drivers/pinball2k.cpp
@@ -600,10 +600,10 @@ void pinball2k_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(pinball2k_state::mediagx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000)
- MCFG_CPU_PROGRAM_MAP(mediagx_map)
- MCFG_CPU_IO_MAP(mediagx_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", MEDIAGX, 166000000)
+ MCFG_DEVICE_PROGRAM_MAP(mediagx_map)
+ MCFG_DEVICE_IO_MAP(mediagx_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
@@ -611,7 +611,7 @@ MACHINE_CONFIG_START(pinball2k_state::mediagx)
MCFG_PCI_BUS_LEGACY_DEVICE(18, DEVICE_SELF, pinball2k_state, cx5510_pci_r, cx5510_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp
index 9462300868e..9988740b5ab 100644
--- a/src/mame/drivers/pingpong.cpp
+++ b/src/mame/drivers/pingpong.cpp
@@ -451,8 +451,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(pingpong_state::pingpong)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
- MCFG_CPU_PROGRAM_MAP(pingpong_map)
+ MCFG_DEVICE_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
+ MCFG_DEVICE_PROGRAM_MAP(pingpong_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", pingpong_state, pingpong_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -473,15 +473,15 @@ MACHINE_CONFIG_START(pingpong_state::pingpong)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76496, 18432000/8)
+ MCFG_DEVICE_ADD("snsnd", SN76496, 18432000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* too fast! */
MACHINE_CONFIG_START(pingpong_state::merlinmm)
pingpong(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(merlinmm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(merlinmm_map)
MCFG_TIMER_MODIFY("scantimer")
MCFG_TIMER_DRIVER_CALLBACK(pingpong_state, merlinmm_interrupt)
diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp
index 23883b1acf7..10527d7a0ee 100644
--- a/src/mame/drivers/pinkiri8.cpp
+++ b/src/mame/drivers/pinkiri8.cpp
@@ -1104,10 +1104,10 @@ static GFXDECODE_START( pinkiri8 )
GFXDECODE_END
MACHINE_CONFIG_START(pinkiri8_state::pinkiri8)
- MCFG_CPU_ADD("maincpu",Z180,XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(pinkiri8_map)
- MCFG_CPU_IO_MAP(pinkiri8_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pinkiri8_state, nmi_line_assert)
+ MCFG_DEVICE_ADD("maincpu",Z180,XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(pinkiri8_map)
+ MCFG_DEVICE_IO_MAP(pinkiri8_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pinkiri8_state, nmi_line_assert)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp
index c63caf19d42..518c45234a5 100644
--- a/src/mame/drivers/pipbug.cpp
+++ b/src/mame/drivers/pipbug.cpp
@@ -160,13 +160,13 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug )
MACHINE_CONFIG_START(pipbug_state::pipbug)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(pipbug_mem)
- MCFG_CPU_DATA_MAP(pipbug_data)
- MCFG_S2650_FLAG_OUTPUT(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD("maincpu", S2650, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pipbug_mem)
+ MCFG_DEVICE_DATA_MAP(pipbug_data)
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE("rs232", rs232_port_device, write_txd))
/* video hardware */
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
MCFG_RS232_RXD_HANDLER(INPUTLINE("maincpu", S2650_SENSE_LINE))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp
index f8f54207b0e..4b38fa7b0ac 100644
--- a/src/mame/drivers/pipedrm.cpp
+++ b/src/mame/drivers/pipedrm.cpp
@@ -579,14 +579,14 @@ MACHINE_RESET_MEMBER(pipedrm_state,pipedrm)
MACHINE_CONFIG_START(pipedrm_state::pipedrm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pipedrm_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pipedrm_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,14318000/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("sub", Z80,14318000/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_MACHINE_START_OVERRIDE(pipedrm_state,pipedrm)
MCFG_MACHINE_RESET_OVERRIDE(pipedrm_state,pipedrm)
@@ -606,7 +606,7 @@ MACHINE_CONFIG_START(pipedrm_state::pipedrm)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w))
MCFG_DEVICE_ADD("vsystem_spr_old", VSYSTEM_SPR2, 0)
MCFG_VSYSTEM_SPR2_SET_GFXREGION(2)
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(pipedrm_state::pipedrm)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("sub", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -634,14 +634,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pipedrm_state::hatris)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pipedrm_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pipedrm_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,14318000/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(hatris_sound_portmap)
+ MCFG_DEVICE_ADD("sub", Z80,14318000/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(hatris_sound_portmap)
MCFG_MACHINE_START_OVERRIDE(pipedrm_state,pipedrm)
MCFG_MACHINE_RESET_OVERRIDE(pipedrm_state,pipedrm)
@@ -661,7 +661,7 @@ MACHINE_CONFIG_START(pipedrm_state::hatris)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, XTAL(14'318'181) / 2) // divider not verified
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(fromance_state, fromance_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, fromance_state, fromance_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(pipedrm_state,hatris)
@@ -675,7 +675,7 @@ MACHINE_CONFIG_START(pipedrm_state::hatris)
// sound board.
//MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("sub", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2608, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2608, 8000000)
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("sub", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp
index 9b4981e7089..d1e8d6149b9 100644
--- a/src/mame/drivers/pipeline.cpp
+++ b/src/mame/drivers/pipeline.cpp
@@ -359,16 +359,16 @@ PALETTE_INIT_MEMBER(pipeline_state, pipeline)
MACHINE_CONFIG_START(pipeline_state::pipeline)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 7372800/2)
- MCFG_CPU_PROGRAM_MAP(cpu0_mem)
+ MCFG_DEVICE_ADD("maincpu", Z80, 7372800/2)
+ MCFG_DEVICE_PROGRAM_MAP(cpu0_mem)
- MCFG_CPU_ADD("audiocpu", Z80, 7372800/2)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 7372800/2)
MCFG_Z80_DAISY_CHAIN(daisy_chain_sound)
- MCFG_CPU_PROGRAM_MAP(cpu1_mem)
- MCFG_CPU_IO_MAP(sound_port)
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_mem)
+ MCFG_DEVICE_IO_MAP(sound_port)
- MCFG_CPU_ADD("mcu", M68705R3, 7372800/2)
- MCFG_M68705_PORTA_W_CB(WRITE8(pipeline_state, mcu_portA_w))
+ MCFG_DEVICE_ADD("mcu", M68705R3, 7372800/2)
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, pipeline_state, mcu_portA_w))
MCFG_DEVICE_ADD("ctc", Z80CTC, 7372800/2 /* same as "audiocpu" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
@@ -376,13 +376,13 @@ MACHINE_CONFIG_START(pipeline_state::pipeline)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
// PORT B Write - related to sound/music : check code at 0x1c0a
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pipeline_state, vidctrl_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pipeline_state, vidctrl_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("DSW1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW2"))
- MCFG_I8255_IN_PORTC_CB(READ8(pipeline_state, protection_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pipeline_state, protection_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pipeline_state, protection_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pipeline_state, protection_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(pipeline_state::pipeline)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 7372800/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 7372800/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp
index 8b968563611..b98c3ddfc0d 100644
--- a/src/mame/drivers/pirates.cpp
+++ b/src/mame/drivers/pirates.cpp
@@ -253,9 +253,9 @@ GFXDECODE_END
/* Machine Driver + Related bits */
MACHINE_CONFIG_START(pirates_state::pirates)
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz */
- MCFG_CPU_PROGRAM_MAP(pirates_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pirates_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16mhz */
+ MCFG_DEVICE_PROGRAM_MAP(pirates_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pirates_state, irq1_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp
index 382e2242280..dc9e5465eb7 100644
--- a/src/mame/drivers/piratesh.cpp
+++ b/src/mame/drivers/piratesh.cpp
@@ -586,8 +586,8 @@ MACHINE_RESET_MEMBER(piratesh_state,piratesh)
MACHINE_CONFIG_START(piratesh_state::piratesh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(piratesh_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(piratesh_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", piratesh_state, piratesh_interrupt, "screen", 0, 1)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -646,7 +646,7 @@ MACHINE_CONFIG_START(piratesh_state::piratesh)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
- MCFG_K054539_TIMER_HANDLER(WRITELINE(piratesh_state, k054539_nmi_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, piratesh_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.2)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp
index e3118280373..7400ad5975f 100644
--- a/src/mame/drivers/pitagjr.cpp
+++ b/src/mame/drivers/pitagjr.cpp
@@ -207,8 +207,8 @@ uint32_t pitagjr_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
MACHINE_CONFIG_START(pitagjr_state::pitajr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD63705, XTAL(2'000'000)) // probably a m6805-based MCU with internal boot ROM
- MCFG_CPU_PROGRAM_MAP(pitajr_mem)
+ MCFG_DEVICE_ADD("maincpu", HD63705, XTAL(2'000'000)) // probably a m6805-based MCU with internal boot ROM
+ MCFG_DEVICE_PROGRAM_MAP(pitajr_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp
index bd907bded13..b1c1b01ee95 100644
--- a/src/mame/drivers/pitnrun.cpp
+++ b/src/mame/drivers/pitnrun.cpp
@@ -279,22 +279,22 @@ static GFXDECODE_START( pitnrun )
GFXDECODE_END
MACHINE_CONFIG_START(pitnrun_state::pitnrun)
- MCFG_CPU_ADD("maincpu", Z80,XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(pitnrun_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pitnrun_state, nmi_source)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(pitnrun_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pitnrun_state, nmi_source)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 7B (mislabeled LS156 on schematic)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pitnrun_state, nmi_enable_w)) // NMION
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(pitnrun_state, color_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, pitnrun_state, nmi_enable_w)) // NMION
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, pitnrun_state, color_select_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // COLOR SEL 2 - not used ?
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(pitnrun_state, char_bank_select_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(pitnrun_state, hflip_w)) // HFLIP
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pitnrun_state, vflip_w)) // VFLIP
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, pitnrun_state, char_bank_select_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, pitnrun_state, hflip_w)) // HFLIP
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pitnrun_state, vflip_w)) // VFLIP
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(pitnrun_sound_map)
- MCFG_CPU_IO_MAP(pitnrun_sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pitnrun_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(5'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(pitnrun_sound_map)
+ MCFG_DEVICE_IO_MAP(pitnrun_sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pitnrun_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -318,14 +318,14 @@ MACHINE_CONFIG_START(pitnrun_state::pitnrun)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("noiselatch", LS259, 0) // 1J
@@ -333,15 +333,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pitnrun_state::pitnrun_mcu)
pitnrun(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pitnrun_map_mcu)
-
- MCFG_CPU_ADD("mcu", M68705P5, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_M68705_PORTA_R_CB(READ8(pitnrun_state, m68705_portA_r))
- MCFG_M68705_PORTB_R_CB(READ8(pitnrun_state, m68705_portB_r))
- MCFG_M68705_PORTC_R_CB(READ8(pitnrun_state, m68705_portC_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(pitnrun_state, m68705_portA_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(pitnrun_state, m68705_portB_w))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pitnrun_map_mcu)
+
+ MCFG_DEVICE_ADD("mcu", M68705P5, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_M68705_PORTA_R_CB(READ8(*this, pitnrun_state, m68705_portA_r))
+ MCFG_M68705_PORTB_R_CB(READ8(*this, pitnrun_state, m68705_portB_r))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, pitnrun_state, m68705_portC_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, pitnrun_state, m68705_portA_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, pitnrun_state, m68705_portB_w))
MACHINE_CONFIG_END
ROM_START( pitnrun )
diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp
index 20258322284..e432fa69c28 100644
--- a/src/mame/drivers/pk8000.cpp
+++ b/src/mame/drivers/pk8000.cpp
@@ -360,11 +360,11 @@ uint32_t pk8000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
MACHINE_CONFIG_START(pk8000_state::pk8000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, 1780000)
- MCFG_CPU_PROGRAM_MAP(pk8000_mem)
- MCFG_CPU_IO_MAP(pk8000_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pk8000_state, interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(pk8000_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu",I8080, 1780000)
+ MCFG_DEVICE_PROGRAM_MAP(pk8000_mem)
+ MCFG_DEVICE_IO_MAP(pk8000_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pk8000_state, interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(pk8000_state, irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -379,18 +379,18 @@ MACHINE_CONFIG_START(pk8000_state::pk8000)
MCFG_PALETTE_INIT_OWNER(pk8000_base_state, pk8000)
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pk8000_state, _80_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pk8000_state, _80_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pk8000_state, _80_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pk8000_state, _80_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pk8000_state, _80_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pk8000_state, _80_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pk8000_base_state, _84_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pk8000_base_state, _84_porta_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pk8000_base_state, _84_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pk8000_base_state, _84_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pk8000_base_state, _84_porta_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pk8000_base_state, _84_portc_w))
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp
index 43b9b724a46..f10b6b88309 100644
--- a/src/mame/drivers/pk8020.cpp
+++ b/src/mame/drivers/pk8020.cpp
@@ -180,11 +180,11 @@ static void pk8020_floppies(device_slot_interface &device)
/* Machine driver */
MACHINE_CONFIG_START(pk8020_state::pk8020)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(20'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(pk8020_mem)
- MCFG_CPU_IO_MAP(pk8020_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pk8020_state, pk8020_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(20'000'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(pk8020_mem)
+ MCFG_DEVICE_IO_MAP(pk8020_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pk8020_state, pk8020_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -200,23 +200,23 @@ MACHINE_CONFIG_START(pk8020_state::pk8020)
MCFG_PALETTE_INIT_OWNER(pk8020_state, pk8020)
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pk8020_state, pk8020_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pk8020_state, pk8020_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pk8020_state, pk8020_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pk8020_state, pk8020_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pk8020_state, pk8020_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pk8020_state, pk8020_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pk8020_state, pk8020_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pk8020_state, pk8020_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pk8020_state, pk8020_2_portc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pk8020_state, pk8020_2_portc_w))
MCFG_DEVICE_ADD("ppi8255_3", I8255, 0)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(20'000'000) / 10)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(pk8020_state,pk8020_pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, pk8020_state,pk8020_pit_out0))
MCFG_PIT8253_CLK1(XTAL(20'000'000) / 10)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pk8020_state,pk8020_pit_out1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, pk8020_state,pk8020_pit_out1))
MCFG_PIT8253_CLK2((XTAL(20'000'000) / 8) / 164)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pic8259", pic8259_device, ir5_w))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
@@ -235,7 +235,7 @@ MACHINE_CONFIG_START(pk8020_state::pk8020)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp
index ce26894c940..b07f1a50871 100644
--- a/src/mame/drivers/pkscram.cpp
+++ b/src/mame/drivers/pkscram.cpp
@@ -305,9 +305,9 @@ void pkscram_state::machine_reset()
MACHINE_CONFIG_START(pkscram_state::pkscramble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000 )
- MCFG_CPU_PROGRAM_MAP(pkscramble_map)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", pkscram_state, irq1_line_hold) /* only valid irq */
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000 )
+ MCFG_DEVICE_PROGRAM_MAP(pkscramble_map)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pkscram_state, irq1_line_hold) /* only valid irq */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -331,8 +331,8 @@ MACHINE_CONFIG_START(pkscram_state::pkscramble)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12000000/4)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(pkscram_state, irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12000000/4)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, pkscram_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp
index 1b8873ebdf5..03376da688d 100644
--- a/src/mame/drivers/pktgaldx.cpp
+++ b/src/mame/drivers/pktgaldx.cpp
@@ -339,9 +339,9 @@ void pktgaldx_state::machine_start()
MACHINE_CONFIG_START(pktgaldx_state::pktgaldx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(pktgaldx_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(pktgaldx_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(pktgaldx_state::pktgaldx)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(pktgaldx_state, screen_update_pktgaldx)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pktgaldx_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pktgaldx_state, vblank_w))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 4096)
@@ -400,8 +400,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pktgaldx_state::pktgaldb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(pktgaldb_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(pktgaldb_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -410,7 +410,7 @@ MACHINE_CONFIG_START(pktgaldx_state::pktgaldb)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(pktgaldx_state, screen_update_pktgaldb)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pktgaldx_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pktgaldx_state, vblank_w))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 4096)
diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp
index 4b6be7f09eb..1386bc3bb66 100644
--- a/src/mame/drivers/plan80.cpp
+++ b/src/mame/drivers/plan80.cpp
@@ -231,9 +231,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(plan80_state::plan80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, 2048000)
- MCFG_CPU_PROGRAM_MAP(plan80_mem)
- MCFG_CPU_IO_MAP(plan80_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, 2048000)
+ MCFG_DEVICE_PROGRAM_MAP(plan80_mem)
+ MCFG_DEVICE_IO_MAP(plan80_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp
index db0afd25b19..8d7668356a7 100644
--- a/src/mame/drivers/play_1.cpp
+++ b/src/mame/drivers/play_1.cpp
@@ -470,14 +470,14 @@ WRITE_LINE_MEMBER( play_1_state::clock_w )
MACHINE_CONFIG_START(play_1_state::play_1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CDP1802, 400000) // 2 gates, 1 cap, 1 resistor oscillating somewhere between 350 to 450 kHz
- MCFG_CPU_PROGRAM_MAP(play_1_map)
- MCFG_CPU_IO_MAP(play_1_io)
- MCFG_COSMAC_WAIT_CALLBACK(READLINE(play_1_state, wait_r))
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(play_1_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(play_1_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(play_1_state, ef3_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(play_1_state, ef4_r))
+ MCFG_DEVICE_ADD("maincpu", CDP1802, 400000) // 2 gates, 1 cap, 1 resistor oscillating somewhere between 350 to 450 kHz
+ MCFG_DEVICE_PROGRAM_MAP(play_1_map)
+ MCFG_DEVICE_IO_MAP(play_1_io)
+ MCFG_COSMAC_WAIT_CALLBACK(READLINE(*this, play_1_state, wait_r))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, play_1_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, play_1_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, play_1_state, ef3_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, play_1_state, ef4_r))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -485,21 +485,21 @@ MACHINE_CONFIG_START(play_1_state::play_1)
MCFG_DEFAULT_LAYOUT(layout_play_1)
MCFG_DEVICE_ADD("xpoint", CLOCK, 100) // crossing-point detector
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_1_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_1_state, clock_w))
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("monotone", CLOCK, 0) // sound device
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(play_1_state::chance)
play_1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(chance_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(chance_map)
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp
index ac03757f335..49e3b6d00ec 100644
--- a/src/mame/drivers/play_2.cpp
+++ b/src/mame/drivers/play_2.cpp
@@ -364,14 +364,14 @@ WRITE8_MEMBER( play_2_state::psg_w )
// **************** Machine *****************************
MACHINE_CONFIG_START(play_2_state::play_2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CDP1802, XTAL(2'950'000))
- MCFG_CPU_PROGRAM_MAP(play_2_map)
- MCFG_CPU_IO_MAP(play_2_io)
+ MCFG_DEVICE_ADD("maincpu", CDP1802, XTAL(2'950'000))
+ MCFG_DEVICE_PROGRAM_MAP(play_2_map)
+ MCFG_DEVICE_IO_MAP(play_2_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(play_2_state, clear_r))
- MCFG_COSMAC_EF1_CALLBACK(READLINE(play_2_state, ef1_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(play_2_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(DEVWRITELINE("4013a", ttl7474_device, clear_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, play_2_state, clear_r))
+ MCFG_COSMAC_EF1_CALLBACK(READLINE(*this, play_2_state, ef1_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, play_2_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE("4013a", ttl7474_device, clear_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -379,19 +379,19 @@ MACHINE_CONFIG_START(play_2_state::play_2)
MCFG_DEFAULT_LAYOUT(layout_play_2)
MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL(2'950'000) / 8) // TPB line from CPU
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_2_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_2_state, clock_w))
MCFG_DEVICE_ADD("xpoint", CLOCK, 60) // crossing-point detector
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_2_state, clock2_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_2_state, clock2_w))
// This is actually a 4013 chip (has 2 RS flipflops)
MCFG_DEVICE_ADD("4013a", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(DEVWRITELINE("4013a", ttl7474_device, d_w))
- MCFG_7474_OUTPUT_CB(WRITELINE(play_2_state, q4013a_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE("4013a", ttl7474_device, d_w))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, play_2_state, q4013a_w))
MCFG_DEVICE_ADD("4013b", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(DEVWRITELINE("maincpu", cosmac_device, ef2_w))
- MCFG_7474_COMP_OUTPUT_CB(DEVWRITELINE("maincpu", cosmac_device, int_w)) MCFG_DEVCB_INVERT // int is reversed in mame
+ MCFG_7474_OUTPUT_CB(WRITELINE("maincpu", cosmac_device, ef2_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE("maincpu", cosmac_device, int_w)) MCFG_DEVCB_INVERT // int is reversed in mame
/* Sound */
genpin_audio(config);
@@ -403,16 +403,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(play_2_state::zira)
play_2(config);
- MCFG_CPU_ADD("cop402", COP402, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(zira_sound_map)
+ MCFG_DEVICE_ADD("cop402", COP402, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(zira_sound_map)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
- MCFG_COP400_WRITE_D_CB(WRITE8(play_2_state, sound_d_w))
- MCFG_COP400_WRITE_G_CB(WRITE8(play_2_state, sound_g_w))
- MCFG_COP400_READ_L_CB(READ8(play_2_state, psg_r))
- MCFG_COP400_WRITE_L_CB(WRITE8(play_2_state, psg_w))
- MCFG_COP400_READ_IN_CB(READ8(play_2_state, sound_in_r))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, play_2_state, sound_d_w))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, play_2_state, sound_g_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, play_2_state, psg_r))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, play_2_state, psg_w))
+ MCFG_COP400_READ_IN_CB(READ8(*this, play_2_state, sound_in_r))
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(2'000'000))
+ MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(2'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp
index 8e4e4696bf0..81d2fe3a12a 100644
--- a/src/mame/drivers/play_3.cpp
+++ b/src/mame/drivers/play_3.cpp
@@ -475,14 +475,14 @@ WRITE_LINE_MEMBER( play_3_state::q4013a_w )
MACHINE_CONFIG_START(play_3_state::play_3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", CDP1802, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(play_3_map)
- MCFG_CPU_IO_MAP(play_3_io)
+ MCFG_DEVICE_ADD("maincpu", CDP1802, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(play_3_map)
+ MCFG_DEVICE_IO_MAP(play_3_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(play_3_state, clear_r))
- MCFG_COSMAC_EF1_CALLBACK(READLINE(play_3_state, ef1_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(play_3_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(DEVWRITELINE("4013a", ttl7474_device, clear_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, play_3_state, clear_r))
+ MCFG_COSMAC_EF1_CALLBACK(READLINE(*this, play_3_state, ef1_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, play_3_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE("4013a", ttl7474_device, clear_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -491,41 +491,41 @@ MACHINE_CONFIG_START(play_3_state::play_3)
// Devices
MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL(3'579'545) / 8) // TPB line from CPU
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_3_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_3_state, clock_w))
MCFG_DEVICE_ADD("xpoint", CLOCK, 60) // crossing-point detector
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(play_3_state, clock2_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_3_state, clock2_w))
// This is actually a 4013 chip (has 2 RS flipflops)
MCFG_DEVICE_ADD("4013a", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(play_3_state, q4013a_w))
- MCFG_7474_COMP_OUTPUT_CB(DEVWRITELINE("4013a", ttl7474_device, d_w))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, play_3_state, q4013a_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE("4013a", ttl7474_device, d_w))
MCFG_DEVICE_ADD("4013b", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(DEVWRITELINE("maincpu", cosmac_device, ef2_w)) MCFG_DEVCB_INVERT // inverted
- MCFG_7474_COMP_OUTPUT_CB(DEVWRITELINE("maincpu", cosmac_device, int_w)) MCFG_DEVCB_INVERT // inverted
+ MCFG_7474_OUTPUT_CB(WRITELINE("maincpu", cosmac_device, ef2_w)) MCFG_DEVCB_INVERT // inverted
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE("maincpu", cosmac_device, int_w)) MCFG_DEVCB_INVERT // inverted
/* Sound */
genpin_audio(config);
- MCFG_CPU_ADD("audiocpu", CDP1802, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(play_3_audio_map)
- MCFG_CPU_IO_MAP(play_3_audio_io)
+ MCFG_DEVICE_ADD("audiocpu", CDP1802, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(play_3_audio_map)
+ MCFG_DEVICE_IO_MAP(play_3_audio_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(play_3_state, clear_a_r))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, play_3_state, clear_a_r))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("aysnd1", AY8910, XTAL(3'579'545) / 2)
+ MCFG_DEVICE_ADD("aysnd1", AY8910, XTAL(3'579'545) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MCFG_SOUND_ADD("aysnd2", AY8910, XTAL(3'579'545) / 2)
+ MCFG_DEVICE_ADD("aysnd2", AY8910, XTAL(3'579'545) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(play_3_state::megaaton)
play_3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(2'950'000))
- MCFG_CPU_IO_MAP(megaaton_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(2'950'000))
+ MCFG_DEVICE_IO_MAP(megaaton_io)
MCFG_DEVICE_MODIFY("tpb_clock")
MCFG_DEVICE_CLOCK(XTAL(2'950'000) / 8) // TPB line from CPU
@@ -533,8 +533,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(play_3_state::sklflite)
play_3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(sklflite_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(sklflite_io)
MCFG_DEVICE_REMOVE("audiocpu")
MCFG_DEVICE_REMOVE("aysnd1")
diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp
index 6c6b68d8e27..807f48e2669 100644
--- a/src/mame/drivers/playch10.cpp
+++ b/src/mame/drivers/playch10.cpp
@@ -646,27 +646,27 @@ WRITE_LINE_MEMBER(playch10_state::vblank_irq)
MACHINE_CONFIG_START(playch10_state::playch10)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(bios_map)
- MCFG_CPU_IO_MAP(bios_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000/2) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(bios_map)
+ MCFG_DEVICE_IO_MAP(bios_io_map)
- MCFG_CPU_ADD("cart", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(cart_map)
+ MCFG_DEVICE_ADD("cart", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(cart_map)
MCFG_DEVICE_ADD("outlatch1", LS259, 0) // 7D
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(playch10_state, sdcs_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(playch10_state, cntrl_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(playch10_state, disp_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(playch10_state, sound_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, playch10_state, sdcs_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, playch10_state, cntrl_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, playch10_state, disp_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, playch10_state, sound_mask_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("cart", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // GAMERES
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("cart", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT // GAMESTOP
MCFG_DEVICE_ADD("outlatch2", LS259, 0) // 7E
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(playch10_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(playch10_state, dog_di_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(playch10_state, ppu_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(playch10_state, up8w_w))
- MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(playch10_state, cart_sel_w)) MCFG_DEVCB_MASK(0x78) MCFG_DEVCB_RSHIFT(-3)
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, playch10_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, playch10_state, dog_di_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, playch10_state, ppu_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, playch10_state, up8w_w))
+ MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, playch10_state, cart_sel_w)) MCFG_DEVCB_MASK(0x78) MCFG_DEVCB_RSHIFT(-3)
// video hardware
MCFG_GFXDECODE_ADD("gfxdecode", "palette", playch10)
@@ -680,7 +680,7 @@ MACHINE_CONFIG_START(playch10_state::playch10)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(playch10_state, screen_update_playch10_top)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(playch10_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, playch10_state, vblank_irq))
MCFG_SCREEN_ADD("bottom", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index bdc1f0a7f9d..1094d8909e9 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -1044,16 +1044,16 @@ MACHINE_RESET_MEMBER(playmark_state,playmark)
MACHINE_CONFIG_START(playmark_state::bigtwin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(bigtwin_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bigtwin_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, 12000000)
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w))
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, playmark_snd_control_w))
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, 12000000)
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w))
MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark)
MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark)
@@ -1084,16 +1084,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::bigtwinb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(bigtwinb_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(bigtwinb_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2)
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w))
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, playmark_snd_control_w))
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2)
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w))
MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark)
MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark)
@@ -1124,17 +1124,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::wbeachvl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(wbeachvl_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
-
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* 12MHz with internal 4x divisor */
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // wrong?
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, playmark_snd_control_w))
-// MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, hrdtimes_snd_control_w)) // probably closer to this, but this only supports 2 sample bank bits
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wbeachvl_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* 12MHz with internal 4x divisor */
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w)) // wrong?
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w))
+// MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, hrdtimes_snd_control_w)) // probably closer to this, but this only supports 2 sample bank bits
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0)
@@ -1168,16 +1168,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::excelsr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(excelsr_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(excelsr_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* 12MHz with internal 4x divisor */
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w))
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, playmark_snd_control_w))
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* 12MHz with internal 4x divisor */
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, playmark_snd_control_w))
MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark)
MCFG_MACHINE_RESET_OVERRIDE(playmark_state,playmark)
@@ -1208,16 +1208,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::hrdtimes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(hrdtimes_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
-
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
-// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, hrdtimes_snd_control_w))
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(hrdtimes_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
+// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, hrdtimes_snd_control_w))
MCFG_DEVICE_DISABLE() /* Internal code is not dumped yet */
MCFG_MACHINE_START_OVERRIDE(playmark_state,playmark)
@@ -1249,16 +1249,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::hotmind)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(hotmind_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold) // irq 2 and 6 point to the same location on hotmind
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(hotmind_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold) // irq 2 and 6 point to the same location on hotmind
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
-// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, hrdtimes_snd_control_w))
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
+// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, hrdtimes_snd_control_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0)
@@ -1295,16 +1295,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(playmark_state::luckboomh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(luckboomh_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
-
- MCFG_CPU_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
-// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
- MCFG_PIC16C5x_READ_B_CB(READ8(playmark_state, playmark_snd_command_r))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(playmark_state, playmark_oki_w))
- MCFG_PIC16C5x_READ_C_CB(READ8(playmark_state, playmark_snd_flag_r))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(playmark_state, hrdtimes_snd_control_w))
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(luckboomh_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", playmark_state, irq6_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", PIC16C57, XTAL(24'000'000)/2) /* verified on pcb */
+// MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, playmark_state, playmark_oki_banking_w)) // Banking data output but not wired. Port C is wired to the OKI banking instead
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, playmark_state, playmark_snd_command_r))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, playmark_state, playmark_oki_w))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, playmark_state, playmark_snd_flag_r))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, playmark_state, hrdtimes_snd_control_w))
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index 60f0a43f2ee..f6db8a12c3c 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -899,74 +899,74 @@ void plus4_state::machine_reset()
MACHINE_CONFIG_START(plus4_state::plus4)
// basic machine hardware
- MCFG_CPU_ADD(MOS7501_TAG, M7501, 0)
- MCFG_CPU_PROGRAM_MAP(plus4_mem)
+ MCFG_DEVICE_ADD(MOS7501_TAG, M7501, 0)
+ MCFG_DEVICE_PROGRAM_MAP(plus4_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M7501_PORT_CALLBACKS(READ8(plus4_state, cpu_r), WRITE8(plus4_state, cpu_w))
+ MCFG_M7501_PORT_CALLBACKS(READ8(*this, plus4_state, cpu_r), WRITE8(*this, plus4_state, cpu_w))
MCFG_M7501_PORT_PULLS(0x00, 0xc0)
MCFG_QUANTUM_PERFECT_CPU(MOS7501_TAG)
// video and sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_MOS7360_ADD(MOS7360_TAG, SCREEN_TAG, MOS7501_TAG, 0, ted_videoram_map, WRITELINE(plus4_state, ted_irq_w), READ8(plus4_state, ted_k_r))
+ MCFG_MOS7360_ADD(MOS7360_TAG, SCREEN_TAG, MOS7501_TAG, 0, ted_videoram_map, WRITELINE(*this, plus4_state, ted_irq_w), READ8(*this, plus4_state, ted_k_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_PLS100_ADD(PLA_TAG)
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, plus4_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_4_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p2)) // cassette sense
- MCFG_PET_USER_PORT_5_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p3))
- MCFG_PET_USER_PORT_6_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p4))
- MCFG_PET_USER_PORT_7_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p5))
- MCFG_PET_USER_PORT_8_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxc))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p0))
- MCFG_PET_USER_PORT_C_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
- MCFG_PET_USER_PORT_F_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p7))
- MCFG_PET_USER_PORT_H_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dcd)) MCFG_DEVCB_XOR(1) // TODO: add missing pull up before inverter
- MCFG_PET_USER_PORT_J_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p6))
- MCFG_PET_USER_PORT_K_HANDLER(DEVWRITELINE(MOS6529_USER_TAG, mos6529_device, write_p1))
- MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(MOS6551_TAG, mos6551_device, write_dsr)) MCFG_DEVCB_XOR(1) // TODO: add missing pull up before inverter
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p2)) // cassette sense
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p3))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p4))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p5))
+ MCFG_PET_USER_PORT_8_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_rxc))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p0))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_rxd))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p7))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dcd)) MCFG_DEVCB_XOR(1) // TODO: add missing pull up before inverter
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p6))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(MOS6529_USER_TAG, mos6529_device, write_p1))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(MOS6551_TAG, mos6551_device, write_dsr)) MCFG_DEVCB_XOR(1) // TODO: add missing pull up before inverter
MCFG_DEVICE_ADD(MOS6551_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_RXC_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_d)) MCFG_DEVCB_XOR(1)
- MCFG_MOS6551_DTR_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_e)) MCFG_DEVCB_XOR(1)
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
- MCFG_MOS6551_IRQ_HANDLER(WRITELINE(plus4_state, acia_irq_w))
+ MCFG_MOS6551_RXC_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_8))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_d)) MCFG_DEVCB_XOR(1)
+ MCFG_MOS6551_DTR_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_e)) MCFG_DEVCB_XOR(1)
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE(*this, plus4_state, acia_irq_w))
MCFG_DEVICE_ADD(MOS6529_USER_TAG, MOS6529, 0)
- MCFG_MOS6529_P0_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
- MCFG_MOS6529_P1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_k))
- MCFG_MOS6529_P2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
- MCFG_MOS6529_P3_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
- MCFG_MOS6529_P4_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
- MCFG_MOS6529_P5_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
- MCFG_MOS6529_P6_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_j))
- MCFG_MOS6529_P7_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_f))
+ MCFG_MOS6529_P0_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
+ MCFG_MOS6529_P1_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_k))
+ MCFG_MOS6529_P2_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_4))
+ MCFG_MOS6529_P3_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_5))
+ MCFG_MOS6529_P4_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_6))
+ MCFG_MOS6529_P5_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_7))
+ MCFG_MOS6529_P6_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_j))
+ MCFG_MOS6529_P7_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_f))
MCFG_DEVICE_ADD(MOS6529_KB_TAG, MOS6529, 0)
- MCFG_MOS6529_P0_HANDLER(WRITELINE(plus4_state, write_kb0))
- MCFG_MOS6529_P1_HANDLER(WRITELINE(plus4_state, write_kb1))
- MCFG_MOS6529_P2_HANDLER(WRITELINE(plus4_state, write_kb2))
- MCFG_MOS6529_P3_HANDLER(WRITELINE(plus4_state, write_kb3))
- MCFG_MOS6529_P4_HANDLER(WRITELINE(plus4_state, write_kb4))
- MCFG_MOS6529_P5_HANDLER(WRITELINE(plus4_state, write_kb5))
- MCFG_MOS6529_P6_HANDLER(WRITELINE(plus4_state, write_kb6))
- MCFG_MOS6529_P7_HANDLER(WRITELINE(plus4_state, write_kb7))
+ MCFG_MOS6529_P0_HANDLER(WRITELINE(*this, plus4_state, write_kb0))
+ MCFG_MOS6529_P1_HANDLER(WRITELINE(*this, plus4_state, write_kb1))
+ MCFG_MOS6529_P2_HANDLER(WRITELINE(*this, plus4_state, write_kb2))
+ MCFG_MOS6529_P3_HANDLER(WRITELINE(*this, plus4_state, write_kb3))
+ MCFG_MOS6529_P4_HANDLER(WRITELINE(*this, plus4_state, write_kb4))
+ MCFG_MOS6529_P5_HANDLER(WRITELINE(*this, plus4_state, write_kb5))
+ MCFG_MOS6529_P6_HANDLER(WRITELINE(*this, plus4_state, write_kb6))
+ MCFG_MOS6529_P7_HANDLER(WRITELINE(*this, plus4_state, write_kb7))
MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, plus4_datassette_devices, "c1531", NOOP)
MCFG_CBM_IEC_ADD("c1541")
- MCFG_CBM_IEC_BUS_ATN_CALLBACK(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
+ MCFG_CBM_IEC_BUS_ATN_CALLBACK(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_9))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_PLUS4_EXPANSION_SLOT_ADD(PLUS4_EXPANSION_SLOT_TAG, XTAL(14'318'181)/16, plus4_expansion_cards, nullptr)
- MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(plus4_state, exp_irq_w))
- MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(plus4_state, read))
- MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(plus4_state, write))
+ MCFG_PLUS4_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, plus4_state, exp_irq_w))
+ MCFG_PLUS4_EXPANSION_SLOT_CD_INPUT_CALLBACK(READ8(*this, plus4_state, read))
+ MCFG_PLUS4_EXPANSION_SLOT_CD_OUTPUT_CALLBACK(WRITE8(*this, plus4_state, write))
MCFG_PLUS4_EXPANSION_SLOT_AEC_CALLBACK(INPUTLINE(MOS7501_TAG, INPUT_LINE_HALT))
MCFG_QUICKLOAD_ADD("quickload", plus4_state, cbm_c16, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -1027,8 +1027,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c16_state::c16n)
plus4n(config);
- MCFG_CPU_MODIFY(MOS7501_TAG)
- MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w))
+ MCFG_DEVICE_MODIFY(MOS7501_TAG)
+ MCFG_M7501_PORT_CALLBACKS(READ8(*this, c16_state, cpu_r), WRITE8(*this, plus4_state, cpu_w))
MCFG_M7501_PORT_PULLS(0x00, 0xc0)
MCFG_DEVICE_REMOVE(MOS6551_TAG)
@@ -1050,8 +1050,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c16_state::c16p)
plus4p(config);
- MCFG_CPU_MODIFY(MOS7501_TAG)
- MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w))
+ MCFG_DEVICE_MODIFY(MOS7501_TAG)
+ MCFG_M7501_PORT_CALLBACKS(READ8(*this, c16_state, cpu_r), WRITE8(*this, plus4_state, cpu_w))
MCFG_M7501_PORT_PULLS(0x00, 0xc0)
MCFG_DEVICE_REMOVE(MOS6551_TAG)
@@ -1084,7 +1084,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(c16_state::v364)
plus4n(config);
- MCFG_SOUND_ADD(T6721A_TAG, T6721A, XTAL(640'000))
+ MCFG_DEVICE_ADD(T6721A_TAG, T6721A, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_MOS8706_ADD(MOS8706_TAG, XTAL(14'318'181)/16)
diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp
index f1ff10262f5..17dbbc0acfc 100644
--- a/src/mame/drivers/pluto5.cpp
+++ b/src/mame/drivers/pluto5.cpp
@@ -255,8 +255,8 @@ void pluto5_state::machine_start()
}
MACHINE_CONFIG_START(pluto5_state::pluto5)
- MCFG_CPU_ADD("maincpu", M68340, 16000000)
- MCFG_CPU_PROGRAM_MAP(pluto5_map)
+ MCFG_DEVICE_ADD("maincpu", M68340, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(pluto5_map)
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index 9147ddc52fa..2d606f7e747 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -554,16 +554,16 @@ WRITE_LINE_MEMBER(polygonet_state::k054539_nmi_gen)
MACHINE_CONFIG_START(polygonet_state::plygonet)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", polygonet_state, polygonet_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", polygonet_state, polygonet_interrupt)
- MCFG_CPU_ADD("dsp", DSP56156, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(dsp_program_map)
- MCFG_CPU_DATA_MAP(dsp_data_map)
+ MCFG_DEVICE_ADD("dsp", DSP56156, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(dsp_program_map)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu") /* TODO: TEMPORARY! UNTIL A MORE LOCALIZED SYNC CAN BE MADE */
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(polygonet_state::plygonet)
MCFG_K054321_ADD("k054321", "lspeaker", "rspeaker")
MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
- MCFG_K054539_TIMER_HANDLER(WRITELINE(polygonet_state, k054539_nmi_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, polygonet_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pm68k.cpp b/src/mame/drivers/pm68k.cpp
index 5278d890b71..31b1f850e46 100644
--- a/src/mame/drivers/pm68k.cpp
+++ b/src/mame/drivers/pm68k.cpp
@@ -60,32 +60,32 @@ void pm68k_state::machine_reset()
MACHINE_CONFIG_START(pm68k_state::pm68k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(pm68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(pm68k_mem)
MCFG_DEVICE_ADD("mpsc", I8274_NEW, 0)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("stc", AM9513, 4000000)
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("mpsc", i8274_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mpsc", i8274_new_device, txca_w))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("mpsc", i8274_new_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mpsc", i8274_new_device, txcb_w))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mpsc", i8274_new_device, rxa_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("mpsc", i8274_new_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("mpsc", i8274_new_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mpsc", i8274_new_device, rxb_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("mpsc", i8274_new_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("mpsc", i8274_new_device, ctsb_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("mpsc", i8274_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mpsc", i8274_new_device, txca_w))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("mpsc", i8274_new_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mpsc", i8274_new_device, txcb_w))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", i8274_new_device, rxa_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("mpsc", i8274_new_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("mpsc", i8274_new_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", i8274_new_device, rxb_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("mpsc", i8274_new_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("mpsc", i8274_new_device, ctsb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp
index a77b1a8ea01..b81d13000ca 100644
--- a/src/mame/drivers/pmd85.cpp
+++ b/src/mame/drivers/pmd85.cpp
@@ -582,9 +582,9 @@ static const struct CassetteOptions pmd85_cassette_options =
/* machine definition */
MACHINE_CONFIG_START(pmd85_state::pmd85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000) /* 2.048MHz ??? */
- MCFG_CPU_PROGRAM_MAP(pmd85_mem)
- MCFG_CPU_IO_MAP(pmd85_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000) /* 2.048MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(pmd85_mem)
+ MCFG_DEVICE_IO_MAP(pmd85_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(pmd85_state::pmd85)
/* uart */
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(pmd85_state, write_cas_tx))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, pmd85_state, write_cas_tx))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -652,93 +652,93 @@ MACHINE_CONFIG_START(pmd85_state::pmd851)
pmd85(config);
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_0_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_0_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_0_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_0_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_0_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_0_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_0_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_0_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_0_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_portc_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_1_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_1_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_1_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_1_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_1_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_1_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_1_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_1_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_1_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_1_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_1_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_1_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_2_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_2_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_2_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_2_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_2_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_2_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_2_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_2_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_2_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_2_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_2_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_2_portc_w))
MCFG_DEVICE_ADD("ppi8255_3", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_3_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_3_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_3_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_3_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_3_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_3_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_3_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_3_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_3_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_3_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_3_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_3_portc_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pmd85_state::pmd852a)
pmd851(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pmd852a_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pmd852a_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pmd85_state::pmd853)
pmd851(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pmd853_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pmd853_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pmd85_state::alfa)
pmd85(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(alfa_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(alfa_mem)
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_0_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_0_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_0_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_0_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_0_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_0_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_0_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_0_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_0_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_portc_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_1_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_1_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_1_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_1_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_1_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_1_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_1_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_1_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_1_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_1_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_1_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_1_portc_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_2_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_2_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, pmd85_ppi_2_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_2_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, pmd85_ppi_2_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, pmd85_ppi_2_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_2_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_2_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, pmd85_ppi_2_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_2_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, pmd85_ppi_2_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, pmd85_ppi_2_portc_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pmd85_state::mato)
pmd85(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mato_mem)
- MCFG_CPU_IO_MAP(mato_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mato_mem)
+ MCFG_DEVICE_IO_MAP(mato_io_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pmd85_state, pmd85_ppi_0_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pmd85_state, pmd85_ppi_0_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pmd85_state, mato_ppi_0_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pmd85_state, pmd85_ppi_0_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pmd85_state, mato_ppi_0_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pmd85_state, mato_ppi_0_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pmd85_state, pmd85_ppi_0_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pmd85_state, mato_ppi_0_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pmd85_state, pmd85_ppi_0_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pmd85_state, mato_ppi_0_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pmd85_state, mato_ppi_0_portc_w))
/* no uart */
MCFG_DEVICE_REMOVE("uart")
@@ -746,8 +746,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pmd85_state::c2717)
pmd851(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(c2717_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(c2717_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp
index e10a0e05a27..5e7ff5b928d 100644
--- a/src/mame/drivers/pmi80.cpp
+++ b/src/mame/drivers/pmi80.cpp
@@ -168,9 +168,9 @@ void pmi80_state::machine_start()
MACHINE_CONFIG_START(pmi80_state::pmi80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(pmi80_mem)
- MCFG_CPU_IO_MAP(pmi80_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pmi80_mem)
+ MCFG_DEVICE_IO_MAP(pmi80_io)
/* video hardware */
diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp
index 25bf80fa8aa..1c3c028d7bf 100644
--- a/src/mame/drivers/pntnpuzl.cpp
+++ b/src/mame/drivers/pntnpuzl.cpp
@@ -350,21 +350,21 @@ static INPUT_PORTS_START( pntnpuzl )
INPUT_PORTS_END
MACHINE_CONFIG_START(pntnpuzl_state::pntnpuzl)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(pntnpuzl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pntnpuzl_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_DEVICE_ADD("via", VIA6522, XTAL(12'000'000) / 10)
MCFG_VIA6522_READPA_HANDLER(IOPORT("IN2"))
MCFG_VIA6522_READPB_HANDLER(IOPORT("IN1"))
- MCFG_VIA6522_WRITEPB_HANDLER(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(4)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(4)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
// CB2 used for serial communication with 8798
- MCFG_CPU_ADD("mcu", P8098, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(mcu_map) // FIXME: this is all internal
+ MCFG_DEVICE_ADD("mcu", P8098, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map) // FIXME: this is all internal
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp
index f2dd0402011..086708db567 100644
--- a/src/mame/drivers/pockchal.cpp
+++ b/src/mame/drivers/pockchal.cpp
@@ -97,9 +97,9 @@ void pockchalv1_state::machine_reset()
MACHINE_CONFIG_START(pockchalv1_state::pockchalv1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMP90845,8000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(pockchalv1_map)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", pockchalv1_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", TMP90845,8000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pockchalv1_map)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pockchalv1_state, irq0_line_hold)
// wrong, it's a b&w / greyscale thing
MCFG_PALETTE_ADD("palette", 0x100)
diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp
index b9c53788f86..7205e222289 100644
--- a/src/mame/drivers/pocketc.cpp
+++ b/src/mame/drivers/pocketc.cpp
@@ -753,16 +753,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1401_state::pc1401)
pocketc(config);
- MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
- MCFG_CPU_PROGRAM_MAP(pc1401_mem)
- MCFG_SC61860_READ_RESET_HANDLER(READLINE(pc1401_state,pc1401_reset))
- MCFG_SC61860_READ_BRK_HANDLER(READLINE(pc1401_state,pc1401_brk))
+ MCFG_DEVICE_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pc1401_mem)
+ MCFG_SC61860_READ_RESET_HANDLER(READLINE(*this, pc1401_state,pc1401_reset))
+ MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1401_state,pc1401_brk))
MCFG_SC61860_READ_X_HANDLER(NOOP)
- MCFG_SC61860_READ_A_HANDLER(READ8(pc1401_state,pc1401_ina))
- MCFG_SC61860_WRITE_A_HANDLER(WRITE8(pc1401_state,pc1401_outa))
- MCFG_SC61860_READ_B_HANDLER(READ8(pc1401_state,pc1401_inb))
- MCFG_SC61860_WRITE_B_HANDLER(WRITE8(pc1401_state,pc1401_outb))
- MCFG_SC61860_WRITE_C_HANDLER(WRITE8(pc1401_state,pc1401_outc))
+ MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1401_state,pc1401_ina))
+ MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1401_state,pc1401_outa))
+ MCFG_SC61860_READ_B_HANDLER(READ8(*this, pc1401_state,pc1401_inb))
+ MCFG_SC61860_WRITE_B_HANDLER(WRITE8(*this, pc1401_state,pc1401_outb))
+ MCFG_SC61860_WRITE_C_HANDLER(WRITE8(*this, pc1401_state,pc1401_outc))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(pc1401_state, screen_update_pc1401)
@@ -770,22 +770,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1401_state::pc1402)
pc1401(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( pc1402_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( pc1402_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1251_state::pc1250)
pocketc(config);
- MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
- MCFG_CPU_PROGRAM_MAP( pc1250_mem)
+ MCFG_DEVICE_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
+ MCFG_DEVICE_PROGRAM_MAP( pc1250_mem)
MCFG_SC61860_READ_RESET_HANDLER(NOOP)
- MCFG_SC61860_READ_BRK_HANDLER(READLINE(pc1251_state,pc1251_brk))
+ MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1251_state,pc1251_brk))
MCFG_SC61860_READ_X_HANDLER(NOOP)
- MCFG_SC61860_READ_A_HANDLER(READ8(pc1251_state,pc1251_ina))
- MCFG_SC61860_WRITE_A_HANDLER(WRITE8(pc1251_state,pc1251_outa))
- MCFG_SC61860_READ_B_HANDLER(READ8(pc1251_state,pc1251_inb))
- MCFG_SC61860_WRITE_B_HANDLER(WRITE8(pc1251_state,pc1251_outb))
- MCFG_SC61860_WRITE_C_HANDLER(WRITE8(pc1251_state,pc1251_outc))
+ MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1251_state,pc1251_ina))
+ MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1251_state,pc1251_outa))
+ MCFG_SC61860_READ_B_HANDLER(READ8(*this, pc1251_state,pc1251_inb))
+ MCFG_SC61860_WRITE_B_HANDLER(WRITE8(*this, pc1251_state,pc1251_outb))
+ MCFG_SC61860_WRITE_C_HANDLER(WRITE8(*this, pc1251_state,pc1251_outc))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -797,42 +797,42 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1251_state::pc1251)
pc1250(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( pc1251_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( pc1251_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1251_state::pc1255)
pc1250(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( pc1255_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( pc1255_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1251_state::pc1260)
pc1250(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( pc1260_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( pc1260_mem)
MCFG_MACHINE_START_OVERRIDE(pc1251_state, pc1260 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1251_state::pc1261)
pc1260(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( pc1261_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( pc1261_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1350_state::pc1350)
pocketc(config);
- MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
- MCFG_CPU_PROGRAM_MAP( pc1350_mem)
+ MCFG_DEVICE_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
+ MCFG_DEVICE_PROGRAM_MAP( pc1350_mem)
MCFG_SC61860_READ_RESET_HANDLER(NOOP)
- MCFG_SC61860_READ_BRK_HANDLER(READLINE(pc1350_state,pc1350_brk))
+ MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1350_state,pc1350_brk))
MCFG_SC61860_READ_X_HANDLER(NOOP)
- MCFG_SC61860_READ_A_HANDLER(READ8(pc1350_state,pc1350_ina))
- MCFG_SC61860_WRITE_A_HANDLER(WRITE8(pc1350_state,pc1350_outa))
- MCFG_SC61860_READ_B_HANDLER(READ8(pc1350_state,pc1350_inb))
- MCFG_SC61860_WRITE_B_HANDLER(WRITE8(pc1350_state,pc1350_outb))
- MCFG_SC61860_WRITE_C_HANDLER(WRITE8(pc1350_state,pc1350_outc))
+ MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1350_state,pc1350_ina))
+ MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1350_state,pc1350_outa))
+ MCFG_SC61860_READ_B_HANDLER(READ8(*this, pc1350_state,pc1350_inb))
+ MCFG_SC61860_WRITE_B_HANDLER(WRITE8(*this, pc1350_state,pc1350_outb))
+ MCFG_SC61860_WRITE_C_HANDLER(WRITE8(*this, pc1350_state,pc1350_outc))
/*
aim: show sharp with keyboard
@@ -852,16 +852,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1403_state::pc1403)
pocketc(config);
- MCFG_CPU_ADD( "maincpu", SC61860, 256000 )
- MCFG_CPU_PROGRAM_MAP( pc1403_mem)
+ MCFG_DEVICE_ADD( "maincpu", SC61860, 256000 )
+ MCFG_DEVICE_PROGRAM_MAP( pc1403_mem)
MCFG_SC61860_READ_RESET_HANDLER(NOOP)
- MCFG_SC61860_READ_BRK_HANDLER(READLINE(pc1403_state,pc1403_brk))
+ MCFG_SC61860_READ_BRK_HANDLER(READLINE(*this, pc1403_state,pc1403_brk))
MCFG_SC61860_READ_X_HANDLER(NOOP)
- MCFG_SC61860_READ_A_HANDLER(READ8(pc1403_state,pc1403_ina))
- MCFG_SC61860_WRITE_A_HANDLER(WRITE8(pc1403_state,pc1403_outa))
+ MCFG_SC61860_READ_A_HANDLER(READ8(*this, pc1403_state,pc1403_ina))
+ MCFG_SC61860_WRITE_A_HANDLER(WRITE8(*this, pc1403_state,pc1403_outa))
MCFG_SC61860_READ_B_HANDLER(NOOP)
MCFG_SC61860_WRITE_B_HANDLER(NOOP)
- MCFG_SC61860_WRITE_C_HANDLER(WRITE8(pc1403_state,pc1403_outc))
+ MCFG_SC61860_WRITE_C_HANDLER(WRITE8(*this, pc1403_state,pc1403_outc))
/*
aim: show sharp with keyboard
@@ -878,8 +878,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pc1403_state::pc1403h)
pc1403(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP( pc1403h_mem)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP( pc1403h_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp
index 55373c8165d..b762eb01b6c 100644
--- a/src/mame/drivers/pockstat.cpp
+++ b/src/mame/drivers/pockstat.cpp
@@ -977,8 +977,8 @@ DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash )
MACHINE_CONFIG_START(pockstat_state::pockstat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7, DEFAULT_CLOCK)
- MCFG_CPU_PROGRAM_MAP(pockstat_mem)
+ MCFG_DEVICE_ADD("maincpu", ARM7, DEFAULT_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(pockstat_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -991,7 +991,7 @@ MACHINE_CONFIG_START(pockstat_state::pockstat)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index fc78c46e8c8..f9de4f01316 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -1018,10 +1018,10 @@ void portfolio_state::machine_reset()
MACHINE_CONFIG_START(portfolio_state::portfolio)
// basic machine hardware
- MCFG_CPU_ADD(M80C88A_TAG, I8088, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(portfolio_mem)
- MCFG_CPU_IO_MAP(portfolio_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(portfolio_state,portfolio_int_ack)
+ MCFG_DEVICE_ADD(M80C88A_TAG, I8088, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(portfolio_mem)
+ MCFG_DEVICE_IO_MAP(portfolio_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(portfolio_state,portfolio_int_ack)
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, LCD)
@@ -1040,21 +1040,21 @@ MACHINE_CONFIG_START(portfolio_state::portfolio)
MCFG_DEVICE_ADD(HD61830_TAG, HD61830, XTAL(4'915'200)/2/2)
MCFG_DEVICE_ADDRESS_MAP(0, portfolio_lcdc)
- MCFG_HD61830_RD_CALLBACK(READ8(portfolio_state, hd61830_rd_r))
+ MCFG_HD61830_RD_CALLBACK(READ8(*this, portfolio_state, hd61830_rd_r))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(PCD3311T_TAG, PCD3311, XTAL(3'578'640))
+ MCFG_DEVICE_ADD(PCD3311T_TAG, PCD3311, XTAL(3'578'640))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_PORTFOLIO_MEMORY_CARD_SLOT_ADD(PORTFOLIO_MEMORY_CARD_SLOT_A_TAG, portfolio_memory_cards, nullptr)
MCFG_PORTFOLIO_EXPANSION_SLOT_ADD(PORTFOLIO_EXPANSION_SLOT_TAG, XTAL(4'915'200), portfolio_expansion_cards, nullptr)
- MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(WRITELINE(portfolio_state, eint_w))
+ MCFG_PORTFOLIO_EXPANSION_SLOT_EINT_CALLBACK(WRITELINE(*this, portfolio_state, eint_w))
MCFG_PORTFOLIO_EXPANSION_SLOT_NMIO_CALLBACK(INPUTLINE(M80C88A_TAG, INPUT_LINE_NMI))
- MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(WRITELINE(portfolio_state, wake_w))
+ MCFG_PORTFOLIO_EXPANSION_SLOT_WAKE_CALLBACK(WRITELINE(*this, portfolio_state, wake_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("counter", portfolio_state, counter_tick, attotime::from_hz(XTAL(32'768)/16384))
MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_TICK_TAG, portfolio_state, system_tick, attotime::from_hz(XTAL(32'768)/32768))
diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp
index b0279325de1..7a574cd4556 100644
--- a/src/mame/drivers/poisk1.cpp
+++ b/src/mame/drivers/poisk1.cpp
@@ -643,48 +643,48 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(p1_state::poisk1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, 5000000)
- MCFG_CPU_PROGRAM_MAP(poisk1_map)
- MCFG_CPU_IO_MAP(poisk1_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 5000000)
+ MCFG_DEVICE_PROGRAM_MAP(poisk1_map)
+ MCFG_DEVICE_IO_MAP(poisk1_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_MACHINE_START_OVERRIDE( p1_state, poisk1 )
MCFG_MACHINE_RESET_OVERRIDE( p1_state, poisk1 )
MCFG_DEVICE_ADD( "pit8253", PIT8253 ,0)
MCFG_PIT8253_CLK0(XTAL(15'000'000)/12) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL(15'000'000)/12) /* keyboard poll -- XXX edge or level triggered? */
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir6_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pic8259", pic8259_device, ir6_w))
MCFG_PIT8253_CLK2(XTAL(15'000'000)/12) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(p1_state, p1_pit8253_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, p1_state, p1_pit8253_out2_changed))
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("ppi8255n1", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(p1_state, p1_ppi_porta_r)) /*60H*/
- MCFG_I8255_OUT_PORTA_CB(WRITE8(p1_state, p1_ppi_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(p1_state, p1_ppi_portb_r)) /*69H*/
- MCFG_I8255_IN_PORTC_CB(READ8(p1_state, p1_ppi_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(p1_state, p1_ppi_portc_w)) /*6AH*/
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, p1_state, p1_ppi_porta_r)) /*60H*/
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, p1_state, p1_ppi_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, p1_state, p1_ppi_portb_r)) /*69H*/
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, p1_state, p1_ppi_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, p1_state, p1_ppi_portc_w)) /*6AH*/
MCFG_DEVICE_ADD("ppi8255n2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(p1_state, p1_ppi2_porta_w)) /*68H*/
- MCFG_I8255_OUT_PORTB_CB(WRITE8(p1_state, p1_ppi2_portb_w)) /*61H*/
- MCFG_I8255_IN_PORTC_CB(READ8(p1_state, p1_ppi2_portc_r)) /*62H*/
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, p1_state, p1_ppi2_porta_w)) /*68H*/
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, p1_state, p1_ppi2_portb_w)) /*61H*/
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, p1_state, p1_ppi2_portc_r)) /*62H*/
MCFG_DEVICE_ADD("isa", ISA8, 0)
MCFG_ISA8_CPU("maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259", pic8259_device, ir7_w))
- MCFG_ISA8_SLOT_ADD("isa", "isa1", p1_isa8_cards, "fdc", false)
- MCFG_ISA8_SLOT_ADD("isa", "isa2", p1_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("isa", "isa3", p1_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("isa", "isa4", p1_isa8_cards, nullptr, false)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259", pic8259_device, ir7_w))
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "isa", p1_isa8_cards, "fdc", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "isa", p1_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "isa", p1_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "isa", p1_isa8_cards, nullptr, false)
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
@@ -693,7 +693,7 @@ MACHINE_CONFIG_START(p1_state::poisk1)
// MCFG_SOFTWARE_LIST_ADD("cass_list","poisk1_cass")
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "speaker", SPEAKER_SOUND, 0 )
+ MCFG_DEVICE_ADD( "speaker", SPEAKER_SOUND )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_SCREEN_ADD( "screen", RASTER )
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index 31bcb6c2e5e..fe1287940cf 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -229,11 +229,11 @@ WRITE_LINE_MEMBER(pokechmp_state::sound_irq)
MACHINE_CONFIG_START(pokechmp_state::pokechmp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(pokechmp_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(pokechmp_map)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL(4'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(pokechmp_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, XTAL(4'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(pokechmp_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -244,7 +244,7 @@ MACHINE_CONFIG_START(pokechmp_state::pokechmp)
MCFG_SCREEN_UPDATE_DRIVER(pokechmp_state, screen_update_pokechmp)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(pokechmp_state, sound_irq))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, pokechmp_state, sound_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pokechmp)
MCFG_PALETTE_ADD("palette", 0x400)
@@ -255,10 +255,10 @@ MACHINE_CONFIG_START(pokechmp_state::pokechmp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(4'000'000)/4)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(4'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000)/16)
+ MCFG_DEVICE_ADD("ym2", YM3812, XTAL(24'000'000)/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(24'000'000)/16, PIN7_LOW)
diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp
index 45231a5df16..3679ca5d821 100644
--- a/src/mame/drivers/pokemini.cpp
+++ b/src/mame/drivers/pokemini.cpp
@@ -1760,8 +1760,8 @@ uint32_t pokemini_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
MACHINE_CONFIG_START(pokemini_state::pokemini)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MINX, 4000000)
- MCFG_CPU_PROGRAM_MAP(pokemini_mem_map)
+ MCFG_DEVICE_ADD("maincpu", MINX, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(pokemini_mem_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1783,7 +1783,7 @@ MACHINE_CONFIG_START(pokemini_state::pokemini)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(3, speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp
index 12fcb9ec5ab..642dda23496 100644
--- a/src/mame/drivers/poker72.cpp
+++ b/src/mame/drivers/poker72.cpp
@@ -370,9 +370,9 @@ MACHINE_CONFIG_START(poker72_state::poker72)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(poker72_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", poker72_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(poker72_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", poker72_state, irq0_line_hold)
/* video hardware */
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(poker72_state::poker72)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8910, 8000000/8) /* ? Mhz */
+ MCFG_DEVICE_ADD("ay", AY8910, 8000000/8) /* ? Mhz */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("SW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("SW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index 9f7d2948aa9..ffb5d363263 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -221,6 +221,7 @@ Todo:
#include "includes/polepos.h"
#include "audio/namco52.h"
#include "audio/namco54.h"
+#include "audio/polepos.h"
#include "cpu/z80/z80.h"
#include "cpu/z8000/z8000.h"
@@ -841,15 +842,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(polepos_state::polepos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(z80_map)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(z80_map)
+ MCFG_DEVICE_IO_MAP(z80_io)
- MCFG_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(z8002_map_1)
+ MCFG_DEVICE_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(z8002_map_1)
- MCFG_CPU_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(z8002_map_2)
+ MCFG_DEVICE_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(z8002_map_2)
MCFG_NAMCO_51XX_ADD("51xx", MASTER_CLOCK/8/2) /* 1.536 MHz */
MCFG_NAMCO_51XX_SCREEN("screen")
@@ -857,19 +858,19 @@ MACHINE_CONFIG_START(polepos_state::polepos)
MCFG_NAMCO_51XX_INPUT_1_CB(IOPORT("IN0")) MCFG_DEVCB_RSHIFT(4)
MCFG_NAMCO_51XX_INPUT_2_CB(IOPORT("DSWB")) MCFG_DEVCB_MASK(0x0f)
MCFG_NAMCO_51XX_INPUT_3_CB(IOPORT("DSWB")) MCFG_DEVCB_RSHIFT(4)
- MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(polepos_state,out_0))
- MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(polepos_state,out_1))
+ MCFG_NAMCO_51XX_OUTPUT_0_CB(WRITE8(*this, polepos_state,out_0))
+ MCFG_NAMCO_51XX_OUTPUT_1_CB(WRITE8(*this, polepos_state,out_1))
MCFG_NAMCO_52XX_ADD("52xx", MASTER_CLOCK/8/2) /* 1.536 MHz */
MCFG_NAMCO_52XX_DISCRETE("discrete")
MCFG_NAMCO_52XX_BASENODE(NODE_04)
- MCFG_NAMCO_52XX_ROMREAD_CB(READ8(polepos_state,namco_52xx_rom_r))
- MCFG_NAMCO_52XX_SI_CB(READ8(polepos_state,namco_52xx_si_r))
+ MCFG_NAMCO_52XX_ROMREAD_CB(READ8(*this, polepos_state,namco_52xx_rom_r))
+ MCFG_NAMCO_52XX_SI_CB(READ8(*this, polepos_state,namco_52xx_si_r))
MCFG_NAMCO_53XX_ADD("53xx", MASTER_CLOCK/8/2) /* 1.536 MHz */
- MCFG_NAMCO_53XX_K_CB(READ8(polepos_state,namco_53xx_k_r))
- MCFG_NAMCO_53XX_INPUT_0_CB(READ8(polepos_state,steering_changed_r))
- MCFG_NAMCO_53XX_INPUT_1_CB(READ8(polepos_state,steering_delta_r))
+ MCFG_NAMCO_53XX_K_CB(READ8(*this, polepos_state,namco_53xx_k_r))
+ MCFG_NAMCO_53XX_INPUT_0_CB(READ8(*this, polepos_state,steering_changed_r))
+ MCFG_NAMCO_53XX_INPUT_1_CB(READ8(*this, polepos_state,steering_delta_r))
MCFG_NAMCO_53XX_INPUT_2_CB(IOPORT("DSWA")) MCFG_DEVCB_MASK(0x0f)
MCFG_NAMCO_53XX_INPUT_3_CB(IOPORT("DSWA")) MCFG_DEVCB_RSHIFT(4)
@@ -879,12 +880,12 @@ MACHINE_CONFIG_START(polepos_state::polepos)
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
- MCFG_NAMCO_06XX_READ_1_CB(DEVREAD8("53xx", namco_53xx_device, read))
- MCFG_NAMCO_06XX_READ_REQUEST_1_CB(DEVWRITELINE("53xx", namco_53xx_device, read_request))
- MCFG_NAMCO_06XX_WRITE_2_CB(DEVWRITE8("52xx", namco_52xx_device, write))
- MCFG_NAMCO_06XX_WRITE_3_CB(DEVWRITE8("54xx", namco_54xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_1_CB(READ8("53xx", namco_53xx_device, read))
+ MCFG_NAMCO_06XX_READ_REQUEST_1_CB(WRITELINE("53xx", namco_53xx_device, read_request))
+ MCFG_NAMCO_06XX_WRITE_2_CB(WRITE8("52xx", namco_52xx_device, write))
+ MCFG_NAMCO_06XX_WRITE_3_CB(WRITE8("54xx", namco_54xx_device, write))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 16) // 128V clocks the same as VBLANK
@@ -898,14 +899,14 @@ MACHINE_CONFIG_START(polepos_state::polepos)
MCFG_DEVICE_ADD("latch", LS259, 0) // at 8E on polepos
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(CLEARLINE("maincpu", 0)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(polepos_state, iosel_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("polepos", polepos_sound_device, clson_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(polepos_state, gasel_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, polepos_state, iosel_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("polepos", polepos_sound_device, clson_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, polepos_state, gasel_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(polepos_state, sb0_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(polepos_state, chacl_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, polepos_state, sb0_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, polepos_state, chacl_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -924,20 +925,20 @@ MACHINE_CONFIG_START(polepos_state::polepos)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/512)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
/* discrete circuit on the 54XX outputs */
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(polepos)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90)
/* engine sound */
- MCFG_SOUND_ADD("polepos", POLEPOS, 0)
+ MCFG_DEVICE_ADD("polepos", POLEPOS_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77)
MACHINE_CONFIG_END
@@ -977,15 +978,15 @@ void polepos_state::sound_z80_bootleg_iomap(address_map &map)
MACHINE_CONFIG_START(polepos_state::topracern)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(z80_map)
- MCFG_CPU_IO_MAP(topracern_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(z80_map)
+ MCFG_DEVICE_IO_MAP(topracern_io)
- MCFG_CPU_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(z8002_map_1)
+ MCFG_DEVICE_ADD("sub", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(z8002_map_1)
- MCFG_CPU_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(z8002_map_2)
+ MCFG_DEVICE_ADD("sub2", Z8002, MASTER_CLOCK/8) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(z8002_map_2)
/* todo, remove these devices too, this bootleg doesn't have them, but the emulation doesn't boot without them.. */
/* doesn't exist on the bootleg, but required for now or the game only boots in test mode!
@@ -996,8 +997,8 @@ MACHINE_CONFIG_START(polepos_state::topracern)
MCFG_NAMCO_06XX_ADD("06xx", MASTER_CLOCK/8/64)
MCFG_NAMCO_06XX_MAINCPU("maincpu")
- MCFG_NAMCO_06XX_READ_0_CB(DEVREAD8("51xx", namco_51xx_device, read))
- MCFG_NAMCO_06XX_WRITE_0_CB(DEVWRITE8("51xx", namco_51xx_device, write))
+ MCFG_NAMCO_06XX_READ_0_CB(READ8("51xx", namco_51xx_device, read))
+ MCFG_NAMCO_06XX_WRITE_0_CB(WRITE8("51xx", namco_51xx_device, write))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 16) // 128V clocks the same as VBLANK
@@ -1011,14 +1012,14 @@ MACHINE_CONFIG_START(polepos_state::topracern)
MCFG_DEVICE_ADD("latch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(CLEARLINE("maincpu", 0)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(polepos_state, iosel_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("namco", namco_device, sound_enable_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("polepos", polepos_sound_device, clson_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(polepos_state, gasel_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, polepos_state, iosel_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("namco", namco_device, sound_enable_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("polepos", polepos_sound_device, clson_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, polepos_state, gasel_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("sub2", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(polepos_state, sb0_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(polepos_state, chacl_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, polepos_state, sb0_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, polepos_state, chacl_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1037,18 +1038,18 @@ MACHINE_CONFIG_START(polepos_state::topracern)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/512)
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/512)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
/* engine sound */
- MCFG_SOUND_ADD("polepos", POLEPOS, 0)
+ MCFG_DEVICE_ADD("polepos", POLEPOS_SOUND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77)
- MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) // unknown resistor configuration
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) // unknown resistor configuration
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.12)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
@@ -1058,15 +1059,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(polepos_state::polepos2bi)
topracern(config);
- MCFG_CPU_ADD("soundz80bl", Z80, MASTER_CLOCK/8) /*? MHz */
- MCFG_CPU_PROGRAM_MAP(sound_z80_bootleg_map)
- MCFG_CPU_IO_MAP(sound_z80_bootleg_iomap)
+ MCFG_DEVICE_ADD("soundz80bl", Z80, MASTER_CLOCK/8) /*? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_z80_bootleg_map)
+ MCFG_DEVICE_IO_MAP(sound_z80_bootleg_iomap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundz80bl", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("tms", TMS5220, 600000) /* ? Mhz */
+ MCFG_DEVICE_ADD("tms", TMS5220, 600000) /* ? Mhz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp
index b48ee627b94..20e911c0c31 100644
--- a/src/mame/drivers/polgar.cpp
+++ b/src/mame/drivers/polgar.cpp
@@ -482,9 +482,9 @@ void mephisto_academy_state::machine_reset()
}
MACHINE_CONFIG_START(mephisto_polgar_state::polgar)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(polgar_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_polgar_state, nmi_line_pulse, XTAL(4'915'200) / (1 << 13))
+ MCFG_DEVICE_ADD("maincpu", M65C02, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(polgar_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_polgar_state, nmi_line_pulse, XTAL(4'915'200) / (1 << 13))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -495,17 +495,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_polgar_state::polgar10)
polgar(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(10'000'000) )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(10'000'000) )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_risc_state::mrisc)
- MCFG_CPU_ADD("maincpu", M65C02, XTAL(10'000'000) / 4) // G65SC02
- MCFG_CPU_PROGRAM_MAP(mrisc_mem)
- MCFG_CPU_PERIODIC_INT_DRIVER(mephisto_risc_state, irq0_line_hold, XTAL(10'000'000) / (1 << 14))
+ MCFG_DEVICE_ADD("maincpu", M65C02, XTAL(10'000'000) / 4) // G65SC02
+ MCFG_DEVICE_PROGRAM_MAP(mrisc_mem)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_risc_state, irq0_line_hold, XTAL(10'000'000) / (1 << 14))
- MCFG_CPU_ADD("subcpu", ARM, XTAL(14'000'000)) // VY86C010
- MCFG_CPU_PROGRAM_MAP(mrisc_arm_mem)
+ MCFG_DEVICE_ADD("subcpu", ARM, XTAL(14'000'000)) // VY86C010
+ MCFG_DEVICE_PROGRAM_MAP(mrisc_arm_mem)
MCFG_ARM_COPRO(VL86C020)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -522,8 +522,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_milano_state::milano)
polgar(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(milano_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(milano_mem)
MCFG_DEVICE_REMOVE("board")
MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board")
@@ -533,18 +533,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_academy_state::academy)
polgar(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(academy_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(academy_mem)
MCFG_DEFAULT_LAYOUT(layout_mephisto_academy)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mephisto_modena_state::modena)
polgar(config);
- MCFG_CPU_MODIFY("maincpu") // W65C02SP
- MCFG_CPU_CLOCK(XTAL(4'194'304))
- MCFG_CPU_PROGRAM_MAP(modena_mem)
- MCFG_CPU_PERIODIC_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu") // W65C02SP
+ MCFG_DEVICE_CLOCK(XTAL(4'194'304))
+ MCFG_DEVICE_PROGRAM_MAP(modena_mem)
+ MCFG_DEVICE_PERIODIC_INT_REMOVE()
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_on", mephisto_modena_state, nmi_on, attotime::from_hz(XTAL(4'194'304) / (1 << 13)))
MCFG_TIMER_START_DELAY(attotime::from_hz(XTAL(4'194'304) / (1 << 13)) - attotime::from_usec(975)) // active for 975us
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_off", mephisto_modena_state, nmi_off, attotime::from_hz(XTAL(4'194'304) / (1 << 13)))
@@ -557,7 +557,7 @@ MACHINE_CONFIG_START(mephisto_modena_state::modena)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp
index 73ab7bc7e5b..04b2a3853b9 100644
--- a/src/mame/drivers/policetr.cpp
+++ b/src/mame/drivers/policetr.cpp
@@ -402,10 +402,10 @@ void policetr_state::machine_start()
MACHINE_CONFIG_START(policetr_state::policetr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3041, MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD("maincpu", R3041, MASTER_CLOCK/2)
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_CPU_PROGRAM_MAP(policetr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", policetr_state, irq4_gen)
+ MCFG_DEVICE_PROGRAM_MAP(policetr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", policetr_state, irq4_gen)
MCFG_EEPROM_SERIAL_93C66_ADD("eeprom")
@@ -434,8 +434,8 @@ MACHINE_CONFIG_START(policetr_state::sshooter)
policetr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sshooter_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sshooter_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp
index a9ba88f62fd..ec286614d03 100644
--- a/src/mame/drivers/poly.cpp
+++ b/src/mame/drivers/poly.cpp
@@ -155,8 +155,8 @@ WRITE8_MEMBER(poly_state::baud_rate_w)
MACHINE_CONFIG_START(poly_state::poly)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'057'600) / 3) // nominally 4 MHz
- MCFG_CPU_PROGRAM_MAP(poly_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(12'057'600) / 3) // nominally 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(poly_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -168,12 +168,12 @@ MACHINE_CONFIG_START(poly_state::poly)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_DEVICE_ADD("saa5050", SAA5050, XTAL(12'057'600) / 2)
- MCFG_SAA5050_D_CALLBACK(READ8(poly_state, videoram_r))
+ MCFG_SAA5050_D_CALLBACK(READ8(*this, poly_state, videoram_r))
MCFG_SAA5050_SCREEN_SIZE(40, 24, 40)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
@@ -181,24 +181,24 @@ MACHINE_CONFIG_START(poly_state::poly)
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(poly_state, pia1_b_in))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, poly_state, pia1_b_in))
// CB1 kbd strobe
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(12'057'600) / 3)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O2_CB(WRITELINE(poly_state, ptm_o2_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(poly_state, ptm_o3_callback))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, poly_state, ptm_o2_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, poly_state, ptm_o3_callback))
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- //MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- //MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ //MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ //MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("adlc", MC6854, 0)
diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp
index 3e584779e4b..e9eacfb6fed 100644
--- a/src/mame/drivers/poly88.cpp
+++ b/src/mame/drivers/poly88.cpp
@@ -197,11 +197,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(poly88_state::poly88)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(16'588'800) / 9) // uses 8224 clock generator
- MCFG_CPU_PROGRAM_MAP(poly88_mem)
- MCFG_CPU_IO_MAP(poly88_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", poly88_state, poly88_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(poly88_state,poly88_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(16'588'800) / 9) // uses 8224 clock generator
+ MCFG_DEVICE_PROGRAM_MAP(poly88_mem)
+ MCFG_DEVICE_IO_MAP(poly88_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", poly88_state, poly88_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(poly88_state,poly88_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -228,8 +228,8 @@ MACHINE_CONFIG_START(poly88_state::poly88)
/* uart */
MCFG_DEVICE_ADD("uart", I8251, XTAL(16'588'800) / 9)
- MCFG_I8251_TXD_HANDLER(WRITELINE(poly88_state,write_cas_tx))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(poly88_state,poly88_usart_rxready))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, poly88_state,write_cas_tx))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, poly88_state,poly88_usart_rxready))
/* snapshot */
MCFG_SNAPSHOT_ADD("snapshot", poly88_state, poly88, "img", 2)
@@ -237,9 +237,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(poly88_state::poly8813)
poly88(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(poly8813_mem)
- MCFG_CPU_IO_MAP(poly8813_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(poly8813_mem)
+ MCFG_DEVICE_IO_MAP(poly8813_io)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp
index 7944fa097f7..8d167a01c06 100644
--- a/src/mame/drivers/poly880.cpp
+++ b/src/mame/drivers/poly880.cpp
@@ -247,9 +247,9 @@ void poly880_state::machine_start()
MACHINE_CONFIG_START(poly880_state::poly880)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(7'372'800)/8)
- MCFG_CPU_PROGRAM_MAP(poly880_mem)
- MCFG_CPU_IO_MAP(poly880_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(7'372'800)/8)
+ MCFG_DEVICE_PROGRAM_MAP(poly880_mem)
+ MCFG_DEVICE_IO_MAP(poly880_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT( layout_poly880 )
@@ -257,15 +257,15 @@ MACHINE_CONFIG_START(poly880_state::poly880)
/* devices */
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(7'372'800)/16)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(poly880_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(poly880_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, poly880_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, poly880_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, XTAL(7'372'800)/16)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(poly880_state, pio1_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(poly880_state, pio1_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(poly880_state, pio1_pb_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, poly880_state, pio1_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, poly880_state, pio1_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, poly880_state, pio1_pb_w))
MCFG_DEVICE_ADD(Z80PIO2_TAG, Z80PIO, XTAL(7'372'800)/16)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp
index b6c397b5d01..df2ae43c171 100644
--- a/src/mame/drivers/polyplay.cpp
+++ b/src/mame/drivers/polyplay.cpp
@@ -314,25 +314,25 @@ GFXDECODE_END
/* the machine driver */
MACHINE_CONFIG_START(polyplay_state::polyplay_zre)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80CPU_TAG, Z80, POLYPLAY_MAIN_CLOCK / 4) /* UB880D */
+ MCFG_DEVICE_ADD(Z80CPU_TAG, Z80, POLYPLAY_MAIN_CLOCK / 4) /* UB880D */
MCFG_Z80_DAISY_CHAIN(daisy_chain_zre)
- MCFG_CPU_PROGRAM_MAP(polyplay_mem_zre)
- MCFG_CPU_IO_MAP(polyplay_io_zre)
- MCFG_CPU_PERIODIC_INT_DRIVER(polyplay_state, nmi_handler, 100) /* A302 - zero cross detection from AC (50Hz) */
+ MCFG_DEVICE_PROGRAM_MAP(polyplay_mem_zre)
+ MCFG_DEVICE_IO_MAP(polyplay_io_zre)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(polyplay_state, nmi_handler, 100) /* A302 - zero cross detection from AC (50Hz) */
/* devices */
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, POLYPLAY_MAIN_CLOCK / 4) /* UB857D */
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80CPU_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(polyplay_state, ctc_zc0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(polyplay_state, ctc_zc1_w))
- //MCFG_Z80CTC_ZC2_CB(WRITELINE(polyplay_state, ctc_zc2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, polyplay_state, ctc_zc0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, polyplay_state, ctc_zc1_w))
+ //MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, polyplay_state, ctc_zc2_w))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, POLYPLAY_MAIN_CLOCK / 4) /* UB855D */
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80CPU_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(polyplay_state, pio_porta_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(polyplay_state, pio_porta_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(polyplay_state, pio_portb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(polyplay_state, pio_portb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, polyplay_state, pio_porta_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, polyplay_state, pio_porta_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, polyplay_state, pio_portb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, polyplay_state, pio_portb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -348,9 +348,9 @@ MACHINE_CONFIG_START(polyplay_state::polyplay_zre)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker1", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker1", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("speaker2", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker2", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -358,10 +358,10 @@ MACHINE_CONFIG_START(polyplay_state::polyplay_zrepp)
polyplay_zre(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY(Z80CPU_TAG) /* UB880D */
+ MCFG_DEVICE_MODIFY(Z80CPU_TAG) /* UB880D */
MCFG_Z80_DAISY_CHAIN(daisy_chain_zrepp)
- MCFG_CPU_PROGRAM_MAP(polyplay_mem_zrepp)
- MCFG_CPU_IO_MAP(polyplay_io_zrepp)
+ MCFG_DEVICE_PROGRAM_MAP(polyplay_mem_zrepp)
+ MCFG_DEVICE_IO_MAP(polyplay_io_zrepp)
/* devices */
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO, POLYPLAY_MAIN_CLOCK / 4) /* UB8560D */
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index 246fc77b0dc..e189fd73b68 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(pong_state::pong)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(breakout_state::breakout)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -503,7 +503,7 @@ MACHINE_CONFIG_START(pong_state::pongd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index d3c4e33d3a4..b9bf946d7a7 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -219,9 +219,9 @@ PALETTE_INIT_MEMBER(poolshrk_state, poolshrk)
MACHINE_CONFIG_START(poolshrk_state::poolshrk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 11055000 / 8) /* ? */
- MCFG_CPU_PROGRAM_MAP(poolshrk_cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", poolshrk_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M6800, 11055000 / 8) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(poolshrk_cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", poolshrk_state, irq0_line_assert)
MCFG_WATCHDOG_ADD("watchdog")
@@ -240,7 +240,7 @@ MACHINE_CONFIG_START(poolshrk_state::poolshrk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(poolshrk)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp
index f41073c7cd5..c019f6020ce 100644
--- a/src/mame/drivers/pooyan.cpp
+++ b/src/mame/drivers/pooyan.cpp
@@ -196,17 +196,17 @@ void pooyan_state::machine_start()
MACHINE_CONFIG_START(pooyan_state::pooyan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B2
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pooyan_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pooyan_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(pooyan_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, pooyan_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pooyan_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, pooyan_state, coin_counter_2_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // PAY OUT - not used
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(pooyan_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, pooyan_state, flipscreen_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -217,7 +217,7 @@ MACHINE_CONFIG_START(pooyan_state::pooyan)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(pooyan_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(pooyan_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, pooyan_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pooyan)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -226,7 +226,7 @@ MACHINE_CONFIG_START(pooyan_state::pooyan)
/* sound hardware */
- MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
+ MCFG_DEVICE_ADD("timeplt_audio", TIMEPLT_AUDIO)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp
index daafc6ab65a..bfd7ce72e29 100644
--- a/src/mame/drivers/popeye.cpp
+++ b/src/mame/drivers/popeye.cpp
@@ -588,10 +588,10 @@ WRITE8_MEMBER(tnx1_state::popeye_portB_w)
MACHINE_CONFIG_START(tnx1_state::config)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(maincpu_program_map)
- MCFG_CPU_IO_MAP(maincpu_io_map)
- MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(tnx1_state, refresh_w))
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_program_map)
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
+ MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(*this, tnx1_state, refresh_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -601,7 +601,7 @@ MACHINE_CONFIG_START(tnx1_state::config)
MCFG_SCREEN_VISIBLE_AREA(0*16, 32*16-1, 2*16, 30*16-1)
MCFG_SCREEN_UPDATE_DRIVER(tnx1_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tnx1_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tnx1_state, screen_vblank))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", popeye)
MCFG_PALETTE_ADD("palette", 16+16*2+8*4)
@@ -610,15 +610,15 @@ MACHINE_CONFIG_START(tnx1_state::config)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(8'000'000)/4)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(8'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tnx1_state, popeye_portB_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tnx1_state, popeye_portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tpp2_state::config)
tpp1_state::config(config);
- MCFG_SOUND_MODIFY("aysnd")
+ MCFG_DEVICE_MODIFY("aysnd")
MCFG_SOUND_ROUTES_RESET()
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT) /* Does tnx1, tpp1 & popeyebl have the same filtering? */
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
@@ -628,7 +628,7 @@ MACHINE_CONFIG_START(tpp2_state::config)
/* NETLIST configuration using internal AY8910 resistor values */
- MCFG_SOUND_ADD("snd_nl", NETLIST_SOUND, 48000)
+ MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, 48000)
MCFG_NETLIST_SETUP(nl_popeye)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index d4562ded0b7..077b1116154 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -640,11 +640,11 @@ TIMER_DEVICE_CALLBACK_MEMBER(popobear_state::irq)
}
MACHINE_CONFIG_START(popobear_state::popobear)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(42'000'000)/4) // XTAL CORRECT, DIVISOR GUESSED
- MCFG_CPU_PROGRAM_MAP(popobear_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(42'000'000)/4) // XTAL CORRECT, DIVISOR GUESSED
+ MCFG_DEVICE_PROGRAM_MAP(popobear_mem)
// levels 2,3,5 look interesting
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", popobear_state, irq5_line_assert)
- //MCFG_CPU_PERIODIC_INT_DRIVER(popobear_state, irq2_line_assert, 120)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", popobear_state, irq5_line_assert)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(popobear_state, irq2_line_assert, 120)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", popobear_state, irq, "screen", 0, 1)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -663,7 +663,7 @@ MACHINE_CONFIG_START(popobear_state::popobear)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", popobear)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(42'000'000)/16) // XTAL CORRECT, DIVISOR GUESSED
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(42'000'000)/16) // XTAL CORRECT, DIVISOR GUESSED
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(42'000'000)/32, PIN7_LOW) // XTAL CORRECT, DIVISOR GUESSED
diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp
index c78c587358b..8afc8d1bc6e 100644
--- a/src/mame/drivers/popper.cpp
+++ b/src/mame/drivers/popper.cpp
@@ -534,11 +534,11 @@ void popper_state::machine_reset()
//**************************************************************************
MACHINE_CONFIG_START(popper_state::popper)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/3/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(18'432'000)/3/2)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(18'432'000)/3/2)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -556,10 +556,10 @@ MACHINE_CONFIG_START(popper_state::popper)
// audio hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/3/2/2)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/3/2/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/3/2/2)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'432'000)/3/2/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp
index 8c5f197342f..972b948c2c0 100644
--- a/src/mame/drivers/portrait.cpp
+++ b/src/mame/drivers/portrait.cpp
@@ -250,12 +250,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(portrait_state::portrait)
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(portrait_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", portrait_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(portrait_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", portrait_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", I8039, 3120000) /* ? */
- MCFG_CPU_PROGRAM_MAP(portrait_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", I8039, 3120000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(portrait_sound_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -278,7 +278,7 @@ MACHINE_CONFIG_START(portrait_state::portrait)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("tms", TMS5200, 640000)
+ MCFG_DEVICE_ADD("tms", TMS5200, 640000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp
index 3bbd775d00f..25d92dca006 100644
--- a/src/mame/drivers/potgoldu.cpp
+++ b/src/mame/drivers/potgoldu.cpp
@@ -82,8 +82,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(potgold_state::potgold)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(potgold_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(potgold_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp
index 35d6c043958..6bac22c65d3 100644
--- a/src/mame/drivers/powerbal.cpp
+++ b/src/mame/drivers/powerbal.cpp
@@ -628,9 +628,9 @@ MACHINE_RESET_MEMBER(powerbal_state,powerbal)
MACHINE_CONFIG_START(powerbal_state::powerbal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(powerbal_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", powerbal_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(powerbal_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", powerbal_state, irq2_line_hold)
MCFG_MACHINE_START_OVERRIDE(powerbal_state,powerbal)
MCFG_MACHINE_RESET_OVERRIDE(powerbal_state,powerbal)
@@ -661,9 +661,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(powerbal_state::magicstk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(magicstk_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", powerbal_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magicstk_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", powerbal_state, irq2_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_EEPROM_SERIAL_DEFAULT_VALUE(0)
@@ -698,9 +698,9 @@ MACHINE_CONFIG_START(powerbal_state::atombjt)
powerbal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(atombjt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", powerbal_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(atombjt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", powerbal_state, irq6_line_hold)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(512, 256) \
diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp
index 5622e36adf6..80f81331a50 100644
--- a/src/mame/drivers/powerins.cpp
+++ b/src/mame/drivers/powerins.cpp
@@ -304,13 +304,13 @@ MACHINE_START_MEMBER(powerins_state, powerinsa)
MACHINE_CONFIG_START(powerins_state::powerins)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12MHz */
- MCFG_CPU_PROGRAM_MAP(powerins_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", powerins_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(powerins_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", powerins_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, 6000000) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(powerins_sound_map)
- MCFG_CPU_IO_MAP(powerins_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 6000000) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(powerins_sound_map)
+ MCFG_DEVICE_IO_MAP(powerins_sound_io_map)
/* video hardware */
@@ -338,7 +338,7 @@ MACHINE_CONFIG_START(powerins_state::powerins)
MCFG_OKIM6295_ADD("oki2", 4000000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
+ MCFG_DEVICE_ADD("ym2203", YM2203, 12000000 / 8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
@@ -352,8 +352,8 @@ MACHINE_CONFIG_START(powerins_state::powerinsa)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(powerinsa_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(powerinsa_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(60)
@@ -379,9 +379,9 @@ MACHINE_CONFIG_START(powerins_state::powerinsb)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_CPU_MODIFY("soundcpu") /* 6 MHz */
- MCFG_CPU_IO_MAP(powerinsb_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(powerins_state, irq0_line_hold, 120) // YM2203 rate is at 150??
+ MCFG_DEVICE_MODIFY("soundcpu") /* 6 MHz */
+ MCFG_DEVICE_IO_MAP(powerinsb_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(powerins_state, irq0_line_hold, 120) // YM2203 rate is at 150??
MCFG_DEVICE_REMOVE("ym2203") // Sound code talks to one, but it's not fitted on the board
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/powerstack.cpp b/src/mame/drivers/powerstack.cpp
index c83d7a6b13a..d757449854d 100644
--- a/src/mame/drivers/powerstack.cpp
+++ b/src/mame/drivers/powerstack.cpp
@@ -28,8 +28,8 @@ static INPUT_PORTS_START( powerstack )
INPUT_PORTS_END
MACHINE_CONFIG_START(powerstack_state::powerstack)
-// MCFG_CPU_ADD("maincpu", PPC604, 300'000'000) // PPC604E @ 300MHz
-// MCFG_CPU_PROGRAM_MAP(mem_map)
+// MCFG_DEVICE_ADD("maincpu", PPC604, 300'000'000) // PPC604E @ 300MHz
+// MCFG_DEVICE_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
ROM_START( powerstk )
diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp
index 85a776c434e..b4fba73677f 100644
--- a/src/mame/drivers/pp01.cpp
+++ b/src/mame/drivers/pp01.cpp
@@ -202,9 +202,9 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(pp01_state::pp01)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(pp01_mem)
- MCFG_CPU_IO_MAP(pp01_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(pp01_mem)
+ MCFG_DEVICE_IO_MAP(pp01_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -220,7 +220,7 @@ MACHINE_CONFIG_START(pp01_state::pp01)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
//MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
//MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -231,19 +231,19 @@ MACHINE_CONFIG_START(pp01_state::pp01)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(0)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(pp01_state,pp01_pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, pp01_state,pp01_pit_out0))
MCFG_PIT8253_CLK1(2000000)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(pp01_state,pp01_pit_out1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, pp01_state,pp01_pit_out1))
MCFG_PIT8253_CLK2(2000000)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit8253", pit8253_device, write_clk0))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("pit8253", pit8253_device, write_clk0))
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(pp01_state, pp01_8255_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pp01_state, pp01_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(pp01_state, pp01_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pp01_state, pp01_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pp01_state, pp01_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pp01_state, pp01_8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, pp01_state, pp01_8255_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pp01_state, pp01_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, pp01_state, pp01_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pp01_state, pp01_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pp01_state, pp01_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pp01_state, pp01_8255_portc_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp
index b9e4e71d190..6a0d6a3c211 100644
--- a/src/mame/drivers/ppmast93.cpp
+++ b/src/mame/drivers/ppmast93.cpp
@@ -371,15 +371,15 @@ uint32_t ppmast93_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
MACHINE_CONFIG_START(ppmast93_state::ppmast93)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,5000000) /* 5 MHz */
- MCFG_CPU_PROGRAM_MAP(ppmast93_cpu1_map)
- MCFG_CPU_IO_MAP(ppmast93_cpu1_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ppmast93_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,5000000) /* 5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ppmast93_cpu1_map)
+ MCFG_DEVICE_IO_MAP(ppmast93_cpu1_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ppmast93_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,5000000) /* 5 MHz */
- MCFG_CPU_PROGRAM_MAP(ppmast93_cpu2_map)
- MCFG_CPU_IO_MAP(ppmast93_cpu2_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(ppmast93_state, irq0_line_hold, 8000)
+ MCFG_DEVICE_ADD("sub", Z80,5000000) /* 5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ppmast93_cpu2_map)
+ MCFG_DEVICE_IO_MAP(ppmast93_cpu2_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ppmast93_state, irq0_line_hold, 8000)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -399,10 +399,10 @@ MACHINE_CONFIG_START(ppmast93_state::ppmast93)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2413, 5000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, 5000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp
index 44bdf05a09a..20b29439782 100644
--- a/src/mame/drivers/prehisle.cpp
+++ b/src/mame/drivers/prehisle.cpp
@@ -202,13 +202,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(prehisle_state::prehisle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(18'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(prehisle_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", prehisle_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(18'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(prehisle_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", prehisle_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(prehisle_sound_map)
- MCFG_CPU_IO_MAP(prehisle_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(prehisle_sound_map)
+ MCFG_DEVICE_IO_MAP(prehisle_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -229,11 +229,11 @@ MACHINE_CONFIG_START(prehisle_state::prehisle)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp
index d8be4698dca..30a314424c8 100644
--- a/src/mame/drivers/prestige.cpp
+++ b/src/mame/drivers/prestige.cpp
@@ -740,10 +740,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(prestige_state::irq_timer)
MACHINE_CONFIG_START(prestige_state::prestige_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(8'000'000)) // Z84C008
- MCFG_CPU_PROGRAM_MAP(prestige_mem)
- MCFG_CPU_IO_MAP(prestige_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(prestige_state,prestige_int_ack)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(8'000'000)) // Z84C008
+ MCFG_DEVICE_PROGRAM_MAP(prestige_mem)
+ MCFG_DEVICE_IO_MAP(prestige_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(prestige_state,prestige_int_ack)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", prestige_state, irq_timer, attotime::from_hz(200))
@@ -772,8 +772,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(prestige_state::glcolor)
prestige_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(glcolor_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(glcolor_io)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -791,8 +791,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(prestige_state::glmcolor)
glcolor(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(prestige_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(prestige_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(prestige_state::snotec)
diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp
index 9fa8669b9cc..b68714a21db 100644
--- a/src/mame/drivers/primo.cpp
+++ b/src/mame/drivers/primo.cpp
@@ -247,9 +247,9 @@ static const struct CassetteOptions primo_cassette_options = {
MACHINE_CONFIG_START(primo_state::primoa32)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", Z80, 2500000 )
- MCFG_CPU_PROGRAM_MAP( primo32_mem)
- MCFG_CPU_IO_MAP( primoa_port)
+ MCFG_DEVICE_ADD( "maincpu", Z80, 2500000 )
+ MCFG_DEVICE_PROGRAM_MAP( primo32_mem)
+ MCFG_DEVICE_IO_MAP( primoa_port)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -259,7 +259,7 @@ MACHINE_CONFIG_START(primo_state::primoa32)
MCFG_SCREEN_VISIBLE_AREA( 0, 256-1, 0, 192-1 )
MCFG_SCREEN_UPDATE_DRIVER(primo_state, screen_update_primo)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(primo_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, primo_state, vblank_irq))
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -267,7 +267,7 @@ MACHINE_CONFIG_START(primo_state::primoa32)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* snapshot/quickload */
@@ -291,44 +291,44 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(primo_state::primoa48)
primoa32(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(primo48_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(primo48_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(primo_state::primoa64)
primoa32(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(primo64_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(primo64_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(primo_state::primob32)
primoa32(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(primob_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(primob_port)
MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(primo_state::primob48)
primoa48(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(primob_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(primob_port)
MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(primo_state::primob64)
primoa64(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(primob_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(primob_port)
MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(primo_state::primoc64)
primoa64(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(primob_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(primob_port)
MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index 054b36102ef..c66af84a830 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -175,9 +175,9 @@ void pro80_state::machine_reset()
MACHINE_CONFIG_START(pro80_state::pro80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(pro80_mem)
- MCFG_CPU_IO_MAP(pro80_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(pro80_mem)
+ MCFG_DEVICE_IO_MAP(pro80_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_pro80)
diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp
index a67a5e03529..10f1e3b5441 100644
--- a/src/mame/drivers/proconn.cpp
+++ b/src/mame/drivers/proconn.cpp
@@ -265,56 +265,56 @@ void proconn_state::machine_reset()
}
MACHINE_CONFIG_START(proconn_state::proconn)
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* ?? Mhz */
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(proconn_map)
- MCFG_CPU_IO_MAP(proconn_portmap)
+ MCFG_DEVICE_PROGRAM_MAP(proconn_map)
+ MCFG_DEVICE_IO_MAP(proconn_portmap)
MCFG_S16LF01_ADD("vfd",0)
MCFG_DEVICE_ADD("z80pio_1", Z80PIO, 4000000) /* ?? Mhz */
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(proconn_state,pio_1_m_out_int_w))
- MCFG_Z80PIO_IN_PA_CB(READ8(proconn_state, pio_1_m_in_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(proconn_state, pio_1_m_out_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(proconn_state, pio_1_m_out_ardy_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(proconn_state, pio_1_m_in_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(proconn_state, pio_1_m_out_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(proconn_state, pio_1_m_out_brdy_w))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, proconn_state,pio_1_m_out_int_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, proconn_state, pio_1_m_in_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, proconn_state, pio_1_m_out_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, proconn_state, pio_1_m_out_ardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, proconn_state, pio_1_m_in_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, proconn_state, pio_1_m_out_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, proconn_state, pio_1_m_out_brdy_w))
MCFG_DEVICE_ADD("z80pio_2", Z80PIO, 4000000) /* ?? Mhz */
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(proconn_state,pio_2_m_out_int_w))
- MCFG_Z80PIO_IN_PA_CB(READ8(proconn_state, pio_2_m_in_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(proconn_state, pio_2_m_out_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(proconn_state, pio_2_m_out_ardy_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(proconn_state, pio_2_m_in_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(proconn_state, pio_2_m_out_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(proconn_state, pio_2_m_out_brdy_w))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, proconn_state,pio_2_m_out_int_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, proconn_state, pio_2_m_in_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, proconn_state, pio_2_m_out_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, proconn_state, pio_2_m_out_ardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, proconn_state, pio_2_m_in_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, proconn_state, pio_2_m_out_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, proconn_state, pio_2_m_out_brdy_w))
MCFG_DEVICE_ADD("z80pio_3", Z80PIO, 4000000) /* ?? Mhz */
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(proconn_state,pio_3_m_out_int_w))
- MCFG_Z80PIO_IN_PA_CB(READ8(proconn_state, pio_3_m_in_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(proconn_state, pio_3_m_out_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(proconn_state, pio_3_m_out_ardy_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(proconn_state, pio_3_m_in_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(proconn_state, pio_3_m_out_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(proconn_state, pio_3_m_out_brdy_w))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, proconn_state,pio_3_m_out_int_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, proconn_state, pio_3_m_in_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, proconn_state, pio_3_m_out_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, proconn_state, pio_3_m_out_ardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, proconn_state, pio_3_m_in_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, proconn_state, pio_3_m_out_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, proconn_state, pio_3_m_out_brdy_w))
MCFG_DEVICE_ADD("z80pio_4", Z80PIO, 4000000) /* ?? Mhz */
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(proconn_state,pio_4_m_out_int_w))
- MCFG_Z80PIO_IN_PA_CB(READ8(proconn_state, pio_4_m_in_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(proconn_state, pio_4_m_out_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(proconn_state, pio_4_m_out_ardy_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(proconn_state, pio_4_m_in_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(proconn_state, pio_4_m_out_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(proconn_state, pio_4_m_out_brdy_w))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, proconn_state,pio_4_m_out_int_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, proconn_state, pio_4_m_in_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, proconn_state, pio_4_m_out_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, proconn_state, pio_4_m_out_ardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, proconn_state, pio_4_m_in_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, proconn_state, pio_4_m_out_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, proconn_state, pio_4_m_out_brdy_w))
MCFG_DEVICE_ADD("z80pio_5", Z80PIO, 4000000) /* ?? Mhz */
- MCFG_Z80PIO_OUT_INT_CB(WRITELINE(proconn_state,pio_5_m_out_int_w))
- MCFG_Z80PIO_IN_PA_CB(READ8(proconn_state, pio_5_m_in_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(proconn_state, pio_5_m_out_pa_w))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(proconn_state, pio_5_m_out_ardy_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(proconn_state, pio_5_m_in_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(proconn_state, pio_5_m_out_pb_w))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(proconn_state, pio_5_m_out_brdy_w))
+ MCFG_Z80PIO_OUT_INT_CB(WRITELINE(*this, proconn_state,pio_5_m_out_int_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, proconn_state, pio_5_m_in_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, proconn_state, pio_5_m_out_pa_w))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, proconn_state, pio_5_m_out_ardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, proconn_state, pio_5_m_in_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, proconn_state, pio_5_m_out_pb_w))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, proconn_state, pio_5_m_out_brdy_w))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, 4000000)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -326,8 +326,8 @@ MACHINE_CONFIG_START(proconn_state::proconn)
MCFG_DEFAULT_LAYOUT(layout_proconn)
- MCFG_SOUND_ADD("aysnd", AY8910, 1000000) /* ?? Mhz */ // YM2149F on PC92?
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(proconn_state, meter_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1000000) /* ?? Mhz */ // YM2149F on PC92?
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, proconn_state, meter_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
MCFG_DEVICE_ADD("meters", METERS, 0)
diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp
index 12246aace05..53bd8645212 100644
--- a/src/mame/drivers/prodigy.cpp
+++ b/src/mame/drivers/prodigy.cpp
@@ -641,20 +641,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(prodigy_state::prodigy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
MCFG_DEFAULT_LAYOUT(layout_prodigy)
MCFG_DEVICE_ADD("io_74145", TTL74145, 0)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(2'000'000))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(prodigy_state, irq_handler));
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(prodigy_state, via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(prodigy_state, via_pb_w))
- MCFG_VIA6522_READPA_HANDLER(READ8(prodigy_state, via_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(prodigy_state, via_pb_r))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(prodigy_state, via_cb1_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(prodigy_state, via_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, prodigy_state, irq_handler));
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, prodigy_state, via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, prodigy_state, via_pb_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, prodigy_state, via_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, prodigy_state, via_pb_r))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, prodigy_state, via_cb1_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, prodigy_state, via_cb2_w))
MCFG_DEVICE_ADD(NETLIST_TAG, NETLIST_CPU, XTAL(2'000'000) * 30)
MCFG_NETLIST_SETUP(prodigy)
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index fa8cbe39964..cc7c92329ba 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -239,9 +239,9 @@ void prof180x_state::machine_reset()
MACHINE_CONFIG_START(prof180x_state::prof180x)
/* basic machine hardware */
- MCFG_CPU_ADD(HD64180_TAG, Z80, XTAL(9'216'000))
- MCFG_CPU_PROGRAM_MAP(prof180x_mem)
- MCFG_CPU_IO_MAP(prof180x_io)
+ MCFG_DEVICE_ADD(HD64180_TAG, Z80, XTAL(9'216'000))
+ MCFG_DEVICE_PROGRAM_MAP(prof180x_mem)
+ MCFG_DEVICE_IO_MAP(prof180x_io)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp
index 105e267ecf0..0cc9dbeab91 100644
--- a/src/mame/drivers/prof80.cpp
+++ b/src/mame/drivers/prof80.cpp
@@ -449,9 +449,9 @@ void prof80_state::machine_start()
MACHINE_CONFIG_START(prof80_state::prof80)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(prof80_mem)
- MCFG_CPU_IO_MAP(prof80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(prof80_mem)
+ MCFG_DEVICE_IO_MAP(prof80_io)
// MMU
MCFG_PROF80_MMU_ADD(MMU_TAG, prof80_mmu)
@@ -468,24 +468,24 @@ MACHINE_CONFIG_START(prof80_state::prof80)
// DEMUX latches
MCFG_DEVICE_ADD(FLR_A_TAG, LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE(UPD1990A_TAG, upd1990a_device, data_in_w)) // TDI
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(UPD1990A_TAG, upd1990a_device, c0_w)) // C0
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE(UPD1990A_TAG, upd1990a_device, c1_w)) // C1
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE(UPD1990A_TAG, upd1990a_device, c2_w)) // C2
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(prof80_state, ready_w)) // READY
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE(UPD1990A_TAG, upd1990a_device, clk_w)) // TCK
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(prof80_state, inuse_w)) // IN USE
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(prof80_state, motor_w)) // _MOTOR
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(prof80_state, select_w)) // SELECT
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(UPD1990A_TAG, upd1990a_device, data_in_w)) // TDI
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(UPD1990A_TAG, upd1990a_device, c0_w)) // C0
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(UPD1990A_TAG, upd1990a_device, c1_w)) // C1
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(UPD1990A_TAG, upd1990a_device, c2_w)) // C2
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, prof80_state, ready_w)) // READY
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(UPD1990A_TAG, upd1990a_device, clk_w)) // TCK
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, prof80_state, inuse_w)) // IN USE
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, prof80_state, motor_w)) // _MOTOR
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, prof80_state, select_w)) // SELECT
MCFG_DEVICE_ADD(FLR_B_TAG, LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(prof80_state, resf_w)) // RESF
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(prof80_state, mini_w)) // MINI
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) // _RTS
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) // TX
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(prof80_state, mstop_w)) // _MSTOP
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) // TXP
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE(UPD1990A_TAG, upd1990a_device, stb_w)) // TSTB
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE(MMU_TAG, prof80_mmu_device, mme_w)) // MME
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, prof80_state, resf_w)) // RESF
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, prof80_state, mini_w)) // MINI
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) // _RTS
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) // TX
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, prof80_state, mstop_w)) // _MSTOP
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd)) // TXP
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(UPD1990A_TAG, upd1990a_device, stb_w)) // TSTB
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(MMU_TAG, prof80_mmu_device, mme_w)) // MME
// ECB bus
MCFG_ECBBUS_ADD()
@@ -496,8 +496,8 @@ MACHINE_CONFIG_START(prof80_state::prof80)
MCFG_ECBBUS_SLOT_ADD(5, "ecb_5", ecbbus_cards, nullptr)
// V24
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp
index 626d87251ac..4180c09256a 100644
--- a/src/mame/drivers/progolf.cpp
+++ b/src/mame/drivers/progolf.cpp
@@ -417,11 +417,11 @@ PALETTE_INIT_MEMBER(progolf_state, progolf)
MACHINE_CONFIG_START(progolf_state::progolf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO_222, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
- MCFG_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_DEVICE_ADD("maincpu", DECO_222, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu)
- MCFG_CPU_ADD("audiocpu", M6502, 500000)
- MCFG_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 500000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -449,18 +449,18 @@ MACHINE_CONFIG_START(progolf_state::progolf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 12000000/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 12000000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MCFG_SOUND_ADD("ay2", AY8910, 12000000/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, 12000000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(progolf_state::progolfa)
progolf(config);
MCFG_DEVICE_REMOVE("maincpu") /* different encrypted cpu to progolf */
- MCFG_CPU_ADD("maincpu", DECO_CPU6, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
- MCFG_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_DEVICE_ADD("maincpu", DECO_CPU6, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp
index 36e0f8aec00..185847e7f57 100644
--- a/src/mame/drivers/prophet600.cpp
+++ b/src/mame/drivers/prophet600.cpp
@@ -270,9 +270,9 @@ void prophet600_state::machine_start()
// master crystal is 8 MHz, all clocks derived from there
MACHINE_CONFIG_START(prophet600_state::prophet600)
- MCFG_CPU_ADD(MAINCPU_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD(MAINCPU_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEFAULT_LAYOUT( layout_prophet600 )
@@ -280,20 +280,20 @@ MACHINE_CONFIG_START(prophet600_state::prophet600)
MCFG_PIT8253_CLK0(XTAL(8'000'000)/4)
MCFG_PIT8253_CLK1(XTAL(8'000'000)/4)
MCFG_PIT8253_CLK2(XTAL(8'000'000)/4)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(prophet600_state, pit_ch0_tick_w))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(prophet600_state, pit_ch2_tick_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, prophet600_state, pit_ch0_tick_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, prophet600_state, pit_ch2_tick_w))
MCFG_DEVICE_ADD(UART_TAG, ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("mdout", midi_port_device, write_txd))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(prophet600_state, acia_irq_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("mdout", midi_port_device, write_txd))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, prophet600_state, acia_irq_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE(UART_TAG, acia6850_device, write_rxd))
+ MCFG_MIDI_RX_HANDLER(WRITELINE(UART_TAG, acia6850_device, write_rxd))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_ADD("acia_clock", CLOCK, XTAL(8'000'000)/16) // 500kHz = 16 times the MIDI rate
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(prophet600_state, acia_clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, prophet600_state, acia_clock_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/proteus.cpp b/src/mame/drivers/proteus.cpp
index 04087a4f641..6cc9def3adc 100644
--- a/src/mame/drivers/proteus.cpp
+++ b/src/mame/drivers/proteus.cpp
@@ -321,12 +321,12 @@ static void proteus_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(proteus_state::proteus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(proteus_6809_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(proteus_6809_mem)
- MCFG_CPU_ADD("z80", Z80, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(proteus_z80_mem)
- MCFG_CPU_IO_MAP(proteus_z80_io)
+ MCFG_DEVICE_ADD("z80", Z80, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(proteus_z80_mem)
+ MCFG_DEVICE_IO_MAP(proteus_z80_io)
MCFG_INPUT_MERGER_ANY_HIGH("irqs")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -334,7 +334,7 @@ MACHINE_CONFIG_START(proteus_state::proteus)
/* fdc */
MCFG_FD1771_ADD("fdc", 4_MHz_XTAL / 2)
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(proteus_state, motor_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, proteus_state, motor_w))
MCFG_WD_FDC_FORCE_READY
MCFG_FLOPPY_DRIVE_ADD("fdc:0", proteus_floppies, "8dssd", proteus_state::floppy_formats)
@@ -348,68 +348,68 @@ MACHINE_CONFIG_START(proteus_state::proteus)
/* network */
MCFG_DEVICE_ADD("mc6854", MC6854, 0)
- MCFG_MC6854_OUT_IRQ_CB(DEVWRITELINE("irqs", input_merger_device, in_w<0>))
+ MCFG_MC6854_OUT_IRQ_CB(WRITELINE("irqs", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("ptm", PTM6840, 4_MHz_XTAL / 2)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O2_CB(WRITELINE(proteus_state, ptm_o2_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(proteus_state, ptm_o3_callback))
- MCFG_PTM6840_IRQ_CB(DEVWRITELINE("irqs", input_merger_device, in_w<1>))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, proteus_state, ptm_o2_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, proteus_state, ptm_o3_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE("irqs", input_merger_device, in_w<1>))
/* parallel port */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- //MCFG_PIA_READPB_HANDLER(READ8(proteus_state, pia_pb_r))
- //MCFG_PIA_WRITEPA_HANDLER(WRITE8(proteus_state, pia_pa_w))
- //MCFG_PIA_WRITEPB_HANDLER(WRITE8(proteus_state, pia_pb_w))
- //MCFG_PIA_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<2>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<3>))
+ //MCFG_PIA_READPB_HANDLER(READ8(*this, proteus_state, pia_pb_r))
+ //MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, proteus_state, pia_pa_w))
+ //MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, proteus_state, pia_pb_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("irqs", input_merger_device, in_w<2>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("irqs", input_merger_device, in_w<3>))
MCFG_CENTRONICS_ADD("parallel", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE("pia", pia6821_device, ca1_w))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("pia", pia6821_device, ca1_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "parallel")
/* terminal port */
MCFG_DEVICE_ADD("acia0", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("terminal", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("terminal", rs232_port_device, write_rts))
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<4>))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("terminal", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("terminal", rs232_port_device, write_rts))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<4>))
- MCFG_RS232_PORT_ADD("terminal", default_rs232_devices, "terminal") // TODO: ADM-31 terminal required
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("terminal", RS232_PORT, default_rs232_devices, "terminal") // TODO: ADM-31 terminal required
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia0", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia0", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia0_clock", CLOCK, 4_MHz_XTAL / 2 / 13) // TODO: this is set using jumpers
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia0", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia0", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia0", acia6850_device, write_rxc))
/* printer port */
MCFG_DEVICE_ADD("acia1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("printer", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("printer", rs232_port_device, write_rts))
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<5>))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("printer", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("printer", rs232_port_device, write_rts))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<5>))
- MCFG_RS232_PORT_ADD("printer", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia1", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia1", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia1_clock", CLOCK, 4_MHz_XTAL / 2 / 13) // TODO: this is set using jumpers J2
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_rxc))
/* modem port */
MCFG_DEVICE_ADD("acia2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("modem", rs232_port_device, write_rts))
- MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("irqs", input_merger_device, in_w<6>))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("modem", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("modem", rs232_port_device, write_rts))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE("irqs", input_merger_device, in_w<6>))
- MCFG_RS232_PORT_ADD("modem", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("modem", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia2", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia2", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia2_clock", CLOCK, 4_MHz_XTAL / 2 / 13) // TODO: this is set using jumpers J1
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia2", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia2", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia2", acia6850_device, write_rxc))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("flop_list", "poly_flop")
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index b07967d70ce..c6aab9129e3 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -379,8 +379,8 @@ void proteus3_state::machine_reset()
MACHINE_CONFIG_START(proteus3_state::proteus3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(3'579'545)) /* Divided by 4 internally */
- MCFG_CPU_PROGRAM_MAP(proteus3_mem)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(3'579'545)) /* Divided by 4 internally */
+ MCFG_DEVICE_PROGRAM_MAP(proteus3_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -395,15 +395,15 @@ MACHINE_CONFIG_START(proteus3_state::proteus3)
/* Devices */
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(proteus3_state, video_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(proteus3_state, ca2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, proteus3_state, video_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, proteus3_state, ca2_w))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(proteus3_state, kbd_put))
/* cassette */
MCFG_DEVICE_ADD ("acia1", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(proteus3_state, acia1_txdata_w))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, proteus3_state, acia1_txdata_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -414,29 +414,29 @@ MACHINE_CONFIG_START(proteus3_state::proteus3)
// optional tty keyboard
MCFG_DEVICE_ADD ("acia2", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia2", acia6850_device, write_cts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia2", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia2", acia6850_device, write_cts))
/* Bit Rate Generator */
MCFG_MC14411_ADD ("brg", XTAL(1'843'200)) // crystal needs verification but is the likely one
- MCFG_MC14411_F1_CB(WRITELINE (proteus3_state, write_f1_clock))
- MCFG_MC14411_F2_CB(WRITELINE (proteus3_state, write_f2_clock))
- MCFG_MC14411_F3_CB(WRITELINE (proteus3_state, write_f3_clock))
- MCFG_MC14411_F4_CB(WRITELINE (proteus3_state, write_f4_clock))
- MCFG_MC14411_F5_CB(WRITELINE (proteus3_state, write_f5_clock))
- MCFG_MC14411_F6_CB(WRITELINE (proteus3_state, write_f6_clock))
- MCFG_MC14411_F7_CB(WRITELINE (proteus3_state, write_f7_clock))
- MCFG_MC14411_F8_CB(WRITELINE (proteus3_state, write_f8_clock))
- MCFG_MC14411_F9_CB(WRITELINE (proteus3_state, write_f9_clock))
- MCFG_MC14411_F10_CB(WRITELINE (proteus3_state, write_f10_clock))
- MCFG_MC14411_F11_CB(WRITELINE (proteus3_state, write_f11_clock))
- MCFG_MC14411_F12_CB(WRITELINE (proteus3_state, write_f12_clock))
- MCFG_MC14411_F13_CB(WRITELINE (proteus3_state, write_f13_clock))
- MCFG_MC14411_F14_CB(WRITELINE (proteus3_state, write_f14_clock))
- MCFG_MC14411_F15_CB(WRITELINE (proteus3_state, write_f15_clock))
+ MCFG_MC14411_F1_CB(WRITELINE (*this, proteus3_state, write_f1_clock))
+ MCFG_MC14411_F2_CB(WRITELINE (*this, proteus3_state, write_f2_clock))
+ MCFG_MC14411_F3_CB(WRITELINE (*this, proteus3_state, write_f3_clock))
+ MCFG_MC14411_F4_CB(WRITELINE (*this, proteus3_state, write_f4_clock))
+ MCFG_MC14411_F5_CB(WRITELINE (*this, proteus3_state, write_f5_clock))
+ MCFG_MC14411_F6_CB(WRITELINE (*this, proteus3_state, write_f6_clock))
+ MCFG_MC14411_F7_CB(WRITELINE (*this, proteus3_state, write_f7_clock))
+ MCFG_MC14411_F8_CB(WRITELINE (*this, proteus3_state, write_f8_clock))
+ MCFG_MC14411_F9_CB(WRITELINE (*this, proteus3_state, write_f9_clock))
+ MCFG_MC14411_F10_CB(WRITELINE (*this, proteus3_state, write_f10_clock))
+ MCFG_MC14411_F11_CB(WRITELINE (*this, proteus3_state, write_f11_clock))
+ MCFG_MC14411_F12_CB(WRITELINE (*this, proteus3_state, write_f12_clock))
+ MCFG_MC14411_F13_CB(WRITELINE (*this, proteus3_state, write_f13_clock))
+ MCFG_MC14411_F14_CB(WRITELINE (*this, proteus3_state, write_f14_clock))
+ MCFG_MC14411_F15_CB(WRITELINE (*this, proteus3_state, write_f15_clock))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ps2.cpp b/src/mame/drivers/ps2.cpp
index 79a7713b627..9787cc414eb 100644
--- a/src/mame/drivers/ps2.cpp
+++ b/src/mame/drivers/ps2.cpp
@@ -87,20 +87,21 @@ void ps2_state::machine_start()
MACHINE_CONFIG_START(ps2_state::ps2m30286)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, 10000000)
- MCFG_CPU_PROGRAM_MAP(ps2_16_map)
- MCFG_CPU_IO_MAP(ps2_16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
- MCFG_80286_SHUTDOWN(DEVWRITELINE("mb", at_mb_device, shutdown))
+ MCFG_DEVICE_ADD("maincpu", I80286, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(ps2_16_map)
+ MCFG_DEVICE_IO_MAP(ps2_16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_80286_SHUTDOWN(WRITELINE("mb", at_mb_device, shutdown))
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
at_softlists(config);
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "vga", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, "fdc", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa3", pc_isa16_cards, "ide", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa4", pc_isa16_cards, "comat", false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "vga", true)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdc", false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ide", false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_IBM_PC_AT_84)
/* internal ram */
@@ -110,26 +111,26 @@ MACHINE_CONFIG_START(ps2_state::ps2m30286)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ps2_state::ps2386)
- MCFG_CPU_ADD("maincpu", I386, 12000000)
- MCFG_CPU_PROGRAM_MAP(ps2_32_map)
- MCFG_CPU_IO_MAP(ps2_32_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I386, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(ps2_32_map)
+ MCFG_DEVICE_IO_MAP(ps2_32_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("mb", AT_MB, 0)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
at_softlists(config);
// on board devices
- MCFG_ISA16_SLOT_ADD("mb:isabus","board1", pc_isa16_cards, "fdcsmc", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board2", pc_isa16_cards, "comat", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board3", pc_isa16_cards, "ide", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus","board4", pc_isa16_cards, "lpt", true)
+ MCFG_DEVICE_ADD("board1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "fdcsmc", true) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("board2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "comat", true)
+ MCFG_DEVICE_ADD("board3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "ide", true)
+ MCFG_DEVICE_ADD("board4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "lpt", true)
// ISA cards
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa1", pc_isa16_cards, "svga_et4k", false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa2", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa3", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa4", pc_isa16_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD("mb:isabus","isa5", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "svga_et4k", false)
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, nullptr, false)
MCFG_PC_KBDC_SLOT_ADD("mb:pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL)
/* internal ram */
diff --git a/src/mame/drivers/ps2sony.cpp b/src/mame/drivers/ps2sony.cpp
index 4691fd7549c..41135c04bfb 100644
--- a/src/mame/drivers/ps2sony.cpp
+++ b/src/mame/drivers/ps2sony.cpp
@@ -198,10 +198,10 @@ static INPUT_PORTS_START( ps2sony )
INPUT_PORTS_END
MACHINE_CONFIG_START(ps2sony_state::ps2sony)
- MCFG_CPU_ADD("maincpu", R5000LE, 294'912'000) // actually R5900
+ MCFG_DEVICE_ADD("maincpu", R5000LE, 294'912'000) // actually R5900
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp
index 9914a999ab0..b5fa534d13d 100644
--- a/src/mame/drivers/psikyo.cpp
+++ b/src/mame/drivers/psikyo.cpp
@@ -1026,13 +1026,13 @@ void psikyo_state::machine_reset()
MACHINE_CONFIG_START(psikyo_state::sngkace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sngkace_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sngkace_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sngkace_sound_map)
- MCFG_CPU_IO_MAP(sngkace_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sngkace_sound_map)
+ MCFG_DEVICE_IO_MAP(sngkace_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1041,7 +1041,7 @@ MACHINE_CONFIG_START(psikyo_state::sngkace)
MCFG_SCREEN_SIZE(320, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
MCFG_SCREEN_UPDATE_DRIVER(psikyo_state, screen_update_psikyo)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(psikyo_state, screen_vblank_psikyo))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo)
@@ -1053,7 +1053,7 @@ MACHINE_CONFIG_START(psikyo_state::sngkace)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(32'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(32'000'000)/4) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1072,13 +1072,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psikyo_state::gunbird)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
- MCFG_CPU_PROGRAM_MAP(gunbird_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(gunbird_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
- MCFG_CPU_PROGRAM_MAP(gunbird_sound_map)
- MCFG_CPU_IO_MAP(gunbird_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
+ MCFG_DEVICE_PROGRAM_MAP(gunbird_sound_map)
+ MCFG_DEVICE_IO_MAP(gunbird_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1087,7 +1087,7 @@ MACHINE_CONFIG_START(psikyo_state::gunbird)
MCFG_SCREEN_SIZE(320, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
MCFG_SCREEN_UPDATE_DRIVER(psikyo_state, screen_update_psikyo)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(psikyo_state, screen_vblank_psikyo))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo)
@@ -1099,7 +1099,7 @@ MACHINE_CONFIG_START(psikyo_state::gunbird)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1110,16 +1110,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psikyo_state::s1945jn)
gunbird(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(s1945jn_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(s1945jn_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psikyo_state::s1945bl) /* Bootleg hardware based on the unprotected Japanese Strikers 1945 set */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
- MCFG_CPU_PROGRAM_MAP(psikyo_bootleg_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(psikyo_bootleg_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1128,7 +1128,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945bl) /* Bootleg hardware based on the unp
MCFG_SCREEN_SIZE(320, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
MCFG_SCREEN_UPDATE_DRIVER(psikyo_state, screen_update_psikyo_bootleg)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(psikyo_state, screen_vblank_psikyo))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo)
@@ -1155,15 +1155,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psikyo_state::s1945)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
- MCFG_CPU_PROGRAM_MAP(s1945_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(s1945_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", psikyo_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
- MCFG_CPU_PROGRAM_MAP(gunbird_sound_map)
- MCFG_CPU_IO_MAP(s1945_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* ! LZ8420M (Z80 core) ! */
+ MCFG_DEVICE_PROGRAM_MAP(gunbird_sound_map)
+ MCFG_DEVICE_IO_MAP(s1945_sound_io_map)
- MCFG_CPU_ADD("mcu", PIC16C57, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_ADD("mcu", PIC16C57, 4000000) /* 4 MHz? */
MCFG_DEVICE_DISABLE() /* Internal ROM aren't dumped */
/* video hardware */
@@ -1173,7 +1173,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945)
MCFG_SCREEN_SIZE(320, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 0, 256-32-1)
MCFG_SCREEN_UPDATE_DRIVER(psikyo_state, screen_update_psikyo)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(psikyo_state, screen_vblank_psikyo))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, psikyo_state, screen_vblank_psikyo))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyo)
@@ -1185,7 +1185,7 @@ MACHINE_CONFIG_START(psikyo_state::s1945)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
+ MCFG_DEVICE_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index 297dc940658..d78d0a62fcc 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -654,9 +654,9 @@ void psikyo4_state::machine_reset()
MACHINE_CONFIG_START(psikyo4_state::ps4big)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(ps4_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", psikyo4_state, psikyosh_interrupt)
+ MCFG_DEVICE_ADD("maincpu", SH2, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(ps4_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", psikyo4_state, psikyosh_interrupt)
MCFG_EEPROM_SERIAL_93C56_8BIT_ADD("eeprom")
@@ -690,7 +690,7 @@ MACHINE_CONFIG_START(psikyo4_state::ps4big)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD("ymf", YMF278B, MASTER_CLOCK/2)
MCFG_DEVICE_ADDRESS_MAP(0, ps4_ymf_map)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 12))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp
index b30d7184e8d..13a63c83197 100644
--- a/src/mame/drivers/psikyosh.cpp
+++ b/src/mame/drivers/psikyosh.cpp
@@ -780,9 +780,9 @@ void psikyosh_state::machine_start()
MACHINE_CONFIG_START(psikyosh_state::psikyo3v1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(ps3v1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", psikyosh_state, psikyosh_interrupt)
+ MCFG_DEVICE_ADD("maincpu", SH2, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(ps3v1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", psikyosh_state, psikyosh_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
@@ -797,7 +797,7 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo3v1)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0, 40*8-1, 0, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(psikyosh_state, screen_update_psikyosh)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram32_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram32_device, vblank_copy_rising))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", psikyosh)
MCFG_PALETTE_ADD("palette", 0x5000/4)
@@ -807,7 +807,7 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo3v1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
+ MCFG_DEVICE_ADD("ymf", YMF278B, MASTER_CLOCK/2)
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 12))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -817,8 +817,8 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo5)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ps5_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ps5_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psikyosh_state::psikyo5_240)
@@ -826,8 +826,8 @@ MACHINE_CONFIG_START(psikyosh_state::psikyo5_240)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ps5_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ps5_map)
/* Measured Hsync 16.165 KHz, Vsync 61.68 Hz */
/* Ideally this would be driven off the video register. However, it doesn't changeat runtime and MAME will pick a better screen resolution if it knows upfront */
diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp
index 5e18c8d3a56..75d6a7ca916 100644
--- a/src/mame/drivers/psion.cpp
+++ b/src/mame/drivers/psion.cpp
@@ -572,7 +572,7 @@ GFXDECODE_END
/* basic configuration for 2 lines display */
MACHINE_CONFIG_START(psion_state::psion_2lines)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD63701, 980000) // should be HD6303 at 0.98MHz
+ MCFG_DEVICE_ADD("maincpu", HD63701, 980000) // should be HD6303 at 0.98MHz
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -593,7 +593,7 @@ MACHINE_CONFIG_START(psion_state::psion_2lines)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram1", psion_state, nvram_init) // sys_regs
@@ -624,8 +624,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psion1_state::psion1)
psion_2lines(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psion1_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psion1_mem)
MCFG_DEVICE_MODIFY("nmi_timer")
MCFG_TIMER_START_DELAY(attotime::from_seconds(1))
@@ -646,29 +646,29 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psion_state::psioncm)
psion_2lines(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psioncm_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psioncm_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psion_state::psionla)
psion_2lines(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psionla_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psionla_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psion_state::psionlam)
psion_2lines(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psionlam_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psionlam_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psion_state::psionp350)
psion_2lines(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psionp350_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psionp350_mem)
MCFG_NVRAM_ADD_0FILL("nvram3") // paged RAM
MACHINE_CONFIG_END
@@ -676,8 +676,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psion_state::psionlz)
psion_4lines(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psionlz_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psionlz_mem)
MCFG_NVRAM_ADD_0FILL("nvram3") // paged RAM
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp
index 60ee4cc376b..9335135e761 100644
--- a/src/mame/drivers/psx.cpp
+++ b/src/mame/drivers/psx.cpp
@@ -515,22 +515,22 @@ void psx1_state::subcpu_map(address_map &map)
MACHINE_CONFIG_START(psx1_state::psj)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( psx_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( psx_map )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("2M")
MCFG_DEVICE_ADD("controllers", PSXCONTROLLERPORTS, 0)
- MCFG_PSX_CONTROLLER_PORTS_RXD_HANDLER(DEVWRITELINE("maincpu:sio0", psxsio0_device, write_rxd))
- MCFG_PSX_CONTROLLER_PORTS_DSR_HANDLER(DEVWRITELINE("maincpu:sio0", psxsio0_device, write_dsr))
+ MCFG_PSX_CONTROLLER_PORTS_RXD_HANDLER(WRITELINE("maincpu:sio0", psxsio0_device, write_rxd))
+ MCFG_PSX_CONTROLLER_PORTS_DSR_HANDLER(WRITELINE("maincpu:sio0", psxsio0_device, write_dsr))
MCFG_PSX_CTRL_PORT_ADD("port1", psx_controllers, "digital_pad")
MCFG_PSX_CTRL_PORT_ADD("port2", psx_controllers, "digital_pad")
MCFG_DEVICE_MODIFY("maincpu:sio0")
- MCFG_PSX_SIO_DTR_HANDLER(DEVWRITELINE("controllers", psxcontrollerports_device, write_dtr))
- MCFG_PSX_SIO_SCK_HANDLER(DEVWRITELINE("controllers", psxcontrollerports_device, write_sck))
- MCFG_PSX_SIO_TXD_HANDLER(DEVWRITELINE("controllers", psxcontrollerports_device, write_txd))
+ MCFG_PSX_SIO_DTR_HANDLER(WRITELINE("controllers", psxcontrollerports_device, write_dtr))
+ MCFG_PSX_SIO_SCK_HANDLER(WRITELINE("controllers", psxcontrollerports_device, write_sck))
+ MCFG_PSX_SIO_TXD_HANDLER(WRITELINE("controllers", psxcontrollerports_device, write_txd))
/* video hardware */
MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x100000, XTAL(53'693'175) )
@@ -548,39 +548,39 @@ MACHINE_CONFIG_START(psx1_state::psj)
MCFG_PSX_PARALLEL_SLOT_ADD("parallel", psx_parallel_devices, nullptr)
MCFG_DEVICE_MODIFY( "maincpu" )
- MCFG_PSX_CD_READ_HANDLER( DEVREAD8( PSXCD_TAG, psxcd_device, read ) )
- MCFG_PSX_CD_WRITE_HANDLER( DEVWRITE8( PSXCD_TAG, psxcd_device, write ) )
+ MCFG_PSX_CD_READ_HANDLER( READ8( PSXCD_TAG, psxcd_device, read ) )
+ MCFG_PSX_CD_WRITE_HANDLER( WRITE8( PSXCD_TAG, psxcd_device, write ) )
MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
- MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
+ MCFG_PSXCD_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin2))
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, this ) )
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, this ) )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psx1_state::psu)
psj(config);
- MCFG_CPU_ADD( "subcpu", HD63705, 4166667 ) // MC68HC05G6
- MCFG_CPU_PROGRAM_MAP( subcpu_map )
+ MCFG_DEVICE_ADD( "subcpu", HD63705, 4166667 ) // MC68HC05G6
+ MCFG_DEVICE_PROGRAM_MAP( subcpu_map )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(psx1_state::pse)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530AQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( psx_map)
+ MCFG_DEVICE_ADD( "maincpu", CXD8530AQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( psx_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("2M")
MCFG_DEVICE_ADD("controllers", PSXCONTROLLERPORTS, 0)
- MCFG_PSX_CONTROLLER_PORTS_RXD_HANDLER(DEVWRITELINE("maincpu:sio0", psxsio0_device, write_rxd))
- MCFG_PSX_CONTROLLER_PORTS_DSR_HANDLER(DEVWRITELINE("maincpu:sio0", psxsio0_device, write_dsr))
+ MCFG_PSX_CONTROLLER_PORTS_RXD_HANDLER(WRITELINE("maincpu:sio0", psxsio0_device, write_rxd))
+ MCFG_PSX_CONTROLLER_PORTS_DSR_HANDLER(WRITELINE("maincpu:sio0", psxsio0_device, write_dsr))
MCFG_PSX_CTRL_PORT_ADD("port1", psx_controllers, "digital_pad")
MCFG_PSX_CTRL_PORT_ADD("port2", psx_controllers, "digital_pad")
MCFG_DEVICE_MODIFY("maincpu:sio0")
- MCFG_PSX_SIO_DTR_HANDLER(DEVWRITELINE("controllers", psxcontrollerports_device, write_dtr))
- MCFG_PSX_SIO_SCK_HANDLER(DEVWRITELINE("controllers", psxcontrollerports_device, write_sck))
- MCFG_PSX_SIO_TXD_HANDLER(DEVWRITELINE("controllers", psxcontrollerports_device, write_txd))
+ MCFG_PSX_SIO_DTR_HANDLER(WRITELINE("controllers", psxcontrollerports_device, write_dtr))
+ MCFG_PSX_SIO_SCK_HANDLER(WRITELINE("controllers", psxcontrollerports_device, write_sck))
+ MCFG_PSX_SIO_TXD_HANDLER(WRITELINE("controllers", psxcontrollerports_device, write_txd))
/* video hardware */
/* TODO: visible area and refresh rate */
@@ -599,11 +599,11 @@ MACHINE_CONFIG_START(psx1_state::pse)
MCFG_PSX_PARALLEL_SLOT_ADD("parallel", psx_parallel_devices, nullptr)
MCFG_DEVICE_MODIFY( "maincpu" )
- MCFG_PSX_CD_READ_HANDLER( DEVREAD8( PSXCD_TAG, psxcd_device, read ) )
- MCFG_PSX_CD_WRITE_HANDLER( DEVWRITE8( PSXCD_TAG, psxcd_device, write ) )
+ MCFG_PSX_CD_READ_HANDLER( READ8( PSXCD_TAG, psxcd_device, read ) )
+ MCFG_PSX_CD_WRITE_HANDLER( WRITE8( PSXCD_TAG, psxcd_device, write ) )
MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
- MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
+ MCFG_PSXCD_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin2))
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, this ) )
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, this ) )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp
index 1318b06beaa..aeaf187cd28 100644
--- a/src/mame/drivers/psychic5.cpp
+++ b/src/mame/drivers/psychic5.cpp
@@ -723,8 +723,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(psychic5_state::psychic5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(psychic5_main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(psychic5_main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", psychic5_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("vrambank", ADDRESS_MAP_BANK, 0)
@@ -734,9 +734,9 @@ MACHINE_CONFIG_START(psychic5_state::psychic5)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(14)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(psychic5_sound_map)
- MCFG_CPU_IO_MAP(psychic5_soundport_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(psychic5_sound_map)
+ MCFG_DEVICE_IO_MAP(psychic5_soundport_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* Allow time for 2nd cpu to interleave */
@@ -760,14 +760,14 @@ MACHINE_CONFIG_START(psychic5_state::psychic5)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -777,8 +777,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(psychic5_state::bombsa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2 ) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(bombsa_main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2 ) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bombsa_main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", psychic5_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("vrambank", ADDRESS_MAP_BANK, 0)
@@ -788,9 +788,9 @@ MACHINE_CONFIG_START(psychic5_state::bombsa)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(14)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) )
- MCFG_CPU_PROGRAM_MAP(bombsa_sound_map)
- MCFG_CPU_IO_MAP(bombsa_soundport_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(5'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(bombsa_sound_map)
+ MCFG_DEVICE_IO_MAP(bombsa_soundport_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -812,14 +812,14 @@ MACHINE_CONFIG_START(psychic5_state::bombsa)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000)/8)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)
MCFG_SOUND_ROUTE(3, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.30)
MCFG_SOUND_ROUTE(2, "mono", 0.30)
diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp
index a48d4426a66..511b32be23a 100644
--- a/src/mame/drivers/pt68k4.cpp
+++ b/src/mame/drivers/pt68k4.cpp
@@ -404,18 +404,18 @@ void pt68k4_isa8_cards(device_slot_interface &device)
MACHINE_CONFIG_START(pt68k4_state::pt68k2)
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(16'000'000)/2) // 68k2 came in 8, 10, and 12 MHz versions
- MCFG_CPU_PROGRAM_MAP(pt68k2_mem)
+ MCFG_DEVICE_ADD(M68K_TAG, M68000, XTAL(16'000'000)/2) // 68k2 came in 8, 10, and 12 MHz versions
+ MCFG_DEVICE_PROGRAM_MAP(pt68k2_mem)
MCFG_DEVICE_ADD("duart1", MC68681, XTAL(3'686'400))
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(pt68k4_state, duart1_irq))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(pt68k4_state, duart1_out))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, pt68k4_state, duart1_irq))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, pt68k4_state, duart1_out))
MCFG_DEVICE_ADD("duart2", MC68681, XTAL(3'686'400))
MCFG_DEVICE_ADD(KBDC_TAG, PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(pt68k4_state, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(pt68k4_state, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, pt68k4_state, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, pt68k4_state, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD(KBDC_TAG, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
@@ -427,16 +427,16 @@ MACHINE_CONFIG_START(pt68k4_state::pt68k2)
MCFG_DEVICE_ADD(ISABUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(M68K_TAG)
MCFG_ISA8_BUS_CUSTOM_SPACES()
- MCFG_ISA_OUT_IRQ5_CB(WRITELINE(pt68k4_state, irq5_w))
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa1", pt68k4_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa2", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa3", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa4", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa5", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa6", pt68k4_isa8_cards, nullptr, false)
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE(*this, pt68k4_state, irq5_w))
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, "cga", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOFTWARE_LIST_ADD("flop525_list", "pt68k2")
@@ -444,19 +444,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pt68k4_state::pt68k4)
/* basic machine hardware */
- MCFG_CPU_ADD(M68K_TAG, M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(pt68k4_mem)
+ MCFG_DEVICE_ADD(M68K_TAG, M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pt68k4_mem)
// add the DUARTS. first one has the console on channel A at 19200.
MCFG_DEVICE_ADD("duart1", MC68681, XTAL(16'000'000) / 4)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(pt68k4_state, duart1_irq))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(pt68k4_state, duart1_out))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, pt68k4_state, duart1_irq))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, pt68k4_state, duart1_out))
MCFG_DEVICE_ADD("duart2", MC68681, XTAL(16'000'000) / 4)
MCFG_DEVICE_ADD(KBDC_TAG, PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(pt68k4_state, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(pt68k4_state, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE(*this, pt68k4_state, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, pt68k4_state, keyboard_data_w))
MCFG_PC_KBDC_SLOT_ADD(KBDC_TAG, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
@@ -464,16 +464,16 @@ MACHINE_CONFIG_START(pt68k4_state::pt68k4)
MCFG_DEVICE_ADD(ISABUS_TAG, ISA8, 0)
MCFG_ISA8_CPU(M68K_TAG)
MCFG_ISA8_BUS_CUSTOM_SPACES()
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa1", pt68k4_isa8_cards, "fdc_at", false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa2", pt68k4_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa3", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa4", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa5", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa6", pt68k4_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD(ISABUS_TAG, "isa7", pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, "fdc_at", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, "cga", false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa7", ISA8_SLOT, 0, ISABUS_TAG, pt68k4_isa8_cards, nullptr, false)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOFTWARE_LIST_ADD("flop525_list", "pt68k2")
diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp
index 8641f2efbc9..3b019e62393 100644
--- a/src/mame/drivers/ptcsol.cpp
+++ b/src/mame/drivers/ptcsol.cpp
@@ -714,10 +714,10 @@ void sol20_state::kbd_put(u8 data)
MACHINE_CONFIG_START(sol20_state::sol20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(14'318'181) / 7) // divider selectable as 5, 6 or 7 through jumpers
- MCFG_CPU_PROGRAM_MAP(sol20_mem)
- MCFG_CPU_IO_MAP(sol20_io)
- MCFG_I8085A_INTE(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(14'318'181) / 7) // divider selectable as 5, 6 or 7 through jumpers
+ MCFG_DEVICE_PROGRAM_MAP(sol20_mem)
+ MCFG_DEVICE_IO_MAP(sol20_io)
+ MCFG_I8085A_INTE(WRITELINE("speaker", speaker_sound_device, level_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -733,7 +733,7 @@ MACHINE_CONFIG_START(sol20_state::sol20)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.00) // music board
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05) // cass1 speaker
@@ -752,13 +752,13 @@ MACHINE_CONFIG_START(sol20_state::sol20)
MCFG_CASSETTE_INTERFACE("sol20_cass")
MCFG_DEVICE_ADD("uart", AY51013, 0) // TMS6011NC
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_AY51013_TX_CLOCK(4800.0)
MCFG_AY51013_RX_CLOCK(4800.0)
MCFG_AY51013_AUTO_RDAV(true) // ROD (pin 4) tied to RDD (pin 18)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
MCFG_DEVICE_ADD("uart_s", AY51013, 0) // TMS6011NC
MCFG_AY51013_TX_CLOCK(4800.0)
diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp
index 8f6208ff89d..157254290af 100644
--- a/src/mame/drivers/pturn.cpp
+++ b/src/mame/drivers/pturn.cpp
@@ -513,21 +513,21 @@ void pturn_state::machine_reset()
}
MACHINE_CONFIG_START(pturn_state::pturn)
- MCFG_CPU_ADD("maincpu", Z80, 12000000/3)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pturn_state, main_intgen)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12000000/3)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pturn_state, main_intgen)
- MCFG_CPU_ADD("audiocpu", Z80, 12000000/3)
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(pturn_state, sub_intgen, 3*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/3)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(pturn_state, sub_intgen, 3*60)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(pturn_state, flip_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(pturn_state, nmi_main_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(pturn_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(pturn_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(pturn_state, bgbank_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(pturn_state, fgbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, pturn_state, flip_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, pturn_state, nmi_main_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, pturn_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, pturn_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, pturn_state, bgbank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, pturn_state, fgbank_w))
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // toggles frequently during gameplay
MCFG_SCREEN_ADD("screen", RASTER)
@@ -547,10 +547,10 @@ MACHINE_CONFIG_START(pturn_state::pturn)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp
index 9c1233627bc..ded89176062 100644
--- a/src/mame/drivers/puckpkmn.cpp
+++ b/src/mame/drivers/puckpkmn.cpp
@@ -281,8 +281,8 @@ void md_boot_state::puckpkmna_map(address_map &map)
MACHINE_CONFIG_START(md_boot_state::puckpkmn)
md_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(puckpkmn_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(puckpkmn_map)
MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_bootleg)
@@ -296,16 +296,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(md_boot_state::puckpkmna)
puckpkmn(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(puckpkmna_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(puckpkmna_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(md_boot_state::jzth)
puckpkmn(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jzth_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jzth_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp
index 15c4984aa01..7200c9c5ea0 100644
--- a/src/mame/drivers/pulsar.cpp
+++ b/src/mame/drivers/pulsar.cpp
@@ -213,38 +213,38 @@ DRIVER_INIT_MEMBER( pulsar_state, pulsar )
MACHINE_CONFIG_START(pulsar_state::pulsar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(pulsar_mem)
- MCFG_CPU_IO_MAP(pulsar_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pulsar_mem)
+ MCFG_DEVICE_IO_MAP(pulsar_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_MACHINE_RESET_OVERRIDE(pulsar_state, pulsar)
/* Devices */
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(pulsar_state, ppi_pa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(pulsar_state, ppi_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(pulsar_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(pulsar_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, pulsar_state, ppi_pa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, pulsar_state, ppi_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, pulsar_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pulsar_state, ppi_pc_w))
MCFG_MSM5832_ADD("rtc", XTAL(32'768))
MCFG_DEVICE_ADD("dart", Z80DART, XTAL(4'000'000))
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("dart", z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("dart", z80dart_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("dart", z80dart_device, ctsa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800))
// Schematic has the labels for FT and FR the wrong way around, but the pin numbers are correct.
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("dart", z80dart_device, txcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxcb_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("dart", z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxca_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("dart", z80dart_device, txcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxcb_w))
MCFG_FD1797_ADD("fdc", XTAL(4'000'000) / 2)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pulsar_floppies, "525hd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index 20da4fdba1a..a9a57d618d0 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -625,23 +625,23 @@ MACHINE_RESET_MEMBER(punchout_state, spnchout)
MACHINE_CONFIG_START(punchout_state::punchout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(punchout_map)
- MCFG_CPU_IO_MAP(punchout_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(punchout_map)
+ MCFG_DEVICE_IO_MAP(punchout_io_map)
- MCFG_CPU_ADD("audiocpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(punchout_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(punchout_sound_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 2B
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(punchout_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, punchout_state, nmi_mask_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // watchdog reset, seldom used because 08 clears the watchdog as well
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // ?
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("vlm", vlm5030_device, rst))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("vlm", vlm5030_device, st))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("vlm", vlm5030_device, vcu))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("vlm", vlm5030_device, rst))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("vlm", vlm5030_device, st))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("vlm", vlm5030_device, vcu))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // enable NVRAM?
/* video hardware */
@@ -656,7 +656,7 @@ MACHINE_CONFIG_START(punchout_state::punchout)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(punchout_state, screen_update_punchout_top)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(punchout_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, punchout_state, vblank_irq))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SCREEN_ADD("bottom", RASTER)
@@ -673,7 +673,7 @@ MACHINE_CONFIG_START(punchout_state::punchout)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("vlm", VLM5030, N2A03_NTSC_XTAL/6)
+ MCFG_DEVICE_ADD("vlm", VLM5030, N2A03_NTSC_XTAL/6)
MCFG_DEVICE_ADDRESS_MAP(0, punchout_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MACHINE_CONFIG_END
@@ -683,8 +683,8 @@ MACHINE_CONFIG_START(punchout_state::spnchout)
punchout(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spnchout_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spnchout_io_map)
MCFG_DEVICE_ADD("rtc", RP5C01, 0) // OSCIN -> Vcc
MCFG_RP5C01_REMOVE_BATTERY()
@@ -698,8 +698,8 @@ MACHINE_CONFIG_START(punchout_state::armwrest)
punchout(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(armwrest_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(armwrest_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", armwrest)
diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp
index 989c9672b54..643350a5d98 100644
--- a/src/mame/drivers/pv1000.cpp
+++ b/src/mame/drivers/pv1000.cpp
@@ -439,9 +439,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(pv1000_state::pv1000)
- MCFG_CPU_ADD( "maincpu", Z80, 17897725/5 )
- MCFG_CPU_PROGRAM_MAP( pv1000 )
- MCFG_CPU_IO_MAP( pv1000_io )
+ MCFG_DEVICE_ADD( "maincpu", Z80, 17897725/5 )
+ MCFG_DEVICE_PROGRAM_MAP( pv1000 )
+ MCFG_DEVICE_IO_MAP( pv1000_io )
/* D65010G031 - Video & sound chip */
@@ -455,7 +455,7 @@ MACHINE_CONFIG_START(pv1000_state::pv1000)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pv1000 )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD( "pv1000_sound", PV1000, 17897725 )
+ MCFG_DEVICE_ADD( "pv1000_sound", PV1000, 17897725 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
/* Cartridge slot */
diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp
index 9f93b991382..a3259303299 100644
--- a/src/mame/drivers/pv2000.cpp
+++ b/src/mame/drivers/pv2000.cpp
@@ -387,21 +387,21 @@ DEVICE_IMAGE_LOAD_MEMBER( pv2000_state, pv2000_cart )
MACHINE_CONFIG_START(pv2000_state::pv2000)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(7'159'090)/2) // 3.579545 MHz
- MCFG_CPU_PROGRAM_MAP(pv2000_map)
- MCFG_CPU_IO_MAP(pv2000_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(7'159'090)/2) // 3.579545 MHz
+ MCFG_DEVICE_PROGRAM_MAP(pv2000_map)
+ MCFG_DEVICE_IO_MAP(pv2000_io_map)
// video hardware
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(pv2000_state, pv2000_vdp_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, pv2000_state, pv2000_vdp_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" )
MCFG_SCREEN_UPDATE_DEVICE( "tms9928a", tms9928a_device, screen_update )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, XTAL(7'159'090)/2) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD("sn76489a", SN76489A, XTAL(7'159'090)/2) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp
index 91072b0e063..32d802320bc 100644
--- a/src/mame/drivers/pv9234.cpp
+++ b/src/mame/drivers/pv9234.cpp
@@ -148,8 +148,8 @@ uint32_t pv9234_state::screen_update_pv9234(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(pv9234_state::pv9234)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7, 4915000) //probably a more powerful clone.
- MCFG_CPU_PROGRAM_MAP(pv9234_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 4915000) //probably a more powerful clone.
+ MCFG_DEVICE_PROGRAM_MAP(pv9234_map)
/* video hardware */
diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp
index cec4828a444..fcee2e70b43 100644
--- a/src/mame/drivers/pve500.cpp
+++ b/src/mame/drivers/pve500.cpp
@@ -359,48 +359,48 @@ WRITE8_MEMBER(pve500_state::io_sel_w)
MACHINE_CONFIG_START(pve500_state::pve500)
/* Main CPU */
- MCFG_CPU_ADD("maincpu", TMPZ84C015, 12_MHz_XTAL / 2) /* TMPZ84C015BF-6 */
- MCFG_CPU_PROGRAM_MAP(maincpu_prg)
- MCFG_CPU_IO_MAP(maincpu_io)
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, 12_MHz_XTAL / 2) /* TMPZ84C015BF-6 */
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_prg)
+ MCFG_DEVICE_IO_MAP(maincpu_io)
MCFG_Z80_DAISY_CHAIN(maincpu_daisy_chain)
- MCFG_TMPZ84C015_OUT_DTRA_CB(WRITELINE(pve500_state, GPI_w))
- MCFG_TMPZ84C015_OUT_DTRB_CB(DEVWRITELINE("buzzer", beep_device, set_state)) MCFG_DEVCB_INVERT
- MCFG_TMPZ84C015_OUT_TXDA_CB(DEVWRITELINE("recorder", rs232_port_device, write_txd))
- MCFG_TMPZ84C015_OUT_TXDB_CB(DEVWRITELINE("player1", rs232_port_device, write_txd))
+ MCFG_TMPZ84C015_OUT_DTRA_CB(WRITELINE(*this, pve500_state, GPI_w))
+ MCFG_TMPZ84C015_OUT_DTRB_CB(WRITELINE("buzzer", beep_device, set_state)) MCFG_DEVCB_INVERT
+ MCFG_TMPZ84C015_OUT_TXDA_CB(WRITELINE("recorder", rs232_port_device, write_txd))
+ MCFG_TMPZ84C015_OUT_TXDB_CB(WRITELINE("player1", rs232_port_device, write_txd))
MCFG_DEVICE_ADD("external_ctc", Z80CTC, 12_MHz_XTAL / 2)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("external_sio", Z80SIO0, 12_MHz_XTAL / 2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("player2", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("edl_inout", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("player2", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("edl_inout", rs232_port_device, write_txd))
/* Secondary CPU */
- MCFG_CPU_ADD("subcpu", TMPZ84C015, 12_MHz_XTAL / 2) /* TMPZ84C015BF-6 */
- MCFG_CPU_PROGRAM_MAP(subcpu_prg)
- MCFG_CPU_IO_MAP(subcpu_io)
- MCFG_TMPZ84C015_OUT_DTRA_CB(WRITELINE(pve500_state, cxdio_reset_w))
- MCFG_TMPZ84C015_OUT_DTRB_CB(WRITELINE(pve500_state, external_monitor_w))
- MCFG_TMPZ84C015_OUT_TXDA_CB(DEVWRITELINE("switcher", rs232_port_device, write_txd))
- MCFG_TMPZ84C015_OUT_TXDB_CB(DEVWRITELINE("serial_mixer", rs232_port_device, write_txd))
+ MCFG_DEVICE_ADD("subcpu", TMPZ84C015, 12_MHz_XTAL / 2) /* TMPZ84C015BF-6 */
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_prg)
+ MCFG_DEVICE_IO_MAP(subcpu_io)
+ MCFG_TMPZ84C015_OUT_DTRA_CB(WRITELINE(*this, pve500_state, cxdio_reset_w))
+ MCFG_TMPZ84C015_OUT_DTRB_CB(WRITELINE(*this, pve500_state, external_monitor_w))
+ MCFG_TMPZ84C015_OUT_TXDA_CB(WRITELINE("switcher", rs232_port_device, write_txd))
+ MCFG_TMPZ84C015_OUT_TXDB_CB(WRITELINE("serial_mixer", rs232_port_device, write_txd))
// PIO callbacks
- MCFG_TMPZ84C015_IN_PA_CB(READ8(pve500_state, eeprom_r))
- MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(pve500_state, eeprom_w))
+ MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, pve500_state, eeprom_r))
+ MCFG_TMPZ84C015_OUT_PA_CB(WRITE8(*this, pve500_state, eeprom_w))
// ICG3: I/O Expander
MCFG_DEVICE_ADD("cxdio", CXD1095, 0)
- MCFG_CXD1095_OUT_PORTA_CB(WRITE8(pve500_state, io_sc_w))
- MCFG_CXD1095_OUT_PORTB_CB(WRITE8(pve500_state, io_le_w))
- MCFG_CXD1095_IN_PORTC_CB(READ8(pve500_state, io_ky_r))
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(pve500_state, io_ld_w))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(pve500_state, io_sel_w))
+ MCFG_CXD1095_OUT_PORTA_CB(WRITE8(*this, pve500_state, io_sc_w))
+ MCFG_CXD1095_OUT_PORTB_CB(WRITE8(*this, pve500_state, io_le_w))
+ MCFG_CXD1095_IN_PORTC_CB(READ8(*this, pve500_state, io_ky_r))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, pve500_state, io_ld_w))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, pve500_state, io_sel_w))
/* Search Dial MCUs */
- MCFG_CPU_ADD("dial_mcu_left", MB88201, 4_MHz_XTAL) /* PLAYER DIAL MCU */
+ MCFG_DEVICE_ADD("dial_mcu_left", MB88201, 4_MHz_XTAL) /* PLAYER DIAL MCU */
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("dial_mcu_right", MB88201, 4_MHz_XTAL) /* RECORDER DIAL MCU */
+ MCFG_DEVICE_ADD("dial_mcu_right", MB88201, 4_MHz_XTAL) /* RECORDER DIAL MCU */
MCFG_DEVICE_DISABLE()
/* Serial EEPROM (128 bytes, 8-bit data organization) */
@@ -408,45 +408,45 @@ MACHINE_CONFIG_START(pve500_state::pve500)
MCFG_EEPROM_SERIAL_MSM16911_8BIT_ADD("eeprom")
/* FIX-ME: These are actually RS422 ports (except EDL IN/OUT which is indeed an RS232 port)*/
- MCFG_RS232_PORT_ADD("recorder", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, rxa_w))
+ MCFG_DEVICE_ADD("recorder", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu", tmpz84c015_device, rxa_w))
- MCFG_RS232_PORT_ADD("player1", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, rxb_w))
+ MCFG_DEVICE_ADD("player1", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("maincpu", tmpz84c015_device, rxb_w))
- MCFG_RS232_PORT_ADD("player2", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("external_sio", z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD("player2", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("external_sio", z80dart_device, rxa_w))
- MCFG_RS232_PORT_ADD("edl_inout", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("external_sio", z80dart_device, rxb_w))
+ MCFG_DEVICE_ADD("edl_inout", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("external_sio", z80dart_device, rxb_w))
- MCFG_RS232_PORT_ADD("switcher", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("subcpu", tmpz84c015_device, rxa_w))
+ MCFG_DEVICE_ADD("switcher", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("subcpu", tmpz84c015_device, rxa_w))
- MCFG_RS232_PORT_ADD("serial_mixer", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("subcpu", tmpz84c015_device, rxb_w))
+ MCFG_DEVICE_ADD("serial_mixer", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("subcpu", tmpz84c015_device, rxb_w))
MCFG_DEVICE_ADD("clk1", CLOCK, 12_MHz_XTAL / 20)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("maincpu", tmpz84c015_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("maincpu", tmpz84c015_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("maincpu", tmpz84c015_device, txcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("subcpu", tmpz84c015_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("subcpu", tmpz84c015_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("subcpu", tmpz84c015_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("subcpu", tmpz84c015_device, txcb_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("maincpu", tmpz84c015_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("maincpu", tmpz84c015_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("maincpu", tmpz84c015_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("maincpu", tmpz84c015_device, txcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("subcpu", tmpz84c015_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("subcpu", tmpz84c015_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("subcpu", tmpz84c015_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("subcpu", tmpz84c015_device, txcb_w))
/* ICF5: 2kbytes of RAM shared between the two CPUs (dual-port RAM)*/
MCFG_DEVICE_ADD("mb8421", MB8421, 0)
- MCFG_MB8421_INTL_HANDLER(WRITELINE(pve500_state, mb8421_intl))
- MCFG_MB8421_INTR_HANDLER(WRITELINE(pve500_state, mb8421_intr))
+ MCFG_MB8421_INTL_HANDLER(WRITELINE(*this, pve500_state, mb8421_intl))
+ MCFG_MB8421_INTR_HANDLER(WRITELINE(*this, pve500_state, mb8421_intr))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_pve500)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("buzzer", BEEP, 12_MHz_XTAL / 3200) // 3.75 kHz CLK2 coming out of IC D4 (frequency divider circuitry)
+ MCFG_DEVICE_ADD("buzzer", BEEP, 12_MHz_XTAL / 3200) // 3.75 kHz CLK2 coming out of IC D4 (frequency divider circuitry)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp
index 30411412452..54e00aebd01 100644
--- a/src/mame/drivers/pwrview.cpp
+++ b/src/mame/drivers/pwrview.cpp
@@ -403,10 +403,10 @@ static void pwrview_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(pwrview_state::pwrview)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(pwrview_map)
- MCFG_CPU_OPCODES_MAP(pwrview_fetch_map)
- MCFG_CPU_IO_MAP(pwrview_io)
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pwrview_map)
+ MCFG_DEVICE_OPCODES_MAP(pwrview_fetch_map)
+ MCFG_DEVICE_IO_MAP(pwrview_io)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(64'000'000)/8, 480, 0, 384, 1040, 0, 960) // clock unknown
@@ -419,8 +419,8 @@ MACHINE_CONFIG_START(pwrview_state::pwrview)
// floppy disk controller
MCFG_UPD765A_ADD("fdc", true, true) // Rockwell R7675P
- //MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic1", pic8259_device, ir6_w))
- //MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w))
+ //MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("pic1", pic8259_device, ir6_w))
+ //MCFG_UPD765_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq1_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", pwrview_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", pwrview_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index 22665bbf853..610c2b439ec 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -1482,9 +1482,9 @@ PALETTE_INIT_MEMBER( px4p_state, px4p )
MACHINE_CONFIG_START(px4_state::px4)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(7'372'800) / 2) // uPD70008
- MCFG_CPU_PROGRAM_MAP(px4_mem)
- MCFG_CPU_IO_MAP(px4_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(7'372'800) / 2) // uPD70008
+ MCFG_DEVICE_PROGRAM_MAP(px4_mem)
+ MCFG_DEVICE_IO_MAP(px4_io)
// video hardware
MCFG_SCREEN_ADD("screen", LCD)
@@ -1501,7 +1501,7 @@ MACHINE_CONFIG_START(px4_state::px4)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("one_sec", px4_state, upd7508_1sec_callback, attotime::from_seconds(1))
@@ -1514,8 +1514,8 @@ MACHINE_CONFIG_START(px4_state::px4)
// centronics printer
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(px4_state, centronics_busy_w))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(px4_state, centronics_perror_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, px4_state, centronics_busy_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, px4_state, centronics_perror_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -1527,15 +1527,15 @@ MACHINE_CONFIG_START(px4_state::px4)
// sio port
MCFG_EPSON_SIO_ADD("sio", nullptr)
- MCFG_EPSON_SIO_RX(WRITELINE(px4_state, sio_rx_w))
- MCFG_EPSON_SIO_PIN(WRITELINE(px4_state, sio_pin_w))
+ MCFG_EPSON_SIO_RX(WRITELINE(*this, px4_state, sio_rx_w))
+ MCFG_EPSON_SIO_PIN(WRITELINE(*this, px4_state, sio_pin_w))
// rs232 port
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(px4_state, rs232_rx_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(px4_state, rs232_dcd_w))
- MCFG_RS232_DSR_HANDLER(WRITELINE(px4_state, rs232_dsr_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(px4_state, rs232_cts_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, px4_state, rs232_rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(*this, px4_state, rs232_dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(*this, px4_state, rs232_dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, px4_state, rs232_cts_w))
// rom capsules
MCFG_GENERIC_CARTSLOT_ADD("capsule1", generic_plain_slot, "px4_cart")
@@ -1548,8 +1548,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(px4p_state::px4p)
px4(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(px4p_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(px4p_io)
MCFG_NVRAM_ADD_0FILL("rdnvram")
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index 3cd20844cb0..1ca7f0ac4e7 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -749,19 +749,19 @@ void px8_state::machine_reset()
MACHINE_CONFIG_START(px8_state::px8)
/* main cpu (uPD70008) */
- MCFG_CPU_ADD(UPD70008_TAG, Z80, XTAL_CR1 / 4) /* 2.45 MHz */
- MCFG_CPU_PROGRAM_MAP(px8_mem)
- MCFG_CPU_IO_MAP(px8_io)
+ MCFG_DEVICE_ADD(UPD70008_TAG, Z80, XTAL_CR1 / 4) /* 2.45 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(px8_mem)
+ MCFG_DEVICE_IO_MAP(px8_io)
/* slave cpu (HD6303) */
- MCFG_CPU_ADD(HD6303_TAG, M6803, XTAL_CR1 / 4) /* 614 kHz */
- MCFG_CPU_PROGRAM_MAP(px8_slave_mem)
- MCFG_CPU_IO_MAP(px8_slave_io)
+ MCFG_DEVICE_ADD(HD6303_TAG, M6803, XTAL_CR1 / 4) /* 614 kHz */
+ MCFG_DEVICE_PROGRAM_MAP(px8_slave_mem)
+ MCFG_DEVICE_IO_MAP(px8_slave_io)
MCFG_DEVICE_DISABLE()
/* sub CPU (uPD7508) */
-// MCFG_CPU_ADD(UPD7508_TAG, UPD7508, 200000) /* 200 kHz */
-// MCFG_CPU_IO_MAP(px8_sub_io)
+// MCFG_DEVICE_ADD(UPD7508_TAG, UPD7508, 200000) /* 200 kHz */
+// MCFG_DEVICE_IO_MAP(px8_sub_io)
// MCFG_DEVICE_DISABLE()
/* video hardware */
diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp
index d52d3475a21..1ec9108cc90 100644
--- a/src/mame/drivers/pyl601.cpp
+++ b/src/mame/drivers/pyl601.cpp
@@ -536,9 +536,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(pyl601_state::pyl601)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6800, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(pyl601_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pyl601_state, pyl601_interrupt)
+ MCFG_DEVICE_ADD("maincpu",M6800, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pyl601_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pyl601_state, pyl601_interrupt)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -552,7 +552,7 @@ MACHINE_CONFIG_START(pyl601_state::pyl601)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -573,8 +573,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pyl601_state::pyl601a)
pyl601(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( XTAL(2'000'000))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( XTAL(2'000'000))
MCFG_GFXDECODE_MODIFY("gfxdecode", pyl601a)
diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp
index 8261f6558be..70db01ab94d 100644
--- a/src/mame/drivers/pyson.cpp
+++ b/src/mame/drivers/pyson.cpp
@@ -197,10 +197,10 @@ static INPUT_PORTS_START( pyson )
INPUT_PORTS_END
MACHINE_CONFIG_START(pyson_state::pyson)
- MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // imported from namcops2.c driver
+ MCFG_DEVICE_ADD("maincpu", R5000LE, 294000000) // imported from namcops2.c driver
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_CPU_PROGRAM_MAP(ps2_map)
+ MCFG_DEVICE_PROGRAM_MAP(ps2_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp
index 871c84b387d..d0060290344 100644
--- a/src/mame/drivers/pzletime.cpp
+++ b/src/mame/drivers/pzletime.cpp
@@ -334,9 +334,9 @@ void pzletime_state::machine_reset()
MACHINE_CONFIG_START(pzletime_state::pzletime)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,10000000)
- MCFG_CPU_PROGRAM_MAP(pzletime_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", pzletime_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,10000000)
+ MCFG_DEVICE_PROGRAM_MAP(pzletime_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", pzletime_state, irq4_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp
index 46ff7174bb7..cc3b6ece314 100644
--- a/src/mame/drivers/qdrmfgp.cpp
+++ b/src/mame/drivers/qdrmfgp.cpp
@@ -526,15 +526,15 @@ void qdrmfgp_state::machine_reset()
MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.000 MHz */
- MCFG_CPU_PROGRAM_MAP(qdrmfgp_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(qdrmfgp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", qdrmfgp_state, qdrmfgp_interrupt, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(qdrmfgp_state,qdrmfgp)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(qdrmfgp_state, ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, qdrmfgp_state, ide_interrupt))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -563,7 +563,7 @@ MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp)
MCFG_DEVICE_ADD("k054539", K054539, XTAL(18'432'000))
MCFG_DEVICE_ADDRESS_MAP(0, qdrmfgp_k054539_map)
- MCFG_K054539_TIMER_HANDLER(WRITELINE(qdrmfgp_state, k054539_irq1_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, qdrmfgp_state, k054539_irq1_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -571,15 +571,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(qdrmfgp_state::qdrmfgp2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.000 MHz */
- MCFG_CPU_PROGRAM_MAP(qdrmfgp2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", qdrmfgp_state, qdrmfgp2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(qdrmfgp2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", qdrmfgp_state, qdrmfgp2_interrupt)
MCFG_MACHINE_START_OVERRIDE(qdrmfgp_state,qdrmfgp2)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(qdrmfgp_state, gp2_ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, qdrmfgp_state, gp2_ide_interrupt))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/qix.cpp b/src/mame/drivers/qix.cpp
index 3696c79fcb0..9aa634a3de3 100644
--- a/src/mame/drivers/qix.cpp
+++ b/src/mame/drivers/qix.cpp
@@ -604,8 +604,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(qix_state::qix_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
/* high interleave needed to ensure correct text in service mode */
/* Zookeeper settings and high score table seem especially sensitive to this */
@@ -623,7 +623,7 @@ MACHINE_CONFIG_START(qix_state::qix_base)
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("P2"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qix_coinctl_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, qix_coinctl_w))
/* video hardware */
qix_video(config);
@@ -637,9 +637,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(qix_state::kram3)
qix(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kram3_main_map)
- MCFG_MC6809E_LIC_CB(WRITELINE(qix_state, kram3_lic_maincpu_changed))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kram3_main_map)
+ MCFG_MC6809E_LIC_CB(WRITELINE(*this, qix_state, kram3_lic_maincpu_changed))
kram3_video(config);
MACHINE_CONFIG_END
@@ -656,20 +656,20 @@ MACHINE_CONFIG_START(qix_state::mcu)
/* basic machine hardware */
- MCFG_CPU_ADD("mcu", M68705P3, COIN_CLOCK_OSC) /* 1.00 MHz */
- MCFG_M68705_PORTB_R_CB(READ8(qix_state, qix_68705_portB_r))
- MCFG_M68705_PORTC_R_CB(READ8(qix_state, qix_68705_portC_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(qix_state, qix_68705_portA_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(qix_state, qix_68705_portB_w))
+ MCFG_DEVICE_ADD("mcu", M68705P3, COIN_CLOCK_OSC) /* 1.00 MHz */
+ MCFG_M68705_PORTB_R_CB(READ8(*this, qix_state, qix_68705_portB_r))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, qix_state, qix_68705_portC_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, qix_state, qix_68705_portA_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, qix_state, qix_68705_portB_w))
MCFG_MACHINE_START_OVERRIDE(qix_state,qixmcu)
MCFG_DEVICE_MODIFY("pia0")
- MCFG_PIA_READPB_HANDLER(READ8(qix_state, qixmcu_coin_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qixmcu_coin_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, qix_state, qixmcu_coin_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, qixmcu_coin_w))
MCFG_DEVICE_MODIFY("pia2")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, qixmcu_coinctrl_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, qixmcu_coinctrl_w))
MACHINE_CONFIG_END
@@ -678,8 +678,8 @@ MACHINE_CONFIG_START(qix_state::zookeep)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zoo_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zoo_main_map)
/* video hardware */
zookeep_video(config);
@@ -699,17 +699,17 @@ MACHINE_CONFIG_START(qix_state::slither)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
MCFG_DEVICE_MODIFY("pia1")
- MCFG_PIA_READPA_HANDLER(READ8(qix_state, slither_trak_lr_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_76489_0_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, qix_state, slither_trak_lr_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, slither_76489_0_w))
MCFG_PIA_READPB_HANDLER(NOOP)
MCFG_DEVICE_MODIFY("pia2")
- MCFG_PIA_READPA_HANDLER(READ8(qix_state, slither_trak_ud_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(qix_state, slither_76489_1_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, qix_state, slither_trak_ud_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, qix_state, slither_76489_1_w))
MCFG_PIA_READPB_HANDLER(NOOP)
/* video hardware */
diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp
index 5659a7e3ed5..43de0f4f3ea 100644
--- a/src/mame/drivers/ql.cpp
+++ b/src/mame/drivers/ql.cpp
@@ -897,16 +897,16 @@ void ql_state::machine_reset()
MACHINE_CONFIG_START(ql_state::ql)
// basic machine hardware
- MCFG_CPU_ADD(M68008_TAG, M68008, X1/2)
- MCFG_CPU_PROGRAM_MAP(ql_mem)
+ MCFG_DEVICE_ADD(M68008_TAG, M68008, X1/2)
+ MCFG_DEVICE_PROGRAM_MAP(ql_mem)
- MCFG_CPU_ADD(I8749_TAG, I8749, X4)
- MCFG_CPU_IO_MAP(ipc_io)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ql_state, ipc_port1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(ql_state, ipc_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ql_state, ipc_port2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(ql_state, ipc_t1_r))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(ql_state, ipc_bus_r))
+ MCFG_DEVICE_ADD(I8749_TAG, I8749, X4)
+ MCFG_DEVICE_IO_MAP(ipc_io)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ql_state, ipc_port1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, ql_state, ipc_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ql_state, ipc_port2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ql_state, ipc_t1_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, ql_state, ipc_bus_r))
// video hardware
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
@@ -918,51 +918,51 @@ MACHINE_CONFIG_START(ql_state::ql)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_DEVICE_ADD(ZX8301_TAG, ZX8301, X1)
MCFG_ZX8301_CPU(M68008_TAG)
- MCFG_ZX8301_VSYNC_CALLBACK(DEVWRITELINE(ZX8302_TAG, zx8302_device, vsync_w))
+ MCFG_ZX8301_VSYNC_CALLBACK(WRITELINE(ZX8302_TAG, zx8302_device, vsync_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADD(ZX8302_TAG, ZX8302, X1)
MCFG_ZX8302_RTC_CLOCK(X2)
MCFG_ZX8302_OUT_IPL1L_CB(INPUTLINE(M68008_TAG, M68K_IRQ_2))
- MCFG_ZX8302_OUT_BAUDX4_CB(WRITELINE(ql_state, ql_baudx4_w))
- MCFG_ZX8302_OUT_COMDATA_CB(WRITELINE(ql_state, ql_comdata_w))
+ MCFG_ZX8302_OUT_BAUDX4_CB(WRITELINE(*this, ql_state, ql_baudx4_w))
+ MCFG_ZX8302_OUT_COMDATA_CB(WRITELINE(*this, ql_state, ql_comdata_w))
// TXD1
- MCFG_ZX8302_OUT_TXD2_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_ZX8302_OUT_TXD2_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
// NETOUT
- MCFG_ZX8302_OUT_MDSELCK_CB(WRITELINE(ql_state, zx8302_mdselck_w))
- MCFG_ZX8302_OUT_MDSELD_CB(DEVWRITELINE(MDV_1, microdrive_image_device, comms_in_w))
- MCFG_ZX8302_OUT_MDRDW_CB(WRITELINE(ql_state, zx8302_mdrdw_w))
- MCFG_ZX8302_OUT_ERASE_CB(WRITELINE(ql_state, zx8302_erase_w))
- MCFG_ZX8302_OUT_RAW1_CB(WRITELINE(ql_state, zx8302_raw1_w))
- MCFG_ZX8302_IN_RAW1_CB(READLINE(ql_state, zx8302_raw1_r))
- MCFG_ZX8302_OUT_RAW2_CB(WRITELINE(ql_state, zx8302_raw2_w))
- MCFG_ZX8302_IN_RAW2_CB(READLINE(ql_state, zx8302_raw2_r))
+ MCFG_ZX8302_OUT_MDSELCK_CB(WRITELINE(*this, ql_state, zx8302_mdselck_w))
+ MCFG_ZX8302_OUT_MDSELD_CB(WRITELINE(MDV_1, microdrive_image_device, comms_in_w))
+ MCFG_ZX8302_OUT_MDRDW_CB(WRITELINE(*this, ql_state, zx8302_mdrdw_w))
+ MCFG_ZX8302_OUT_ERASE_CB(WRITELINE(*this, ql_state, zx8302_erase_w))
+ MCFG_ZX8302_OUT_RAW1_CB(WRITELINE(*this, ql_state, zx8302_raw1_w))
+ MCFG_ZX8302_IN_RAW1_CB(READLINE(*this, ql_state, zx8302_raw1_r))
+ MCFG_ZX8302_OUT_RAW2_CB(WRITELINE(*this, ql_state, zx8302_raw2_w))
+ MCFG_ZX8302_IN_RAW2_CB(READLINE(*this, ql_state, zx8302_raw2_r))
MCFG_MICRODRIVE_ADD(MDV_1)
- MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(DEVWRITELINE(MDV_2, microdrive_image_device, comms_in_w))
+ MCFG_MICRODRIVE_COMMS_OUT_CALLBACK(WRITELINE(MDV_2, microdrive_image_device, comms_in_w))
MCFG_MICRODRIVE_ADD(MDV_2)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr) // wired as DCE
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr) // wired as DTE
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ZX8302_TAG, zx8302_device, write_cts2))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr) // wired as DCE
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr) // wired as DTE
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ZX8302_TAG, zx8302_device, write_cts2))
MCFG_QL_EXPANSION_SLOT_ADD("exp", ql_expansion_cards, nullptr)
//MCFG_QL_EXPANSION_SLOT_IPL0L_CALLBACK()
//MCFG_QL_EXPANSION_SLOT_IPL1L_CALLBACK()
//MCFG_QL_EXPANSION_SLOT_BERRL_CALLBACK()
- MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(ql_state, exp_extintl_w))
+ MCFG_QL_EXPANSION_SLOT_EXTINTL_CALLBACK(WRITELINE(*this, ql_state, exp_extintl_w))
MCFG_QL_ROM_CARTRIDGE_SLOT_ADD("rom", ql_rom_cartridge_cards, nullptr)
MCFG_DEVICE_ADD(QIMI_TAG, QIMI, 0)
- MCFG_QIMI_EXTINT_CALLBACK(WRITELINE(ql_state, qimi_extintl_w))
+ MCFG_QIMI_EXTINT_CALLBACK(WRITELINE(*this, ql_state, qimi_extintl_w))
// software lists
MCFG_SOFTWARE_LIST_ADD("cart_list", "ql_cart")
diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp
index 374da7316aa..e8d92468674 100644
--- a/src/mame/drivers/qtsbc.cpp
+++ b/src/mame/drivers/qtsbc.cpp
@@ -478,26 +478,26 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(qtsbc_state::qtsbc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL) // Mostek MK3880
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL) // Mostek MK3880
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEVICE_ADD("pit", PIT8253, 0) // U9
MCFG_PIT8253_CLK0(4_MHz_XTAL / 2) /* Timer 0: baud rate gen for 8251 */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("usart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("usart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("usart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("usart", i8251_device, write_rxc))
MCFG_PIT8253_CLK1(4_MHz_XTAL / 2)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk2))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("pit", pit8253_device, write_clk2))
MCFG_DEVICE_ADD("usart", I8251, 0) // U8
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("usart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("usart", i8251_device, write_dsr)) // actually from pin 11, "Reverse Channel Transmit"
- MCFG_RS232_CTS_HANDLER(WRITELINE(qtsbc_state, rts_loopback_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("usart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("usart", i8251_device, write_dsr)) // actually from pin 11, "Reverse Channel Transmit"
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, qtsbc_state, rts_loopback_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) // must be exactly here
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp
index e6a3b794f55..6d70edfdc68 100644
--- a/src/mame/drivers/quakeat.cpp
+++ b/src/mame/drivers/quakeat.cpp
@@ -123,10 +123,10 @@ void quakeat_state::machine_start()
MACHINE_CONFIG_START(quakeat_state::quake)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM2, 233000000) /* Pentium II, 233MHz */
- MCFG_CPU_PROGRAM_MAP(quake_map)
- MCFG_CPU_IO_MAP(quake_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM2, 233000000) /* Pentium II, 233MHz */
+ MCFG_DEVICE_PROGRAM_MAP(quake_map)
+ MCFG_DEVICE_IO_MAP(quake_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index 35c2efbc4a5..2482c9226fc 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -275,9 +275,9 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_START(quantum_state::quantum)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(quantum_state, irq1_line_hold, CLOCK_3KHZ / 12)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(quantum_state, irq1_line_hold, CLOCK_3KHZ / 12)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -297,31 +297,31 @@ MACHINE_CONFIG_START(quantum_state::quantum)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, 600000)
- MCFG_POKEY_POT0_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT1_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT2_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT3_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT4_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT5_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT6_R_CB(READ8(quantum_state, input_1_r))
- MCFG_POKEY_POT7_R_CB(READ8(quantum_state, input_1_r))
+ MCFG_DEVICE_ADD("pokey1", POKEY, 600000)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, quantum_state, input_1_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, quantum_state, input_1_r))
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0)
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
- MCFG_SOUND_ADD("pokey2", POKEY, 600000)
- MCFG_POKEY_POT0_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT1_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT2_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT3_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT4_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT5_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT6_R_CB(READ8(quantum_state, input_2_r))
- MCFG_POKEY_POT7_R_CB(READ8(quantum_state, input_2_r))
+ MCFG_DEVICE_ADD("pokey2", POKEY, 600000)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, quantum_state, input_2_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, quantum_state, input_2_r))
MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0)
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 1)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(quantum)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp
index 063dced522d..a0ed1e8a336 100644
--- a/src/mame/drivers/quasar.cpp
+++ b/src/mame/drivers/quasar.cpp
@@ -301,18 +301,18 @@ MACHINE_RESET_MEMBER(quasar_state,quasar)
MACHINE_CONFIG_START(quasar_state::quasar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */
- MCFG_CPU_PROGRAM_MAP(quasar)
- MCFG_CPU_IO_MAP(quasar_io)
- MCFG_CPU_DATA_MAP(quasar_data)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", quasar_state, quasar_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
-
- MCFG_CPU_ADD("soundcpu",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(quasar_state, audio_t1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_DEVICE_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */
+ MCFG_DEVICE_PROGRAM_MAP(quasar)
+ MCFG_DEVICE_IO_MAP(quasar_io)
+ MCFG_DEVICE_DATA_MAP(quasar_data)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quasar_state, quasar_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
+
+ MCFG_DEVICE_ADD("soundcpu",I8035,6000000) /* 6MHz crystal divide by 15 in CPU */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, quasar_state, audio_t1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
MCFG_MACHINE_START_OVERRIDE(quasar_state,quasar)
MCFG_MACHINE_RESET_OVERRIDE(quasar_state,quasar)
@@ -348,7 +348,7 @@ MACHINE_CONFIG_START(quasar_state::quasar)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/queen.cpp b/src/mame/drivers/queen.cpp
index a12d1719694..b7a5a4fbf64 100644
--- a/src/mame/drivers/queen.cpp
+++ b/src/mame/drivers/queen.cpp
@@ -281,10 +281,10 @@ void queen_state::machine_reset()
MACHINE_CONFIG_START(queen_state::queen)
- MCFG_CPU_ADD("maincpu", PENTIUM3, 533000000/16) // Celeron or Pentium 3, 533 Mhz
- MCFG_CPU_PROGRAM_MAP(queen_map)
- MCFG_CPU_IO_MAP(queen_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 533000000/16) // Celeron or Pentium 3, 533 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(queen_map)
+ MCFG_DEVICE_IO_MAP(queen_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
@@ -293,10 +293,10 @@ MACHINE_CONFIG_START(queen_state::queen)
MCFG_PCI_BUS_LEGACY_DEVICE(7, DEVICE_SELF, queen_state, intel82371ab_pci_r, intel82371ab_pci_w)
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_IDE_CONTROLLER_32_ADD("ide2", ata_devices, nullptr, nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir7_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir7_w))
/* video hardware */
pcvideo_vga(config);
diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp
index 7ff5737986b..5facd6045ad 100644
--- a/src/mame/drivers/quickpick5.cpp
+++ b/src/mame/drivers/quickpick5.cpp
@@ -400,14 +400,14 @@ void quickpick5_state::machine_reset()
MACHINE_CONFIG_START(quickpick5_state::quickpick5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(32'000'000)/4) // z84c0008pec 8mhz part, 32Mhz xtal verified on PCB, divisor unknown
- MCFG_CPU_PROGRAM_MAP(quickpick5_main)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(32'000'000)/4) // z84c0008pec 8mhz part, 32Mhz xtal verified on PCB, divisor unknown
+ MCFG_DEVICE_PROGRAM_MAP(quickpick5_main)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", quickpick5_state, scanline, "screen", 0, 1)
MCFG_DEVICE_ADD("k053252", K053252, XTAL(32'000'000)/4) /* K053252, xtal verified, divider not verified */
- MCFG_K053252_INT1_ACK_CB(WRITELINE(quickpick5_state, vbl_ack_w))
- MCFG_K053252_INT2_ACK_CB(WRITELINE(quickpick5_state, nmi_ack_w))
- MCFG_K053252_INT_TIME_CB(WRITE8(quickpick5_state, ccu_int_time_w))
+ MCFG_K053252_INT1_ACK_CB(WRITELINE(*this, quickpick5_state, vbl_ack_w))
+ MCFG_K053252_INT2_ACK_CB(WRITELINE(*this, quickpick5_state, nmi_ack_w))
+ MCFG_K053252_INT_TIME_CB(WRITE8(*this, quickpick5_state, ccu_int_time_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp
index 8d428738b55..d62d3d647b9 100644
--- a/src/mame/drivers/quizdna.cpp
+++ b/src/mame/drivers/quizdna.cpp
@@ -443,10 +443,10 @@ void quizdna_state::machine_start()
MACHINE_CONFIG_START(quizdna_state::quizdna)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
- MCFG_CPU_PROGRAM_MAP(quizdna_map)
- MCFG_CPU_IO_MAP(quizdna_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", quizdna_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(quizdna_map)
+ MCFG_DEVICE_IO_MAP(quizdna_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quizdna_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -464,7 +464,7 @@ MACHINE_CONFIG_START(quizdna_state::quizdna)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, MCLK/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MCLK/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.10)
@@ -481,8 +481,8 @@ MACHINE_CONFIG_START(quizdna_state::gakupara)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(gakupara_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(gakupara_io_map)
MACHINE_CONFIG_END
@@ -491,9 +491,9 @@ MACHINE_CONFIG_START(quizdna_state::gekiretu)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gekiretu_map)
- MCFG_CPU_IO_MAP(gekiretu_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gekiretu_map)
+ MCFG_DEVICE_IO_MAP(gekiretu_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp
index bec3cf377ed..377b0e04793 100644
--- a/src/mame/drivers/quizo.cpp
+++ b/src/mame/drivers/quizo.cpp
@@ -217,11 +217,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(quizo_state::quizo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL1/2)
- MCFG_CPU_PROGRAM_MAP(memmap)
- MCFG_CPU_IO_MAP(portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL1/2)
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ MCFG_DEVICE_IO_MAP(portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", quizo_state, irq0_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quizo_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -237,7 +237,7 @@ MACHINE_CONFIG_START(quizo_state::quizo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL2/16 )
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL2/16 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp
index f3a88acea1e..d3ddaa40cc0 100644
--- a/src/mame/drivers/quizpani.cpp
+++ b/src/mame/drivers/quizpani.cpp
@@ -195,10 +195,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(quizpani_state::quizpani)
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(quizpani_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpani_state, irq4_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(quizpani_state, irq1_line_hold, 164) // music tempo
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(quizpani_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quizpani_state, irq4_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(quizpani_state, irq1_line_hold, 164) // music tempo
MCFG_GFXDECODE_ADD("gfxdecode", "palette", quizpani)
MCFG_PALETTE_ADD("palette", 0x200)
diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp
index 86e6f0d9f5a..d5937a81fc3 100644
--- a/src/mame/drivers/quizpun2.cpp
+++ b/src/mame/drivers/quizpun2.cpp
@@ -572,28 +572,28 @@ GFXDECODE_END
MACHINE_CONFIG_START(quizpun2_state::quizpun2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(quizpun2_map)
- MCFG_CPU_IO_MAP(quizpun2_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpun2_state, irq0_line_hold)
-
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(quizpun2_sound_map)
- MCFG_CPU_IO_MAP(quizpun2_sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpun2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(quizpun2_map)
+ MCFG_DEVICE_IO_MAP(quizpun2_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quizpun2_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(quizpun2_sound_map)
+ MCFG_DEVICE_IO_MAP(quizpun2_sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", quizpun2_state, irq0_line_hold)
// NMI generated by main CPU
- MCFG_CPU_ADD("cop", COP402, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(quizpun2_cop_map)
+ MCFG_DEVICE_ADD("cop", COP402, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(quizpun2_cop_map)
MCFG_COP400_CONFIG(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false)
- MCFG_COP400_WRITE_D_CB(WRITE8(quizpun2_state, cop_d_w))
- MCFG_COP400_WRITE_G_CB(WRITE8(quizpun2_state, cop_g_w))
- MCFG_COP400_READ_L_CB(READ8(quizpun2_state, cop_l_r))
- MCFG_COP400_WRITE_L_CB(WRITE8(quizpun2_state, cop_l_w))
- MCFG_COP400_READ_IN_CB(READ8(quizpun2_state, cop_in_r))
- MCFG_COP400_READ_SI_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read))
- MCFG_COP400_WRITE_SO_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write))
- MCFG_COP400_WRITE_SK_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, quizpun2_state, cop_d_w))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, quizpun2_state, cop_g_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, quizpun2_state, cop_l_r))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, quizpun2_state, cop_l_w))
+ MCFG_COP400_READ_IN_CB(READ8(*this, quizpun2_state, cop_in_r))
+ MCFG_COP400_READ_SI_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write))
+ MCFG_COP400_WRITE_SK_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -615,7 +615,7 @@ MACHINE_CONFIG_START(quizpun2_state::quizpun2)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(8'000'000) / 2) // 4 MHz
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(8'000'000) / 2) // 4 MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -623,13 +623,13 @@ MACHINE_CONFIG_START(quizpun2_state::quizpun)
quizpun2(config);
MCFG_DEVICE_REMOVE("cop")
- MCFG_CPU_ADD("mcu", M68705P5, XTAL(4'000'000)) // xtal is 4MHz, divided by 4 internally
- MCFG_M68705_PORTA_R_CB(READ8(quizpun2_state, quizpun_68705_port_a_r))
- MCFG_M68705_PORTB_R_CB(READ8(quizpun2_state, quizpun_68705_port_b_r))
- MCFG_M68705_PORTC_R_CB(READ8(quizpun2_state, quizpun_68705_port_c_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(quizpun2_state, quizpun_68705_port_a_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(quizpun2_state, quizpun_68705_port_b_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(quizpun2_state, quizpun_68705_port_c_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, XTAL(4'000'000)) // xtal is 4MHz, divided by 4 internally
+ MCFG_M68705_PORTA_R_CB(READ8(*this, quizpun2_state, quizpun_68705_port_a_r))
+ MCFG_M68705_PORTB_R_CB(READ8(*this, quizpun2_state, quizpun_68705_port_b_r))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, quizpun2_state, quizpun_68705_port_c_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, quizpun2_state, quizpun_68705_port_a_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, quizpun2_state, quizpun_68705_port_b_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, quizpun2_state, quizpun_68705_port_c_w))
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 1a1752049ca..459e49778bf 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -388,10 +388,10 @@ void quizshow_state::machine_reset()
MACHINE_CONFIG_START(quizshow_state::quizshow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK / 16) // divider guessed
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_S2650_SENSE_INPUT(READLINE(quizshow_state, tape_signal_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(quizshow_state, flag_output_w))
+ MCFG_DEVICE_ADD("maincpu", S2650, MASTER_CLOCK / 16) // divider guessed
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, quizshow_state, tape_signal_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, quizshow_state, flag_output_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("clock_timer", quizshow_state, clock_timer_cb, attotime::from_hz(PIXEL_CLOCK / (HTOTAL * 8))) // 8V
/* video hardware */
@@ -409,7 +409,7 @@ MACHINE_CONFIG_START(quizshow_state::quizshow)
/* sound hardware (discrete) */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/qvt103.cpp b/src/mame/drivers/qvt103.cpp
index 3ff060680bc..8a474ebaecb 100644
--- a/src/mame/drivers/qvt103.cpp
+++ b/src/mame/drivers/qvt103.cpp
@@ -66,9 +66,9 @@ static const z80_daisy_config daisy_chain[] =
};
MACHINE_CONFIG_START(qvt103_state::qvt103)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(29'376'000) / 9) // divider guessed
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(29'376'000) / 9) // divider guessed
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(29'376'000) / 9)
@@ -82,7 +82,7 @@ MACHINE_CONFIG_START(qvt103_state::qvt103)
//MCFG_SCREEN_RAW_PARAMS(XTAL(29'376'000), 170 * 9, 0, 132 * 9, 320, 0, 300)
MCFG_SCREEN_UPDATE_DRIVER(qvt103_state, screen_update)
- MCFG_CPU_ADD("kbdmcu", I8741, XTAL(6'000'000))
+ MCFG_DEVICE_ADD("kbdmcu", I8741, XTAL(6'000'000))
MACHINE_CONFIG_END
/**************************************************************************************************************
diff --git a/src/mame/drivers/qvt201.cpp b/src/mame/drivers/qvt201.cpp
index 39c1592a1e9..fcc6255fbe2 100644
--- a/src/mame/drivers/qvt201.cpp
+++ b/src/mame/drivers/qvt201.cpp
@@ -78,14 +78,14 @@ static INPUT_PORTS_START( qvt201 )
INPUT_PORTS_END
MACHINE_CONFIG_START(qvt201_state::qvt201)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'686'400))
- MCFG_CPU_PROGRAM_MAP(mem_map) // IORQ is not used at all
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'686'400))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map) // IORQ is not used at all
MCFG_INPUT_MERGER_ANY_HIGH("mainint") // open collector
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400)) // XTAL not directly connected
- MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("mainint", input_merger_device, in_w<1>))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE("mainint", input_merger_device, in_w<1>))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -96,7 +96,7 @@ MACHINE_CONFIG_START(qvt201_state::qvt201)
MCFG_DEVICE_ADD("crtc", SCN2672, XTAL(48'654'000) / 30)
MCFG_SCN2672_CHARACTER_WIDTH(10) // 9 in 132-column mode
- MCFG_SCN2672_INTR_CALLBACK(DEVWRITELINE("mainint", input_merger_device, in_w<0>))
+ MCFG_SCN2672_INTR_CALLBACK(WRITELINE("mainint", input_merger_device, in_w<0>))
MCFG_VIDEO_SET_SCREEN("screen")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/qvt6800.cpp b/src/mame/drivers/qvt6800.cpp
index dc15a18e126..23fe242b2db 100644
--- a/src/mame/drivers/qvt6800.cpp
+++ b/src/mame/drivers/qvt6800.cpp
@@ -68,8 +68,8 @@ static INPUT_PORTS_START( qvt6800 )
INPUT_PORTS_END
MACHINE_CONFIG_START(qvt6800_state::qvt102)
- MCFG_CPU_ADD("maincpu", M6800, XTAL(16'669'800) / 18)
- MCFG_CPU_PROGRAM_MAP(qvt102_mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(16'669'800) / 18)
+ MCFG_DEVICE_PROGRAM_MAP(qvt102_mem_map)
MCFG_NVRAM_ADD_0FILL("nvram") // 2x TC5514-APL + 3V battery
@@ -78,12 +78,12 @@ MACHINE_CONFIG_START(qvt6800_state::qvt102)
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'669'800) / 9)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("acia", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("ctcclk", CLOCK, XTAL(16'669'800) / 18) // OR of CRTC CLK and Ï•1
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(16'669'800), 882, 0, 720, 315, 0, 300)
@@ -94,12 +94,12 @@ MACHINE_CONFIG_START(qvt6800_state::qvt102)
MCFG_MC6845_UPDATE_ROW_CB(qvt6800_state, update_row)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_CPU_ADD("kbdmcu", I8748, XTAL(6'000'000))
+ MCFG_DEVICE_ADD("kbdmcu", I8748, XTAL(6'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(qvt6800_state::qvt190)
- MCFG_CPU_ADD("maincpu", M6800, XTAL(16'669'800) / 9)
- MCFG_CPU_PROGRAM_MAP(qvt190_mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(16'669'800) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(qvt190_mem_map)
MCFG_NVRAM_ADD_0FILL("nvram") // V61C16P55L + battery
diff --git a/src/mame/drivers/qvt70.cpp b/src/mame/drivers/qvt70.cpp
index 802b8af3bfb..80538e530ca 100644
--- a/src/mame/drivers/qvt70.cpp
+++ b/src/mame/drivers/qvt70.cpp
@@ -32,8 +32,8 @@ static INPUT_PORTS_START( qvt70 )
INPUT_PORTS_END
MACHINE_CONFIG_START(qvt70_state::qvt70)
- MCFG_CPU_ADD("maincpu", Z80, 2'000'000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2'000'000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MACHINE_CONFIG_END
/**************************************************************************************************************
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index e5e421c0825..20b7e04d1ad 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -729,10 +729,10 @@ static void keyboard(device_slot_interface &device)
MACHINE_CONFIG_START(qx10_state::qx10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, MAIN_CLK / 4)
- MCFG_CPU_PROGRAM_MAP(qx10_mem)
- MCFG_CPU_IO_MAP(qx10_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu",Z80, MAIN_CLK / 4)
+ MCFG_DEVICE_PROGRAM_MAP(qx10_mem)
+ MCFG_DEVICE_IO_MAP(qx10_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -770,39 +770,39 @@ MACHINE_CONFIG_START(qx10_state::qx10)
MCFG_DEVICE_ADD("pit8253_2", PIT8253, 0)
MCFG_PIT8253_CLK0(MAIN_CLK / 8)
MCFG_PIT8253_CLK1(MAIN_CLK / 8)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(qx10_state, keyboard_clk))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, qx10_state, keyboard_clk))
MCFG_PIT8253_CLK2(MAIN_CLK / 8)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("upd7201", z80dart_device, rxtxcb_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("upd7201", z80dart_device, rxtxcb_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(qx10_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, qx10_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("upd7201", UPD7201, MAIN_CLK/4) // channel b clock set by pit2 channel 2
// Channel A: Keyboard
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("kbd", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("kbd", rs232_port_device, write_txd))
// Channel B: RS232
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_INT_CB(WRITELINE(qx10_state, keyboard_irq))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, qx10_state, keyboard_irq))
MCFG_DEVICE_ADD("8237dma_1", AM9517A, MAIN_CLK/4)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(qx10_state, dma_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(qx10_state, tc_w))
- MCFG_I8237_IN_MEMR_CB(READ8(qx10_state, memory_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(qx10_state, memory_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(qx10_state, fdc_dma_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(qx10_state, gdc_dack_r))
- //MCFG_I8237_IN_IOR_2_CB(DEVREAD8("upd7220", upd7220_device, dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(qx10_state, fdc_dma_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(qx10_state, gdc_dack_w))
- //MCFG_I8237_OUT_IOW_2_CB(DEVWRITE8("upd7220", upd7220_device, dack_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, qx10_state, dma_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, qx10_state, tc_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, qx10_state, memory_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, qx10_state, memory_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, qx10_state, fdc_dma_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, qx10_state, gdc_dack_r))
+ //MCFG_I8237_IN_IOR_2_CB(READ8("upd7220", upd7220_device, dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, qx10_state, fdc_dma_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, qx10_state, gdc_dack_w))
+ //MCFG_I8237_OUT_IOW_2_CB(WRITE8("upd7220", upd7220_device, dack_w))
MCFG_DEVICE_ADD("8237dma_2", AM9517A, MAIN_CLK/4)
MCFG_DEVICE_ADD("i8255", I8255, 0)
@@ -814,18 +814,18 @@ MACHINE_CONFIG_START(qx10_state::qx10)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir2_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir2_w))
MCFG_UPD765A_ADD("upd765", true, true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(qx10_state, qx10_upd765_interrupt))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("8237dma_1", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, qx10_state, qx10_upd765_interrupt))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("8237dma_1", am9517a_device, dreq0_w)) MCFG_DEVCB_INVERT
MCFG_FLOPPY_DRIVE_ADD("upd765:0", qx10_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd765:1", qx10_floppies, "525dd", floppy_image_device::default_floppy_formats)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd7201", upd7201_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("upd7201", upd7201_device, rxb_w))
- MCFG_RS232_PORT_ADD("kbd", keyboard, "qx10")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("upd7201", z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD("kbd", RS232_PORT, keyboard, "qx10")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("upd7201", z80dart_device, rxa_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp
index 189b0e412f9..db78a9643cf 100644
--- a/src/mame/drivers/r2dtank.cpp
+++ b/src/mame/drivers/r2dtank.cpp
@@ -441,11 +441,11 @@ INPUT_PORTS_END
*************************************/
MACHINE_CONFIG_START(r2dtank_state::r2dtank)
- MCFG_CPU_ADD("maincpu", M6809,3000000) /* ?? too fast ? */
- MCFG_CPU_PROGRAM_MAP(r2dtank_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6809,3000000) /* ?? too fast ? */
+ MCFG_DEVICE_PROGRAM_MAP(r2dtank_main_map)
- MCFG_CPU_ADD("audiocpu", M6802,3000000) /* ?? */
- MCFG_CPU_PROGRAM_MAP(r2dtank_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802,3000000) /* ?? */
+ MCFG_DEVICE_PROGRAM_MAP(r2dtank_audio_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -460,7 +460,7 @@ MACHINE_CONFIG_START(r2dtank_state::r2dtank)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(r2dtank_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("74123", ttl74123_device, a_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE("74123", ttl74123_device, a_w))
/* 74LS123 */
@@ -471,21 +471,21 @@ MACHINE_CONFIG_START(r2dtank_state::r2dtank)
MCFG_TTL74123_A_PIN_VALUE(1) /* A pin - driven by the CRTC */
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(r2dtank_state, ttl74123_output_changed))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, r2dtank_state, ttl74123_output_changed))
MCFG_DEVICE_ADD("pia_main", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA_CB2_HANDLER(WRITELINE(r2dtank_state, flipscreen_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, r2dtank_state, flipscreen_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, r2dtank_state, main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, r2dtank_state, main_cpu_irq))
MCFG_DEVICE_ADD("pia_audio", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(r2dtank_state, AY8910_port_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(r2dtank_state, AY8910_port_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(r2dtank_state, AY8910_select_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(r2dtank_state, main_cpu_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, r2dtank_state, AY8910_port_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, r2dtank_state, AY8910_port_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, r2dtank_state, AY8910_select_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, r2dtank_state, main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, r2dtank_state, main_cpu_irq))
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -493,11 +493,11 @@ MACHINE_CONFIG_START(r2dtank_state::r2dtank)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, (4000000 / 4))
+ MCFG_DEVICE_ADD("ay1", AY8910, (4000000 / 4))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, (4000000 / 4))
+ MCFG_DEVICE_ADD("ay2", AY8910, (4000000 / 4))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWA"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp
index 4e3078ea822..3203cc7a6a9 100644
--- a/src/mame/drivers/r2dx_v33.cpp
+++ b/src/mame/drivers/r2dx_v33.cpp
@@ -787,9 +787,9 @@ void r2dx_v33_state::r2dx_oki_map(address_map &map)
MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33, 32000000/2 ) // ?
- MCFG_CPU_PROGRAM_MAP(rdx_v33_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt)
+ MCFG_DEVICE_ADD("maincpu", V33, 32000000/2 ) // ?
+ MCFG_DEVICE_PROGRAM_MAP(rdx_v33_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(r2dx_v33_state,r2dx_v33)
@@ -810,8 +810,8 @@ MACHINE_CONFIG_START(r2dx_v33_state::rdx_v33)
MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden2_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden2_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden2_state, tile_scroll_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -824,14 +824,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(r2dx_v33_state::nzerotea)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V33,XTAL(32'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(nzerotea_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt)
+ MCFG_DEVICE_ADD("maincpu", V33,XTAL(32'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(nzerotea_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", r2dx_v33_state, rdx_v33_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(r2dx_v33_state,nzeroteam)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(zeroteam_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK)
@@ -848,14 +848,14 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea)
MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden2_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden2_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden2_state, tile_scroll_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -864,14 +864,14 @@ MACHINE_CONFIG_START(r2dx_v33_state::nzerotea)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(r2dx_v33_state::zerotm2k)
nzerotea(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zerotm2k_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zerotm2k_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index f50d80e8391..21864623461 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -643,8 +643,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(r9751_state::r9751)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68030, 20000000)
- MCFG_CPU_PROGRAM_MAP(r9751_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(r9751_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -656,8 +656,8 @@ MACHINE_CONFIG_START(r9751_state::r9751)
/* disk hardware */
MCFG_DEVICE_ADD("pdc", PDC, 0)
- MCFG_PDC_R_CB(READ8(r9751_state, pdc_dma_r))
- MCFG_PDC_W_CB(WRITE8(r9751_state, pdc_dma_w))
+ MCFG_PDC_R_CB(READ8(*this, r9751_state, pdc_dma_r))
+ MCFG_PDC_W_CB(WRITE8(*this, r9751_state, pdc_dma_w))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_DEVICE_ADD("wd33c93", WD33C93, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index a3e37fb39cb..c907243fced 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -901,9 +901,9 @@ INTERRUPT_GEN_MEMBER(rabbit_state::vblank_interrupt)
}
MACHINE_CONFIG_START(rabbit_state::rabbit)
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(24'000'000))
- MCFG_CPU_PROGRAM_MAP(rabbit_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rabbit_state, vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(24'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(rabbit_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rabbit_state, vblank_interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/rad_eu3a05.cpp b/src/mame/drivers/rad_eu3a05.cpp
index 00a3cadae70..780323b19fc 100644
--- a/src/mame/drivers/rad_eu3a05.cpp
+++ b/src/mame/drivers/rad_eu3a05.cpp
@@ -1149,9 +1149,9 @@ INTERRUPT_GEN_MEMBER(radica_eu3a05_state::interrupt)
MACHINE_CONFIG_START(radica_eu3a05_state::radicasi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502,XTAL(21'281'370)/2) // Tetris has a XTAL(21'281'370), not confirmed on Space Invaders, actual CPU clock unknown.
- MCFG_CPU_PROGRAM_MAP(radicasi_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", radica_eu3a05_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu",M6502,XTAL(21'281'370)/2) // Tetris has a XTAL(21'281'370), not confirmed on Space Invaders, actual CPU clock unknown.
+ MCFG_DEVICE_PROGRAM_MAP(radicasi_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", radica_eu3a05_state, interrupt)
MCFG_DEVICE_ADD("bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(radicasi_bank_map)
@@ -1179,7 +1179,7 @@ MACHINE_CONFIG_START(radica_eu3a05_state::radicasi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_DEVICE_ADD("6ch_sound", RADICA6502_SOUND, 8000)
- MCFG_RADICA6502_SOUND_SPACE_READ_CB(READ8(radica_eu3a05_state, read_full_space))
+ MCFG_RADICA6502_SOUND_SPACE_READ_CB(READ8(*this, radica_eu3a05_state, read_full_space))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rad_eu3a14.cpp b/src/mame/drivers/rad_eu3a14.cpp
index fecd55fce37..7211e97c334 100644
--- a/src/mame/drivers/rad_eu3a14.cpp
+++ b/src/mame/drivers/rad_eu3a14.cpp
@@ -776,9 +776,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(radica_eu3a14_state::radica_eu3a14)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6502,XTAL(21'477'272)/2) // marked as 21'477'270
- MCFG_CPU_PROGRAM_MAP(radica_eu3a14_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", radica_eu3a14_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu",M6502,XTAL(21'477'272)/2) // marked as 21'477'270
+ MCFG_DEVICE_PROGRAM_MAP(radica_eu3a14_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", radica_eu3a14_state, interrupt)
MCFG_DEVICE_ADD("bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank_map)
@@ -804,7 +804,7 @@ MACHINE_CONFIG_START(radica_eu3a14_state::radica_eu3a14)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_DEVICE_ADD("6ch_sound", RADICA6502_SOUND, 8000)
- MCFG_RADICA6502_SOUND_SPACE_READ_CB(READ8(radica_eu3a14_state, read_full_space))
+ MCFG_RADICA6502_SOUND_SPACE_READ_CB(READ8(*this, radica_eu3a14_state, read_full_space))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index 41c4a6fb843..15a0bad20cd 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -353,21 +353,21 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(radio86_state::radio86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(16'000'000) / 9)
- MCFG_CPU_PROGRAM_MAP(radio86_mem)
- MCFG_CPU_IO_MAP(radio86_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(16'000'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(radio86_mem)
+ MCFG_DEVICE_IO_MAP(radio86_io)
MCFG_MACHINE_RESET_OVERRIDE(radio86_state, radio86 )
MCFG_DEVICE_ADD("ppi8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, radio86_8255_portc_r2))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, radio86_8255_portc_r2))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MCFG_DEVICE_ADD("i8275", I8275, XTAL(16'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(radio86_state, display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma8257",i8257_device, dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma8257",i8257_device, dreq2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -384,10 +384,10 @@ MACHINE_CONFIG_START(radio86_state::radio86)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("dma8257", I8257, XTAL(16'000'000) / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(radio86_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
- MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("i8275", i8275_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, radio86_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, radio86_state, memory_read_byte))
+ MCFG_I8257_OUT_MEMW_CB(WRITE8(*this, radio86_state, memory_write_byte))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("i8275", i8275_device, dack_w))
MCFG_I8257_REVERSE_RW_MODE(1)
MCFG_CASSETTE_ADD( "cassette" )
@@ -402,20 +402,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::radio16)
radio86(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(radio86_16_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(radio86_16_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::radiorom)
radio86(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(radio86rom_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(radio86rom_mem)
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(radio86_state, radio86rom_romdisk_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(radio86_state, radio86_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_romdisk_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, radio86_state, radio86rom_romdisk_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, radio86_state, radio86_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_romdisk_portc_w))
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "radio86_cart")
MCFG_GENERIC_EXTENSIONS("bin,rom")
@@ -426,53 +426,53 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::radioram)
radio86(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(radio86ram_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(radio86ram_mem)
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(radio86_state, radio86ram_romdisk_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(radio86_state, radio86_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_romdisk_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, radio86_state, radio86ram_romdisk_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, radio86_state, radio86_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_romdisk_portc_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::rk7007)
radio86(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(rk7007_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(rk7007_io)
MCFG_DEVICE_ADD("ms7007", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, rk7007_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, rk7007_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::rk700716)
radio16(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(rk7007_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(rk7007_io)
MCFG_DEVICE_ADD("ms7007", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(radio86_state, radio86_8255_porta_w2))
- MCFG_I8255_IN_PORTB_CB(READ8(radio86_state, radio86_8255_portb_r2))
- MCFG_I8255_IN_PORTC_CB(READ8(radio86_state, rk7007_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, radio86_state, radio86_8255_porta_w2))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, radio86_state, radio86_8255_portb_r2))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, radio86_state, rk7007_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, radio86_state, radio86_8255_portc_w2))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::mikron2)
radio86(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mikron2_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mikron2_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(radio86_state::impuls03)
radio86(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(impuls03_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(impuls03_mem)
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp
index 2a5e21b468d..104a548f7ac 100644
--- a/src/mame/drivers/raiden.cpp
+++ b/src/mame/drivers/raiden.cpp
@@ -337,14 +337,14 @@ WRITE_LINE_MEMBER(raiden_state::vblank_irq)
MACHINE_CONFIG_START(raiden_state::raiden)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("sub", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", V30,XTAL(20'000'000)/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -357,8 +357,8 @@ MACHINE_CONFIG_START(raiden_state::raiden)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(raiden_state, screen_update_raiden)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(raiden_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, raiden_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", raiden)
@@ -368,8 +368,8 @@ MACHINE_CONFIG_START(raiden_state::raiden)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // frequency and pin 7 verified
@@ -378,15 +378,15 @@ MACHINE_CONFIG_START(raiden_state::raiden)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(raiden_state::raidene)
raiden(config);
MCFG_DEVICE_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(raiden_sound_map)
- MCFG_CPU_OPCODES_MAP(raiden_sound_decrypted_opcodes_map)
+ MCFG_DEVICE_PROGRAM_MAP(raiden_sound_map)
+ MCFG_DEVICE_OPCODES_MAP(raiden_sound_decrypted_opcodes_map)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_PROGRAM_MAP(sei80bu_encrypted_full_map)
@@ -396,11 +396,11 @@ MACHINE_CONFIG_START(raiden_state::raidenu)
raidene(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(raidenu_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(raidenu_main_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(raidenu_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(raidenu_sub_map)
MACHINE_CONFIG_END
WRITE16_MEMBER( raiden_state::raidenb_layer_scroll_w )
@@ -412,26 +412,26 @@ MACHINE_CONFIG_START(raiden_state::raidenkb)
raiden(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_CLOCK(XTAL(32'000'000) / 4) // Xtal and clock verified
MACHINE_CONFIG_END
MACHINE_CONFIG_START(raiden_state::raidenb)
raiden(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(raidenb_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(raidenb_main_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(raiden_state,raidenb)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden_state, raidenb_layer_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden_state, raidenb_layer_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden_state, raidenb_layer_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden_state, raidenb_layer_scroll_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(raiden_state, screen_update_raidenb)
diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp
index 9a62484b225..9b767ec933c 100644
--- a/src/mame/drivers/raiden2.cpp
+++ b/src/mame/drivers/raiden2.cpp
@@ -1433,14 +1433,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(raiden2_state::raiden2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(raiden2_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(raiden2_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raiden2)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
- MCFG_CPU_PROGRAM_MAP(raiden2_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
+ MCFG_DEVICE_PROGRAM_MAP(raiden2_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1453,11 +1453,11 @@ MACHINE_CONFIG_START(raiden2_state::raiden2)
//MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden2_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden2_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden2_state, tile_scroll_w))
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(raiden2_state, m_videoram_private_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w))
MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2)
@@ -1465,7 +1465,7 @@ MACHINE_CONFIG_START(raiden2_state::raiden2)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", XTAL(28'636'363)/8)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -1478,14 +1478,14 @@ MACHINE_CONFIG_START(raiden2_state::raiden2)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2151_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2151_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(raiden2_state::xsedae)
raiden2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(xsedae_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(xsedae_mem)
MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,xsedae)
@@ -1496,8 +1496,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(raiden2_state::raidendx)
raiden2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(raidendx_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(raidendx_mem)
MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,raidendx)
MACHINE_CONFIG_END
@@ -1506,14 +1506,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(raiden2_state::zeroteam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(zeroteam_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", V30,XTAL(32'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(zeroteam_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", raiden2_state, raiden2_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(raiden2_state,zeroteam)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
- MCFG_CPU_PROGRAM_MAP(zeroteam_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/8)
+ MCFG_DEVICE_PROGRAM_MAP(zeroteam_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1527,19 +1527,19 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam)
//MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(raiden2_state, tilemap_enable_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(raiden2_state, tile_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, raiden2_state, tilemap_enable_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, raiden2_state, tile_scroll_w))
MCFG_DEVICE_ADD("raiden2cop", RAIDEN2COP, 0)
- MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(raiden2_state, m_videoram_private_w))
+ MCFG_RAIDEN2COP_VIDEORAM_OUT_CB(WRITE16(*this, raiden2_state, m_videoram_private_w))
MCFG_VIDEO_START_OVERRIDE(raiden2_state,raiden2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'636'363)/8)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'636'363)/8)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000/* ? */, PIN7_LOW)
@@ -1548,8 +1548,8 @@ MACHINE_CONFIG_START(raiden2_state::zeroteam)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
/* ROM LOADING */
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index 682aa5a8680..eba75692532 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -3214,14 +3214,14 @@ MACHINE_CONFIG_START(rainbow_state::rainbow)
MCFG_DEFAULT_LAYOUT(layout_rainbow)
/* basic machine hardware */
-MCFG_CPU_ADD("maincpu", I8088, XTAL(24'073'400) / 5) // approximately 4.815 MHz
-MCFG_CPU_PROGRAM_MAP(rainbow8088_map)
-MCFG_CPU_IO_MAP(rainbow8088_io)
-MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(rainbow_state, irq_callback)
+MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'073'400) / 5) // approximately 4.815 MHz
+MCFG_DEVICE_PROGRAM_MAP(rainbow8088_map)
+MCFG_DEVICE_IO_MAP(rainbow8088_io)
+MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(rainbow_state, irq_callback)
-MCFG_CPU_ADD("subcpu", Z80, XTAL(24'073'400) / 6)
-MCFG_CPU_PROGRAM_MAP(rainbowz80_mem)
-MCFG_CPU_IO_MAP(rainbowz80_io)
+MCFG_DEVICE_ADD("subcpu", Z80, XTAL(24'073'400) / 6)
+MCFG_DEVICE_PROGRAM_MAP(rainbowz80_mem)
+MCFG_DEVICE_IO_MAP(rainbowz80_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3235,13 +3235,13 @@ MCFG_DEVICE_ADD("vt100_video", RAINBOW_VIDEO, XTAL(24'073'400))
MCFG_VT_SET_SCREEN("screen")
MCFG_VT_CHARGEN("chargen")
-MCFG_VT_VIDEO_RAM_CALLBACK(READ8(rainbow_state, read_video_ram_r))
-MCFG_VT_VIDEO_VERT_FREQ_INTR_CALLBACK(WRITELINE(rainbow_state, video_interrupt))
+MCFG_VT_VIDEO_RAM_CALLBACK(READ8(*this, rainbow_state, read_video_ram_r))
+MCFG_VT_VIDEO_VERT_FREQ_INTR_CALLBACK(WRITELINE(*this, rainbow_state, video_interrupt))
// *************************** COLOR GRAPHICS (OPTION) **************************************
// While the OSC frequency is confirmed, the divider is not (refresh rate is ~60 Hz with 32).
MCFG_DEVICE_ADD("upd7220", UPD7220, 31188000 / 32) // Duell schematics shows a 31.188 Mhz oscillator (confirmed by RFKA).
-MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE(rainbow_state, GDC_vblank_irq)) // "The vsync callback line needs to be below the 7220 DEVICE_ADD line."
+MCFG_UPD7220_VSYNC_CALLBACK(WRITELINE(*this, rainbow_state, GDC_vblank_irq)) // "The vsync callback line needs to be below the 7220 DEVICE_ADD line."
MCFG_DEVICE_ADDRESS_MAP(0, upd7220_map)
MCFG_UPD7220_DISPLAY_PIXELS_CALLBACK_OWNER(rainbow_state, hgdc_display_pixels)
@@ -3271,20 +3271,20 @@ MCFG_SOFTWARE_LIST_ADD("flop_list", "rainbow")
/// ********************************* HARD DISK CONTROLLER *****************************************
MCFG_DEVICE_ADD("hdc", WD2010, 5000000) // 10 Mhz quartz on controller (divided by 2 for WCLK)
-MCFG_WD2010_OUT_INTRQ_CB(WRITELINE(rainbow_state, bundle_irq)) // FIRST IRQ SOURCE (OR'ed with DRQ)
-MCFG_WD2010_OUT_BDRQ_CB(WRITELINE(rainbow_state, hdc_bdrq)) // BUFFER DATA REQUEST
+MCFG_WD2010_OUT_INTRQ_CB(WRITELINE(*this, rainbow_state, bundle_irq)) // FIRST IRQ SOURCE (OR'ed with DRQ)
+MCFG_WD2010_OUT_BDRQ_CB(WRITELINE(*this, rainbow_state, hdc_bdrq)) // BUFFER DATA REQUEST
// SIGNALS -FROM- WD CONTROLLER:
-MCFG_WD2010_OUT_BCS_CB(WRITELINE(rainbow_state, hdc_read_sector)) // Problem: OUT_BCS_CB = WRITE8 ... (!)
-MCFG_WD2010_OUT_BCR_CB(WRITELINE(rainbow_state, hdc_bcr)) // BUFFER COUNTER RESET (pulses)
+MCFG_WD2010_OUT_BCS_CB(WRITELINE(*this, rainbow_state, hdc_read_sector)) // Problem: OUT_BCS_CB = WRITE8 ... (!)
+MCFG_WD2010_OUT_BCR_CB(WRITELINE(*this, rainbow_state, hdc_bcr)) // BUFFER COUNTER RESET (pulses)
-MCFG_WD2010_OUT_WG_CB(WRITELINE(rainbow_state, hdc_write_sector)) // WRITE GATE
-MCFG_WD2010_OUT_STEP_CB(WRITELINE(rainbow_state, hdc_step)) // STEP PULSE
-MCFG_WD2010_OUT_DIRIN_CB(WRITELINE(rainbow_state, hdc_direction))
+MCFG_WD2010_OUT_WG_CB(WRITELINE(*this, rainbow_state, hdc_write_sector)) // WRITE GATE
+MCFG_WD2010_OUT_STEP_CB(WRITELINE(*this, rainbow_state, hdc_step)) // STEP PULSE
+MCFG_WD2010_OUT_DIRIN_CB(WRITELINE(*this, rainbow_state, hdc_direction))
-MCFG_WD2010_IN_WF_CB(READLINE(rainbow_state, hdc_write_fault)) // WRITE FAULT (set to GND if not serviced)
+MCFG_WD2010_IN_WF_CB(READLINE(*this, rainbow_state, hdc_write_fault)) // WRITE FAULT (set to GND if not serviced)
-MCFG_WD2010_IN_DRDY_CB(READLINE(rainbow_state, hdc_drive_ready)) // DRIVE_READY (set to VCC if not serviced)
+MCFG_WD2010_IN_DRDY_CB(READLINE(*this, rainbow_state, hdc_drive_ready)) // DRIVE_READY (set to VCC if not serviced)
MCFG_WD2010_IN_SC_CB(VCC) // SEEK COMPLETE (set to VCC if not serviced)
MCFG_WD2010_IN_TK000_CB(VCC) // CURRENTLY NOT EVALUATED WITHIN 'WD2010'
@@ -3306,23 +3306,23 @@ MCFG_HARDDISK_INTERFACE("corvus_hdd")
MCFG_DS1315_ADD("rtc") // DS1315 (ClikClok for DEC-100 B) * OPTIONAL *
MCFG_DEVICE_ADD("dbrg", COM8116_003, XTAL(24'073'400) / 4) // 6.01835 MHz (nominally 6 MHz)
-MCFG_COM8116_FR_HANDLER(WRITELINE(rainbow_state, dbrg_fr_w))
-MCFG_COM8116_FT_HANDLER(WRITELINE(rainbow_state, dbrg_ft_w))
+MCFG_COM8116_FR_HANDLER(WRITELINE(*this, rainbow_state, dbrg_fr_w))
+MCFG_COM8116_FT_HANDLER(WRITELINE(*this, rainbow_state, dbrg_ft_w))
MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL(24'073'400) / 5 / 2) // 2.4073 MHz (nominally 2.5 MHz)
-MCFG_Z80SIO_OUT_INT_CB(WRITELINE(rainbow_state, mpsc_irq))
-MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("comm", rs232_port_device, write_txd))
-MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("printer", rs232_port_device, write_txd))
+MCFG_Z80SIO_OUT_INT_CB(WRITELINE(*this, rainbow_state, mpsc_irq))
+MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("comm", rs232_port_device, write_txd))
+MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("printer", rs232_port_device, write_txd))
// RTS and DTR outputs are not connected
-MCFG_RS232_PORT_ADD("comm", default_rs232_devices, nullptr)
-MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, rxa_w))
-MCFG_RS232_CTS_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, ctsa_w))
-MCFG_RS232_DCD_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, dcda_w))
+MCFG_DEVICE_ADD("comm", RS232_PORT, default_rs232_devices, nullptr)
+MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxa_w))
+MCFG_RS232_CTS_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsa_w))
+MCFG_RS232_DCD_HANDLER(WRITELINE("mpsc", upd7201_new_device, dcda_w))
-MCFG_RS232_PORT_ADD("printer", default_rs232_devices, nullptr)
-MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, rxb_w))
-MCFG_RS232_DCD_HANDLER(DEVWRITELINE("mpsc", upd7201_new_device, ctsb_w)) // actually DTR
+MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr)
+MCFG_RS232_RXD_HANDLER(WRITELINE("mpsc", upd7201_new_device, rxb_w))
+MCFG_RS232_DCD_HANDLER(WRITELINE("mpsc", upd7201_new_device, ctsb_w)) // actually DTR
MCFG_DEVICE_MODIFY("comm")
MCFG_SLOT_OPTION_ADD("microsoft_mouse", MSFT_SERIAL_MOUSE)
@@ -3333,18 +3333,18 @@ MCFG_DEVICE_MODIFY("printer")
MCFG_SLOT_DEFAULT_OPTION("printer")
MCFG_DEVICE_ADD("kbdser", I8251, XTAL(24'073'400) / 5 / 2)
-MCFG_I8251_TXD_HANDLER(WRITELINE(rainbow_state, kbd_tx))
-MCFG_I8251_DTR_HANDLER(WRITELINE(rainbow_state, irq_hi_w))
-MCFG_I8251_RXRDY_HANDLER(WRITELINE(rainbow_state, kbd_rxready_w))
-MCFG_I8251_TXRDY_HANDLER(WRITELINE(rainbow_state, kbd_txready_w))
+MCFG_I8251_TXD_HANDLER(WRITELINE(*this, rainbow_state, kbd_tx))
+MCFG_I8251_DTR_HANDLER(WRITELINE(*this, rainbow_state, irq_hi_w))
+MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_rxready_w))
+MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, rainbow_state, kbd_txready_w))
MCFG_DEVICE_ADD(LK201_TAG, LK201, 0)
-MCFG_LK201_TX_HANDLER(DEVWRITELINE("kbdser", i8251_device, write_rxd))
+MCFG_LK201_TX_HANDLER(WRITELINE("kbdser", i8251_device, write_rxd))
MCFG_DEVICE_ADD("prtbrg", RIPPLE_COUNTER, XTAL(24'073'400) / 6 / 13) // 74LS393 at E17 (both halves)
// divided clock should ideally be 307.2 kHz, but is actually approximately 308.6333 kHz
MCFG_RIPPLE_COUNTER_STAGES(8)
-MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(rainbow_state, bitrate_counter_w))
+MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(*this, rainbow_state, bitrate_counter_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("motor", rainbow_state, hd_motor_tick, attotime::from_hz(60))
diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp
index de2f70491be..05d5a1cdf69 100644
--- a/src/mame/drivers/rallyx.cpp
+++ b/src/mame/drivers/rallyx.cpp
@@ -817,19 +817,19 @@ WRITE_LINE_MEMBER(rallyx_state::jungler_vblank_irq)
MACHINE_CONFIG_START(rallyx_state::rallyx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(rallyx_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rallyx_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 259 at 12M or 4099 at 11M on Logic Board I
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(rallyx_state, bang_w)) // BANG
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(rallyx_state, irq_mask_w)) // INT ON
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(rallyx_state, sound_on_w)) // SOUND ON
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(rallyx_state, flip_screen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, rallyx_state, bang_w)) // BANG
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, rallyx_state, irq_mask_w)) // INT ON
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, rallyx_state, sound_on_w)) // SOUND ON
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, rallyx_state, flip_screen_w)) // FLIP
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0"))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1"))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(rallyx_state, coin_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(rallyx_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, rallyx_state, coin_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, rallyx_state, coin_counter_1_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -843,7 +843,7 @@ MACHINE_CONFIG_START(rallyx_state::rallyx)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(rallyx_state, screen_update_rallyx)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rallyx_state, rallyx_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rallyx_state, rallyx_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rallyx)
@@ -856,11 +856,11 @@ MACHINE_CONFIG_START(rallyx_state::rallyx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO, MASTER_CLOCK/6/32) /* 96 KHz */
+ MCFG_DEVICE_ADD("namco", NAMCO, MASTER_CLOCK/6/32) /* 96 KHz */
MCFG_NAMCO_AUDIO_VOICES(3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(rallyx_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
@@ -870,18 +870,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rallyx_state::jungler)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(jungler_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(jungler_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 1C on Loco-Motion
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w)) // SOUNDON
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(rallyx_state, nmi_mask_w)) // INTST
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, mute_w)) // MUT
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(rallyx_state, flip_screen_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(rallyx_state, coin_counter_1_w)) // OUT1
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w)) // SOUNDON
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, rallyx_state, nmi_mask_w)) // INTST
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, mute_w)) // MUT
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, rallyx_state, flip_screen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, rallyx_state, coin_counter_1_w)) // OUT1
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // OUT2
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(rallyx_state, coin_counter_2_w)) // OUT3
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(rallyx_state, stars_enable_w)) // STARSON
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, rallyx_state, coin_counter_2_w)) // OUT3
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, rallyx_state, stars_enable_w)) // STARSON
MCFG_WATCHDOG_ADD("watchdog")
@@ -895,7 +895,7 @@ MACHINE_CONFIG_START(rallyx_state::jungler)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(rallyx_state, screen_update_jungler)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rallyx_state, jungler_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rallyx_state, jungler_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", jungler)
@@ -906,7 +906,7 @@ MACHINE_CONFIG_START(rallyx_state::jungler)
MCFG_VIDEO_START_OVERRIDE(rallyx_state,jungler)
/* sound hardware */
- MCFG_SOUND_ADD("timeplt_audio", LOCOMOTN_AUDIO, 0)
+ MCFG_DEVICE_ADD("timeplt_audio", LOCOMOTN_AUDIO)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rambo.cpp b/src/mame/drivers/rambo.cpp
index 406eeac48d0..773c0c12009 100644
--- a/src/mame/drivers/rambo.cpp
+++ b/src/mame/drivers/rambo.cpp
@@ -147,10 +147,10 @@ void rambo_state::machine_reset()
MACHINE_CONFIG_START(rambo_state::rambo)
- MCFG_CPU_ADD("maincpu", ATMEGA2560, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(rambo_prg_map)
- MCFG_CPU_DATA_MAP(rambo_data_map)
- MCFG_CPU_IO_MAP(rambo_io_map)
+ MCFG_DEVICE_ADD("maincpu", ATMEGA2560, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(rambo_prg_map)
+ MCFG_DEVICE_DATA_MAP(rambo_data_map)
+ MCFG_DEVICE_IO_MAP(rambo_io_map)
MCFG_CPU_AVR8_EEPROM("eeprom")
MCFG_CPU_AVR8_LFUSE(0xFF)
diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp
index 8fab57a1d91..40ad8927d14 100644
--- a/src/mame/drivers/rampart.cpp
+++ b/src/mame/drivers/rampart.cpp
@@ -340,8 +340,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(rampart_state::rampart)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_SLAPSTIC_ADD("slapstic", 118)
@@ -367,7 +367,7 @@ MACHINE_CONFIG_START(rampart_state::rampart)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/2, 456, 0+12, 336+12, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(rampart_state, screen_update_rampart)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rampart_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rampart_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -375,7 +375,7 @@ MACHINE_CONFIG_START(rampart_state::rampart)
MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("ymsnd", YM2413, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp
index 4d6f81215c2..d25917a89bc 100644
--- a/src/mame/drivers/rastan.cpp
+++ b/src/mame/drivers/rastan.cpp
@@ -368,12 +368,12 @@ void rastan_state::machine_reset()
MACHINE_CONFIG_START(rastan_state::rastan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rastan_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rastan_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rastan_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rastan_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rastan_s_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rastan_s_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -405,17 +405,17 @@ MACHINE_CONFIG_START(rastan_state::rastan)
MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rastan_state,rastan_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rastan_state,rastan_bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
- MCFG_MSM5205_VCLK_CB(WRITELINE(rastan_state, rastan_msm5205_vck)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) /* verified on pcb */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, rastan_state, rastan_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_DEVICE_ADD("adpcm_sel", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
MCFG_DEVICE_ADD("ciu", PC060HA, 0)
MCFG_PC060HA_MASTER_CPU("maincpu")
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index 7d9337a9b26..b05f4925c70 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -144,7 +144,7 @@ public:
void update_irq(uint32_t which, uint32_t state);
void upload_palette(uint32_t word1, uint32_t word2);
IRQ_CALLBACK_MEMBER(irq_callback);
- static void ncr53c700(device_t *device);
+ void ncr53c700(device_t *device);
void rastersp(machine_config &config);
void cpu_map(address_map &map);
void dsp_map(address_map &map);
@@ -843,9 +843,9 @@ void rastersp_state::ncr53c700(device_t *device)
devcb_base *devcb;
(void)devcb;
MCFG_DEVICE_CLOCK(66000000)
- MCFG_NCR53C7XX_IRQ_HANDLER(DEVWRITELINE(":", rastersp_state, scsi_irq))
- MCFG_NCR53C7XX_HOST_READ(DEVREAD32(":", rastersp_state, ncr53c700_read))
- MCFG_NCR53C7XX_HOST_WRITE(DEVWRITE32(":", rastersp_state, ncr53c700_write))
+ MCFG_NCR53C7XX_IRQ_HANDLER(WRITELINE(*this, rastersp_state, scsi_irq))
+ MCFG_NCR53C7XX_HOST_READ(READ32(*this, rastersp_state, ncr53c700_read))
+ MCFG_NCR53C7XX_HOST_WRITE(WRITE32(*this, rastersp_state, ncr53c700_write))
}
static void rastersp_scsi_devices(device_slot_interface &device)
@@ -862,13 +862,13 @@ static void rastersp_scsi_devices(device_slot_interface &device)
*************************************/
MACHINE_CONFIG_START(rastersp_state::rastersp)
- MCFG_CPU_ADD("maincpu", I486, 33330000)
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(rastersp_state,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I486, 33330000)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(rastersp_state,irq_callback)
- MCFG_CPU_ADD("dsp", TMS32031, 33330000)
- MCFG_CPU_PROGRAM_MAP(dsp_map)
+ MCFG_DEVICE_ADD("dsp", TMS32031, 33330000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_map)
MCFG_TMS3203X_MCBL(true) // Boot-loader mode
/* Devices */
@@ -880,7 +880,7 @@ MACHINE_CONFIG_START(rastersp_state::rastersp)
MCFG_NSCSI_BUS_ADD("scsibus")
MCFG_NSCSI_ADD("scsibus:0", rastersp_scsi_devices, "harddisk", true)
MCFG_NSCSI_ADD("scsibus:7", rastersp_scsi_devices, "ncr53c700", true)
- MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr53c700", ncr53c700)
+ MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr53c700", [this] (device_t *device) { ncr53c700(device); })
/* Video */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -890,15 +890,15 @@ MACHINE_CONFIG_START(rastersp_state::rastersp)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rastersp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rastersp_state, vblank_irq))
MCFG_PALETTE_ADD_RRRRRGGGGGGBBBBB("palette")
/* Sound */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp
index 0172e558fdc..090454c8f02 100644
--- a/src/mame/drivers/ravens.cpp
+++ b/src/mame/drivers/ravens.cpp
@@ -338,11 +338,11 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens )
MACHINE_CONFIG_START(ravens_state::ravens)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000)) // frequency is unknown
- MCFG_CPU_PROGRAM_MAP(ravens_mem)
- MCFG_CPU_IO_MAP(ravens_io)
- MCFG_S2650_SENSE_INPUT(READLINE(ravens_state, cass_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(ravens_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu",S2650, XTAL(1'000'000)) // frequency is unknown
+ MCFG_DEVICE_PROGRAM_MAP(ravens_mem)
+ MCFG_DEVICE_IO_MAP(ravens_io)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, ravens_state, cass_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, ravens_state, cass_w))
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_ravens)
@@ -359,11 +359,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ravens_state::ravens2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",S2650, XTAL(1'000'000)) // frequency is unknown
- MCFG_CPU_PROGRAM_MAP(ravens_mem)
- MCFG_CPU_IO_MAP(ravens2_io)
- MCFG_S2650_SENSE_INPUT(READLINE(ravens_state, cass_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(ravens_state, cass_w))
+ MCFG_DEVICE_ADD("maincpu",S2650, XTAL(1'000'000)) // frequency is unknown
+ MCFG_DEVICE_PROGRAM_MAP(ravens_mem)
+ MCFG_DEVICE_IO_MAP(ravens2_io)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, ravens_state, cass_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, ravens_state, cass_w))
MCFG_MACHINE_RESET_OVERRIDE(ravens_state, ravens2)
diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp
index ddbb565c9ae..e307b5df60e 100644
--- a/src/mame/drivers/rbisland.cpp
+++ b/src/mame/drivers/rbisland.cpp
@@ -656,19 +656,19 @@ WRITE8_MEMBER(rbisland_state::counters_w)
MACHINE_CONFIG_START(rbisland_state::rbisland)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rbisland_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rbisland_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rbisland_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rbisland_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rbisland_sound_map)
MCFG_TAITO_CCHIP_ADD("cchip", XTAL(12'000'000)) /* 12MHz OSC next to C-Chip */
MCFG_CCHIP_IN_PORTA_CB(IOPORT("800007"))
MCFG_CCHIP_IN_PORTB_CB(IOPORT("800009"))
MCFG_CCHIP_IN_PORTC_CB(IOPORT("80000B"))
MCFG_CCHIP_IN_PORTAD_CB(IOPORT("80000D"))
- MCFG_CCHIP_OUT_PORTB_CB(WRITE8(rbisland_state, counters_w))
+ MCFG_CCHIP_OUT_PORTB_CB(WRITE8(*this, rbisland_state, counters_w))
MCFG_TIMER_DRIVER_ADD("cchip_irq_clear", rbisland_state, cchip_irq_clear_cb)
@@ -700,7 +700,7 @@ MACHINE_CONFIG_START(rbisland_state::rbisland)
MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rbisland_state,bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rbisland_state,bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -714,12 +714,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rbisland_state::jumping)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(18'432'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(jumping_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(18'432'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(jumping_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(jumping_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(jumping_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough unless otherwise */
@@ -747,19 +747,19 @@ MACHINE_CONFIG_START(rbisland_state::jumping)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(24'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(24'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(24'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/* Imnoe PCB uses 16MHz CPU crystal instead of 18.432 for CPU */
MACHINE_CONFIG_START(rbisland_state::jumpingi)
jumping(config);
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(jumping_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(jumping_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rbisland_state, irq4_line_hold)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp
index 91ef0e79800..55301b272da 100644
--- a/src/mame/drivers/rbmk.cpp
+++ b/src/mame/drivers/rbmk.cpp
@@ -567,15 +567,15 @@ INTERRUPT_GEN_MEMBER(rbmk_state::mcu_irq)
}
MACHINE_CONFIG_START(rbmk_state::rbmk)
- MCFG_CPU_ADD("maincpu", M68000, 22000000 /2)
- MCFG_CPU_PROGRAM_MAP(rbmk_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rbmk_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 22000000 /2)
+ MCFG_DEVICE_PROGRAM_MAP(rbmk_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rbmk_state, irq1_line_hold)
- MCFG_CPU_ADD("mcu", AT89C4051, 22000000 / 4) // frequency isn't right
- MCFG_CPU_PROGRAM_MAP(mcu_mem)
- MCFG_CPU_IO_MAP(mcu_io)
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(rbmk_state, mcu_io_mux_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rbmk_state, mcu_irq)
+ MCFG_DEVICE_ADD("mcu", AT89C4051, 22000000 / 4) // frequency isn't right
+ MCFG_DEVICE_PROGRAM_MAP(mcu_mem)
+ MCFG_DEVICE_IO_MAP(mcu_io)
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, rbmk_state, mcu_io_mux_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rbmk_state, mcu_irq)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rbmk)
@@ -606,10 +606,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rbmk_state::rbspm)
rbmk(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rbspm_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rbspm_mem)
- MCFG_CPU_MODIFY("mcu")
+ MCFG_DEVICE_MODIFY("mcu")
MCFG_DEVICE_DISABLE() // until decapped
// PIC16F84 but no CPU core available
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp
index bbe87db641d..8919c17b981 100644
--- a/src/mame/drivers/rc702.cpp
+++ b/src/mame/drivers/rc702.cpp
@@ -329,20 +329,20 @@ static void floppies(device_slot_interface &device)
MACHINE_CONFIG_START(rc702_state::rc702)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(rc702_mem)
- MCFG_CPU_IO_MAP(rc702_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(rc702_mem)
+ MCFG_DEVICE_IO_MAP(rc702_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain_intf)
MCFG_MACHINE_RESET_OVERRIDE(rc702_state, rc702)
MCFG_DEVICE_ADD("ctc_clock", CLOCK, 614000)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(rc702_state, clock_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, rc702_state, clock_w))
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(8'000'000) / 2)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio1", z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80dart_device, rxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("sio1", z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio1", z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", z80dart_device, rxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("sio1", z80dart_device, rxtxcb_w))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("sio1", Z80DART, XTAL(8'000'000) / 2)
@@ -350,22 +350,22 @@ MACHINE_CONFIG_START(rc702_state::rc702)
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(8'000'000) / 2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
-// MCFG_Z80PIO_OUT_PB_CB(WRITE8(rc702_state, portxx_w)) // parallel port
+// MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, rc702_state, portxx_w)) // parallel port
MCFG_DEVICE_ADD("dma", AM9517A, XTAL(8'000'000) / 2)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(rc702_state, busreq_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(rc702_state, tc_w)) // inverted
- MCFG_I8237_IN_MEMR_CB(READ8(rc702_state, memory_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(rc702_state, memory_write_byte))
- MCFG_I8237_IN_IOR_1_CB(DEVREAD8("fdc", upd765a_device, mdma_r))
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8("fdc", upd765a_device, mdma_w))
- MCFG_I8237_OUT_IOW_2_CB(DEVWRITE8("crtc", i8275_device, dack_w))
- MCFG_I8237_OUT_IOW_3_CB(DEVWRITE8("crtc", i8275_device, dack_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(rc702_state, dack1_w)) // inverted
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, rc702_state, busreq_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, rc702_state, tc_w)) // inverted
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, rc702_state, memory_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, rc702_state, memory_write_byte))
+ MCFG_I8237_IN_IOR_1_CB(READ8("fdc", upd765a_device, mdma_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8("fdc", upd765a_device, mdma_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8("crtc", i8275_device, dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8("crtc", i8275_device, dack_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, rc702_state, dack1_w)) // inverted
MCFG_UPD765A_ADD("fdc", false, true)
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("ctc1", z80ctc_device, trg3))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma", am9517a_device, dreq1_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("ctc1", z80ctc_device, trg3))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma", am9517a_device, dreq1_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -374,8 +374,8 @@ MACHINE_CONFIG_START(rc702_state::rc702)
MCFG_GENERIC_KEYBOARD_CB(PUT(rc702_state, kbd_put))
MCFG_DEVICE_ADD("7474", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(rc702_state, q_w))
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(rc702_state, qbar_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, rc702_state, q_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, rc702_state, qbar_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -387,14 +387,14 @@ MACHINE_CONFIG_START(rc702_state::rc702)
MCFG_DEVICE_ADD("crtc", I8275, 11640000/7)
MCFG_I8275_CHARACTER_WIDTH(7)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(rc702_state, display_pixels)
- MCFG_I8275_IRQ_CALLBACK(DEVWRITELINE("7474", ttl7474_device, clear_w)) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc1", z80ctc_device, trg2))
- MCFG_I8275_DRQ_CALLBACK(WRITELINE(rc702_state, crtc_drq_w))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE("7474", ttl7474_device, clear_w)) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc1", z80ctc_device, trg2))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(*this, rc702_state, crtc_drq_w))
MCFG_PALETTE_ADD("palette", 2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 1000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index 21be59dd228..028b2ee5541 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -531,29 +531,29 @@ static void rc759_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(rc759_state::rc759)
- MCFG_CPU_ADD("maincpu", I80186, 6000000)
- MCFG_CPU_PROGRAM_MAP(rc759_map)
- MCFG_CPU_IO_MAP(rc759_io)
- MCFG_80186_IRQ_SLAVE_ACK(READ8(rc759_state, irq_callback))
- MCFG_80186_TMROUT0_HANDLER(WRITELINE(rc759_state, i186_timer0_w))
- MCFG_80186_TMROUT1_HANDLER(WRITELINE(rc759_state, i186_timer1_w))
+ MCFG_DEVICE_ADD("maincpu", I80186, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(rc759_map)
+ MCFG_DEVICE_IO_MAP(rc759_io)
+ MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, rc759_state, irq_callback))
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE(*this, rc759_state, i186_timer0_w))
+ MCFG_80186_TMROUT1_HANDLER(WRITELINE(*this, rc759_state, i186_timer1_w))
// interrupt controller
MCFG_DEVICE_ADD("pic", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("maincpu", i80186_cpu_device, int0_w))
// nvram
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", rc759_state, nvram_init)
// ppi
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(rc759_state, ppi_porta_r))
- MCFG_I8255_IN_PORTB_CB(READ8(rc759_state, ppi_portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(rc759_state, ppi_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, rc759_state, ppi_porta_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, rc759_state, ppi_portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, rc759_state, ppi_portc_w))
// rtc
MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
- MCFG_MM58167_IRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir3_w))
+ MCFG_MM58167_IRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir3_w))
// video
MCFG_SCREEN_ADD("screen", RASTER)
@@ -563,7 +563,7 @@ MACHINE_CONFIG_START(rc759_state::rc759)
MCFG_I82730_ADD("txt", "maincpu", 1250000)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_I82730_UPDATE_ROW_CB(rc759_state, txt_update_row)
- MCFG_I82730_SINT_HANDLER(DEVWRITELINE("pic", pic8259_device, ir4_w))
+ MCFG_I82730_SINT_HANDLER(WRITELINE("pic", pic8259_device, ir4_w))
// keyboard
MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0)
@@ -575,29 +575,29 @@ MACHINE_CONFIG_START(rc759_state::rc759)
// sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("snd", SN76489A, XTAL(20'000'000) / 10)
+ MCFG_DEVICE_ADD("snd", SN76489A, XTAL(20'000'000) / 10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// internal centronics
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(rc759_state, centronics_busy_w))
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(rc759_state, centronics_ack_w))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(rc759_state, centronics_fault_w))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(rc759_state, centronics_perror_w))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(rc759_state, centronics_select_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, rc759_state, centronics_busy_w))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, rc759_state, centronics_ack_w))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, rc759_state, centronics_fault_w))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, rc759_state, centronics_perror_w))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, rc759_state, centronics_select_w))
// isbx slot
MCFG_ISBX_SLOT_ADD("isbx", 0, isbx_cards, nullptr)
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int1_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int3_w))
- MCFG_ISBX_SLOT_MDRQT_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int1_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int3_w))
+ MCFG_ISBX_SLOT_MDRQT_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w))
// floppy disk controller
MCFG_WD2797_ADD("fdc", 1000000)
-// MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir0_w))
-// MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w))
+// MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("pic", pic8259_device, ir0_w))
+// MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq1_w))
// floppy drives
MCFG_FLOPPY_DRIVE_ADD("fdc:0", rc759_floppies, "hd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp
index a7c821641f1..6a6e99a11f6 100644
--- a/src/mame/drivers/rcorsair.cpp
+++ b/src/mame/drivers/rcorsair.cpp
@@ -159,13 +159,13 @@ MACHINE_CONFIG_START(rcorsair_state::rcorsair)
/* Main CPU is probably inside Custom Block with
program code, unknown type */
- MCFG_CPU_ADD("maincpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(rcorsair_main_map)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", rcorsair_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(rcorsair_main_map)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rcorsair_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", I8035, 8000000)
- MCFG_CPU_PROGRAM_MAP(rcorsair_sub_map)
- MCFG_CPU_IO_MAP(rcorsair_sub_io_map)
+ MCFG_DEVICE_ADD("subcpu", I8035, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(rcorsair_sub_map)
+ MCFG_DEVICE_IO_MAP(rcorsair_sub_io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp
index 234ea08fcf7..4a111fb97c7 100644
--- a/src/mame/drivers/rd100.cpp
+++ b/src/mame/drivers/rd100.cpp
@@ -99,8 +99,8 @@ MACHINE_RESET_MEMBER( rd100_state, rd100 )
MACHINE_CONFIG_START(rd100_state::rd100)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000)) // MC6809P???
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000)) // MC6809P???
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_MACHINE_RESET_OVERRIDE(rd100_state, rd100)
diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp
index 193585907db..564d18a2f06 100644
--- a/src/mame/drivers/rd110.cpp
+++ b/src/mame/drivers/rd110.cpp
@@ -236,9 +236,9 @@ void d110_state::d110_io(address_map &map)
}
MACHINE_CONFIG_START(d110_state::d110)
- MCFG_CPU_ADD( "maincpu", P8098, XTAL(12'000'000) )
- MCFG_CPU_PROGRAM_MAP( d110_map )
- MCFG_CPU_IO_MAP( d110_io )
+ MCFG_DEVICE_ADD( "maincpu", P8098, XTAL(12'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP( d110_map )
+ MCFG_DEVICE_IO_MAP( d110_io )
// Battery-backed main ram
MCFG_RAM_ADD( "ram" )
diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp
index 38917c27891..89f3c5a54b4 100644
--- a/src/mame/drivers/re900.cpp
+++ b/src/mame/drivers/re900.cpp
@@ -383,10 +383,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(re900_state::re900)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mem_prg)
- MCFG_CPU_IO_MAP(mem_io)
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(re900_state, cpu_port_0_w))
+ MCFG_DEVICE_ADD("maincpu", I8051, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mem_prg)
+ MCFG_DEVICE_IO_MAP(mem_io)
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, re900_state, cpu_port_0_w))
/* video hardware */
MCFG_DEVICE_ADD( "tms9128", TMS9128, XTAL(10'738'635) / 2 ) /* TMS9128NL on the board */
@@ -399,11 +399,11 @@ MACHINE_CONFIG_START(re900_state::re900)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay_re900", AY8910, TMS_CLOCK) /* From TMS9128NL - Pin 37 (GROMCLK) */
- MCFG_AY8910_PORT_A_READ_CB(READ8(re900_state, re_psg_portA_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(re900_state, re_psg_portB_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(re900_state, re_mux_port_A_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(re900_state, re_mux_port_B_w))
+ MCFG_DEVICE_ADD("ay_re900", AY8910, TMS_CLOCK) /* From TMS9128NL - Pin 37 (GROMCLK) */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, re900_state, re_psg_portA_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, re900_state, re_psg_portB_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, re900_state, re_mux_port_A_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, re900_state, re_mux_port_B_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -411,7 +411,7 @@ MACHINE_CONFIG_START(re900_state::bs94)
re900(config);
/* sound hardware */
- MCFG_SOUND_MODIFY("ay_re900")
+ MCFG_DEVICE_MODIFY("ay_re900")
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_AY8910_PORT_A_WRITE_CB(NOOP)
diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp
index 1ae3a4a4523..da55a242ed8 100644
--- a/src/mame/drivers/realbrk.cpp
+++ b/src/mame/drivers/realbrk.cpp
@@ -763,13 +763,13 @@ WRITE_LINE_MEMBER(realbrk_state::vblank_irq)
MACHINE_CONFIG_START(realbrk_state::realbrk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(32'000'000) / 2) /* !! TMP68301 !! */
- MCFG_CPU_PROGRAM_MAP(realbrk_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(32'000'000) / 2) /* !! TMP68301 !! */
+ MCFG_DEVICE_PROGRAM_MAP(realbrk_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(realbrk_state,realbrk_flipscreen_w))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, realbrk_state,realbrk_flipscreen_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -779,7 +779,7 @@ MACHINE_CONFIG_START(realbrk_state::realbrk)
MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1)
MCFG_SCREEN_UPDATE_DRIVER(realbrk_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(realbrk_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, realbrk_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", realbrk)
MCFG_PALETTE_ADD("palette", 0x8000)
@@ -788,19 +788,19 @@ MACHINE_CONFIG_START(realbrk_state::realbrk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(33'868'800) / 2)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(33'868'800) / 2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(realbrk_state::pkgnsh)
realbrk(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pkgnsh_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pkgnsh_mem)
MCFG_DEVICE_MODIFY("tmp68301")
MCFG_TMP68301_OUT_PARALLEL_CB(NOOP)
@@ -808,14 +808,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(realbrk_state::pkgnshdx)
pkgnsh(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pkgnshdx_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pkgnshdx_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(realbrk_state::dai2kaku)
realbrk(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dai2kaku_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dai2kaku_mem)
MCFG_GFXDECODE_MODIFY("gfxdecode", dai2kaku)
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/redalert.cpp b/src/mame/drivers/redalert.cpp
index e14c8f494d6..2a0044042b5 100644
--- a/src/mame/drivers/redalert.cpp
+++ b/src/mame/drivers/redalert.cpp
@@ -394,9 +394,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(redalert_state::redalert)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(redalert_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(redalert_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
/* video hardware */
redalert_video(config);
@@ -408,9 +408,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(redalert_state::ww3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ww3_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ww3_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
/* video hardware */
ww3_video(config);
@@ -422,9 +422,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(redalert_state::panther)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(panther_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(panther_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
/* video hardware */
panther_video(config);
@@ -436,9 +436,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(redalert_state::demoneye)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(demoneye_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(demoneye_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", redalert_state, redalert_vblank_interrupt)
/* video hardware */
demoneye_video(config);
diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp
index 31901d38c80..81679ba7258 100644
--- a/src/mame/drivers/redclash.cpp
+++ b/src/mame/drivers/redclash.cpp
@@ -348,8 +348,8 @@ void redclash_state::machine_reset()
MACHINE_CONFIG_START(redclash_state::zerohour)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(zerohour_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(zerohour_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -358,7 +358,7 @@ MACHINE_CONFIG_START(redclash_state::zerohour)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(redclash_state, screen_update_redclash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(redclash_state, screen_vblank_redclash))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, redclash_state, screen_vblank_redclash))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", redclash)
@@ -375,8 +375,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(redclash_state::redclash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(redclash_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(redclash_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -385,7 +385,7 @@ MACHINE_CONFIG_START(redclash_state::redclash)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 4*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(redclash_state, screen_update_redclash)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(redclash_state, screen_vblank_redclash))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, redclash_state, screen_vblank_redclash))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", redclash)
diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp
index f2a4b5c439c..02d8c744abc 100644
--- a/src/mame/drivers/relief.cpp
+++ b/src/mame/drivers/relief.cpp
@@ -272,8 +272,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(relief_state::relief)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(relief_state::relief)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
- MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(relief_state, scanline_int_write_line))
+ MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(*this, relief_state, scanline_int_write_line))
MCFG_ATARI_VAD_PLAYFIELD(relief_state, "gfxdecode", get_playfield_tile_info)
MCFG_ATARI_VAD_PLAYFIELD2(relief_state, "gfxdecode", get_playfield2_tile_info)
MCFG_ATARI_VAD_MOB(relief_state::s_mob_config, "gfxdecode")
@@ -305,7 +305,7 @@ MACHINE_CONFIG_START(relief_state::relief)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
- MCFG_SOUND_ADD("ymsnd", YM2413, ATARI_CLOCK_14MHz/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, ATARI_CLOCK_14MHz/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp
index b56e8ff405e..7ad23848994 100644
--- a/src/mame/drivers/renegade.cpp
+++ b/src/mame/drivers/renegade.cpp
@@ -469,12 +469,12 @@ void renegade_state::machine_reset()
MACHINE_CONFIG_START(renegade_state::renegade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */
- MCFG_CPU_PROGRAM_MAP(renegade_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */
+ MCFG_DEVICE_PROGRAM_MAP(renegade_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", renegade_state, interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", MC6809, 12000000/2) // HD68A09P
- MCFG_CPU_PROGRAM_MAP(renegade_sound_map) /* IRQs are caused by the main CPU */
+ MCFG_DEVICE_ADD("audiocpu", MC6809, 12000000/2) // HD68A09P
+ MCFG_DEVICE_PROGRAM_MAP(renegade_sound_map) /* IRQs are caused by the main CPU */
MCFG_DEVICE_ADD("mcu", TAITO68705_MCU, 12000000/4) // ?
@@ -497,12 +497,12 @@ MACHINE_CONFIG_START(renegade_state::renegade)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6809_IRQ_LINE))
- MCFG_SOUND_ADD("ymsnd", YM3526, 12000000/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, 12000000/4)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, 12000000/32)
- MCFG_MSM5205_VCLK_CB(WRITELINE(renegade_state, adpcm_int))
+ MCFG_DEVICE_ADD("msm", MSM5205, 12000000/32)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, renegade_state, adpcm_int))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -510,8 +510,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(renegade_state::kuniokunb)
renegade(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(renegade_nomcu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(renegade_nomcu_map)
MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp
index 698f56e2601..8a37f504bcc 100644
--- a/src/mame/drivers/replicator.cpp
+++ b/src/mame/drivers/replicator.cpp
@@ -608,10 +608,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(replicator_state::replicator)
- MCFG_CPU_ADD("maincpu", ATMEGA1280, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(replicator_prg_map)
- MCFG_CPU_DATA_MAP(replicator_data_map)
- MCFG_CPU_IO_MAP(replicator_io_map)
+ MCFG_DEVICE_ADD("maincpu", ATMEGA1280, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(replicator_prg_map)
+ MCFG_DEVICE_DATA_MAP(replicator_data_map)
+ MCFG_DEVICE_IO_MAP(replicator_io_map)
MCFG_CPU_AVR8_EEPROM("eeprom")
MCFG_CPU_AVR8_LFUSE(0xFF)
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(replicator_state::replicator)
/* sound hardware */
/* A piezo is connected to the PORT G bit 5 (OC0B pin driven by Timer/Counter #4) */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(0, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp
index a391eacec00..b0cf1beb31a 100644
--- a/src/mame/drivers/retofinv.cpp
+++ b/src/mame/drivers/retofinv.cpp
@@ -416,28 +416,28 @@ INTERRUPT_GEN_MEMBER(retofinv_state::sub_vblank_irq)
MACHINE_CONFIG_START(retofinv_state::retofinv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", retofinv_state, main_vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", retofinv_state, main_vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", retofinv_state, sub_vblank_irq)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", retofinv_state, sub_vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(retofinv_state, nmi_line_pulse, 2*60) // wrong, should be ~128-132 per frame, not 120.
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(retofinv_state, nmi_line_pulse, 2*60) // wrong, should be ~128-132 per frame, not 120.
- MCFG_CPU_ADD("68705", TAITO68705_MCU, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
+ MCFG_DEVICE_ADD("68705", TAITO68705_MCU, XTAL(18'432'000)/6) /* XTAL and divider verified, 3.072 MHz */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - enough for the sound CPU to read all commands */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC72 - probably shared between CPUs
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(retofinv_state, irq0_ack_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(retofinv_state, coinlockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, retofinv_state, irq0_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, retofinv_state, coinlockout_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("68705", taito68705_mcu_device, reset_w)) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(retofinv_state, irq1_ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("68705", taito68705_mcu_device, reset_w)) MCFG_DEVCB_INVERT
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, retofinv_state, irq1_ack_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_WATCHDOG_ADD("watchdog")
@@ -461,10 +461,10 @@ MACHINE_CONFIG_START(retofinv_state::retofinv)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL(18'432'000)/6) /* @IC5?; XTAL, chip type, and divider verified, 3.072 MHz */
+ MCFG_DEVICE_ADD("sn1", SN76489A, XTAL(18'432'000)/6) /* @IC5?; XTAL, chip type, and divider verified, 3.072 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("sn2", SN76489A, XTAL(18'432'000)/6) /* @IC6?; XTAL, chip type, and divider verified, 3.072 MHz */
+ MCFG_DEVICE_ADD("sn2", SN76489A, XTAL(18'432'000)/6) /* @IC6?; XTAL, chip type, and divider verified, 3.072 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -478,8 +478,8 @@ MACHINE_CONFIG_END
/* bootleg which has no mcu */
MACHINE_CONFIG_START(retofinv_state::retofinvb_nomcu)
retofinv(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
MCFG_DEVICE_MODIFY("mainlatch")
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP)
@@ -490,8 +490,8 @@ MACHINE_CONFIG_END
/* bootleg which has different pallete clut and also has no mcu */
MACHINE_CONFIG_START(retofinv_state::retofinvb1_nomcu)
retofinvb1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
MCFG_DEVICE_MODIFY("mainlatch")
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP)
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 18f12240bd1..051483a81f0 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -885,9 +885,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(rex6000_state::rex6000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) //Toshiba microprocessor Z80 compatible at 4.3MHz
- MCFG_CPU_PROGRAM_MAP(rex6000_mem)
- MCFG_CPU_IO_MAP(rex6000_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) //Toshiba microprocessor Z80 compatible at 4.3MHz
+ MCFG_DEVICE_PROGRAM_MAP(rex6000_mem)
+ MCFG_DEVICE_IO_MAP(rex6000_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("sec_timer", rex6000_state, sec_timer, attotime::from_hz(1))
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer1", rex6000_state, irq_timer1, attotime::from_hz(32))
@@ -920,23 +920,23 @@ MACHINE_CONFIG_START(rex6000_state::rex6000)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x2000)
MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(1'843'200) )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(rex6000_state, serial_irq))
-
- MCFG_RS232_PORT_ADD( "serport", default_rs232_devices, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, rex6000_state, serial_irq))
+
+ MCFG_DEVICE_ADD( "serport", RS232_PORT, default_rs232_devices, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("ns16550", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("ns16550", ins8250_uart_device, cts_w))
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", rex6000_state, rex6000, "rex,ds2", 0)
MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL(32'768))
- MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(rex6000_state, alarm_irq))
+ MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, rex6000_state, alarm_irq))
/*
Fujitsu 29DL16X have feature which is capability of reading data from one
@@ -956,32 +956,32 @@ MACHINE_CONFIG_START(rex6000_state::rex6000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 0 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(oz750_state::oz750)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(9'830'400)) //Toshiba microprocessor Z80 compatible at 9.8MHz
- MCFG_CPU_PROGRAM_MAP(rex6000_mem)
- MCFG_CPU_IO_MAP(oz750_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(9'830'400)) //Toshiba microprocessor Z80 compatible at 9.8MHz
+ MCFG_DEVICE_PROGRAM_MAP(rex6000_mem)
+ MCFG_DEVICE_IO_MAP(oz750_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("sec_timer", rex6000_state, sec_timer, attotime::from_hz(1))
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer1", rex6000_state, irq_timer1, attotime::from_hz(64))
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer2", rex6000_state, irq_timer2, attotime::from_hz(8192))
MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL(9'830'400) / 4 )
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("serport", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("serport", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(rex6000_state, serial_irq))
-
- MCFG_RS232_PORT_ADD( "serport", default_rs232_devices, nullptr )
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, ri_w))
- //MCFG_RS232_CTS_HANDLER(DEVWRITELINE("ns16550", ins8250_uart_device, cts_w))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("serport", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("serport", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("serport", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, rex6000_state, serial_irq))
+
+ MCFG_DEVICE_ADD( "serport", RS232_PORT, default_rs232_devices, nullptr )
+ MCFG_RS232_RXD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("ns16550", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("ns16550", ins8250_uart_device, ri_w))
+ //MCFG_RS232_CTS_HANDLER(WRITELINE("ns16550", ins8250_uart_device, cts_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -1012,7 +1012,7 @@ MACHINE_CONFIG_START(oz750_state::oz750)
MCFG_QUICKLOAD_ADD("quickload", oz750_state, oz750, "wzd", 0)
MCFG_DEVICE_ADD(TC8521_TAG, TC8521, XTAL(32'768))
- MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(rex6000_state, alarm_irq))
+ MCFG_RP5C01_OUT_ALARM_CB(WRITELINE(*this, rex6000_state, alarm_irq))
MCFG_SHARP_LH28F016S_ADD("flash0a")
MCFG_SHARP_LH28F016S_ADD("flash1a")
@@ -1023,7 +1023,7 @@ MACHINE_CONFIG_START(oz750_state::oz750)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 0 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp
index 9f6a1449676..6ce0adbf6e9 100644
--- a/src/mame/drivers/rgum.cpp
+++ b/src/mame/drivers/rgum.cpp
@@ -243,8 +243,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(rgum_state::rgum)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02,24000000/16) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(rgum_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02,24000000/16) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rgum_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -270,7 +270,7 @@ MACHINE_CONFIG_START(rgum_state::rgum)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 24000000/16) /* guessed to use the same xtal as the crtc */
+ MCFG_DEVICE_ADD("aysnd", AY8910, 24000000/16) /* guessed to use the same xtal as the crtc */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp
index 71850608ccc..22982ac451b 100644
--- a/src/mame/drivers/risc2500.cpp
+++ b/src/mame/drivers/risc2500.cpp
@@ -312,10 +312,10 @@ void risc2500_state::risc2500_mem(address_map &map)
MACHINE_CONFIG_START(risc2500_state::risc2500)
- MCFG_CPU_ADD("maincpu", ARM, XTAL(28'322'000) / 2) // VY86C010
- MCFG_CPU_PROGRAM_MAP(risc2500_mem)
+ MCFG_DEVICE_ADD("maincpu", ARM, XTAL(28'322'000) / 2) // VY86C010
+ MCFG_DEVICE_PROGRAM_MAP(risc2500_mem)
MCFG_ARM_COPRO(VL86C020)
- MCFG_CPU_PERIODIC_INT_DRIVER(risc2500_state, irq1_line_hold, 250)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(risc2500_state, irq1_line_hold, 250)
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE(50)
@@ -337,7 +337,7 @@ MACHINE_CONFIG_START(risc2500_state::risc2500)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_2BIT_BINARY_WEIGHTED_ONES_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_BINARY_WEIGHTED_ONES_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp
index e56656a7969..230931becaf 100644
--- a/src/mame/drivers/riscpc.cpp
+++ b/src/mame/drivers/riscpc.cpp
@@ -811,8 +811,8 @@ void riscpc_state::machine_reset()
MACHINE_CONFIG_START(riscpc_state::rpc600)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, 60_MHz_XTAL/2) // ARM610
- MCFG_CPU_PROGRAM_MAP(a7000_mem)
+ MCFG_DEVICE_ADD( "maincpu", ARM7, 60_MHz_XTAL/2) // ARM610
+ MCFG_DEVICE_PROGRAM_MAP(a7000_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -826,8 +826,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::rpc700)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, 80_MHz_XTAL/2) // ARM710
- MCFG_CPU_PROGRAM_MAP(a7000_mem)
+ MCFG_DEVICE_ADD( "maincpu", ARM7, 80_MHz_XTAL/2) // ARM710
+ MCFG_DEVICE_PROGRAM_MAP(a7000_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -841,8 +841,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::a7000)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, XTAL(32'000'000) ) // ARM7500
- MCFG_CPU_PROGRAM_MAP(a7000_mem)
+ MCFG_DEVICE_ADD( "maincpu", ARM7, XTAL(32'000'000) ) // ARM7500
+ MCFG_DEVICE_PROGRAM_MAP(a7000_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -856,14 +856,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::a7000p)
a7000(config);
- MCFG_CPU_MODIFY("maincpu") // ARM7500FE
- MCFG_CPU_CLOCK(XTAL(48'000'000))
+ MCFG_DEVICE_MODIFY("maincpu") // ARM7500FE
+ MCFG_DEVICE_CLOCK(XTAL(48'000'000))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::sarpc)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, 202000000 ) // StrongARM
- MCFG_CPU_PROGRAM_MAP(a7000_mem)
+ MCFG_DEVICE_ADD( "maincpu", ARM7, 202000000 ) // StrongARM
+ MCFG_DEVICE_PROGRAM_MAP(a7000_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -877,8 +877,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(riscpc_state::sarpc_j233)
/* Basic machine hardware */
- MCFG_CPU_ADD( "maincpu", ARM7, 233000000 ) // StrongARM
- MCFG_CPU_PROGRAM_MAP(a7000_mem)
+ MCFG_DEVICE_ADD( "maincpu", ARM7, 233000000 ) // StrongARM
+ MCFG_DEVICE_PROGRAM_MAP(a7000_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp
index 958cbe977e1..2b4105ba1de 100644
--- a/src/mame/drivers/rltennis.cpp
+++ b/src/mame/drivers/rltennis.cpp
@@ -187,9 +187,9 @@ void rltennis_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(rltennis_state::rltennis)
- MCFG_CPU_ADD("maincpu", M68000, RLT_XTAL/2) /* 68000P8 ??? */
- MCFG_CPU_PROGRAM_MAP(rltennis_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rltennis_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, RLT_XTAL/2) /* 68000P8 ??? */
+ MCFG_DEVICE_PROGRAM_MAP(rltennis_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rltennis_state, interrupt)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( RLT_REFRESH_RATE )
@@ -207,8 +207,8 @@ MACHINE_CONFIG_START(rltennis_state::rltennis)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index 725309498d0..68af947d6ea 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -235,9 +235,9 @@ uint32_t rm380z_state::screen_update_rm380z(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(rm380z_state::rm380z)
/* basic machine hardware */
- MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(rm380z_mem)
- MCFG_CPU_IO_MAP(rm380z_io)
+ MCFG_DEVICE_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(rm380z_mem)
+ MCFG_DEVICE_IO_MAP(rm380z_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -275,9 +275,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rm380z_state::rm480z)
/* basic machine hardware */
- MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(rm480z_mem)
- MCFG_CPU_IO_MAP(rm480z_io)
+ MCFG_DEVICE_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(rm480z_mem)
+ MCFG_DEVICE_IO_MAP(rm480z_io)
MCFG_MACHINE_RESET_OVERRIDE(rm380z_state, rm480z)
/* video hardware */
diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp
index 0ad7b06d25d..ca4052f40a2 100644
--- a/src/mame/drivers/rmhaihai.cpp
+++ b/src/mame/drivers/rmhaihai.cpp
@@ -505,10 +505,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(rmhaihai_state::rmhaihai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(rmhaihai_map)
- MCFG_CPU_IO_MAP(rmhaihai_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rmhaihai_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(rmhaihai_map)
+ MCFG_DEVICE_IO_MAP(rmhaihai_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rmhaihai_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -528,12 +528,12 @@ MACHINE_CONFIG_START(rmhaihai_state::rmhaihai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 20000000/16)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 20000000/16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("msm", MSM5205, 500000)
+ MCFG_DEVICE_ADD("msm", MSM5205, 500000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -554,9 +554,9 @@ MACHINE_CONFIG_START(themj_state::themj)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(themj_map)
- MCFG_CPU_IO_MAP(themj_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(themj_map)
+ MCFG_DEVICE_IO_MAP(themj_io_map)
MCFG_DEVICE_REMOVE("nvram")
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index c50c650309a..6b5ada9ab47 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -107,20 +107,20 @@ void rmnimbus_state::nimbus_iocpu_io(address_map &map)
MACHINE_CONFIG_START(rmnimbus_state::nimbus)
/* basic machine hardware */
- MCFG_CPU_ADD(MAINCPU_TAG, I80186, 16000000) // the cpu is a 10Mhz part but the serial clocks are wrong unless it runs at 8Mhz
- MCFG_CPU_PROGRAM_MAP(nimbus_mem)
- MCFG_CPU_IO_MAP(nimbus_io)
- MCFG_80186_IRQ_SLAVE_ACK(READ8(rmnimbus_state, cascade_callback))
- MCFG_80186_TMROUT0_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
- MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
-
- MCFG_CPU_ADD(IOCPU_TAG, I8031, 11059200)
- MCFG_CPU_PROGRAM_MAP(nimbus_iocpu_mem)
- MCFG_CPU_IO_MAP(nimbus_iocpu_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(rmnimbus_state, nimbus_pc8031_port1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(rmnimbus_state, nimbus_pc8031_port1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(rmnimbus_state, nimbus_pc8031_port3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(rmnimbus_state, nimbus_pc8031_port3_w))
+ MCFG_DEVICE_ADD(MAINCPU_TAG, I80186, 16000000) // the cpu is a 10Mhz part but the serial clocks are wrong unless it runs at 8Mhz
+ MCFG_DEVICE_PROGRAM_MAP(nimbus_mem)
+ MCFG_DEVICE_IO_MAP(nimbus_io)
+ MCFG_80186_IRQ_SLAVE_ACK(READ8(*this, rmnimbus_state, cascade_callback))
+ MCFG_80186_TMROUT0_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
+ MCFG_80186_TMROUT1_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+
+ MCFG_DEVICE_ADD(IOCPU_TAG, I8031, 11059200)
+ MCFG_DEVICE_PROGRAM_MAP(nimbus_iocpu_mem)
+ MCFG_DEVICE_IO_MAP(nimbus_iocpu_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, rmnimbus_state, nimbus_pc8031_port1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, rmnimbus_state, nimbus_pc8031_port1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, rmnimbus_state, nimbus_pc8031_port3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, rmnimbus_state, nimbus_pc8031_port3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -134,18 +134,18 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus)
/* Backing storage */
MCFG_WD2793_ADD(FDC_TAG, 1000000)
MCFG_WD_FDC_FORCE_READY
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(rmnimbus_state,nimbus_fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(rmnimbus_state,nimbus_fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, rmnimbus_state,nimbus_fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, rmnimbus_state,nimbus_fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":0", rmnimbus_floppies, "35dd", isa8_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FDC_TAG":1", rmnimbus_floppies, "35dd", isa8_fdc_device::floppy_formats)
MCFG_DEVICE_ADD(SCSIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
- MCFG_SCSI_MSG_HANDLER(WRITELINE(rmnimbus_state, write_scsi_msg))
- MCFG_SCSI_BSY_HANDLER(WRITELINE(rmnimbus_state, write_scsi_bsy))
- MCFG_SCSI_IO_HANDLER(WRITELINE(rmnimbus_state, write_scsi_io))
- MCFG_SCSI_CD_HANDLER(WRITELINE(rmnimbus_state, write_scsi_cd))
- MCFG_SCSI_REQ_HANDLER(WRITELINE(rmnimbus_state, write_scsi_req))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE(*this, rmnimbus_state, write_scsi_msg))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE(*this, rmnimbus_state, write_scsi_bsy))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(*this, rmnimbus_state, write_scsi_io))
+ MCFG_SCSI_CD_HANDLER(WRITELINE(*this, rmnimbus_state, write_scsi_cd))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE(*this, rmnimbus_state, write_scsi_req))
MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
MCFG_SCSIDEV_ADD(SCSIBUS_TAG ":" SCSI_PORT_DEVICE2, "harddisk", SCSIHD, SCSI_ID_1)
@@ -156,9 +156,9 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus)
MCFG_DEVICE_ADD("scsi_data_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("scsi_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE(SCSIBUS_TAG, scsi_port_device, write_rst))
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE(SCSIBUS_TAG, scsi_port_device, write_sel))
- MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE(rmnimbus_state, write_scsi_iena))
+ MCFG_OUTPUT_LATCH_BIT0_HANDLER(WRITELINE(SCSIBUS_TAG, scsi_port_device, write_rst))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(WRITELINE(SCSIBUS_TAG, scsi_port_device, write_sel))
+ MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE(*this, rmnimbus_state, write_scsi_iena))
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("1536K")
@@ -166,42 +166,42 @@ MACHINE_CONFIG_START(rmnimbus_state::nimbus)
/* Peripheral chips */
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO2, 4000000)
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_INT_CB(WRITELINE(rmnimbus_state, sio_interrupt))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_INT_CB(WRITELINE(*this, rmnimbus_state, sio_interrupt))
- MCFG_RS232_PORT_ADD("rs232a", keyboard, "rmnkbd")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, keyboard, "rmnkbd")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxa_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, dcdb_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rib_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, dcdb_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rib_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, ctsb_w))
MCFG_EEPROM_SERIAL_93C06_ADD(ER59256_TAG)
MCFG_DEVICE_ADD(VIA_TAG, VIA6522, 1000000)
- MCFG_VIA6522_WRITEPA_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(rmnimbus_state,nimbus_via_write_portb))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE(MAINCPU_TAG, i80186_cpu_device, int3_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, rmnimbus_state,nimbus_via_write_portb))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(MAINCPU_TAG, i80186_cpu_device, int3_w))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(VIA_TAG, via6522_device, write_ca1)) MCFG_DEVCB_INVERT
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(VIA_TAG, via6522_device, write_ca1)) MCFG_DEVCB_INVERT
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO(MONO_TAG)
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, 2000000)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(rmnimbus_state, nimbus_sound_ay8910_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(rmnimbus_state, nimbus_sound_ay8910_portb_w))
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, 2000000)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, rmnimbus_state, nimbus_sound_ay8910_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, rmnimbus_state, nimbus_sound_ay8910_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS,MONO_TAG, 0.75)
- MCFG_SOUND_ADD(MSM5205_TAG, MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(rmnimbus_state, nimbus_msm5205_vck)) /* VCK function */
+ MCFG_DEVICE_ADD(MSM5205_TAG, MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, rmnimbus_state, nimbus_msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, MONO_TAG, 0.75)
diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp
index 9c8fd506a9d..468dfe88b88 100644
--- a/src/mame/drivers/rmt32.cpp
+++ b/src/mame/drivers/rmt32.cpp
@@ -353,9 +353,9 @@ void mt32_state::mt32_io(address_map &map)
}
MACHINE_CONFIG_START(mt32_state::mt32)
- MCFG_CPU_ADD( "maincpu", P8098, XTAL(12'000'000) )
- MCFG_CPU_PROGRAM_MAP( mt32_map )
- MCFG_CPU_IO_MAP( mt32_io )
+ MCFG_DEVICE_ADD( "maincpu", P8098, XTAL(12'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP( mt32_map )
+ MCFG_DEVICE_IO_MAP( mt32_io )
MCFG_RAM_ADD( "ram" )
MCFG_RAM_DEFAULT_SIZE( "32K" )
diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp
index cfa1a70159a..781ef802b29 100644
--- a/src/mame/drivers/rockrage.cpp
+++ b/src/mame/drivers/rockrage.cpp
@@ -251,11 +251,11 @@ void rockrage_state::machine_reset()
MACHINE_CONFIG_START(rockrage_state::rockrage)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8)
- MCFG_CPU_PROGRAM_MAP(rockrage_map)
+ MCFG_DEVICE_ADD("maincpu", HD6309E, XTAL(24'000'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(rockrage_map)
- MCFG_CPU_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
- MCFG_CPU_PROGRAM_MAP(rockrage_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, XTAL(24'000'000) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(rockrage_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -267,7 +267,7 @@ MACHINE_CONFIG_START(rockrage_state::rockrage)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(rockrage_state, screen_update_rockrage)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rockrage_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rockrage_state, vblank_irq))
MCFG_K007342_ADD("k007342")
MCFG_K007342_GFXNUM(0)
@@ -295,7 +295,7 @@ MACHINE_CONFIG_START(rockrage_state::rockrage)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_SOUND_ADD("vlm", VLM5030, 3579545)
+ MCFG_DEVICE_ADD("vlm", VLM5030, 3579545)
MCFG_DEVICE_ADDRESS_MAP(0, rockrage_vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp
index d4683225f34..48e8e3d42d3 100644
--- a/src/mame/drivers/rocnrope.cpp
+++ b/src/mame/drivers/rocnrope.cpp
@@ -209,16 +209,16 @@ WRITE_LINE_MEMBER(rocnrope_state::vblank_irq)
MACHINE_CONFIG_START(rocnrope_state::rocnrope)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK / 3 / 4) /* Verified in schematics */
- MCFG_CPU_PROGRAM_MAP(rocnrope_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, MASTER_CLOCK / 3 / 4) /* Verified in schematics */
+ MCFG_DEVICE_PROGRAM_MAP(rocnrope_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B2
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(rocnrope_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(rocnrope_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(rocnrope_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(rocnrope_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, rocnrope_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, rocnrope_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, rocnrope_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, rocnrope_state, irq_mask_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -230,7 +230,7 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(rocnrope_state, screen_update_rocnrope)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rocnrope_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rocnrope_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rocnrope)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(rocnrope_state::rocnrope)
/* sound hardware */
- MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
+ MCFG_DEVICE_ADD("timeplt_audio", TIMEPLT_AUDIO)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp
index e9a3a3447ac..20d85d0d676 100644
--- a/src/mame/drivers/rohga.cpp
+++ b/src/mame/drivers/rohga.cpp
@@ -876,12 +876,12 @@ DECOSPR_COLOUR_CB_MEMBER(rohga_state::schmeisr_col_callback)
MACHINE_CONFIG_START(rohga_state::rohga)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(rohga_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(rohga_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, 32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, 32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1")
@@ -949,7 +949,7 @@ MACHINE_CONFIG_START(rohga_state::rohga)
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rohga_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.78)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.78)
@@ -965,12 +965,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rohga_state::wizdfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(wizdfire_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(wizdfire_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1")
@@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(rohga_state::wizdfire)
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rohga_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
@@ -1059,12 +1059,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rohga_state::nitrobal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(nitrobal_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(nitrobal_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1")
@@ -1138,7 +1138,7 @@ MACHINE_CONFIG_START(rohga_state::nitrobal)
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rohga_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
@@ -1154,12 +1154,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rohga_state::schmeisr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(schmeisr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(schmeisr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rohga_state, irq6_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram1")
@@ -1227,7 +1227,7 @@ MACHINE_CONFIG_START(rohga_state::schmeisr)
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(rohga_state,sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, rohga_state,sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
@@ -1246,8 +1246,8 @@ MACHINE_CONFIG_START(rohga_state::hangzo)
schmeisr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hangzo_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hangzo_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp
index 231dd47e2a1..821b682829d 100644
--- a/src/mame/drivers/rollerg.cpp
+++ b/src/mame/drivers/rollerg.cpp
@@ -247,13 +247,13 @@ WRITE8_MEMBER( rollerg_state::banking_callback )
MACHINE_CONFIG_START(rollerg_state::rollerg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(rollerg_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rollerg_state, irq0_line_assert)
- MCFG_KONAMICPU_LINE_CB(WRITE8(rollerg_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(rollerg_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rollerg_state, irq0_line_assert)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, rollerg_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(rollerg_sound_map) /* NMIs are generated by the 053260 */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(rollerg_sound_map) /* NMIs are generated by the 053260 */
MCFG_WATCHDOG_ADD("watchdog")
@@ -281,13 +281,13 @@ MACHINE_CONFIG_START(rollerg_state::rollerg)
MCFG_K051316_CB(rollerg_state, zoom_callback)
MCFG_DEVICE_ADD("k053252", K053252, 3000000*2)
- MCFG_K053252_INT1_ACK_CB(WRITELINE(rollerg_state,rollerg_irq_ack_w))
+ MCFG_K053252_INT1_ACK_CB(WRITELINE(*this, rollerg_state,rollerg_irq_ack_w))
MCFG_K053252_OFFSETS(14*8, 2*8)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_K053260_ADD("k053260", 3579545)
diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp
index 98b8a732516..e2e091a564f 100644
--- a/src/mame/drivers/rollext.cpp
+++ b/src/mame/drivers/rollext.cpp
@@ -541,14 +541,14 @@ void rollext_state::machine_start()
MACHINE_CONFIG_START(rollext_state::rollext)
- MCFG_CPU_ADD("maincpu", TMS32082_MP, 60000000)
- MCFG_CPU_PROGRAM_MAP(memmap)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", rollext_state, vblank_interrupt)
- MCFG_CPU_PERIODIC_INT_DRIVER(rollext_state, irq1_line_assert, 60)
- //MCFG_CPU_PERIODIC_INT_DRIVER(rollext_state, irq3_line_assert, 500)
-
- MCFG_CPU_ADD("pp0", TMS32082_PP, 60000000)
- MCFG_CPU_PROGRAM_MAP(memmap);
+ MCFG_DEVICE_ADD("maincpu", TMS32082_MP, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(memmap)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rollext_state, vblank_interrupt)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(rollext_state, irq1_line_assert, 60)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(rollext_state, irq3_line_assert, 500)
+
+ MCFG_DEVICE_ADD("pp0", TMS32082_PP, 60000000)
+ MCFG_DEVICE_PROGRAM_MAP(memmap);
MCFG_QUANTUM_TIME(attotime::from_hz(100))
diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp
index 5cbdf5f6317..75f0f754ab4 100644
--- a/src/mame/drivers/rollrace.cpp
+++ b/src/mame/drivers/rollrace.cpp
@@ -252,21 +252,21 @@ INTERRUPT_GEN_MEMBER(rollrace_state::sound_timer_irq)
MACHINE_CONFIG_START(rollrace_state::rollrace)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(24'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rollrace_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(24'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rollrace_map)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(24'000'000)/16) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rollrace_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(rollrace_state, sound_timer_irq, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(24'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rollrace_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(rollrace_state, sound_timer_irq, 4*60)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(rollrace_state, flipx_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(rollrace_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(rollrace_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(rollrace_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(rollrace_state, charbank_0_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(rollrace_state, charbank_1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(rollrace_state, spritebank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, rollrace_state, flipx_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, rollrace_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, rollrace_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, rollrace_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, rollrace_state, charbank_0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, rollrace_state, charbank_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, rollrace_state, spritebank_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -276,7 +276,7 @@ MACHINE_CONFIG_START(rollrace_state::rollrace)
MCFG_SCREEN_VISIBLE_AREA(0,256-1,16, 255-16)
MCFG_SCREEN_UPDATE_DRIVER(rollrace_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(rollrace_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, rollrace_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rollrace)
MCFG_PALETTE_ADD("palette", 256)
@@ -287,13 +287,13 @@ MACHINE_CONFIG_START(rollrace_state::rollrace)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay1", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MCFG_SOUND_ADD("ay2", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay2", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MCFG_SOUND_ADD("ay3", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ay3", AY8910,XTAL(24'000'000)/16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ron.cpp b/src/mame/drivers/ron.cpp
index 36a5512d7f1..2dac33d27ff 100644
--- a/src/mame/drivers/ron.cpp
+++ b/src/mame/drivers/ron.cpp
@@ -486,25 +486,25 @@ WRITE8_MEMBER(ron_state::ay_pa_w)
MACHINE_CONFIG_START(ron_state::ron)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ron_map)
- MCFG_CPU_IO_MAP(ron_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ron_map)
+ MCFG_DEVICE_IO_MAP(ron_io)
- MCFG_CPU_ADD("audiocpu", I8035, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(ron_audio_map)
- MCFG_CPU_IO_MAP(ron_audio_io)
+ MCFG_DEVICE_ADD("audiocpu", I8035, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(ron_audio_map)
+ MCFG_DEVICE_IO_MAP(ron_audio_io)
MCFG_MCS48_PORT_T0_CLK_DEVICE("aysnd")
- MCFG_MCS48_PORT_P2_IN_CB(READ8(ron_state, audio_cmd_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ron_state, audio_p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ron_state, audio_p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(ron_state, audio_T1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, ron_state, audio_cmd_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ron_state, audio_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ron_state, audio_p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ron_state, audio_T1_r))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(ron_state, screen_update)
MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK, 320, 0, 256, 264, 0, 240)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ron_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ron_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ron)
@@ -515,9 +515,9 @@ MACHINE_CONFIG_START(ron_state::ron)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 0) // T0 CLK from I8035 (not verified)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 0) // T0 CLK from I8035 (not verified)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(ron_state, ay_pa_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, ron_state, ay_pa_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp
index 810290d9e67..7b394bd268d 100644
--- a/src/mame/drivers/rotaryf.cpp
+++ b/src/mame/drivers/rotaryf.cpp
@@ -264,15 +264,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(rotaryf_state::rotaryf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A,4000000) /* ?? MHz */
- MCFG_CPU_PROGRAM_MAP(rotaryf_map)
- MCFG_CPU_IO_MAP(rotaryf_io_map)
+ MCFG_DEVICE_ADD("maincpu",I8085A,4000000) /* ?? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rotaryf_map)
+ MCFG_DEVICE_IO_MAP(rotaryf_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", rotaryf_state, rotaryf_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(rotaryf_state, porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(rotaryf_state, portb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(rotaryf_state, portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, rotaryf_state, porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, rotaryf_state, portb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, rotaryf_state, portc_w))
//MCFG_I8255_TRISTATE_PORTC_CB(CONSTANT(0))
/* video hardware */
@@ -284,7 +284,7 @@ MACHINE_CONFIG_START(rotaryf_state::rotaryf)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -300,7 +300,7 @@ MACHINE_CONFIG_START(rotaryf_state::rotaryf)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(rotaryf_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp
index 208f5340e9b..86a002d94bd 100644
--- a/src/mame/drivers/roul.cpp
+++ b/src/mame/drivers/roul.cpp
@@ -305,13 +305,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(roul_state::roul)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(roul_map)
- MCFG_CPU_IO_MAP(roul_cpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(roul_map)
+ MCFG_DEVICE_IO_MAP(roul_cpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_cpu_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_cpu_io_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -333,7 +333,7 @@ MACHINE_CONFIG_START(roul_state::roul)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp
index e64fcdb46d3..9323ed3c6a0 100644
--- a/src/mame/drivers/route16.cpp
+++ b/src/mame/drivers/route16.cpp
@@ -614,13 +614,13 @@ DRIVER_INIT_MEMBER(route16_state, route16)
MACHINE_CONFIG_START(route16_state::route16)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
- MCFG_CPU_PROGRAM_MAP(route16_cpu1_map)
- MCFG_CPU_IO_MAP(cpu1_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", route16_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(route16_cpu1_map)
+ MCFG_DEVICE_IO_MAP(cpu1_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", route16_state, irq0_line_hold)
- MCFG_CPU_ADD("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
- MCFG_CPU_PROGRAM_MAP(route16_cpu2_map)
+ MCFG_DEVICE_ADD("cpu2", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(route16_cpu2_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -634,7 +634,7 @@ MACHINE_CONFIG_START(route16_state::route16)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("ay8910", AY8910, 10000000/8)
+ MCFG_DEVICE_ADD("ay8910", AY8910, 10000000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -643,8 +643,8 @@ MACHINE_CONFIG_START(route16_state::routex)
route16(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(routex_cpu1_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(routex_cpu1_map)
MACHINE_CONFIG_END
@@ -652,11 +652,11 @@ MACHINE_CONFIG_START(route16_state::stratvox)
route16(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(stratvox_cpu1_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(stratvox_cpu1_map)
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PROGRAM_MAP(stratvox_cpu2_map)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PROGRAM_MAP(stratvox_cpu2_map)
/* video hardware */
@@ -664,10 +664,10 @@ MACHINE_CONFIG_START(route16_state::stratvox)
MCFG_SCREEN_UPDATE_DRIVER(route16_state, screen_update_ttmahjng)
/* sound hardware */
- MCFG_SOUND_MODIFY("ay8910")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(route16_state, stratvox_sn76477_w)) /* SN76477 commands (not used in Route 16?) */
+ MCFG_DEVICE_MODIFY("ay8910")
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, route16_state, stratvox_sn76477_w)) /* SN76477 commands (not used in Route 16?) */
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(150), CAP_U(0.001)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_M(3.3)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(1), RES_K(4.7)) // attack_decay_cap + attack_res
@@ -683,7 +683,7 @@ MACHINE_CONFIG_START(route16_state::stratvox)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -693,8 +693,8 @@ MACHINE_CONFIG_START(route16_state::speakres)
stratvox(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(speakres_cpu1_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(speakres_cpu1_map)
MCFG_MACHINE_START_OVERRIDE(route16_state, speakres)
MACHINE_CONFIG_END
@@ -704,15 +704,15 @@ MACHINE_CONFIG_START(route16_state::spacecho)
speakres(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("cpu2")
- MCFG_CPU_PERIODIC_INT_DRIVER(route16_state, irq0_line_hold, 48*60)
+ MCFG_DEVICE_MODIFY("cpu2")
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(route16_state, irq0_line_hold, 48*60)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(route16_state::ttmahjng)
route16(config);
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(ttmahjng_cpu1_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(ttmahjng_cpu1_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO)
MCFG_MACHINE_START_OVERRIDE(route16_state, ttmahjng)
diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp
index d57147bdd91..77af11d2484 100644
--- a/src/mame/drivers/rowamet.cpp
+++ b/src/mame/drivers/rowamet.cpp
@@ -222,11 +222,11 @@ TIMER_DEVICE_CALLBACK_MEMBER( rowamet_state::timer_a )
MACHINE_CONFIG_START(rowamet_state::rowamet)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 1888888)
- MCFG_CPU_PROGRAM_MAP(rowamet_map)
- MCFG_CPU_ADD("cpu2", Z80, 1888888)
- MCFG_CPU_PROGRAM_MAP(rowamet_sub_map)
- MCFG_CPU_IO_MAP(rowamet_sub_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 1888888)
+ MCFG_DEVICE_PROGRAM_MAP(rowamet_map)
+ MCFG_DEVICE_ADD("cpu2", Z80, 1888888)
+ MCFG_DEVICE_PROGRAM_MAP(rowamet_sub_map)
+ MCFG_DEVICE_IO_MAP(rowamet_sub_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", rowamet_state, timer_a, attotime::from_hz(200))
/* Video */
@@ -234,7 +234,7 @@ MACHINE_CONFIG_START(rowamet_state::rowamet)
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index e028270fc08..ff81152750b 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -3472,10 +3472,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(royalmah_state::royalmah)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(royalmah_map)
- MCFG_CPU_IO_MAP(royalmah_iomap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(royalmah_map)
+ MCFG_DEVICE_IO_MAP(royalmah_iomap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3494,97 +3494,97 @@ MACHINE_CONFIG_START(royalmah_state::royalmah)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, 18432000/12)
- MCFG_AY8910_PORT_A_READ_CB(READ8(royalmah_state, player_1_port_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(royalmah_state, player_2_port_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 18432000/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, royalmah_state, player_1_port_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, royalmah_state, player_2_port_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.33)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::janoh)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(janoh_map)
-
- MCFG_CPU_ADD("sub", Z80, 4000000) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(janoh_sub_map)
- MCFG_CPU_IO_MAP(janoh_sub_iomap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(janoh_map)
+
+ MCFG_DEVICE_ADD("sub", Z80, 4000000) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(janoh_sub_map)
+ MCFG_DEVICE_IO_MAP(janoh_sub_iomap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::jansou)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jansou_map)
- MCFG_CPU_IO_MAP(royalmah_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jansou_map)
+ MCFG_DEVICE_IO_MAP(royalmah_iomap)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4.000 MHz */
- MCFG_CPU_PROGRAM_MAP(jansou_sub_map)
- MCFG_CPU_IO_MAP(jansou_sub_iomap)
- MCFG_CPU_PERIODIC_INT_DRIVER(royalmah_state, irq0_line_hold, 4000000/512)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(jansou_sub_map)
+ MCFG_DEVICE_IO_MAP(jansou_sub_iomap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(royalmah_state, irq0_line_hold, 4000000/512)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::dondenmj)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MCFG_CPU_IO_MAP(dondenmj_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_IO_MAP(dondenmj_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::tahjong)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(tahjong_map)
- MCFG_CPU_IO_MAP(tahjong_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(tahjong_map)
+ MCFG_DEVICE_IO_MAP(tahjong_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::makaijan)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MCFG_CPU_IO_MAP(makaijan_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_IO_MAP(makaijan_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::daisyari)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MCFG_CPU_IO_MAP(daisyari_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_IO_MAP(daisyari_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjclub)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(8000000/2) /* 4 MHz ? */
- MCFG_CPU_IO_MAP(mjclub_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(8000000/2) /* 4 MHz ? */
+ MCFG_DEVICE_IO_MAP(mjclub_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjyarou)
royalmah(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjyarou_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjyarou_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::ippatsu)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(ippatsu_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(ippatsu_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::janyoup2)
ippatsu(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(18'432'000)/4) // unknown divider
- MCFG_CPU_IO_MAP(janyoup2_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(18'432'000)/4) // unknown divider
+ MCFG_DEVICE_IO_MAP(janyoup2_iomap)
MCFG_MC6845_ADD("crtc", H46505, "screen", XTAL(18'432'000)/12) // unknown divider
MCFG_MC6845_SHOW_BORDER_AREA(false)
@@ -3593,9 +3593,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::seljan)
janyoup2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(seljan_map)
- MCFG_CPU_IO_MAP(seljan_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(seljan_map)
+ MCFG_DEVICE_IO_MAP(seljan_iomap)
MACHINE_CONFIG_END
INTERRUPT_GEN_MEMBER(royalmah_state::suzume_irq)
@@ -3606,40 +3606,40 @@ INTERRUPT_GEN_MEMBER(royalmah_state::suzume_irq)
MACHINE_CONFIG_START(royalmah_state::suzume)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(suzume_iomap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, suzume_irq)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(suzume_iomap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", royalmah_state, suzume_irq)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::tontonb)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(tontonb_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(tontonb_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjdiplob)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjdiplob_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjdiplob_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::majs101b)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(majs101b_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(majs101b_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjapinky)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjapinky_map)
- MCFG_CPU_IO_MAP(mjapinky_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjapinky_map)
+ MCFG_DEVICE_IO_MAP(mjapinky_iomap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjderngr)
dondenmj(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mjderngr_iomap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mjderngr_iomap)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -3651,35 +3651,35 @@ MACHINE_CONFIG_START(royalmah_state::janptr96)
mjderngr(config);
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2) /* 8 MHz? */
- MCFG_CPU_PROGRAM_MAP(janptr96_map)
- MCFG_CPU_IO_MAP(janptr96_iomap)
- MCFG_TMPZ84C015_IN_PA_CB(READ8(royalmah_state, janptr96_dsw_r))
- MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(royalmah_state, janptr96_dswsel_w))
+ MCFG_DEVICE_ADD("maincpu", TMPZ84C015, XTAL(16'000'000)/2) /* 8 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(janptr96_map)
+ MCFG_DEVICE_IO_MAP(janptr96_iomap)
+ MCFG_TMPZ84C015_IN_PA_CB(READ8(*this, royalmah_state, janptr96_dsw_r))
+ MCFG_TMPZ84C015_OUT_PB_CB(WRITE8(*this, royalmah_state, janptr96_dswsel_w))
// internal CTC channels 0 & 1 have falling edge triggers
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("maincpu", tmpz84c015_device, trg0)) MCFG_DEVCB_INVERT
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
- MCFG_MSM6242_OUT_INT_HANDLER(DEVWRITELINE("maincpu", tmpz84c015_device, trg1)) MCFG_DEVCB_INVERT
+ MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE("maincpu", tmpz84c015_device, trg1)) MCFG_DEVCB_INVERT
MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjifb)
mjderngr(config);
- MCFG_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(mjifb_map)
- MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjifb_p3_r))
- MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, mjifb_p3_w))
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, mjifb_p4_w))
- MCFG_TLCS90_PORT_P5_READ_CB(READ8(royalmah_state, mjifb_p5_r))
- MCFG_TLCS90_PORT_P6_READ_CB(READ8(royalmah_state, mjifb_p6_r))
- MCFG_TLCS90_PORT_P7_READ_CB(READ8(royalmah_state, mjifb_p7_r))
- MCFG_TLCS90_PORT_P8_READ_CB(READ8(royalmah_state, mjifb_p8_r))
- MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(royalmah_state, mjifb_p8_w))
+ MCFG_DEVICE_REPLACE("maincpu",TMP90841, 8000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(mjifb_map)
+ MCFG_TLCS90_PORT_P3_READ_CB(READ8(*this, royalmah_state, mjifb_p3_r))
+ MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(*this, royalmah_state, mjifb_p3_w))
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, royalmah_state, mjifb_p4_w))
+ MCFG_TLCS90_PORT_P5_READ_CB(READ8(*this, royalmah_state, mjifb_p5_r))
+ MCFG_TLCS90_PORT_P6_READ_CB(READ8(*this, royalmah_state, mjifb_p6_r))
+ MCFG_TLCS90_PORT_P7_READ_CB(READ8(*this, royalmah_state, mjifb_p7_r))
+ MCFG_TLCS90_PORT_P8_READ_CB(READ8(*this, royalmah_state, mjifb_p8_r))
+ MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(*this, royalmah_state, mjifb_p8_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
@@ -3689,16 +3689,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjdejavu)
mjderngr(config);
- MCFG_CPU_REPLACE("maincpu",TMP90841, 8000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(mjdejavu_map)
- MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjifb_p3_r))
- MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, mjifb_p3_w))
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, mjifb_p4_w))
- MCFG_TLCS90_PORT_P5_READ_CB(READ8(royalmah_state, mjifb_p5_r))
- MCFG_TLCS90_PORT_P6_READ_CB(READ8(royalmah_state, mjifb_p6_r))
- MCFG_TLCS90_PORT_P7_READ_CB(READ8(royalmah_state, mjifb_p7_r))
- MCFG_TLCS90_PORT_P8_READ_CB(READ8(royalmah_state, mjifb_p8_r))
- MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(royalmah_state, mjifb_p8_w))
+ MCFG_DEVICE_REPLACE("maincpu",TMP90841, 8000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(mjdejavu_map)
+ MCFG_TLCS90_PORT_P3_READ_CB(READ8(*this, royalmah_state, mjifb_p3_r))
+ MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(*this, royalmah_state, mjifb_p3_w))
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, royalmah_state, mjifb_p4_w))
+ MCFG_TLCS90_PORT_P5_READ_CB(READ8(*this, royalmah_state, mjifb_p5_r))
+ MCFG_TLCS90_PORT_P6_READ_CB(READ8(*this, royalmah_state, mjifb_p6_r))
+ MCFG_TLCS90_PORT_P7_READ_CB(READ8(*this, royalmah_state, mjifb_p7_r))
+ MCFG_TLCS90_PORT_P8_READ_CB(READ8(*this, royalmah_state, mjifb_p8_r))
+ MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(*this, royalmah_state, mjifb_p8_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
@@ -3708,10 +3708,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjtensin)
mjderngr(config);
- MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(mjtensin_map)
- MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r))
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, mjtensin_p4_w))
+ MCFG_DEVICE_REPLACE("maincpu",TMP90841, 12000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(mjtensin_map)
+ MCFG_TLCS90_PORT_P3_READ_CB(READ8(*this, royalmah_state, mjtensin_p3_r))
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, royalmah_state, mjtensin_p4_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
@@ -3724,10 +3724,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::cafetime)
mjderngr(config);
- MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(cafetime_map)
- MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, cafetime_p3_w))
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, cafetime_p4_w))
+ MCFG_DEVICE_REPLACE("maincpu",TMP90841, 12000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(cafetime_map)
+ MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(*this, royalmah_state, cafetime_p3_w))
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, royalmah_state, cafetime_p4_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
@@ -3740,11 +3740,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(royalmah_state::mjvegasa)
mjderngr(config);
- MCFG_CPU_REPLACE("maincpu",TMP90841, XTAL(8'000'000)) /* ? */
- MCFG_CPU_PROGRAM_MAP(mjvegasa_map)
- MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r))
- MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, mjvegasa_p3_w))
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, mjvegasa_p4_w))
+ MCFG_DEVICE_REPLACE("maincpu",TMP90841, XTAL(8'000'000)) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(mjvegasa_map)
+ MCFG_TLCS90_PORT_P3_READ_CB(READ8(*this, royalmah_state, mjtensin_p3_r))
+ MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(*this, royalmah_state, mjvegasa_p3_w))
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, royalmah_state, mjvegasa_p4_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8)
diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp
index fc8047c0e0e..5d202b66723 100644
--- a/src/mame/drivers/rpunch.cpp
+++ b/src/mame/drivers/rpunch.cpp
@@ -460,14 +460,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(rpunch_state::rpunch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ANY_HIGH("soundirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", 0))
@@ -485,7 +485,7 @@ MACHINE_CONFIG_START(rpunch_state::rpunch)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, VIDEO_CLOCK/2) // verified from rpunch schematics
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(rpunch_state, rpunch_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, rpunch_state, rpunch_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(rpunch_state,rpunch)
@@ -493,11 +493,11 @@ MACHINE_CONFIG_START(rpunch_state::rpunch)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -511,14 +511,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(rpunch_state::svolleybl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ANY_HIGH("soundirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", 0))
@@ -536,7 +536,7 @@ MACHINE_CONFIG_START(rpunch_state::svolleybl)
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
MCFG_DEVICE_ADD("gga", VSYSTEM_GGA, VIDEO_CLOCK/2)
- MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(rpunch_state, rpunch_gga_data_w))
+ MCFG_VSYSTEM_GGA_REGISTER_WRITE_CB(WRITE8(*this, rpunch_state, rpunch_gga_data_w))
MCFG_VIDEO_START_OVERRIDE(rpunch_state,rpunch)
@@ -545,11 +545,11 @@ MACHINE_CONFIG_START(rpunch_state::svolleybl)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK/4)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", input_merger_device, in_w<1>))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", input_merger_device, in_w<1>))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rsc55.cpp b/src/mame/drivers/rsc55.cpp
index ed1c71cc578..1511409303e 100644
--- a/src/mame/drivers/rsc55.cpp
+++ b/src/mame/drivers/rsc55.cpp
@@ -70,9 +70,9 @@ void sc55_state::sc55_io(address_map &map)
}
MACHINE_CONFIG_START(sc55_state::sc55)
- MCFG_CPU_ADD( "maincpu", P8098, XTAL(20'000'000) ) // probably not?
- MCFG_CPU_PROGRAM_MAP( sc55_map )
- MCFG_CPU_IO_MAP( sc55_io )
+ MCFG_DEVICE_ADD( "maincpu", P8098, XTAL(20'000'000) ) // probably not?
+ MCFG_DEVICE_PROGRAM_MAP( sc55_map )
+ MCFG_DEVICE_IO_MAP( sc55_io )
MACHINE_CONFIG_END
ROM_START( sc55 )
diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp
index db52bb8bf06..1c4fa2f07a4 100644
--- a/src/mame/drivers/rt1715.cpp
+++ b/src/mame/drivers/rt1715.cpp
@@ -284,16 +284,16 @@ static const z80_daisy_config rt1715_daisy_chain[] =
MACHINE_CONFIG_START(rt1715_state::rt1715)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(2'457'600))
- MCFG_CPU_PROGRAM_MAP(rt1715_mem)
- MCFG_CPU_IO_MAP(rt1715_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(2'457'600))
+ MCFG_DEVICE_PROGRAM_MAP(rt1715_mem)
+ MCFG_DEVICE_IO_MAP(rt1715_io)
MCFG_Z80_DAISY_CHAIN(rt1715_daisy_chain)
/* keyboard */
- MCFG_CPU_ADD("keyboard", Z80, 683000)
- MCFG_CPU_PROGRAM_MAP(k7658_mem)
- MCFG_CPU_IO_MAP(k7658_io)
+ MCFG_DEVICE_ADD("keyboard", Z80, 683000)
+ MCFG_DEVICE_PROGRAM_MAP(k7658_mem)
+ MCFG_DEVICE_IO_MAP(k7658_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp
index 329561dbc6e..ebda7c7b3f5 100644
--- a/src/mame/drivers/runaway.cpp
+++ b/src/mame/drivers/runaway.cpp
@@ -331,8 +331,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(runaway_state::runaway)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12096000 / 8) /* ? */
- MCFG_CPU_PROGRAM_MAP(runaway_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 8) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(runaway_map)
MCFG_ATARIVGEAROM_ADD("earom")
@@ -352,19 +352,19 @@ MACHINE_CONFIG_START(runaway_state::runaway)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, 12096000 / 8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, 12096000 / 8)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("6008"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, 12096000 / 8)
- MCFG_POKEY_POT0_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT1_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT2_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT3_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT4_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT5_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT6_R_CB(READ8(runaway_state, runaway_pot_r))
- MCFG_POKEY_POT7_R_CB(READ8(runaway_state, runaway_pot_r))
+ MCFG_DEVICE_ADD("pokey2", POKEY, 12096000 / 8)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, runaway_state, runaway_pot_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, runaway_state, runaway_pot_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index 95403525439..4bf9f4199e6 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -395,12 +395,12 @@ void rungun_state::machine_reset()
MACHINE_CONFIG_START(rungun_state::rng)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(rungun_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rungun_state, rng_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(rungun_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rungun_state, rng_interrupt)
- MCFG_CPU_ADD("soundcpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(rungun_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(rungun_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // higher if sound stutters
@@ -449,7 +449,7 @@ MACHINE_CONFIG_START(rungun_state::rng)
MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_DEVICE_ADDRESS_MAP(0, rungun_k054539_map)
- MCFG_K054539_TIMER_HANDLER(WRITELINE(rungun_state, k054539_nmi_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, rungun_state, k054539_nmi_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp
index d24cb0b61ab..efe4381375c 100644
--- a/src/mame/drivers/rvoice.cpp
+++ b/src/mame/drivers/rvoice.cpp
@@ -366,13 +366,13 @@ void rvoice_state::null_kbd_put(u8 data)
MACHINE_CONFIG_START(rvoice_state::rvoicepc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD63701, XTAL(7'372'800))
- MCFG_CPU_PROGRAM_MAP(hd63701_main_mem)
- MCFG_CPU_IO_MAP(hd63701_main_io)
+ MCFG_DEVICE_ADD("maincpu", HD63701, XTAL(7'372'800))
+ MCFG_DEVICE_PROGRAM_MAP(hd63701_main_mem)
+ MCFG_DEVICE_IO_MAP(hd63701_main_io)
- //MCFG_CPU_ADD("playercpu", HD63701, XTAL(7'372'800)) // not dumped yet
- //MCFG_CPU_PROGRAM_MAP(hd63701_slave_mem)
- //MCFG_CPU_IO_MAP(hd63701_slave_io)
+ //MCFG_DEVICE_ADD("playercpu", HD63701, XTAL(7'372'800)) // not dumped yet
+ //MCFG_DEVICE_PROGRAM_MAP(hd63701_slave_mem)
+ //MCFG_DEVICE_IO_MAP(hd63701_slave_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_DEVICE_ADD("acia65c51", MOS6551, 0)
diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp
index ee68fb8589c..b433d174ba6 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -472,10 +472,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(rx78_state::rx78)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK/7) // unknown divider
- MCFG_CPU_PROGRAM_MAP(rx78_mem)
- MCFG_CPU_IO_MAP(rx78_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", rx78_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80, MASTER_CLOCK/7) // unknown divider
+ MCFG_DEVICE_PROGRAM_MAP(rx78_mem)
+ MCFG_DEVICE_IO_MAP(rx78_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", rx78_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -507,7 +507,7 @@ MACHINE_CONFIG_START(rx78_state::rx78)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn1", SN76489A, XTAL(28'636'363)/8) // unknown divider
+ MCFG_DEVICE_ADD("sn1", SN76489A, XTAL(28'636'363)/8) // unknown divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Software lists */
diff --git a/src/mame/drivers/rz1.cpp b/src/mame/drivers/rz1.cpp
index a0431eeed1d..f4348d21798 100644
--- a/src/mame/drivers/rz1.cpp
+++ b/src/mame/drivers/rz1.cpp
@@ -333,13 +333,13 @@ PALETTE_INIT_MEMBER(rz1_state, rz1)
//**************************************************************************
MACHINE_CONFIG_START( rz1_state::rz1 )
- MCFG_CPU_ADD("maincpu", UPD7811, 12_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(map)
- MCFG_UPD7810_PORTA_READ_CB(READ8(rz1_state, port_a_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(rz1_state, port_a_w))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(rz1_state, port_b_w))
- MCFG_UPD7810_PORTC_READ_CB(READ8(rz1_state, port_c_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(rz1_state, port_c_w))
+ MCFG_DEVICE_ADD("maincpu", UPD7811, 12_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(map)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, rz1_state, port_a_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, rz1_state, port_a_w))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, rz1_state, port_b_w))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, rz1_state, port_c_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, rz1_state, port_c_w))
// video hardware
MCFG_SCREEN_ADD("screen", LCD)
@@ -360,11 +360,11 @@ MACHINE_CONFIG_START( rz1_state::rz1 )
MCFG_DEFAULT_LAYOUT(layout_rz1)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("upd934g_c", UPD934G, 1333000)
- MCFG_UPD934G_DATA_CB(READ8(rz1_state, upd934g_c_data_r))
+ MCFG_DEVICE_ADD("upd934g_c", UPD934G, 1333000)
+ MCFG_UPD934G_DATA_CB(READ8(*this, rz1_state, upd934g_c_data_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("upd934g_b", UPD934G, 1280000)
- MCFG_UPD934G_DATA_CB(READ8(rz1_state, upd934g_b_data_r))
+ MCFG_DEVICE_ADD("upd934g_b", UPD934G, 1280000)
+ MCFG_UPD934G_DATA_CB(READ8(*this, rz1_state, upd934g_b_data_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp
index 6958a4ad5a2..46fbc78b613 100644
--- a/src/mame/drivers/rzone.cpp
+++ b/src/mame/drivers/rzone.cpp
@@ -244,12 +244,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(rzone_state::rzindy500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM510, 32.768_kHz_XTAL) // no external XTAL
+ MCFG_DEVICE_ADD("maincpu", SM510, 32.768_kHz_XTAL) // no external XTAL
MCFG_SM510_R_MASK_OPTION(SM510_R_CONTROL_OUTPUT) // confirmed
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(rzone_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(rzone_state, t1_write_s))
- MCFG_SM510_WRITE_R_CB(WRITE8(rzone_state, t1_write_r))
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, rzone_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, rzone_state, t1_write_s))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, rzone_state, t1_write_r))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -263,18 +263,18 @@ MACHINE_CONFIG_START(rzone_state::rzindy500)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(rzone_state::rzbatfor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SM512, 32.768_kHz_XTAL) // no external XTAL
- MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
- MCFG_SM510_READ_K_CB(READ8(rzone_state, input_r))
- MCFG_SM510_WRITE_S_CB(WRITE8(rzone_state, t2_write_s))
- MCFG_SM510_WRITE_R_CB(WRITE8(rzone_state, t2_write_r))
+ MCFG_DEVICE_ADD("maincpu", SM512, 32.768_kHz_XTAL) // no external XTAL
+ MCFG_SM510_WRITE_SEGS_CB(WRITE16(*this, hh_sm510_state, sm510_lcd_segment_w))
+ MCFG_SM510_READ_K_CB(READ8(*this, rzone_state, input_r))
+ MCFG_SM510_WRITE_S_CB(WRITE8(*this, rzone_state, t2_write_s))
+ MCFG_SM510_WRITE_R_CB(WRITE8(*this, rzone_state, t2_write_r))
/* video hardware */
MCFG_SCREEN_SVG_ADD("screen", "svg")
@@ -288,7 +288,7 @@ MACHINE_CONFIG_START(rzone_state::rzbatfor)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index 32b34a6e729..2b69234bf05 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -384,8 +384,8 @@ DRIVER_INIT_MEMBER( s11_state, s11 )
MACHINE_CONFIG_START(s11_state::s11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11_state, s11)
/* Video */
@@ -396,90 +396,90 @@ MACHINE_CONFIG_START(s11_state::s11)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia2c_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia2c_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia34_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pias_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
/* Add the background music card */
- MCFG_CPU_ADD("bgcpu", MC6809E, 8000000 / 4) // MC68B09E
- MCFG_CPU_PROGRAM_MAP(s11_bg_map)
+ MCFG_DEVICE_ADD("bgcpu", MC6809E, 8000000 / 4) // MC68B09E
+ MCFG_DEVICE_PROGRAM_MAP(s11_bg_map)
MCFG_SPEAKER_STANDARD_MONO("bg")
MCFG_YM2151_ADD("ym2151", 3580000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11_state, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11_state, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
- MCFG_SOUND_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
+ MCFG_DEVICE_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac1", dac_byte_interface, write))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, write))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia40_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia40_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index c07e7169fd8..af6899b0ff7 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -176,8 +176,8 @@ DRIVER_INIT_MEMBER( s11a_state, s11a )
MACHINE_CONFIG_START(s11a_state::s11a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11a_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11a_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11a_state, s11a)
/* Video */
@@ -188,90 +188,90 @@ MACHINE_CONFIG_START(s11a_state::s11a)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia2c_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia2c_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, pia34_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11a_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11a_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia40_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
/* Add the background music card */
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
- MCFG_CPU_PROGRAM_MAP(s11a_bg_map)
+ MCFG_DEVICE_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
+ MCFG_DEVICE_PROGRAM_MAP(s11a_bg_map)
MCFG_SPEAKER_STANDARD_MONO("bg")
MCFG_YM2151_ADD("ym2151", XTAL(3'579'545))
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11a_state, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11a_state, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
- MCFG_SOUND_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
+ MCFG_DEVICE_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac1", dac_byte_interface, write))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, write))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia40_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pias_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index 2bb0f92a4d9..96f82b46022 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -250,8 +250,8 @@ DRIVER_INIT_MEMBER( s11b_state, s11b_invert )
MACHINE_CONFIG_START(s11b_state::s11b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11b_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11b_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11b_state, s11b)
/* Video */
@@ -262,95 +262,95 @@ MACHINE_CONFIG_START(s11b_state::s11b)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11b_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia2c_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11b_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11b_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia34_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11b_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11b_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11b_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pias_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pias_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pias_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pias_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
/* Add the background music card */
- MCFG_CPU_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
- MCFG_CPU_PROGRAM_MAP(s11b_bg_map)
+ MCFG_DEVICE_ADD("bgcpu", MC6809E, XTAL(8'000'000) / 4) // MC68B09E
+ MCFG_DEVICE_PROGRAM_MAP(s11b_bg_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
MCFG_SPEAKER_STANDARD_MONO("bg")
MCFG_YM2151_ADD("ym2151", 3580000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(s11b_state, ym2151_irq_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, s11b_state, ym2151_irq_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
- MCFG_SOUND_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
+ MCFG_DEVICE_ADD("dac1", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.25)
- MCFG_SOUND_ADD("hc55516_bg", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516_bg", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 0.50)
MCFG_DEVICE_ADD("pia40", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac1", dac_byte_interface, write))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia40_pb_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("ym2151", ym2151_device, reset_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia40_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac1", dac_byte_interface, write))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia40_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("ym2151", ym2151_device, reset_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia40_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("bgcpu", M6809_FIRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("bgcpu", INPUT_LINE_NMI))
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index 128af7ea3ec..8c628700b12 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -155,8 +155,8 @@ DRIVER_INIT_MEMBER(s11c_state,s11c)
MACHINE_CONFIG_START(s11c_state::s11c)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s11c_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s11c_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s11c_state, s11c)
/* Video */
@@ -167,49 +167,49 @@ MACHINE_CONFIG_START(s11c_state::s11c)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, pia28_w7_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s11_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, pia28_w7_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11b_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s11_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia2c_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11b_state, pia2c_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11b_state, pia2c_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11b_state, pia2c_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s11_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, switch_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s11_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, switch_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s11b_state, pia34_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s11_state, pia34_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s11_state, pia34_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s11_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s11_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s11b_state, pia34_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s11_state, pia34_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s11_state, pia34_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s11_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s11_state, pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -217,7 +217,7 @@ MACHINE_CONFIG_START(s11c_state::s11c)
/* Add the background music card */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("bgm", S11C_BG, 0)
+ MCFG_DEVICE_ADD("bgm", S11C_BG)
MCFG_S11C_BG_ROM_REGION(":bgcpu")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index 5a5b76c91ee..072560f848c 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -435,8 +435,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( s3_state::irq )
MACHINE_CONFIG_START(s3_state::s3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 3580000)
- MCFG_CPU_PROGRAM_MAP(s3_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s3_main_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s3_state, irq, attotime::from_hz(250))
MCFG_MACHINE_RESET_OVERRIDE(s3_state, s3)
@@ -448,37 +448,37 @@ MACHINE_CONFIG_START(s3_state::s3)
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, sol0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, sol1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia22_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia22_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s3_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s3_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s3_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s3_state, pia22_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, lamp1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia24_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia24_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s3_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s3_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s3_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s3_state, pia24_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s3_state, dips_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(s3_state, pia28_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(s3_state, pia28_cb1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s3_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia28_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s3_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, s3_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, s3_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s3_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s3_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s3_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s3_state, pia28_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s3_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s3_state, switch_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s3_state, pia30_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s3_state, pia30_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s3_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s3_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s3_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s3_state, pia30_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
@@ -488,18 +488,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(s3_state::s3a)
s3(config);
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, 3580000)
- MCFG_CPU_PROGRAM_MAP(s3_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s3_audio_map)
MCFG_MACHINE_RESET_OVERRIDE(s3_state, s3a)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(s3_state,sound_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, s3_state,sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index ff75edaaacb..89f0148931a 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -429,8 +429,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( s4_state::irq )
MACHINE_CONFIG_START(s4_state::s4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 3580000)
- MCFG_CPU_PROGRAM_MAP(s4_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s4_main_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s4_state, irq, attotime::from_hz(250))
MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4)
@@ -442,37 +442,37 @@ MACHINE_CONFIG_START(s4_state::s4)
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, sol0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, sol1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia22_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia22_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s4_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s4_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s4_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s4_state, pia22_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, lamp1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia24_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia24_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s4_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s4_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s4_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s4_state, pia24_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s4_state, dips_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(s4_state, pia28_ca1_r))
- MCFG_PIA_READCB1_HANDLER(READLINE(s4_state, pia28_cb1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s4_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia28_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s4_state, dips_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, s4_state, pia28_ca1_r))
+ MCFG_PIA_READCB1_HANDLER(READLINE(*this, s4_state, pia28_cb1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s4_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s4_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s4_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s4_state, pia28_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s4_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s4_state, switch_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s4_state, pia30_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s4_state, pia30_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s4_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s4_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s4_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s4_state, pia30_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
@@ -482,18 +482,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(s4_state::s4a)
s4(config);
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, 3580000)
- MCFG_CPU_PROGRAM_MAP(s4_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s4_audio_map)
MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4a)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(s4_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, s4_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index f0f421ac433..ea9470c16ad 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -406,8 +406,8 @@ DRIVER_INIT_MEMBER( s6_state, s6 )
MACHINE_CONFIG_START(s6_state::s6)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here
- MCFG_CPU_PROGRAM_MAP(s6_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here
+ MCFG_DEVICE_PROGRAM_MAP(s6_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s6_state, s6)
/* Video */
@@ -418,58 +418,58 @@ MACHINE_CONFIG_START(s6_state::s6)
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, sol0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, sol1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia22_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia22_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia22_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, lamp1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia24_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s6_state, dips_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s6_state, dips_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s6_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6_state, switch_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6_state, pia30_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s6_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6_state, pia_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, 3580000)
- MCFG_CPU_PROGRAM_MAP(s6_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s6_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(s6_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, s6_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp
index 7689111eea6..f703d79da88 100644
--- a/src/mame/drivers/s6a.cpp
+++ b/src/mame/drivers/s6a.cpp
@@ -389,8 +389,8 @@ DRIVER_INIT_MEMBER( s6a_state, s6a )
MACHINE_CONFIG_START(s6a_state::s6a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, 3580000)
- MCFG_CPU_PROGRAM_MAP(s6a_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s6a_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s6a_state, s6a)
/* Video */
@@ -401,58 +401,58 @@ MACHINE_CONFIG_START(s6a_state::s6a)
/* Devices */
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, sol0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, sol1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia22_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia22_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6a_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6a_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6a_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6a_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6a_state, pia22_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, lamp1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia24_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6a_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6a_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6a_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6a_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6a_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s6a_state, dips_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s6a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6a_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s6a_state, dips_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s6a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6a_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6a_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6a_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s6a_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s6a_state, switch_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s6a_state, pia30_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s6a_state, pia30_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s6a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s6a_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s6a_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s6a_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s6a_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s6a_state, pia30_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s6a_state, pia_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6802, 3580000)
- MCFG_CPU_PROGRAM_MAP(s6a_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s6a_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(s6a_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, s6a_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index a88266a1af8..3f210f32263 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -432,8 +432,8 @@ DRIVER_INIT_MEMBER( s7_state, s7 )
MACHINE_CONFIG_START(s7_state::s7)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, 3580000)
- MCFG_CPU_PROGRAM_MAP(s7_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s7_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s7_state, s7)
/* Video */
@@ -446,68 +446,68 @@ MACHINE_CONFIG_START(s7_state::s7)
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(CONSTANT(0xff))
MCFG_PIA_READPB_HANDLER(CONSTANT(0x3f))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq))
MCFG_DEVICE_ADD("pia22", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, sol0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, sol1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia22_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia22_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, sol0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, sol1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia22_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia22_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, lamp1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia24_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, lamp1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia24_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s7_state, dips_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s7_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s7_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s7_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s7_state, dips_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s7_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s7_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s7_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s7_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s7_state, switch_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s7_state, pia30_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s7_state, pia30_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s7_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s7_state, switch_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s7_state, pia30_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s7_state, pia30_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6808_IRQ_LINE))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, 3580000)
- MCFG_CPU_PROGRAM_MAP(s7_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, 3580000)
+ MCFG_DEVICE_PROGRAM_MAP(s7_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(s7_state, sound_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, s7_state, sound_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
MCFG_PIA_WRITEPB_HANDLER(NOOP)
MCFG_PIA_READCA1_HANDLER(VCC)
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index 03bfc4a22e7..5cfc5d6845d 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -314,8 +314,8 @@ DRIVER_INIT_MEMBER( s8_state, s8 )
MACHINE_CONFIG_START(s8_state::s8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s8_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s8_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s8_state, s8)
/* Video */
@@ -326,50 +326,50 @@ MACHINE_CONFIG_START(s8_state::s8)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s8_state, sound_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(s8_state, pia21_ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, sound_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, s8_state, pia21_ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s8_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s8_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s8_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s8_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s8_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8_state, switch_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8_state, switch_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8_state, pia_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s8_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s8_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s8_state, sound_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s8_state, sound_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index a9bec06fd7e..454e9ec28a9 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -286,8 +286,8 @@ DRIVER_INIT_MEMBER( s8a_state, s8a )
MACHINE_CONFIG_START(s8a_state::s8a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s8a_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s8a_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s8a_state, s8a)
/* Video */
@@ -298,50 +298,50 @@ MACHINE_CONFIG_START(s8a_state::s8a)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s8a_state, sound_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(s8a_state, pia21_ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8a_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8a_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s8a_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s8a_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8a_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s8a_state, sound_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, s8a_state, pia21_ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8a_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8a_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s8a_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8a_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8a_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8a_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s8a_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8a_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8a_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8a_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8a_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s8a_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8a_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s8a_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s8a_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8a_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s8a_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8a_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s8a_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s8a_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s8a_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s8a_state, switch_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s8a_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s8a_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s8a_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s8a_state, switch_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s8a_state, pia_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s8a_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s8a_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s8a_state, sound_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s8a_state, sound_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index d7ef5e23080..083fe3f1eb1 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -320,8 +320,8 @@ DRIVER_INIT_MEMBER( s9_state, s9 )
MACHINE_CONFIG_START(s9_state::s9)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s9_main_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s9_main_map)
MCFG_MACHINE_RESET_OVERRIDE(s9_state, s9)
/* Video */
@@ -332,56 +332,56 @@ MACHINE_CONFIG_START(s9_state::s9)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s9_state, sound_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(s9_state, pia21_ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, sound_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, sol2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pia21_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia21_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, sound_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, s9_state, pia21_ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s9_state, sound_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, sol2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s9_state, pia21_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s9_state, pia21_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, lamp1_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia24_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s9_state, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, lamp1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s9_state, pia24_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(s9_state, dig0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, dig1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(s9_state, pia28_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(s9_state, pia28_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, s9_state, dig0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, dig1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, s9_state, pia28_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, s9_state, pia28_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s9_state, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(s9_state, switch_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(s9_state, pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(s9_state, pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, s9_state, switch_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, s9_state, pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, s9_state, pia_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
/* Add the soundcard */
- MCFG_CPU_ADD("audiocpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(s9_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(s9_audio_map)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SPEAKER_STANDARD_MONO("speech")
- MCFG_SOUND_ADD("hc55516", HC55516, 0)
+ MCFG_DEVICE_ADD("hc55516", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech", 1.00)
MCFG_DEVICE_ADD("pias", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(s9_state, sound_r))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, clock_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("hc55516", hc55516_device, digit_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, s9_state, sound_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("hc55516", hc55516_device, clock_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("hc55516", hc55516_device, digit_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6808_IRQ_LINE))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sacstate.cpp b/src/mame/drivers/sacstate.cpp
index 8bb546412de..6b3090155b3 100644
--- a/src/mame/drivers/sacstate.cpp
+++ b/src/mame/drivers/sacstate.cpp
@@ -134,9 +134,9 @@ void sacstate_state::machine_reset()
MACHINE_CONFIG_START(sacstate_state::sacstate)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8008, 800000)
- MCFG_CPU_PROGRAM_MAP(sacstate_mem)
- MCFG_CPU_IO_MAP(sacstate_io)
+ MCFG_DEVICE_ADD("maincpu",I8008, 800000)
+ MCFG_DEVICE_PROGRAM_MAP(sacstate_mem)
+ MCFG_DEVICE_IO_MAP(sacstate_io)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index 694b7561946..3afe622261a 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -305,7 +305,7 @@ static const char *const safarir_sample_names[] =
MACHINE_CONFIG_START(safarir_state::safarir_audio)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(safarir_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -406,8 +406,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(safarir_state::safarir)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000)/12) /* 1.5 MHz ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000)/12) /* 1.5 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
/* video hardware */
MCFG_PALETTE_ADD("palette", 2*8)
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 7423e31b1e2..c69c9b66d8b 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -411,8 +411,8 @@ READ16_MEMBER(sage2_state::rom_r)
MACHINE_CONFIG_START(sage2_state::sage2)
// basic machine hardware
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(sage2_mem)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(sage2_mem)
// devices
MCFG_DEVICE_ADD(I8259_TAG, PIC8259, 0)
@@ -421,62 +421,62 @@ MACHINE_CONFIG_START(sage2_state::sage2)
MCFG_DEVICE_ADD(I8255A_0_TAG, I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("J7"))
MCFG_I8255_IN_PORTB_CB(IOPORT("J6"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sage2_state, ppi0_pc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sage2_state, ppi0_pc_w))
MCFG_DEVICE_ADD(I8255A_1_TAG, I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTB_CB(READ8(sage2_state, ppi1_pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sage2_state, ppi1_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, sage2_state, ppi1_pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sage2_state, ppi1_pc_w))
MCFG_DEVICE_ADD(I8253_0_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(0) // from U75 OUT0
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir6_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259_TAG, pic8259_device, ir6_w))
MCFG_PIT8253_CLK1(XTAL(16'000'000)/2/125)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(I8253_0_TAG, pit8253_device, write_clk2))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(I8253_0_TAG, pit8253_device, write_clk2))
MCFG_PIT8253_CLK2(0) // from OUT2
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(I8259_TAG, pic8259_device, ir0_w))
MCFG_DEVICE_ADD(I8253_1_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000)/2/125)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8253_0_TAG, pit8253_device, write_clk0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8253_0_TAG, pit8253_device, write_clk0))
MCFG_PIT8253_CLK1(XTAL(16'000'000)/2/13)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(sage2_state, br1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, sage2_state, br1_w))
MCFG_PIT8253_CLK2(XTAL(16'000'000)/2/13)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sage2_state, br2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, sage2_state, br2_w))
MCFG_DEVICE_ADD(I8251_0_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
MCFG_I8251_RXRDY_HANDLER(INPUTLINE(M68000_TAG, M68K_IRQ_5))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir2_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(I8259_TAG, pic8259_device, ir2_w))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_0_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_0_TAG, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251_0_TAG, i8251_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_0_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_0_TAG, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251_0_TAG, i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD(I8251_1_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir1_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE(I8259_TAG, pic8259_device, ir3_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(I8259_TAG, pic8259_device, ir1_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(I8259_TAG, pic8259_device, ir3_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_1_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_1_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_1_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_1_TAG, i8251_device, write_dsr))
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(sage2_state, fdc_irq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, sage2_state, fdc_irq))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(sage2_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sage2_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(sage2_state, write_centronics_perror))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(sage2_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(sage2_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, sage2_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, sage2_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, sage2_state, write_centronics_perror))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, sage2_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, sage2_state, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/sam.cpp b/src/mame/drivers/sam.cpp
index 98dd1b406f7..10fa7c29135 100644
--- a/src/mame/drivers/sam.cpp
+++ b/src/mame/drivers/sam.cpp
@@ -24,8 +24,8 @@ static INPUT_PORTS_START( sam )
INPUT_PORTS_END
MACHINE_CONFIG_START(sam_state::sam)
- MCFG_CPU_ADD("maincpu", ARM7, XTAL(40'000'000)) // AT91R40008
- MCFG_CPU_PROGRAM_MAP(sam_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, XTAL(40'000'000)) // AT91R40008
+ MCFG_DEVICE_PROGRAM_MAP(sam_map)
MACHINE_CONFIG_END
#define ROM_LOAD_BOOT_EPROM \
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index 048bd51cd0d..c5f93593141 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -521,10 +521,10 @@ static void samcoupe_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(samcoupe_state::samcoupe)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SAMCOUPE_XTAL_X1 / 4) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(samcoupe_mem)
- MCFG_CPU_IO_MAP(samcoupe_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", samcoupe_state, samcoupe_frame_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, SAMCOUPE_XTAL_X1 / 4) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(samcoupe_mem)
+ MCFG_DEVICE_IO_MAP(samcoupe_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", samcoupe_state, samcoupe_frame_interrupt)
/* video hardware */
@@ -538,12 +538,12 @@ MACHINE_CONFIG_START(samcoupe_state::samcoupe)
/* devices */
MCFG_CENTRONICS_ADD("lpt1", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(samcoupe_state, write_lpt1_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, samcoupe_state, write_lpt1_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt1_data_out", "lpt1")
MCFG_CENTRONICS_ADD("lpt2", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(samcoupe_state, write_lpt2_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, samcoupe_state, write_lpt2_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("lpt2_data_out", "lpt2")
@@ -562,7 +562,7 @@ MACHINE_CONFIG_START(samcoupe_state::samcoupe)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SAA1099_ADD("saa1099", SAMCOUPE_XTAL_X1/3) /* 8 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp
index 3e70d4d2316..8dadd317149 100644
--- a/src/mame/drivers/sandscrp.cpp
+++ b/src/mame/drivers/sandscrp.cpp
@@ -467,13 +467,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(sandscrp_state::sandscrp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */
- MCFG_CPU_PROGRAM_MAP(sandscrp)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sandscrp_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */
+ MCFG_DEVICE_PROGRAM_MAP(sandscrp)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sandscrp_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */
- MCFG_CPU_PROGRAM_MAP(sandscrp_soundmem)
- MCFG_CPU_IO_MAP(sandscrp_soundport)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000) /* Z8400AB1, Reads the DSWs: it can't be disabled */
+ MCFG_DEVICE_PROGRAM_MAP(sandscrp_soundmem)
+ MCFG_DEVICE_IO_MAP(sandscrp_soundport)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(3)) /* a guess, and certainly wrong */
@@ -485,7 +485,7 @@ MACHINE_CONFIG_START(sandscrp_state::sandscrp)
MCFG_SCREEN_SIZE(256, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 0+16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(sandscrp_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sandscrp_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sandscrp_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sandscrp)
@@ -515,7 +515,7 @@ MACHINE_CONFIG_START(sandscrp_state::sandscrp)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
/* YM3014B + YM2203C */
- MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 4000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp
index e5183ef40ba..480bc134deb 100644
--- a/src/mame/drivers/sangho.cpp
+++ b/src/mame/drivers/sangho.cpp
@@ -462,9 +462,9 @@ MACHINE_RESET_MEMBER(sangho_state,sexyboom)
MACHINE_CONFIG_START(sangho_state::pzlestar)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) // ?
- MCFG_CPU_PROGRAM_MAP(sangho_map)
- MCFG_CPU_IO_MAP(pzlestar_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6) // ?
+ MCFG_DEVICE_PROGRAM_MAP(sangho_map)
+ MCFG_DEVICE_IO_MAP(pzlestar_io_map)
MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272)) // typical 9958 clock, not verified
MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
@@ -473,7 +473,7 @@ MACHINE_CONFIG_START(sangho_state::pzlestar)
MCFG_MACHINE_RESET_OVERRIDE(sangho_state,pzlestar)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(21'477'272)/6)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(21'477'272)/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -481,9 +481,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sangho_state::sexyboom)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6)
- MCFG_CPU_PROGRAM_MAP(sangho_map)
- MCFG_CPU_IO_MAP(sexyboom_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6)
+ MCFG_DEVICE_PROGRAM_MAP(sangho_map)
+ MCFG_DEVICE_IO_MAP(sexyboom_io_map)
MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL(21'477'272))
MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
@@ -494,7 +494,7 @@ MACHINE_CONFIG_START(sangho_state::sexyboom)
MCFG_PALETTE_ADD("palette", 19780)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(21'477'272)/6)
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(21'477'272)/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sanremmg.cpp b/src/mame/drivers/sanremmg.cpp
index d58fe3421a0..a6dae7f2e93 100644
--- a/src/mame/drivers/sanremmg.cpp
+++ b/src/mame/drivers/sanremmg.cpp
@@ -59,8 +59,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sanremmg_state::sanremmg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7, 50000000) // wrong, this is an M30624FG (M16C/62A family) with 256K internal ROM, no CPU core available
- MCFG_CPU_PROGRAM_MAP(sanremmg_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 50000000) // wrong, this is an M30624FG (M16C/62A family) with 256K internal ROM, no CPU core available
+ MCFG_DEVICE_PROGRAM_MAP(sanremmg_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index b6dc931bcb8..c39925a0e35 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -356,10 +356,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(sanremo_state::sanremo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sanremo_map)
- MCFG_CPU_IO_MAP(sanremo_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sanremo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sanremo_map)
+ MCFG_DEVICE_IO_MAP(sanremo_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sanremo_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -386,7 +386,7 @@ MACHINE_CONFIG_START(sanremo_state::sanremo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, SND_CLOCK)
+ MCFG_DEVICE_ADD("ay8910", AY8910, SND_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sansa_fuze.cpp b/src/mame/drivers/sansa_fuze.cpp
index c8c4132d774..f922821ebf2 100644
--- a/src/mame/drivers/sansa_fuze.cpp
+++ b/src/mame/drivers/sansa_fuze.cpp
@@ -44,8 +44,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sansa_fuze_state::sansa_fuze)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7, 50000000) // arm based, speed unknown
- MCFG_CPU_PROGRAM_MAP(sansa_fuze_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 50000000) // arm based, speed unknown
+ MCFG_DEVICE_PROGRAM_MAP(sansa_fuze_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index 42da3b51d3a..cc289aa942d 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -618,8 +618,8 @@ DRIVER_INIT_MEMBER( sapi1_state, sapizps3b )
/* Machine driver */
MACHINE_CONFIG_START(sapi1_state::sapi1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
- MCFG_CPU_PROGRAM_MAP(sapi1_mem)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
+ MCFG_DEVICE_PROGRAM_MAP(sapi1_mem)
MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapi1)
/* video hardware */
@@ -641,8 +641,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sapi1_state::sapi2)
sapi1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sapi2_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sapi2_mem)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(sapi1_state, kbd_put))
MACHINE_CONFIG_END
@@ -650,9 +650,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sapi1_state::sapi3)
sapi2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sapi3_mem)
- MCFG_CPU_IO_MAP(sapi3_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sapi3_mem)
+ MCFG_DEVICE_IO_MAP(sapi3_io)
MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(40*6, 20*9)
@@ -663,9 +663,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sapi1_state::sapi3b)
sapi3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sapi3b_mem)
- MCFG_CPU_IO_MAP(sapi3b_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sapi3b_mem)
+ MCFG_DEVICE_IO_MAP(sapi3b_io)
MCFG_MC6845_ADD("crtc", MC6845, "screen", 1008000) // guess
MCFG_MC6845_SHOW_BORDER_AREA(false)
@@ -688,20 +688,20 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sapi1_state::sapi3a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
- MCFG_CPU_PROGRAM_MAP(sapi3a_mem)
- MCFG_CPU_IO_MAP(sapi3a_io)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'000'000) / 9) // Tesla MHB8080A + MHB8224 + MHB8228
+ MCFG_DEVICE_PROGRAM_MAP(sapi3a_mem)
+ MCFG_DEVICE_IO_MAP(sapi3a_io)
MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 )
/* video hardware */
MCFG_DEVICE_ADD("uart", AY51013, 0) // Tesla MHB1012
MCFG_AY51013_TX_CLOCK(XTAL(12'288'000) / 80) // not actual rate?
MCFG_AY51013_RX_CLOCK(XTAL(12'288'000) / 80) // not actual rate?
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("v24", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("v24", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("v24", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("v24", rs232_port_device, write_txd))
MCFG_AY51013_AUTO_RDAV(true) // RDAV not actually tied to RDE, but pulsed by K155AG3 (=74123N): R25=22k, C14=220
- MCFG_RS232_PORT_ADD("v24", default_rs232_devices, "terminal")
+ MCFG_DEVICE_ADD("v24", RS232_PORT, default_rs232_devices, "terminal")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
/* internal ram */
diff --git a/src/mame/drivers/sartorius.cpp b/src/mame/drivers/sartorius.cpp
index 61bb6d53661..b1ae62be3aa 100644
--- a/src/mame/drivers/sartorius.cpp
+++ b/src/mame/drivers/sartorius.cpp
@@ -86,7 +86,7 @@ public:
MACHINE_CONFIG_START(sart3733_state::sart3733)
- MCFG_CPU_ADD("maincpu", I4040, 750'000) // clock speed is a complete guess - can't see crystal or multi-phase clock generator
+ MCFG_DEVICE_ADD("maincpu", I4040, 750'000) // clock speed is a complete guess - can't see crystal or multi-phase clock generator
MCFG_I4040_ROM_MAP(sart3733_rom)
MCFG_I4040_RAM_MEMORY_MAP(sart3733_memory)
MCFG_I4040_RAM_STATUS_MAP(sart3733_status)
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index ba716313f2d..3aec4c43df3 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -786,18 +786,18 @@ uint8_t sat_console_state::smpc_direct_mode(uint16_t in_value,bool which)
MACHINE_CONFIG_START(sat_console_state::saturn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MCFG_CPU_PROGRAM_MAP(saturn_mem)
+ MCFG_DEVICE_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MCFG_DEVICE_PROGRAM_MAP(saturn_mem)
MCFG_SH2_IS_SLAVE(0)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sat_console_state, saturn_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MCFG_CPU_PROGRAM_MAP(saturn_mem)
+ MCFG_DEVICE_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MCFG_DEVICE_PROGRAM_MAP(saturn_mem)
MCFG_SH2_IS_SLAVE(1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("slave_scantimer", sat_console_state, saturn_slave_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, 11289600) //256 x 44100 Hz = 11.2896 MHz
- MCFG_CPU_PROGRAM_MAP(sound_mem)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 11289600) //256 x 44100 Hz = 11.2896 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_mem)
MCFG_SEGA_SCU_ADD("scu")
downcast<sega_scu_device &>(*device).set_hostcpu("maincpu");
@@ -808,18 +808,18 @@ MACHINE_CONFIG_START(sat_console_state::saturn)
MCFG_SMPC_HLE_ADD("smpc", XTAL(4'000'000))
MCFG_SMPC_HLE_SCREEN("screen")
MCFG_SMPC_HLE_CONTROL_PORTS("ctrl1", "ctrl2")
- MCFG_SMPC_HLE_PDR1_IN_CB(READ8(sat_console_state, saturn_pdr1_direct_r))
- MCFG_SMPC_HLE_PDR2_IN_CB(READ8(sat_console_state, saturn_pdr2_direct_r))
- MCFG_SMPC_HLE_PDR1_OUT_CB(WRITE8(sat_console_state, saturn_pdr1_direct_w))
- MCFG_SMPC_HLE_PDR2_OUT_CB(WRITE8(sat_console_state, saturn_pdr2_direct_w))
- MCFG_SMPC_HLE_MASTER_RESET_CB(WRITELINE(saturn_state, master_sh2_reset_w))
- MCFG_SMPC_HLE_MASTER_NMI_CB(WRITELINE(saturn_state, master_sh2_nmi_w))
- MCFG_SMPC_HLE_SLAVE_RESET_CB(WRITELINE(saturn_state, slave_sh2_reset_w))
- MCFG_SMPC_HLE_SOUND_RESET_CB(WRITELINE(saturn_state, sound_68k_reset_w))
- MCFG_SMPC_HLE_SYSTEM_RESET_CB(WRITELINE(saturn_state, system_reset_w))
- MCFG_SMPC_HLE_SYSTEM_HALT_CB(WRITELINE(saturn_state, system_halt_w))
- MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(saturn_state, dot_select_w))
- MCFG_SMPC_HLE_IRQ_HANDLER_CB(DEVWRITELINE("scu", sega_scu_device, smpc_irq_w))
+ MCFG_SMPC_HLE_PDR1_IN_CB(READ8(*this, sat_console_state, saturn_pdr1_direct_r))
+ MCFG_SMPC_HLE_PDR2_IN_CB(READ8(*this, sat_console_state, saturn_pdr2_direct_r))
+ MCFG_SMPC_HLE_PDR1_OUT_CB(WRITE8(*this, sat_console_state, saturn_pdr1_direct_w))
+ MCFG_SMPC_HLE_PDR2_OUT_CB(WRITE8(*this, sat_console_state, saturn_pdr2_direct_w))
+ MCFG_SMPC_HLE_MASTER_RESET_CB(WRITELINE(*this, saturn_state, master_sh2_reset_w))
+ MCFG_SMPC_HLE_MASTER_NMI_CB(WRITELINE(*this, saturn_state, master_sh2_nmi_w))
+ MCFG_SMPC_HLE_SLAVE_RESET_CB(WRITELINE(*this, saturn_state, slave_sh2_reset_w))
+ MCFG_SMPC_HLE_SOUND_RESET_CB(WRITELINE(*this, saturn_state, sound_68k_reset_w))
+ MCFG_SMPC_HLE_SYSTEM_RESET_CB(WRITELINE(*this, saturn_state, system_reset_w))
+ MCFG_SMPC_HLE_SYSTEM_HALT_CB(WRITELINE(*this, saturn_state, system_halt_w))
+ MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(*this, saturn_state, dot_select_w))
+ MCFG_SMPC_HLE_IRQ_HANDLER_CB(WRITELINE("scu", sega_scu_device, smpc_irq_w))
MCFG_MACHINE_START_OVERRIDE(sat_console_state,saturn)
MCFG_MACHINE_RESET_OVERRIDE(sat_console_state,saturn)
@@ -838,10 +838,10 @@ MACHINE_CONFIG_START(sat_console_state::saturn)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(saturn_state, scsp_irq))
- MCFG_SCSP_MAIN_IRQ_CB(DEVWRITELINE("scu", sega_scu_device, sound_req_w))
- MCFG_SCSP_EXTS_CB(DEVREAD16("stvcd", stvcd_device, channel_volume_r))
+ MCFG_DEVICE_ADD("scsp", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, saturn_state, scsp_irq))
+ MCFG_SCSP_MAIN_IRQ_CB(WRITELINE("scu", sega_scu_device, sound_req_w))
+ MCFG_SCSP_EXTS_CB(READ16("stvcd", stvcd_device, channel_volume_r))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp
index 4c6a0ef4e76..ea8b292a9b8 100644
--- a/src/mame/drivers/sauro.cpp
+++ b/src/mame/drivers/sauro.cpp
@@ -450,10 +450,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(sauro_state::tecfri)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(20'000'000)/4) /* verified on pcb */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(sauro_state, irq_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, sauro_state, irq_reset_w))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -466,14 +466,14 @@ MACHINE_CONFIG_START(sauro_state::tecfri)
MCFG_SCREEN_SIZE(32 * 8, 32 * 8)
MCFG_SCREEN_VISIBLE_AREA(1 * 8, 31 * 8 - 1, 2 * 8, 30 * 8 - 1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sauro_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sauro_state, vblank_irq))
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 1024)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(20'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(20'000'000)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -481,13 +481,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sauro_state::trckydoc)
tecfri(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(trckydoc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(trckydoc_map)
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(sauro_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(sauro_state, coin1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(sauro_state, coin2_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, sauro_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, sauro_state, coin1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, sauro_state, coin2_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", trckydoc)
@@ -500,21 +500,21 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sauro_state::sauro)
tecfri(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sauro_map)
- MCFG_CPU_IO_MAP(sauro_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sauro_map)
+ MCFG_DEVICE_IO_MAP(sauro_io_map)
MCFG_DEVICE_MODIFY("mainlatch") // Z3
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(sauro_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(sauro_state, coin1_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(sauro_state, coin2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, sauro_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, sauro_state, coin1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, sauro_state, coin2_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // sound IRQ trigger?
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(sauro_state, sauro_palette_bank0_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(sauro_state, sauro_palette_bank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, sauro_state, sauro_palette_bank0_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, sauro_state, sauro_palette_bank1_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(20'000'000)/5) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sauro_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(sauro_state, irq0_line_hold, 8*60) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(20'000'000)/5) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sauro_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(sauro_state, irq0_line_hold, 8*60) // ?
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sauro)
@@ -524,10 +524,10 @@ MACHINE_CONFIG_START(sauro_state::sauro)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_DEVICE_CLOCK(XTAL(20'000'000)/5) /* verified on pcb */
- MCFG_SOUND_ADD("speech", SP0256, XTAL(20'000'000)/5) /* verified on pcb */
+ MCFG_DEVICE_ADD("speech", SP0256, XTAL(20'000'000)/5) /* verified on pcb */
MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -535,8 +535,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sauro_state::saurob)
sauro(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(saurob_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(saurob_sound_map)
/* sound hardware */
MCFG_DEVICE_REMOVE("speech")
diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp
index fdd916f7f97..d596eaa7584 100644
--- a/src/mame/drivers/savia84.cpp
+++ b/src/mame/drivers/savia84.cpp
@@ -181,19 +181,19 @@ READ8_MEMBER( savia84_state::savia84_8255_portc_r ) // IN FA - read keyboard
MACHINE_CONFIG_START(savia84_state::savia84)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_savia84)
/* Devices */
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(savia84_state, savia84_8255_porta_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(savia84_state, savia84_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(savia84_state, savia84_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(savia84_state, savia84_8255_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, savia84_state, savia84_8255_porta_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, savia84_state, savia84_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, savia84_state, savia84_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, savia84_state, savia84_8255_portc_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp
index d44b66d27a6..311ef811b47 100644
--- a/src/mame/drivers/savquest.cpp
+++ b/src/mame/drivers/savquest.cpp
@@ -813,10 +813,10 @@ void savquest_isa16_cards(device_slot_interface &device)
}
MACHINE_CONFIG_START(savquest_state::savquest)
- MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000) // actually Pentium II 450
- MCFG_CPU_PROGRAM_MAP(savquest_map)
- MCFG_CPU_IO_MAP(savquest_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM2, 450000000) // actually Pentium II 450
+ MCFG_DEVICE_PROGRAM_MAP(savquest_map)
+ MCFG_DEVICE_IO_MAP(savquest_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
MCFG_DEVICE_REMOVE("rtc")
@@ -828,16 +828,16 @@ MACHINE_CONFIG_START(savquest_state::savquest)
MCFG_PCI_BUS_LEGACY_DEVICE(13, DEVICE_SELF, savquest_state, pci_3dfx_r, pci_3dfx_w)
MCFG_IDE_CONTROLLER_32_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_IDE_CONTROLLER_32_ADD("ide2", ata_devices, nullptr, nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir7_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir7_w))
/* sound hardware */
- MCFG_DEVICE_ADD("isa", ISA16, 0)
+ MCFG_DEVICE_ADD("isa", ISA16, 0) // FIXME: determine ISA bus clock
MCFG_ISA16_CPU("maincpu")
- MCFG_ISA16_SLOT_ADD("isa", "isa1", savquest_isa16_cards, "sb16", false)
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, "isa", savquest_isa16_cards, "sb16", false)
/* video hardware */
pcvideo_s3_vga(config);
@@ -847,7 +847,7 @@ MACHINE_CONFIG_START(savquest_state::savquest)
MCFG_VOODOO_TMUMEM(4,4) /* this is the 12Mb card */
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("maincpu")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(savquest_state,vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, savquest_state,vblank_assert))
MACHINE_CONFIG_END
ROM_START( savquest )
diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp
index 362ed6bba35..e20c1810947 100644
--- a/src/mame/drivers/sbasketb.cpp
+++ b/src/mame/drivers/sbasketb.cpp
@@ -197,19 +197,19 @@ WRITE_LINE_MEMBER(sbasketb_state::vblank_irq)
MACHINE_CONFIG_START(sbasketb_state::sbasketb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, 1400000) /* 1.400 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sbasketb_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, 1400000) /* 1.400 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sbasketb_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* 3.5795 MHz */
- MCFG_CPU_PROGRAM_MAP(sbasketb_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181) / 4) /* 3.5795 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sbasketb_sound_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B3
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(sbasketb_state, flipscreen_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(sbasketb_state, irq_mask_w)) // INTST
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, sbasketb_state, flipscreen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, sbasketb_state, irq_mask_w)) // INTST
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // MUT - not used?
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(sbasketb_state, coin_counter_1_w)) // COIN 1
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(sbasketb_state, coin_counter_2_w)) // COIN 2
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(sbasketb_state, spriteram_select_w)) // OBJ CHE
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, sbasketb_state, coin_counter_1_w)) // COIN 1
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, sbasketb_state, coin_counter_2_w)) // COIN 2
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, sbasketb_state, spriteram_select_w)) // OBJ CHE
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // END - not used
MCFG_WATCHDOG_ADD("watchdog")
@@ -222,7 +222,7 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(sbasketb_state, screen_update_sbasketb)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sbasketb_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sbasketb_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sbasketb)
MCFG_PALETTE_ADD("palette", 16*16+16*16*16)
@@ -234,24 +234,24 @@ MACHINE_CONFIG_START(sbasketb_state::sbasketb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_DEVICE_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76489, XTAL(14'318'181) / 8)
+ MCFG_DEVICE_ADD("snsnd", SN76489, XTAL(14'318'181) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */
+ MCFG_DEVICE_ADD("vlm", VLM5030, XTAL(3'579'545)) /* Schematics say 3.58MHz, but board uses 3.579545MHz xtal */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sbasketb_state::sbasketbu)
sbasketb(config);
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", MC6809E, 1400000) /* 6809E at 1.400 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sbasketb_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 1400000) /* 6809E at 1.400 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sbasketb_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp
index 178b6d3429f..012914e52a7 100644
--- a/src/mame/drivers/sbc6510.cpp
+++ b/src/mame/drivers/sbc6510.cpp
@@ -275,14 +275,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(sbc6510_state::sbc6510)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6510, XTAL(1'000'000))
- MCFG_CPU_PROGRAM_MAP(sbc6510_mem)
+ MCFG_DEVICE_ADD("maincpu",M6510, XTAL(1'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sbc6510_mem)
- MCFG_CPU_ADD("videocpu",ATMEGA88, XTAL(16'000'000))
+ MCFG_DEVICE_ADD("videocpu",ATMEGA88, XTAL(16'000'000))
// MCFG_DEVICE_DISABLE() // trips SLEEP opcode, needs to be emulated
- MCFG_CPU_PROGRAM_MAP(sbc6510_video_mem)
- MCFG_CPU_DATA_MAP(sbc6510_video_data)
- MCFG_CPU_IO_MAP(sbc6510_video_io)
+ MCFG_DEVICE_PROGRAM_MAP(sbc6510_video_mem)
+ MCFG_DEVICE_DATA_MAP(sbc6510_video_data)
+ MCFG_DEVICE_IO_MAP(sbc6510_video_io)
MCFG_CPU_AVR8_EEPROM("eeprom")
MCFG_PALETTE_ADD_MONOCHROME("palette") // for F4 displayer only
@@ -293,17 +293,17 @@ MACHINE_CONFIG_START(sbc6510_state::sbc6510)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(1'000'000))
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(1'000'000))
// Ports A and B connect to the IDE socket
- MCFG_AY8910_PORT_A_READ_CB(READ8(sbc6510_state, psg_a_r)) // port A read
- MCFG_AY8910_PORT_B_READ_CB(READ8(sbc6510_state, psg_b_r)) // port B read
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, sbc6510_state, psg_a_r)) // port A read
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, sbc6510_state, psg_b_r)) // port B read
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("cia6526", MOS6526, XTAL(1'000'000))
MCFG_MOS6526_TOD(50)
MCFG_MOS6526_IRQ_CALLBACK(INPUTLINE("maincpu", M6510_IRQ_LINE))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(sbc6510_state, key_w))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(sbc6510_state, key_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, sbc6510_state, key_w))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, sbc6510_state, key_r))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index 1fa1e23283d..866cfdc5a1d 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -408,9 +408,9 @@ PALETTE_INIT_MEMBER(sbowling_state, sbowling)
}
MACHINE_CONFIG_START(sbowling_state::sbowling)
- MCFG_CPU_ADD("maincpu", I8080, XTAL(19'968'000)/10) /* ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(port_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(19'968'000)/10) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(port_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sbowling_state, interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -431,7 +431,7 @@ MACHINE_CONFIG_START(sbowling_state::sbowling)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(19'968'000)/16) /* ? */
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(19'968'000)/16) /* ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp
index 0da25855356..3166ed8d146 100644
--- a/src/mame/drivers/sbrain.cpp
+++ b/src/mame/drivers/sbrain.cpp
@@ -539,14 +539,14 @@ u32 sbrain_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con
MACHINE_CONFIG_START(sbrain_state::sbrain)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(sbrain_mem)
- MCFG_CPU_IO_MAP(sbrain_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sbrain_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(sbrain_mem)
+ MCFG_DEVICE_IO_MAP(sbrain_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sbrain_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(sbrain_submem)
- MCFG_CPU_IO_MAP(sbrain_subio)
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(sbrain_submem)
+ MCFG_DEVICE_IO_MAP(sbrain_subio)
MCFG_MACHINE_RESET_OVERRIDE(sbrain_state, sbrain)
@@ -565,27 +565,27 @@ MACHINE_CONFIG_START(sbrain_state::sbrain)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 800)
+ MCFG_DEVICE_ADD("beeper", BEEP, 800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* Devices */
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(sbrain_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(sbrain_state, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(sbrain_state, ppi_pb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(sbrain_state, ppi_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(sbrain_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sbrain_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, sbrain_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, sbrain_state, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, sbrain_state, ppi_pb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, sbrain_state, ppi_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, sbrain_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sbrain_state, ppi_pc_w))
MCFG_DEVICE_ADD("uart0", I8251, 0)
MCFG_DEVICE_ADD("uart1", I8251, 0)
MCFG_DEVICE_ADD("brg", COM8116, XTAL(5'068'800)) // BR1941L
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("uart0", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart0", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("uart0", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart0", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
MCFG_FD1791_ADD("fdc", XTAL(16'000'000) / 16)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 72f7f263720..08207ef4696 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -559,16 +559,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(sbrkout_state::sbrkout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("outlatch", F9334, 0) // H8
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // SERV LED (active low)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("lamp0")) // LAMP1
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("lamp1")) // LAMP2
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(sbrkout_state, pot_mask1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(sbrkout_state, pot_mask2_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(sbrkout_state, coincount_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, sbrkout_state, pot_mask1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, sbrkout_state, pot_mask2_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, sbrkout_state, coincount_w))
// Note that connecting pin 15 to a pullup, as shown on the schematics, may result in spurious
// coin counter activity as stated in Atari bulletin B-0054 (which recommends tying it to the
// CPU reset line instead).
@@ -588,7 +588,7 @@ MACHINE_CONFIG_START(sbrkout_state::sbrkout)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99)
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp
index 96e34727edc..3576d9e367d 100644
--- a/src/mame/drivers/sbugger.cpp
+++ b/src/mame/drivers/sbugger.cpp
@@ -216,9 +216,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sbugger_state::sbugger)
- MCFG_CPU_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */
- MCFG_CPU_PROGRAM_MAP(sbugger_map)
- MCFG_CPU_IO_MAP(sbugger_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */
+ MCFG_DEVICE_PROGRAM_MAP(sbugger_map)
+ MCFG_DEVICE_IO_MAP(sbugger_io_map)
MCFG_DEVICE_ADD("i8156", I8156, 200000) /* freq is an approximation */
MCFG_I8155_IN_PORTA_CB(IOPORT("INPUTS"))
@@ -242,10 +242,10 @@ MACHINE_CONFIG_START(sbugger_state::sbugger)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489.1", SN76489, 3000000)
+ MCFG_DEVICE_ADD("sn76489.1", SN76489, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn76489.2", SN76489, 3000000)
+ MCFG_DEVICE_ADD("sn76489.2", SN76489, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp
index 90b0cd3ee19..8f230295bb7 100644
--- a/src/mame/drivers/sc1.cpp
+++ b/src/mame/drivers/sc1.cpp
@@ -158,21 +158,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sc1_state::sc1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(sc1_mem)
- MCFG_CPU_IO_MAP(sc1_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sc1_mem)
+ MCFG_DEVICE_IO_MAP(sc1_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_sc1)
/* devices */
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(sc1_state, pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(sc1_state, pio_port_b_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, sc1_state, pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, sc1_state, pio_port_b_r))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp
index e1d75ecc5fc..21a148d666b 100644
--- a/src/mame/drivers/sc2.cpp
+++ b/src/mame/drivers/sc2.cpp
@@ -213,9 +213,9 @@ WRITE8_MEMBER( sc2_state::pio_port_b_w )
MACHINE_CONFIG_START(sc2_state::sc2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(sc2_mem)
- MCFG_CPU_IO_MAP(sc2_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sc2_mem)
+ MCFG_DEVICE_IO_MAP(sc2_io)
/* video hardware */
@@ -223,14 +223,14 @@ MACHINE_CONFIG_START(sc2_state::sc2)
/* devices */
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000))
- MCFG_Z80PIO_IN_PA_CB(READ8(sc2_state, pio_port_a_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(sc2_state, pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(sc2_state, pio_port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(sc2_state, pio_port_b_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, sc2_state, pio_port_a_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, sc2_state, pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, sc2_state, pio_port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, sc2_state, pio_port_b_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 3250 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 3250 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp
index ecaadbde27b..9f5f4cdbe46 100644
--- a/src/mame/drivers/scobra.cpp
+++ b/src/mame/drivers/scobra.cpp
@@ -865,16 +865,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(scobra_state::type1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(type1_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(type1_map)
- MCFG_CPU_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
- MCFG_CPU_PROGRAM_MAP(scobra_sound_map)
- MCFG_CPU_IO_MAP(scobra_sound_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318000/8) /* 1.78975 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(scobra_sound_map)
+ MCFG_DEVICE_IO_MAP(scobra_sound_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback)
MCFG_DEVICE_ADD("konami_7474", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,scramble_sh_7474_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,scramble_sh_7474_q_callback))
MCFG_MACHINE_RESET_OVERRIDE(scobra_state,scramble)
@@ -884,14 +884,14 @@ MACHINE_CONFIG_START(scobra_state::type1)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w))
MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_1_callback))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_1_callback))
MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_2_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_2_q_callback))
MCFG_TIMER_DRIVER_ADD("int_timer", scobra_state, galaxold_interrupt_timer)
@@ -917,12 +917,12 @@ MACHINE_CONFIG_START(scobra_state::type1)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 14318000/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 14318000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MCFG_SOUND_ADD("ay2", AY8910, 14318000/8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(scramble_state, scramble_portB_r))
+ MCFG_DEVICE_ADD("ay2", AY8910, 14318000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, scramble_state, scramble_portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_CONFIG_END
@@ -947,14 +947,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(scobra_state::rescuefe)
rescue(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rescuefe_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rescuefe_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(scobra_state::rescueb)
rescue(config);
MCFG_DEVICE_MODIFY("ppi8255_1")
- MCFG_I8255_IN_PORTC_CB(READ8(scobra_state, rescueb_a002_r)) // protection? must return 0xfc or the game jumps to 0x00
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, scobra_state, rescueb_a002_r)) // protection? must return 0xfc or the game jumps to 0x00
MACHINE_CONFIG_END
@@ -974,8 +974,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(scobra_state::minefldfe)
minefld(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(minefldfe_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(minefldfe_map)
MACHINE_CONFIG_END
@@ -983,8 +983,8 @@ MACHINE_CONFIG_START(scobra_state::mimonkey)
type1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mimonkey_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mimonkey_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(scobra_state,mimonkey)
@@ -995,16 +995,16 @@ MACHINE_CONFIG_START(scobra_state::type2)
type1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(type2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(type2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(scobra_state::tazmani3)
type2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tazmani3_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tazmani3_map)
MACHINE_CONFIG_END
@@ -1015,8 +1015,8 @@ MACHINE_CONFIG_START(scobra_state::stratgyx)
MCFG_DEVICE_REMOVE("ppi8255_1")
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN3"))
/* video hardware */
@@ -1045,24 +1045,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(scobra_state::hustler)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(hustler_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hustler_map)
- MCFG_CPU_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */
- MCFG_CPU_PROGRAM_MAP(hustler_sound_map)
- MCFG_CPU_IO_MAP(hustler_sound_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback)
+ MCFG_DEVICE_ADD("audiocpu",Z80,14318000/8) /* 1.78975 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hustler_sound_map)
+ MCFG_DEVICE_IO_MAP(hustler_sound_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback)
MCFG_DEVICE_ADD("konami_7474", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,scramble_sh_7474_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,scramble_sh_7474_q_callback))
MCFG_MACHINE_RESET_OVERRIDE(scobra_state,scramble)
MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_1_callback))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_1_callback))
MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scobra_state,galaxold_7474_9m_2_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scobra_state,galaxold_7474_9m_2_q_callback))
MCFG_TIMER_DRIVER_ADD("int_timer", scobra_state, galaxold_interrupt_timer)
@@ -1074,8 +1074,8 @@ MACHINE_CONFIG_START(scobra_state::hustler)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1095,9 +1095,9 @@ MACHINE_CONFIG_START(scobra_state::hustler)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, 14318000/8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(scramble_state, hustler_portB_r))
+ MCFG_DEVICE_ADD("aysnd", AY8910, 14318000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, scramble_state, hustler_portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
@@ -1105,20 +1105,20 @@ MACHINE_CONFIG_START(scobra_state::hustlerb)
hustler(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hustlerb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hustlerb_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(hustlerb_sound_map)
- MCFG_CPU_IO_MAP(hustlerb_sound_io_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(hustlerb_sound_map)
+ MCFG_DEVICE_IO_MAP(hustlerb_sound_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(scobra_state::hustlerb4)
hustler(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hustlerb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hustlerb_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp
index 395d45e99cf..87de2341f0a 100644
--- a/src/mame/drivers/scopus.cpp
+++ b/src/mame/drivers/scopus.cpp
@@ -173,33 +173,33 @@ READ8_MEMBER(sagitta180_state::memory_read_byte)
MACHINE_CONFIG_START(sagitta180_state::sagitta180)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(10'000'000)) /* guessed ! */
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_IO_MAP(maincpu_io_map)
-// MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("intlatch", i8212_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(10'000'000)) /* guessed ! */
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
+// MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("intlatch", i8212_device, inta_cb)
MCFG_DEVICE_ADD("dma", I8257, XTAL(14'745'600)) /* guessed xtal */
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("crtc", i8275_device, dack_w))
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(sagitta180_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(sagitta180_state, memory_read_byte))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("crtc", i8275_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, sagitta180_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, sagitta180_state, memory_read_byte))
MCFG_DEVICE_ADD( "uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
MCFG_DEVICE_ADD("uart_clock", CLOCK, 19218) // 19218 / 19222 ? guesses...
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
// MCFG_DEVICE_ADD("intlatch", I8212, 0)
// MCFG_I8212_MD_CALLBACK(GND) // guessed !
-// MCFG_I8212_DI_CALLBACK(DEVREAD8("picu", i8214_device, vector_r))
+// MCFG_I8212_DI_CALLBACK(READ8("picu", i8214_device, vector_r))
// MCFG_I8212_INT_CALLBACK(INPUTLINE("maincpu", I8085_INTR_LINE)) // guessed !
/* video hardware */
@@ -214,7 +214,7 @@ MACHINE_CONFIG_START(sagitta180_state::sagitta180)
MCFG_DEVICE_ADD("crtc", I8275, 12480000 / 8) /* guessed xtal */
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(sagitta180_state, crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma" , i8257_device , dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma" , i8257_device , dreq2_w))
MCFG_I8275_IRQ_CALLBACK(INPUTLINE("maincpu" , I8085_INTR_LINE))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_PALETTE_ADD("palette", 3)
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index 99399b1e196..dc93140ef0b 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -291,10 +291,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(scorpion_state::scorpion)
spectrum_128(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(scorpion_mem)
- MCFG_CPU_IO_MAP(scorpion_io)
- MCFG_CPU_OPCODES_MAP(scorpion_switch)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(scorpion_mem)
+ MCFG_DEVICE_IO_MAP(scorpion_io)
+ MCFG_DEVICE_OPCODES_MAP(scorpion_switch)
MCFG_MACHINE_START_OVERRIDE(scorpion_state, scorpion )
MCFG_MACHINE_RESET_OVERRIDE(scorpion_state, scorpion )
diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp
index d74c08a2a4d..68579d6bd6c 100644
--- a/src/mame/drivers/scotrsht.cpp
+++ b/src/mame/drivers/scotrsht.cpp
@@ -190,12 +190,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(scotrsht_state::scotrsht)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(scotrsht_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(scotrsht_map)
- MCFG_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(scotrsht_sound_map)
- MCFG_CPU_IO_MAP(scotrsht_sound_port)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(scotrsht_sound_map)
+ MCFG_DEVICE_IO_MAP(scotrsht_sound_port)
MCFG_WATCHDOG_ADD("watchdog")
@@ -207,7 +207,7 @@ MACHINE_CONFIG_START(scotrsht_state::scotrsht)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(scotrsht_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(scotrsht_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, scotrsht_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", scotrsht)
MCFG_PALETTE_ADD("palette", 16*8*16+16*8*16)
@@ -219,7 +219,7 @@ MACHINE_CONFIG_START(scotrsht_state::scotrsht)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 18432000/6)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 18432000/6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp
index 133a07ae5f7..88f8825314f 100644
--- a/src/mame/drivers/scramble.cpp
+++ b/src/mame/drivers/scramble.cpp
@@ -1305,22 +1305,22 @@ GFXDECODE_END
MACHINE_CONFIG_START(scramble_state::scramble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(scramble_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(scramble_map)
- MCFG_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MCFG_CPU_PROGRAM_MAP(scramble_sound_map)
- MCFG_CPU_IO_MAP(scramble_sound_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(scramble_sound_map)
+ MCFG_DEVICE_IO_MAP(scramble_sound_io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(scramble_state,scramble_sh_irq_callback)
MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(scramble_state,galaxold_7474_9m_1_callback))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, scramble_state,galaxold_7474_9m_1_callback))
MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scramble_state,galaxold_7474_9m_2_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scramble_state,galaxold_7474_9m_2_q_callback))
MCFG_DEVICE_ADD("konami_7474", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scramble_state,scramble_sh_7474_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scramble_state,scramble_sh_7474_q_callback))
MCFG_TIMER_DRIVER_ADD("int_timer", scramble_state, galaxold_interrupt_timer)
@@ -1334,8 +1334,8 @@ MACHINE_CONFIG_START(scramble_state::scramble)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1357,12 +1357,12 @@ MACHINE_CONFIG_START(scramble_state::scramble)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("8910.1", AY8910, 14318000/8)
+ MCFG_DEVICE_ADD("8910.1", AY8910, 14318000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MCFG_SOUND_ADD("8910.2", AY8910, 14318000/8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_READ_CB(READ8(scramble_state, scramble_portB_r))
+ MCFG_DEVICE_ADD("8910.2", AY8910, 14318000/8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, scramble_state, scramble_portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
MACHINE_CONFIG_END
@@ -1370,13 +1370,13 @@ MACHINE_CONFIG_START(scramble_state::mars)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mars_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mars_map)
MCFG_DEVICE_REMOVE("ppi8255_1")
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, scramble_sh_irqtrigger_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, scramble_sh_irqtrigger_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN3"))
/* video hardware */
@@ -1389,8 +1389,8 @@ MACHINE_CONFIG_START(scramble_state::devilfsh)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mars_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mars_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", devilfsh)
@@ -1403,9 +1403,9 @@ MACHINE_CONFIG_START(scramble_state::newsin7)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(newsin7_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", scramble_state, irq0_line_hold) // newsin7a has a corrupt opcode at 0x67, the irq routine instead of NMI avoids it by jumping to 0x68 after doing some other things, probably intentional. newsin7 has this fixed, maybe a bootleg?
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(newsin7_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", scramble_state, irq0_line_hold) // newsin7a has a corrupt opcode at 0x67, the irq routine instead of NMI avoids it by jumping to 0x68 after doing some other things, probably intentional. newsin7 has this fixed, maybe a bootleg?
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", newsin7)
@@ -1419,13 +1419,13 @@ MACHINE_CONFIG_START(scramble_state::mrkougb)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mrkougar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mrkougar_map)
MCFG_DEVICE_REMOVE("ppi8255_1")
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(scramble_state, mrkougar_sh_irqtrigger_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, scramble_state, mrkougar_sh_irqtrigger_w))
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1444,8 +1444,8 @@ MACHINE_CONFIG_START(scramble_state::ckongs)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ckongs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ckongs_map)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1458,14 +1458,14 @@ MACHINE_CONFIG_START(scramble_state::hotshock)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hotshock_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hotshock_map)
MCFG_DEVICE_REMOVE( "ppi8255_0" )
MCFG_DEVICE_REMOVE( "ppi8255_1" )
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_IO_MAP(hotshock_sound_io_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_IO_MAP(hotshock_sound_io_map)
MCFG_MACHINE_RESET_OVERRIDE(scramble_state,galaxold)
@@ -1475,13 +1475,13 @@ MACHINE_CONFIG_START(scramble_state::hotshock)
MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold)
MCFG_VIDEO_START_OVERRIDE(scramble_state,pisces)
- MCFG_SOUND_MODIFY("8910.1")
+ MCFG_DEVICE_MODIFY("8910.1")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
- MCFG_SOUND_MODIFY("8910.2")
- MCFG_AY8910_PORT_A_READ_CB(READ8(scramble_state, hotshock_soundlatch_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(scramble_state, scramble_portB_r))
+ MCFG_DEVICE_MODIFY("8910.2")
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, scramble_state, hotshock_soundlatch_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, scramble_state, scramble_portB_r))
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
MACHINE_CONFIG_END
@@ -1502,8 +1502,8 @@ MACHINE_CONFIG_START(scramble_state::mimonscr)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mimonscr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mimonscr_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(scramble_state,mimonkey)
@@ -1514,9 +1514,9 @@ MACHINE_CONFIG_START(scramble_state::triplep)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(triplep_map)
- MCFG_CPU_IO_MAP(triplep_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(triplep_map)
+ MCFG_DEVICE_IO_MAP(triplep_io_map)
MCFG_DEVICE_REMOVE("audiocpu")
MCFG_DEVICE_REMOVE("ppi8255_1")
@@ -1528,8 +1528,8 @@ MACHINE_CONFIG_START(scramble_state::triplep)
MCFG_PALETTE_INIT_OWNER(scramble_state,galaxold)
/* sound hardware */
- MCFG_SOUND_MODIFY("8910.1")
- MCFG_SOUND_CLOCK(18432000/12) // triple punch/knock out ay clock is 1.535MHz, derived from main cpu xtal; verified on hardware
+ MCFG_DEVICE_MODIFY("8910.1")
+ MCFG_DEVICE_CLOCK(18432000/12) // triple punch/knock out ay clock is 1.535MHz, derived from main cpu xtal; verified on hardware
MCFG_SOUND_ROUTES_RESET()
@@ -1556,11 +1556,11 @@ MACHINE_CONFIG_START(scramble_state::hunchbks)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", S2650, 18432000/6)
- MCFG_CPU_PROGRAM_MAP(hunchbks_map)
- MCFG_CPU_IO_MAP(hunchbks_readport)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", scramble_state, hunchbks_vh_interrupt)
+ MCFG_DEVICE_REPLACE("maincpu", S2650, 18432000/6)
+ MCFG_DEVICE_PROGRAM_MAP(hunchbks_map)
+ MCFG_DEVICE_IO_MAP(hunchbks_readport)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", scramble_state, hunchbks_vh_interrupt)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
@@ -1576,25 +1576,25 @@ MACHINE_CONFIG_START(scramble_state::hncholms)
hunchbks(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(18432000/6/2/2)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(18432000/6/2/2)
MCFG_VIDEO_START_OVERRIDE(scramble_state,scorpion)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(scramble_state::ad2083)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(ad2083_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ad2083_map)
MCFG_DEVICE_ADD("konami_7474", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scramble_state,scramble_sh_7474_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scramble_state,scramble_sh_7474_q_callback))
MCFG_DEVICE_ADD("7474_9m_1", TTL7474, 0)
- MCFG_7474_OUTPUT_CB(WRITELINE(scramble_state,galaxold_7474_9m_1_callback))
+ MCFG_7474_OUTPUT_CB(WRITELINE(*this, scramble_state,galaxold_7474_9m_1_callback))
MCFG_DEVICE_ADD("7474_9m_2", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(scramble_state,galaxold_7474_9m_2_q_callback))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, scramble_state,galaxold_7474_9m_2_q_callback))
MCFG_TIMER_DRIVER_ADD("int_timer", scramble_state, galaxold_interrupt_timer)
@@ -1628,21 +1628,21 @@ MACHINE_CONFIG_START(scramble_state::harem)
scramble(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(harem_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(harem_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(harem_sound_map)
- MCFG_CPU_IO_MAP(harem_sound_io_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(harem_sound_map)
+ MCFG_DEVICE_IO_MAP(harem_sound_io_map)
MCFG_VIDEO_START_OVERRIDE(scramble_state,harem)
/* extra AY8910 with I/O ports */
- MCFG_SOUND_ADD("8910.3", AY8910, 14318000/8)
+ MCFG_DEVICE_ADD("8910.3", AY8910, 14318000/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("digitalker", digitalker_device, digitalker_data_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(scramble_state, harem_digitalker_control_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("digitalker", digitalker_device, digitalker_data_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, scramble_state, harem_digitalker_control_w))
MCFG_DIGITALKER_ADD("digitalker", 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.16)
diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp
index 7611e7c11cc..f84eca2edbb 100644
--- a/src/mame/drivers/scregg.cpp
+++ b/src/mame/drivers/scregg.cpp
@@ -267,8 +267,8 @@ MACHINE_RESET_MEMBER(scregg_state,scregg)
MACHINE_CONFIG_START(scregg_state::dommy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(dommy_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(dommy_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("irq", scregg_state, scregg_interrupt, "screen", 0, 8)
MCFG_MACHINE_START_OVERRIDE(scregg_state,scregg)
@@ -288,10 +288,10 @@ MACHINE_CONFIG_START(scregg_state::dommy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
@@ -299,8 +299,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(scregg_state::scregg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(eggs_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(eggs_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("irq", scregg_state, scregg_interrupt, "screen", 0, 8)
MCFG_MACHINE_START_OVERRIDE(scregg_state,scregg)
@@ -320,10 +320,10 @@ MACHINE_CONFIG_START(scregg_state::scregg)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp
index 2a68da51f73..4b7cab41f7f 100644
--- a/src/mame/drivers/scv.cpp
+++ b/src/mame/drivers/scv.cpp
@@ -660,12 +660,12 @@ static void scv_cart(device_slot_interface &device)
MACHINE_CONFIG_START(scv_state::scv)
- MCFG_CPU_ADD( "maincpu", UPD7801, XTAL(4'000'000) )
- MCFG_CPU_PROGRAM_MAP( scv_mem )
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(scv_state, porta_w))
- MCFG_UPD7810_PORTB_READ_CB(READ8(scv_state, portb_r))
- MCFG_UPD7810_PORTC_READ_CB(READ8(scv_state, portc_r))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(scv_state, portc_w))
+ MCFG_DEVICE_ADD( "maincpu", UPD7801, XTAL(4'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP( scv_mem )
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, scv_state, porta_w))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, scv_state, portb_r))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, scv_state, portc_r))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, scv_state, portc_w))
/* Video chip is EPOCH TV-1 */
MCFG_SCREEN_ADD( "screen", RASTER )
@@ -679,8 +679,8 @@ MACHINE_CONFIG_START(scv_state::scv)
/* Sound is generated by UPD1771C clocked at XTAL(6'000'000) */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD( "upd1771c", UPD1771C, XTAL(6'000'000) )
- MCFG_UPD1771_ACK_HANDLER(WRITELINE(scv_state, upd1771_ack_w))
+ MCFG_DEVICE_ADD( "upd1771c", UPD1771C, XTAL(6'000'000) )
+ MCFG_UPD1771_ACK_HANDLER(WRITELINE(*this, scv_state, upd1771_ack_w))
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MCFG_SCV_CARTRIDGE_ADD("cartslot", scv_cart, nullptr)
@@ -692,8 +692,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(scv_state::scv_pal)
scv(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_CLOCK( 3780000 )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_CLOCK( 3780000 )
/* Video chip is EPOCH TV-1A */
MCFG_SCREEN_MODIFY( "screen" )
diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp
index 87980788c95..b2c67dc902d 100644
--- a/src/mame/drivers/scyclone.cpp
+++ b/src/mame/drivers/scyclone.cpp
@@ -607,17 +607,17 @@ INTERRUPT_GEN_MEMBER(scyclone_state::irq)
MACHINE_CONFIG_START(scyclone_state::scyclone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000/2) // MOSTEK Z80-CPU ? MHz (there's also a 9.987MHz XTAL) intermissions seem driven directly by CPU speed for reference
- MCFG_CPU_PROGRAM_MAP(scyclone_map)
- MCFG_CPU_IO_MAP(scyclone_iomap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", scyclone_state, irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000/2) // MOSTEK Z80-CPU ? MHz (there's also a 9.987MHz XTAL) intermissions seem driven directly by CPU speed for reference
+ MCFG_DEVICE_PROGRAM_MAP(scyclone_map)
+ MCFG_DEVICE_IO_MAP(scyclone_iomap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", scyclone_state, irq)
// sound ?
- MCFG_CPU_ADD("subcpu", Z80, 5000000/2) // LH0080 Z80-CPU SHARP ? MHz (5Mhz XTAL on this sub-pcb)
- MCFG_CPU_PROGRAM_MAP(scyclone_sub_map)
- MCFG_CPU_IO_MAP(scyclone_sub_iomap)
+ MCFG_DEVICE_ADD("subcpu", Z80, 5000000/2) // LH0080 Z80-CPU SHARP ? MHz (5Mhz XTAL on this sub-pcb)
+ MCFG_DEVICE_PROGRAM_MAP(scyclone_sub_map)
+ MCFG_DEVICE_IO_MAP(scyclone_sub_iomap)
// no idea, but it does wait on an irq in places, irq0 increases a register checked in the wait loop so without it sound dies after a while
- MCFG_CPU_PERIODIC_INT_DRIVER(scyclone_state, irq0_line_hold, 400*60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(scyclone_state, irq0_line_hold, 400*60)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
@@ -639,17 +639,17 @@ MACHINE_CONFIG_START(scyclone_state::scyclone)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("snsnd0", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd0", SN76477)
MCFG_SN76477_ENABLE(1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
- MCFG_SOUND_ADD("snsnd1", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd1", SN76477)
MCFG_SN76477_ENABLE(1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
// this is just taken from route16.cpp
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0)
@@ -657,7 +657,7 @@ MACHINE_CONFIG_START(scyclone_state::scyclone)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0)
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref2", VOLTAGE_REGULATOR, 0)
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp
index 656af0ebc45..07549232020 100644
--- a/src/mame/drivers/sderby.cpp
+++ b/src/mame/drivers/sderby.cpp
@@ -601,9 +601,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(sderby_state::sderby)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(sderby_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(sderby_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -626,9 +626,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sderby_state::sderbya)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(sderbya_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(sderbya_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -651,9 +651,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sderby_state::luckboom)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(luckboom_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(luckboom_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -676,9 +676,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sderby_state::spacewin)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(spacewin_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(spacewin_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -701,9 +701,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sderby_state::shinygld)
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL / 2) // verified
- MCFG_CPU_PROGRAM_MAP(shinygld_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 2) // verified
+ MCFG_DEVICE_PROGRAM_MAP(shinygld_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -726,9 +726,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sderby_state::pmroulet)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(roulette_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(roulette_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/sderby2.cpp b/src/mame/drivers/sderby2.cpp
index ff64eb9cf42..6db38d4b058 100644
--- a/src/mame/drivers/sderby2.cpp
+++ b/src/mame/drivers/sderby2.cpp
@@ -294,15 +294,15 @@ void sderby2_state::machine_reset()
}
MACHINE_CONFIG_START(sderby2_state::sderby2)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(main_program_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby2_state, irq0_line_hold)
-
- MCFG_CPU_ADD("subcpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sub_program_map)
- MCFG_CPU_IO_MAP(sub_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(main_program_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby2_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("subcpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sub_program_map)
+ MCFG_DEVICE_IO_MAP(sub_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sderby2_state, irq0_line_hold)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp
index acf7dd89e71..bd645cb44b8 100644
--- a/src/mame/drivers/sdk80.cpp
+++ b/src/mame/drivers/sdk80.cpp
@@ -122,26 +122,26 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sdk80_state::sdk80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'432'000)/9)
- MCFG_CPU_PROGRAM_MAP(sdk80_mem)
- MCFG_CPU_IO_MAP(sdk80_io)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'432'000)/9)
+ MCFG_DEVICE_PROGRAM_MAP(sdk80_mem)
+ MCFG_DEVICE_IO_MAP(sdk80_io)
MCFG_DEVICE_ADD(I8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
MCFG_DEVICE_ADD(I8255A_0_TAG, I8255A, 0)
MCFG_DEVICE_ADD(I8255A_1_TAG, I8255A, 0)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(18'432'000)/60)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(sdk80_state, usart_clock_tick))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, sdk80_state, usart_clock_tick))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp
index 6f34592766d..86dcfd8cb8c 100644
--- a/src/mame/drivers/sdk85.cpp
+++ b/src/mame/drivers/sdk85.cpp
@@ -148,9 +148,9 @@ READ8_MEMBER( sdk85_state::kbd_r )
MACHINE_CONFIG_START(sdk85_state::sdk85)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(sdk85_mem)
- MCFG_CPU_IO_MAP(sdk85_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(sdk85_mem)
+ MCFG_DEVICE_IO_MAP(sdk85_io)
MCFG_DEVICE_ADD("romio", I8355, 6.144_MHz_XTAL / 2) // Monitor ROM (A14)
@@ -167,9 +167,9 @@ MACHINE_CONFIG_START(sdk85_state::sdk85)
/* Devices */
MCFG_DEVICE_ADD("kdc", I8279, 6.144_MHz_XTAL / 2) // Keyboard/Display Controller (A13)
MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq
- MCFG_I8279_OUT_SL_CB(WRITE8(sdk85_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(sdk85_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(sdk85_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, sdk85_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, sdk85_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, sdk85_state, kbd_r)) // kbd RL lines
MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp
index b82d8ef2e18..f73851dd771 100644
--- a/src/mame/drivers/sdk86.cpp
+++ b/src/mame/drivers/sdk86.cpp
@@ -146,32 +146,32 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sdk86_state::sdk86)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(14'745'600)/3) /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */
- MCFG_CPU_PROGRAM_MAP(sdk86_mem)
- MCFG_CPU_IO_MAP(sdk86_io)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(14'745'600)/3) /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */
+ MCFG_DEVICE_PROGRAM_MAP(sdk86_mem)
+ MCFG_DEVICE_IO_MAP(sdk86_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_sdk86)
/* Devices */
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_cts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD("usart_clock", CLOCK, XTAL(14'745'600)/3/16)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_TAG, i8251_device, write_rxc))
MCFG_DEVICE_ADD("i8279", I8279, 2500000) // based on divider
- MCFG_I8279_OUT_SL_CB(WRITE8(sdk86_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(sdk86_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(sdk86_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, sdk86_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, sdk86_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, sdk86_state, kbd_r)) // kbd RL lines
MCFG_I8279_IN_SHIFT_CB(GND) // Shift key
MCFG_I8279_IN_CTRL_CB(GND)
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index d8fa5bb530e..24d1bce04df 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -475,28 +475,28 @@ GFXDECODE_END
MACHINE_CONFIG_START(seabattl_state::seabattl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 14318180/4/2)
- MCFG_CPU_PROGRAM_MAP(seabattl_map)
- MCFG_CPU_DATA_MAP(seabattl_data_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seabattl_state, seabattl_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
+ MCFG_DEVICE_ADD("maincpu", S2650, 14318180/4/2)
+ MCFG_DEVICE_PROGRAM_MAP(seabattl_map)
+ MCFG_DEVICE_DATA_MAP(seabattl_data_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seabattl_state, seabattl_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
MCFG_DEVICE_ADD("s2636", S2636, 0)
MCFG_S2636_OFFSETS(-13, -29)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_DEVICE_ADD("sc_thousand", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(seabattl_state, digit_w<0>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, seabattl_state, digit_w<0>))
MCFG_DEVICE_ADD("sc_hundred", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(seabattl_state, digit_w<1>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, seabattl_state, digit_w<1>))
MCFG_DEVICE_ADD("sc_half", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(seabattl_state, digit_w<2>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, seabattl_state, digit_w<2>))
MCFG_DEVICE_ADD("sc_unity", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(seabattl_state, digit_w<3>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, seabattl_state, digit_w<3>))
MCFG_DEVICE_ADD("tm_half", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(seabattl_state, digit_w<4>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, seabattl_state, digit_w<4>))
MCFG_DEVICE_ADD("tm_unity", DM9368, 0)
- MCFG_DM9368_UPDATE_CALLBACK(WRITE8(seabattl_state, digit_w<5>))
+ MCFG_DM9368_UPDATE_CALLBACK(WRITE8(*this, seabattl_state, digit_w<5>))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp
index b521a3d3765..1c8303dc7a1 100644
--- a/src/mame/drivers/sealy.cpp
+++ b/src/mame/drivers/sealy.cpp
@@ -101,8 +101,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(sealy_state::sealy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
- MCFG_CPU_PROGRAM_MAP(sealy_map)
+ MCFG_DEVICE_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
+ MCFG_DEVICE_PROGRAM_MAP(sealy_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp
index d53f4c9994c..e8150277365 100644
--- a/src/mame/drivers/seattle.cpp
+++ b/src/mame/drivers/seattle.cpp
@@ -1871,7 +1871,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(seattle_state::seattle_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3)
+ MCFG_DEVICE_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
@@ -1894,8 +1894,8 @@ MACHINE_CONFIG_START(seattle_state::seattle_common)
MCFG_VOODOO_PCI_FBMEM(2)
MCFG_VOODOO_PCI_TMUMEM(4, 0)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
- MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", seattle_state, vblank_assert))
- MCFG_VOODOO_STALL_CB(DEVWRITELINE(PCI_ID_GALILEO, gt64xxx_device, pci_stall))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, seattle_state, vblank_assert))
+ MCFG_VOODOO_STALL_CB(WRITELINE(PCI_ID_GALILEO, gt64xxx_device, pci_stall))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -1912,7 +1912,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::phoenixsa)
seattle_common(config);
- MCFG_CPU_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2)
+ MCFG_DEVICE_REPLACE("maincpu", R4700LE, SYSTEM_CLOCK*2)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
@@ -1925,7 +1925,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::seattle150)
seattle_common(config);
- MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3)
+ MCFG_DEVICE_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*3)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
@@ -1935,13 +1935,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::seattle150_widget)
seattle150(config);
MCFG_SMC91C94_ADD("ethernet")
- MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt))
+ MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ethernet_interrupt))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::seattle200)
seattle_common(config);
- MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
+ MCFG_DEVICE_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
@@ -1951,12 +1951,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::seattle200_widget)
seattle200(config);
MCFG_SMC91C94_ADD("ethernet")
- MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt))
+ MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ethernet_interrupt))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::flagstaff)
seattle_common(config);
- MCFG_CPU_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
+ MCFG_DEVICE_REPLACE("maincpu", R5000LE, SYSTEM_CLOCK*4)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
@@ -1965,7 +1965,7 @@ MACHINE_CONFIG_START(seattle_state::flagstaff)
MCFG_GT64XXX_SET_CS(3, seattle_state::seattle_flagstaff_cs3_map)
MCFG_SMC91C94_ADD("ethernet")
- MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(seattle_state, ethernet_interrupt))
+ MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ethernet_interrupt))
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO)
MCFG_VOODOO_PCI_FBMEM(2)
@@ -1984,7 +1984,7 @@ MACHINE_CONFIG_START(seattle_state::wg3dh)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_IOASIC_UPPER(310/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
@@ -1998,35 +1998,35 @@ MACHINE_CONFIG_START(seattle_state::mace)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE)
MCFG_MIDWAY_IOASIC_UPPER(319/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::sfrush)
flagstaff(config);
MCFG_DEVICE_ADD("cage", ATARI_CAGE_SEATTLE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x5236)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(DEVWRITE8("ioasic",midway_ioasic_device,cage_irq_handler))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8("ioasic",midway_ioasic_device,cage_irq_handler))
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_IOASIC_UPPER(315/* no alternates */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(100)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(seattle_state, wheel_board_w))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, seattle_state, wheel_board_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::sfrushrk)
flagstaff(config);
MCFG_DEVICE_ADD("cage", ATARI_CAGE_SEATTLE, 0)
MCFG_ATARI_CAGE_SPEEDUP(0x5329)
- MCFG_ATARI_CAGE_IRQ_CALLBACK(DEVWRITE8("ioasic",midway_ioasic_device,cage_irq_handler))
+ MCFG_ATARI_CAGE_IRQ_CALLBACK(WRITE8("ioasic",midway_ioasic_device,cage_irq_handler))
MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_SFRUSHRK)
MCFG_MIDWAY_IOASIC_UPPER(331/* unknown */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(100)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(seattle_state, wheel_board_w))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, seattle_state, wheel_board_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::sfrushrkw)
@@ -2045,7 +2045,7 @@ MACHINE_CONFIG_START(seattle_state::calspeed)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CALSPEED)
MCFG_MIDWAY_IOASIC_UPPER(328/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(100)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
@@ -2059,7 +2059,7 @@ MACHINE_CONFIG_START(seattle_state::vaportrx)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_VAPORTRX)
MCFG_MIDWAY_IOASIC_UPPER(324/* 334? unknown */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(100)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::biofreak)
@@ -2072,7 +2072,7 @@ MACHINE_CONFIG_START(seattle_state::biofreak)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_IOASIC_UPPER(231/* no alternates */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::blitz)
@@ -2085,7 +2085,7 @@ MACHINE_CONFIG_START(seattle_state::blitz)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99)
MCFG_MIDWAY_IOASIC_UPPER(444/* or 528 */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::blitz99)
@@ -2098,7 +2098,7 @@ MACHINE_CONFIG_START(seattle_state::blitz99)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99)
MCFG_MIDWAY_IOASIC_UPPER(481/* or 484 or 520 */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::blitz2k)
@@ -2111,7 +2111,7 @@ MACHINE_CONFIG_START(seattle_state::blitz2k)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99)
MCFG_MIDWAY_IOASIC_UPPER(494/* or 498 */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::carnevil)
@@ -2124,7 +2124,7 @@ MACHINE_CONFIG_START(seattle_state::carnevil)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CARNEVIL)
MCFG_MIDWAY_IOASIC_UPPER(469/* 469 or 486 or 528 */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seattle_state::hyprdriv)
@@ -2137,7 +2137,7 @@ MACHINE_CONFIG_START(seattle_state::hyprdriv)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_HYPRDRIV)
MCFG_MIDWAY_IOASIC_UPPER(469/* unknown */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(seattle_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, seattle_state, ioasic_irq))
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp
index d04d800f264..68b36b97a67 100644
--- a/src/mame/drivers/seattlecmp.cpp
+++ b/src/mame/drivers/seattlecmp.cpp
@@ -104,38 +104,38 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(seattle_comp_state::seattle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8086, XTAL(24'000'000) / 3) // 8 MHz or 4 MHz selectable
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(24'000'000) / 3) // 8 MHz or 4 MHz selectable
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic1", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("pic1", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_INT0))
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(seattle_comp_state, pic_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, seattle_comp_state, pic_slave_ack))
MCFG_DEVICE_ADD("pic2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic1", pic8259_device, ir1_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic1", pic8259_device, ir1_w))
MCFG_DEVICE_ADD("stc", AM9513, XTAL(4'000'000)) // dedicated XTAL
- MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("pic2", pic8259_device, ir0_w))
- MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("pic2", pic8259_device, ir4_w))
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("pic2", pic8259_device, ir7_w))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
- MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("stc", am9513_device, source1_w))
+ MCFG_AM9513_OUT2_CALLBACK(WRITELINE("pic2", pic8259_device, ir0_w))
+ MCFG_AM9513_OUT3_CALLBACK(WRITELINE("pic2", pic8259_device, ir4_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("pic2", pic8259_device, ir7_w))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
+ MCFG_AM9513_FOUT_CALLBACK(WRITELINE("stc", am9513_device, source1_w))
// FOUT not shown on schematics, which inexplicably have Source 1 tied to Gate 5
MCFG_DEVICE_ADD("uart", I8251, XTAL(24'000'000) / 12) // CLOCK on line 49
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic2", pic8259_device, ir1_w))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("pic2", pic8259_device, ir5_w))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic2", pic8259_device, ir1_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("pic2", pic8259_device, ir5_w))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal) // must be exactly here
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp
index 92076b872ca..4d26d225f49 100644
--- a/src/mame/drivers/segac2.cpp
+++ b/src/mame/drivers/segac2.cpp
@@ -1540,9 +1540,9 @@ WRITE_LINE_MEMBER(segac2_state::vdp_lv4irqline_callback_c2)
MACHINE_CONFIG_START(segac2_state::segac)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XL2_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, XL2_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
MCFG_MACHINE_START_OVERRIDE(segac2_state,segac2)
MCFG_MACHINE_RESET_OVERRIDE(segac2_state,segac2)
@@ -1551,19 +1551,19 @@ MACHINE_CONFIG_START(segac2_state::segac)
MCFG_DEVICE_ADD("io", SEGA_315_5296, XL2_CLOCK/6) // clock divider guessed
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("P2"))
- MCFG_315_5296_IN_PORTC_CB(READ8(segac2_state, io_portc_r))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segac2_state, io_portd_w))
+ MCFG_315_5296_IN_PORTC_CB(READ8(*this, segac2_state, io_portc_r))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segac2_state, io_portd_w))
MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("COINAGE"))
MCFG_315_5296_IN_PORTG_CB(IOPORT("DSW"))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(segac2_state, io_porth_w))
+ MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segac2_state, io_porth_w))
/* video hardware */
MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0)
MCFG_SEGA315_5313_IS_PAL(false)
- MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(segac2_state, vdp_sndirqline_callback_c2));
- MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(segac2_state, vdp_lv6irqline_callback_c2));
- MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(segac2_state, vdp_lv4irqline_callback_c2));
+ MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, segac2_state, vdp_sndirqline_callback_c2));
+ MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, segac2_state, vdp_lv6irqline_callback_c2));
+ MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, segac2_state, vdp_lv4irqline_callback_c2));
MCFG_SEGA315_5313_ALT_TIMING(1);
MCFG_VIDEO_SET_SCREEN("megadriv")
@@ -1574,7 +1574,7 @@ MACHINE_CONFIG_START(segac2_state::segac)
MCFG_SCREEN_SIZE(512, 262)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(segac2_state, screen_update_segac2_new)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(segac2_state, screen_vblank_megadriv))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, segac2_state, screen_vblank_megadriv))
MCFG_PALETTE_ADD("palette", 2048*3)
@@ -1583,12 +1583,12 @@ MACHINE_CONFIG_START(segac2_state::segac)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3438, XL2_CLOCK/7)
- MCFG_YM2612_IRQ_HANDLER(WRITELINE(segac2_state, segac2_irq2_interrupt))
+ MCFG_DEVICE_ADD("ymsnd", YM3438, XL2_CLOCK/7)
+ MCFG_YM2612_IRQ_HANDLER(WRITELINE(*this, segac2_state, segac2_irq2_interrupt))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
/* right channel not connected */
- MCFG_SOUND_ADD("snsnd", SN76496, XL2_CLOCK/15)
+ MCFG_DEVICE_ADD("snsnd", SN76496, XL2_CLOCK/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1598,10 +1598,10 @@ MACHINE_CONFIG_START(segac2_state::segac2)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5296_OUT_CNT1_CB(DEVWRITELINE("upd", upd7759_device, reset_w))
+ MCFG_315_5296_OUT_CNT1_CB(WRITELINE("upd", upd7759_device, reset_w))
/* sound hardware */
- MCFG_SOUND_ADD("upd", UPD7759, XL1_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759, XL1_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segacoin.cpp b/src/mame/drivers/segacoin.cpp
index 3b1c76f080a..c2c5a4bd6ba 100644
--- a/src/mame/drivers/segacoin.cpp
+++ b/src/mame/drivers/segacoin.cpp
@@ -125,33 +125,33 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segacoin_state::westdrm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8000000) // clock frequency unknown
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000) // clock frequency unknown
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK2(1000000) // clock frequency unknown
MCFG_DEVICE_ADD("io", SEGA_315_5338A, 0)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000) // clock frequency unknown
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) // clock frequency unknown
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
/* no video! */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym0", YM3438, 8000000) // clock frequency unknown
+ MCFG_DEVICE_ADD("ym0", YM3438, 8000000) // clock frequency unknown
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_SOUND_ADD("ym1", YM3438, 8000000) // clock frequency unknown
+ MCFG_DEVICE_ADD("ym1", YM3438, 8000000) // clock frequency unknown
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM3438, 8000000) // clock frequency unknown
+ MCFG_DEVICE_ADD("ym2", YM3438, 8000000) // clock frequency unknown
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index 03f073573de..0cf6b33064c 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -879,12 +879,12 @@ uint32_t systeme_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
}
MACHINE_CONFIG_START(systeme_state::systeme)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
- MCFG_CPU_PROGRAM_MAP(systeme_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(systeme_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(systeme_state, coin_counters_write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, systeme_state, coin_counters_write))
MCFG_I8255_TRISTATE_PORTB_CB(CONSTANT(0))
MCFG_SCREEN_ADD("screen", RASTER)
@@ -905,19 +905,19 @@ MACHINE_CONFIG_START(systeme_state::systeme)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SEGAPSG, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD("sn1", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SEGAPSG, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD("sn2", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(systeme_state::hangonjr)
systeme(config);
MCFG_DEVICE_MODIFY("ppi")
- MCFG_I8255_IN_PORTA_CB(READ8(systeme_state, hangonjr_port_f8_read))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, systeme_state, hangonjr_port_f8_read))
MCFG_I8255_IN_PORTC_CB(CONSTANT(0)) // bit 4 must be the ADC0804 /INTR signal
- MCFG_I8255_OUT_PORTC_CB(WRITE8(systeme_state, hangonjr_port_fa_write)) // CD4051 selector input
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, systeme_state, hangonjr_port_fa_write)) // CD4051 selector input
MACHINE_CONFIG_END
MACHINE_CONFIG_START(systeme_state::ridleofp)
@@ -927,37 +927,37 @@ MACHINE_CONFIG_START(systeme_state::ridleofp)
MCFG_UPD4701_PORTY("PAD2")
MCFG_DEVICE_MODIFY("ppi")
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("upd4701", upd4701_device, d_r))
- MCFG_I8255_OUT_PORTC_CB(DEVWRITELINE("upd4701", upd4701_device, cs_w)) MCFG_DEVCB_BIT(4)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, xy_w)) MCFG_DEVCB_BIT(3)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, ul_w)) MCFG_DEVCB_BIT(2)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, resetx_w)) MCFG_DEVCB_BIT(1) // or possibly bit 0
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, resety_w)) MCFG_DEVCB_BIT(0) // or possibly bit 1
+ MCFG_I8255_IN_PORTA_CB(READ8("upd4701", upd4701_device, d_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE("upd4701", upd4701_device, cs_w)) MCFG_DEVCB_BIT(4)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, xy_w)) MCFG_DEVCB_BIT(3)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, ul_w)) MCFG_DEVCB_BIT(2)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, resetx_w)) MCFG_DEVCB_BIT(1) // or possibly bit 0
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, resety_w)) MCFG_DEVCB_BIT(0) // or possibly bit 1
MACHINE_CONFIG_END
MACHINE_CONFIG_START(systeme_state::systemex)
systeme(config);
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
- MCFG_CPU_PROGRAM_MAP(systeme_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(systeme_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(systeme_state::systemex_315_5177)
systeme(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
- MCFG_CPU_PROGRAM_MAP(systeme_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5177, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(systeme_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(systeme_state::systemeb)
systeme(config);
- MCFG_CPU_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
- MCFG_CPU_PROGRAM_MAP(systeme_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_OPCODES_MAP(banked_decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, XTAL(10'738'635)/2) /* Z80B @ 5.3693Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(systeme_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_OPCODES_MAP(banked_decrypted_opcodes_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp
index cf0a6de25ec..5119c119654 100644
--- a/src/mame/drivers/segag80r.cpp
+++ b/src/mame/drivers/segag80r.cpp
@@ -840,12 +840,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(segag80r_state::g80r_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_OPCODES_MAP(g80r_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segag80r_state, segag80r_vblank_start)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(segag80r_state, segag80r_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", Z80, VIDEO_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_OPCODES_MAP(g80r_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segag80r_state, segag80r_vblank_start)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(segag80r_state, segag80r_irq_ack)
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", segag80r)
@@ -877,8 +877,8 @@ MACHINE_CONFIG_START(segag80r_state::sega005)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(main_ppi8255_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(main_ppi8255_portmap)
/* sound boards */
sega005_sound_board(config);
@@ -907,8 +907,8 @@ MACHINE_CONFIG_START(segag80r_state::monsterb)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(main_ppi8255_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(main_ppi8255_portmap)
/* background board changes */
MCFG_GFXDECODE_MODIFY("gfxdecode", monsterb)
@@ -921,12 +921,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segag80r_state::monster2)
monsterb(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_SPAT, VIDEO_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_ppi8255_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segag80r_state, segag80r_vblank_start)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(segag80r_state, segag80r_irq_ack)
- MCFG_CPU_OPCODES_MAP(sega_315_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_SPAT, VIDEO_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_ppi8255_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segag80r_state, segag80r_vblank_start)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(segag80r_state, segag80r_irq_ack)
+ MCFG_DEVICE_OPCODES_MAP(sega_315_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -949,16 +949,16 @@ MACHINE_CONFIG_START(segag80r_state::sindbadm)
g80r_base(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5028, VIDEO_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(sindbadm_portmap)
- MCFG_CPU_OPCODES_MAP(sega_315_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segag80r_state, sindbadm_vblank_start)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5028, VIDEO_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(sindbadm_portmap)
+ MCFG_DEVICE_OPCODES_MAP(sega_315_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segag80r_state, sindbadm_vblank_start)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTB_CB(IOPORT("FC"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(segag80r_state, sindbadm_misc_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segag80r_state, sindbadm_misc_w))
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", monsterb)
@@ -967,15 +967,15 @@ MACHINE_CONFIG_START(segag80r_state::sindbadm)
/* sound boards */
- MCFG_CPU_ADD("audiocpu", Z80, SINDBADM_SOUND_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(sindbadm_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(segag80r_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SINDBADM_SOUND_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(sindbadm_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(segag80r_state, irq0_line_hold, 4*60)
/* sound hardware */
- MCFG_SOUND_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/2) /* matches PCB videos, correct? */
+ MCFG_DEVICE_ADD("sn1", SN76496, SINDBADM_SOUND_CLOCK/2) /* matches PCB videos, correct? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("sn2", SN76496, SINDBADM_SOUND_CLOCK/4) /* matches PCB videos, correct? */
+ MCFG_DEVICE_ADD("sn2", SN76496, SINDBADM_SOUND_CLOCK/4) /* matches PCB videos, correct? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp
index 42966526509..a67be65ba81 100644
--- a/src/mame/drivers/segag80v.cpp
+++ b/src/mame/drivers/segag80v.cpp
@@ -896,11 +896,11 @@ static const char *const zektor_sample_names[] =
MACHINE_CONFIG_START(segag80v_state::g80v_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_OPCODES_MAP(opcodes_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segag80v_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, VIDEO_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_OPCODES_MAP(opcodes_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segag80v_state, irq0_line_hold)
/* video hardware */
@@ -922,7 +922,7 @@ MACHINE_CONFIG_START(segag80v_state::elim2)
g80v_base(config);
/* custom sound board */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(elim_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
@@ -933,7 +933,7 @@ MACHINE_CONFIG_START(segag80v_state::spacfury)
g80v_base(config);
/* custom sound board */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(spacfury_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
@@ -947,12 +947,12 @@ MACHINE_CONFIG_START(segag80v_state::zektor)
g80v_base(config);
/* custom sound board */
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(8)
MCFG_SAMPLES_NAMES(zektor_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("aysnd", AY8912, VIDEO_CLOCK/4/2)
+ MCFG_DEVICE_ADD("aysnd", AY8912, VIDEO_CLOCK/4/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.33)
/* speech board */
diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp
index 8ff5c4bb4b1..98dbccb7749 100644
--- a/src/mame/drivers/segahang.cpp
+++ b/src/mame/drivers/segahang.cpp
@@ -760,23 +760,23 @@ GFXDECODE_END
MACHINE_CONFIG_START(segahang_state::shared_base)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4)
- MCFG_CPU_PROGRAM_MAP(hangon_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4)
+ MCFG_DEVICE_PROGRAM_MAP(hangon_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold)
- MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/4)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("subcpu", M68000, MASTER_CLOCK_25MHz/4)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("i8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(segahang_state, video_lamps_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(segahang_state, tilemap_sound_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, segahang_state, video_lamps_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segahang_state, tilemap_sound_w))
MCFG_DEVICE_ADD("i8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(segahang_state, sub_control_adc_w))
- MCFG_I8255_IN_PORTC_CB(READ8(segahang_state, adc_status_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, segahang_state, sub_control_adc_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, segahang_state, adc_status_r))
MCFG_SEGAIC16VID_ADD("segaic16vid")
MCFG_SEGAIC16VID_GFXDECODE("gfxdecode")
@@ -806,12 +806,12 @@ MACHINE_CONFIG_START(segahang_state::sharrier_base)
shared_base(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(sharrier_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sharrier_map)
- MCFG_CPU_MODIFY("subcpu")
- MCFG_CPU_CLOCK(MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_MODIFY("subcpu")
+ MCFG_DEVICE_CLOCK(MASTER_CLOCK_10MHz)
// video hardware
MCFG_SEGA_SHARRIER_SPRITES_ADD("sprites")
@@ -822,8 +822,8 @@ MACHINE_CONFIG_START(segahang_state::enduror_base)
sharrier_base(config);
// basic machine hardware
- MCFG_CPU_REPLACE("maincpu", FD1089B, MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(sharrier_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089B, MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sharrier_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold)
MACHINE_CONFIG_END
@@ -831,22 +831,22 @@ MACHINE_CONFIG_START(segahang_state::endurord_base)
sharrier_base(config);
// basic machine hardware
- MCFG_CPU_REPLACE("maincpu", M68000, MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(sharrier_map)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(sharrier_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segahang_state::sound_board_2203)
// basic machine hardware
- MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MCFG_CPU_PROGRAM_MAP(sound_map_2203)
- MCFG_CPU_IO_MAP(sound_portmap_2203)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_2203)
+ MCFG_DEVICE_IO_MAP(sound_portmap_2203)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK_8MHz/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK_8MHz/2)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
@@ -867,14 +867,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segahang_state::sound_board_2203x2)
// basic machine hardware
- MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MCFG_CPU_PROGRAM_MAP(sound_map_2151)
- MCFG_CPU_IO_MAP(sound_portmap_2203x2)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_2151)
+ MCFG_DEVICE_IO_MAP(sound_portmap_2203x2)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
+ MCFG_DEVICE_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
@@ -885,7 +885,7 @@ MACHINE_CONFIG_START(segahang_state::sound_board_2203x2)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.37)
MCFG_SOUND_ROUTE(3, "rspeaker", 0.37)
- MCFG_SOUND_ADD("ym2", YM2203, MASTER_CLOCK_8MHz/2)
+ MCFG_DEVICE_ADD("ym2", YM2203, MASTER_CLOCK_8MHz/2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.13)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.13)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.13)
@@ -905,9 +905,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segahang_state::sound_board_2151)
// basic machine hardware
- MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
- MCFG_CPU_PROGRAM_MAP(sound_map_2151)
- MCFG_CPU_IO_MAP(sound_portmap_2151)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK_8MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_2151)
+ MCFG_DEVICE_IO_MAP(sound_portmap_2151)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -940,18 +940,18 @@ MACHINE_CONFIG_START(segahang_state::shangupb)
sound_board_2151(config);
// not sure about these speeds, but at 6MHz, the road is not updated fast enough
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(10000000)
- MCFG_CPU_MODIFY("subcpu")
- MCFG_CPU_CLOCK(10000000)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(10000000)
+ MCFG_DEVICE_MODIFY("subcpu")
+ MCFG_DEVICE_CLOCK(10000000)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segahang_state::shangonro)
shangupb(config);
- MCFG_CPU_REPLACE("subcpu", FD1094, 10000000)
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_OPCODES_MAP(fd1094_decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("subcpu", FD1094, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_OPCODES_MAP(fd1094_decrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -959,11 +959,11 @@ MACHINE_CONFIG_START(segahang_state::sharrier)
sharrier_base(config);
sound_board_2203(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segahang_state, i8751_main_cpu_vblank)
- MCFG_CPU_ADD("mcu", I8751, 8000000)
- MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", I8751, 8000000)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("mcu", INPUT_LINE_IRQ0))
@@ -994,8 +994,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segahang_state::endurobl)
sharrier_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
sound_board_2203(config);
MACHINE_CONFIG_END
@@ -1003,8 +1003,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segahang_state::endurob2)
sharrier_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
sound_board_2203x2(config);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index 27d28a96f24..7788f52ae6b 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -373,31 +373,31 @@ void segajw_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(segajw_state::segajw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000,8000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(segajw_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segajw_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu",M68000,8000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(segajw_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segajw_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(segajw_audiocpu_map)
- MCFG_CPU_IO_MAP(segajw_audiocpu_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(segajw_audiocpu_map)
+ MCFG_DEVICE_IO_MAP(segajw_audiocpu_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(2000))
MCFG_NVRAM_ADD_NO_FILL("nvram")
MCFG_DEVICE_ADD("io1a", SEGA_315_5296, 0) // unknown clock
- MCFG_315_5296_OUT_PORTA_CB(WRITE8(segajw_state, coin_counter_w))
- MCFG_315_5296_OUT_PORTB_CB(WRITE8(segajw_state, lamps1_w))
- MCFG_315_5296_OUT_PORTC_CB(WRITE8(segajw_state, lamps2_w))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segajw_state, hopper_w))
- MCFG_315_5296_IN_PORTF_CB(READ8(segajw_state, coin_counter_r))
+ MCFG_315_5296_OUT_PORTA_CB(WRITE8(*this, segajw_state, coin_counter_w))
+ MCFG_315_5296_OUT_PORTB_CB(WRITE8(*this, segajw_state, lamps1_w))
+ MCFG_315_5296_OUT_PORTC_CB(WRITE8(*this, segajw_state, lamps2_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segajw_state, hopper_w))
+ MCFG_315_5296_IN_PORTF_CB(READ8(*this, segajw_state, coin_counter_r))
MCFG_DEVICE_ADD("io1c", SEGA_315_5296, 0) // unknown clock
MCFG_315_5296_IN_PORTA_CB(IOPORT("IN0"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("IN1"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("IN2"))
MCFG_315_5296_IN_PORTD_CB(IOPORT("IN3"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(segajw_state, coinlockout_w))
+ MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segajw_state, coinlockout_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -421,7 +421,7 @@ MACHINE_CONFIG_START(segajw_state::segajw)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3438, 8000000) // unknown clock
+ MCFG_DEVICE_ADD("ymsnd", YM3438, 8000000) // unknown clock
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("maincpu", 5))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp
index 6cd988930b5..71be4f2ec29 100644
--- a/src/mame/drivers/segald.cpp
+++ b/src/mame/drivers/segald.cpp
@@ -375,10 +375,10 @@ void segald_state::machine_start()
MACHINE_CONFIG_START(segald_state::astron)
/* main cpu */
- MCFG_CPU_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(mainmem)
- MCFG_CPU_IO_MAP(mainport)
- MCFG_CPU_PERIODIC_INT_DRIVER(segald_state, nmi_line_pulse, 1000.0/59.94)
+ MCFG_DEVICE_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(mainmem)
+ MCFG_DEVICE_IO_MAP(mainport)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(segald_state, nmi_line_pulse, 1000.0/59.94)
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
@@ -394,7 +394,7 @@ MACHINE_CONFIG_START(segald_state::astron)
/* sound hardare */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp
index 6e2a40b7f1c..35a4287a65f 100644
--- a/src/mame/drivers/segam1.cpp
+++ b/src/mame/drivers/segam1.cpp
@@ -348,16 +348,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segam1_state::segam1)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(segam1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segam1_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(segam1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segam1_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(segam1_sound_map)
- MCFG_CPU_IO_MAP(segam1_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(segam1_sound_map)
+ MCFG_DEVICE_IO_MAP(segam1_sound_io_map)
- MCFG_CPU_ADD("m1comm", Z80, 4000000) // unknown clock
- MCFG_CPU_PROGRAM_MAP(segam1_comms_map)
+ MCFG_DEVICE_ADD("m1comm", Z80, 4000000) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(segam1_comms_map)
MCFG_DEVICE_ADD("io1", SEGA_315_5296, 0) // unknown clock
MCFG_315_5296_IN_PORTA_CB(IOPORT("INA"))
@@ -393,17 +393,17 @@ MACHINE_CONFIG_START(segam1_state::segam1)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3438, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM3438, 8000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- //MCFG_YM2612_IRQ_HANDLER(WRITELINE(segam1_state, ym3438_irq_handler))
+ //MCFG_YM2612_IRQ_HANDLER(WRITELINE(*this, segam1_state, ym3438_irq_handler))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segam1_state::unkm1)
segam1(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(unkm1_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(unkm1_sound_map)
- MCFG_CPU_MODIFY("m1comm")
+ MCFG_DEVICE_MODIFY("m1comm")
MCFG_DEVICE_DISABLE() // not dumped yet
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index a1e97682662..64a5de44874 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -1147,27 +1147,27 @@ GFXDECODE_END
MACHINE_CONFIG_START(segaorun_state::outrun_base)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(outrun_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(outrun_map)
- MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("subcpu", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_DEVICE_ADD("i8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(segaorun_state, bankmotor_limit_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(segaorun_state, unknown_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(segaorun_state, unknown_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(segaorun_state, bankmotor_control_w))
- MCFG_I8255_IN_PORTC_CB(READ8(segaorun_state, unknown_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(segaorun_state, video_control_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, segaorun_state, bankmotor_limit_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, segaorun_state, unknown_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, segaorun_state, unknown_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, segaorun_state, bankmotor_control_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, segaorun_state, unknown_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segaorun_state, video_control_w))
MCFG_DEVICE_ADD("mapper", SEGA_315_5195_MEM_MAPPER, MASTER_CLOCK/4)
MCFG_SEGA_315_5195_CPU("maincpu")
@@ -1227,17 +1227,17 @@ MACHINE_CONFIG_START(segaorun_state::outrun_fd1094)
outrun(config);
// basic machine hardware
- MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(outrun_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(outrun_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segaorun_state::outrun_fd1089a)
outrun(config);
// basic machine hardware
- MCFG_CPU_REPLACE("maincpu", FD1089A, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(outrun_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089A, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(outrun_map)
MACHINE_CONFIG_END
@@ -1247,12 +1247,12 @@ MACHINE_CONFIG_START(segaorun_state::shangon)
// basic machine hardware
MCFG_DEVICE_REMOVE("i8255")
MCFG_DEVICE_ADD("i8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(segaorun_state, unknown_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(segaorun_state, unknown_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(segaorun_state, unknown_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(segaorun_state, unknown_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(segaorun_state, unknown_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(segaorun_state, video_control_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, segaorun_state, unknown_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, segaorun_state, unknown_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, segaorun_state, unknown_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, segaorun_state, unknown_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, segaorun_state, unknown_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segaorun_state, video_control_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1268,8 +1268,8 @@ MACHINE_CONFIG_START(segaorun_state::shangon_fd1089b)
shangon(config);
// basic machine hardware
- MCFG_CPU_REPLACE("maincpu", FD1089B, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(outrun_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089B, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(outrun_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp
index 8c0c5d254d7..8c4a52411b8 100644
--- a/src/mame/drivers/segapico.cpp
+++ b/src/mame/drivers/segapico.cpp
@@ -391,8 +391,8 @@ MACHINE_START_MEMBER(pico_state,pico)
MACHINE_CONFIG_START(pico_state::pico)
md_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pico_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pico_mem)
MCFG_DEVICE_REMOVE("genesis_snd_z80")
MCFG_DEVICE_REMOVE("ymsnd")
@@ -403,8 +403,8 @@ MACHINE_CONFIG_START(pico_state::pico)
MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, nullptr)
MCFG_SOFTWARE_LIST_ADD("cart_list","pico")
- MCFG_SOUND_ADD("315_5641", SEGA_315_5641_PCM, UPD7759_STANDARD_CLOCK*2)
- MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(pico_state,sound_cause_irq))
+ MCFG_DEVICE_ADD("315_5641", SEGA_315_5641_PCM, upd7759_device::STANDARD_CLOCK*2)
+ MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, pico_state,sound_cause_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16)
MACHINE_CONFIG_END
@@ -412,8 +412,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pico_state::picopal)
md_pal(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pico_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pico_mem)
MCFG_DEVICE_REMOVE("genesis_snd_z80")
MCFG_DEVICE_REMOVE("ymsnd")
@@ -424,8 +424,8 @@ MACHINE_CONFIG_START(pico_state::picopal)
MCFG_PICO_CARTRIDGE_ADD("picoslot", pico_cart, nullptr)
MCFG_SOFTWARE_LIST_ADD("cart_list","pico")
- MCFG_SOUND_ADD("315_5641", SEGA_315_5641_PCM, UPD7759_STANDARD_CLOCK*2)
- MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(pico_state,sound_cause_irq))
+ MCFG_DEVICE_ADD("315_5641", SEGA_315_5641_PCM, upd7759_device::STANDARD_CLOCK*2)
+ MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, pico_state,sound_cause_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16)
MACHINE_CONFIG_END
@@ -607,8 +607,8 @@ MACHINE_START_MEMBER(copera_state,copera)
MACHINE_CONFIG_START(copera_state::copera)
md_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(copera_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(copera_mem)
MCFG_DEVICE_REMOVE("genesis_snd_z80")
MCFG_DEVICE_REMOVE("ymsnd")
@@ -619,8 +619,8 @@ MACHINE_CONFIG_START(copera_state::copera)
MCFG_COPERA_CARTRIDGE_ADD("coperaslot", copera_cart, nullptr)
MCFG_SOFTWARE_LIST_ADD("cart_list","copera")
- MCFG_SOUND_ADD("315_5641", SEGA_315_5641_PCM, UPD7759_STANDARD_CLOCK)
- MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(copera_state,sound_cause_irq))
+ MCFG_DEVICE_ADD("315_5641", SEGA_315_5641_PCM, upd7759_device::STANDARD_CLOCK)
+ MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, copera_state,sound_cause_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp
index 10d7054974c..1b1d3daa106 100644
--- a/src/mame/drivers/segapm.cpp
+++ b/src/mame/drivers/segapm.cpp
@@ -57,8 +57,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segapm_state::segapm)
- MCFG_CPU_ADD("maincpu", M68000, 8000000) // ??
- MCFG_CPU_PROGRAM_MAP(segapm_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) // ??
+ MCFG_DEVICE_PROGRAM_MAP(segapm_map)
// + 2 sh2s on 32x board
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index 158e7a11d67..7bd6f8632fa 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -1972,32 +1972,32 @@ GFXDECODE_END
MACHINE_CONFIG_START(segas16a_state::system16a)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(system16a_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(system16a_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
- MCFG_CPU_ADD("n7751", N7751, 6000000)
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(segas16a_state, n7751_rom_r))
+ MCFG_DEVICE_ADD("n7751", N7751, 6000000)
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, segas16a_state, n7751_rom_r))
MCFG_MCS48_PORT_T1_IN_CB(GND) // labelled as "TEST", connected to ground
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(segas16a_state, n7751_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(segas16a_state, n7751_p2_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("n7751_8243", i8243_device, prog_w))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, segas16a_state, n7751_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, segas16a_state, n7751_p2_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("n7751_8243", i8243_device, prog_w))
- MCFG_I8243_ADD("n7751_8243", NOOP, WRITE8(segas16a_state,n7751_rom_offset_w))
+ MCFG_I8243_ADD("n7751_8243", NOOP, WRITE8(*this, segas16a_state,n7751_rom_offset_w))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_WATCHDOG_ADD("watchdog")
MCFG_DEVICE_ADD("i8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("soundlatch", generic_latch_8_device, write))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(segas16a_state, misc_control_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(segas16a_state, tilemap_sound_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("soundlatch", generic_latch_8_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, segas16a_state, misc_control_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, segas16a_state, tilemap_sound_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2020,10 +2020,10 @@ MACHINE_CONFIG_START(segas16a_state::system16a)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_YM2151_ADD("ymsnd", 4000000)
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(segas16a_state, n7751_control_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, segas16a_state, n7751_control_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.43)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -2031,24 +2031,24 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_fd1089a)
system16a(config);
- MCFG_CPU_REPLACE("maincpu", FD1089A, 10000000)
- MCFG_CPU_PROGRAM_MAP(system16a_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089A, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(system16a_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_fd1089b)
system16a(config);
- MCFG_CPU_REPLACE("maincpu", FD1089B, 10000000)
- MCFG_CPU_PROGRAM_MAP(system16a_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089B, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(system16a_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_fd1094)
system16a(config);
- MCFG_CPU_REPLACE("maincpu", FD1094, 10000000)
- MCFG_CPU_PROGRAM_MAP(system16a_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(system16a_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::aceattaca_fd1094)
@@ -2059,35 +2059,35 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_i8751)
system16a(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, i8751_main_cpu_vblank)
- MCFG_CPU_ADD("mcu", I8751, 8000000)
- MCFG_CPU_IO_MAP(mcu_io_map)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(segas16a_state, mcu_control_w))
+ MCFG_DEVICE_ADD("mcu", I8751, 8000000)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, segas16a_state, mcu_control_w))
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16a_state, mcu_irq_assert)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_no7751)
system16a(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(sound_no7751_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(sound_no7751_portmap)
MCFG_DEVICE_REMOVE("n7751")
MCFG_DEVICE_REMOVE("dac")
MCFG_DEVICE_REMOVE("vref")
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_no7751p)
system16a_no7751(config);
- MCFG_CPU_REPLACE("soundcpu", SEGA_315_5177, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_no7751_portmap)
- MCFG_CPU_OPCODES_MAP(sound_decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("soundcpu", SEGA_315_5177, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_no7751_portmap)
+ MCFG_DEVICE_OPCODES_MAP(sound_decrypted_opcodes_map)
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":sound_decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2098,47 +2098,47 @@ static MACHINE_CONFIG_START( system16a_i8751_no7751 )
MCFG_DEVICE_REMOVE("dac")
MCFG_DEVICE_REMOVE("vref")
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
*/
MACHINE_CONFIG_START(segas16a_state::system16a_fd1089a_no7751)
system16a_fd1089a(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(sound_no7751_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(sound_no7751_portmap)
MCFG_DEVICE_REMOVE("n7751")
MCFG_DEVICE_REMOVE("dac")
MCFG_DEVICE_REMOVE("vref")
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_fd1089b_no7751)
system16a_fd1089b(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(sound_no7751_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(sound_no7751_portmap)
MCFG_DEVICE_REMOVE("n7751")
MCFG_DEVICE_REMOVE("dac")
MCFG_DEVICE_REMOVE("vref")
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16a_state::system16a_fd1094_no7751)
system16a_fd1094(config);
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_IO_MAP(sound_no7751_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_IO_MAP(sound_no7751_portmap)
MCFG_DEVICE_REMOVE("n7751")
MCFG_DEVICE_REMOVE("dac")
MCFG_DEVICE_REMOVE("vref")
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 4000000)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index 87c6f8fe4b8..7e0646428a7 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -3718,13 +3718,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(segas16b_state::system16b)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(system16b_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(system16b_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK_10MHz/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK_10MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3752,39 +3752,39 @@ MACHINE_CONFIG_START(segas16b_state::system16b)
MCFG_YM2151_ADD("ym2151", MASTER_CLOCK_8MHz/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
- MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(segas16b_state,upd7759_generate_nmi))
+ MCFG_DEVICE_ADD("upd", UPD7759)
+ MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, segas16b_state,upd7759_generate_nmi))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.48)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16b_mc8123)
system16b(config);
- MCFG_CPU_REPLACE("soundcpu", MC8123, MASTER_CLOCK_10MHz/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_OPCODES_MAP(sound_decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("soundcpu", MC8123, MASTER_CLOCK_10MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_OPCODES_MAP(sound_decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16b_fd1089a)
system16b(config);
- MCFG_CPU_REPLACE("maincpu", FD1089A, MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(system16b_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089A, MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(system16b_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16b_fd1089b)
system16b(config);
- MCFG_CPU_REPLACE("maincpu", FD1089B, MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(system16b_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1089B, MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(system16b_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16b_fd1094)
system16b(config);
- MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK_10MHz)
- MCFG_CPU_PROGRAM_MAP(system16b_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, MASTER_CLOCK_10MHz)
+ MCFG_DEVICE_PROGRAM_MAP(system16b_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::aceattacb_fd1094)
@@ -3800,13 +3800,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16b_i8751)
system16b(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, i8751_main_cpu_vblank)
- MCFG_CPU_ADD("mcu", I8751, MASTER_CLOCK_8MHz)
- MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", I8751, MASTER_CLOCK_8MHz)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
MCFG_MCS51_PORT_P1_IN_CB(IOPORT("SERVICE"))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(segas16b_state, spin_68k_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, segas16b_state, spin_68k_w))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("mcu", INPUT_LINE_IRQ0))
@@ -3837,15 +3837,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16b_split)
system16b(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(system16b_bootleg_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map_x)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(system16b_bootleg_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map_x)
MCFG_DEVICE_REMOVE("mapper")
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_sound_map)
- MCFG_CPU_IO_MAP(bootleg_sound_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_sound_map)
+ MCFG_DEVICE_IO_MAP(bootleg_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MACHINE_CONFIG_END
@@ -3883,12 +3883,12 @@ MACHINE_CONFIG_START(segas16b_state::fpointbl)
MCFG_DEVICE_REMOVE("sprites")
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fpointbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fpointbl_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(fpointbl_sound_map)
- MCFG_CPU_IO_MAP(bootleg_sound_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(fpointbl_sound_map)
+ MCFG_DEVICE_IO_MAP(bootleg_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", 0))
@@ -3904,12 +3904,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::fpointbla)
fpointbl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(map_fpointbla)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map_fpointbla)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(map_fpointbla)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map_fpointbla)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_sound_map)
MCFG_DEVICE_MODIFY("sprites")
MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(60) // these align the pieces with the playfield
@@ -3918,13 +3918,13 @@ MACHINE_CONFIG_START(segas16b_state::fpointbla)
MACHINE_CONFIG_START(segas16b_state::lockonph)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // ?
- MCFG_CPU_PROGRAM_MAP(lockonph_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // ?
+ MCFG_DEVICE_PROGRAM_MAP(lockonph_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas16b_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) // ?
- MCFG_CPU_PROGRAM_MAP(lockonph_sound_map)
- MCFG_CPU_IO_MAP(lockonph_sound_iomap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/4) // ?
+ MCFG_DEVICE_PROGRAM_MAP(lockonph_sound_map)
+ MCFG_DEVICE_IO_MAP(lockonph_sound_iomap)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -3977,7 +3977,7 @@ MACHINE_CONFIG_START(segas16b_state::atomicp) // 10MHz CPU Clock verified
// sound hardware
MCFG_DEVICE_REMOVE("ym2151")
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(20'000'000)/4) // 20MHz OSC divided by 4 (verified)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(20'000'000)/4) // 20MHz OSC divided by 4 (verified)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_REMOVE("upd")
@@ -3986,8 +3986,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas16b_state::system16c)
system16b(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(system16c_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(system16c_map)
MACHINE_CONFIG_END
@@ -9768,13 +9768,13 @@ MACHINE_CONFIG_START(isgsm_state::isgsm)
MCFG_DEVICE_REMOVE("maincpu")
MCFG_DEVICE_REMOVE("mapper")
- MCFG_CPU_ADD("maincpu", M68000, 16000000) // no obvious CPU, but seems to be clocked faster than an original system16 based on the boot times
- MCFG_CPU_PROGRAM_MAP(isgsm_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", isgsm_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) // no obvious CPU, but seems to be clocked faster than an original system16 based on the boot times
+ MCFG_DEVICE_PROGRAM_MAP(isgsm_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", isgsm_state, irq4_line_hold)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_sound_map)
- MCFG_CPU_IO_MAP(bootleg_sound_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_sound_map)
+ MCFG_DEVICE_IO_MAP(bootleg_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp
index 0a6605a0b7c..0a4cb97488a 100644
--- a/src/mame/drivers/segas18.cpp
+++ b/src/mame/drivers/segas18.cpp
@@ -1302,13 +1302,13 @@ WRITE_LINE_MEMBER(segas18_state::vdp_lv4irqline_callback_s18)
MACHINE_CONFIG_START(segas18_state::system18)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(system18_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas18_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(system18_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas18_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1321,19 +1321,19 @@ MACHINE_CONFIG_START(segas18_state::system18)
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("P2"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("P3"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas18_state, misc_outputs_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas18_state, misc_outputs_w))
MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("COINAGE"))
MCFG_315_5296_IN_PORTG_CB(IOPORT("DSW"))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(segas18_state, rom_5874_bank_w))
- MCFG_315_5296_OUT_CNT1_CB(DEVWRITELINE("segaic16vid", segaic16_video_device, set_display_enable))
- MCFG_315_5296_OUT_CNT2_CB(WRITELINE(segas18_state, set_vdp_enable))
+ MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segas18_state, rom_5874_bank_w))
+ MCFG_315_5296_OUT_CNT1_CB(WRITELINE("segaic16vid", segaic16_video_device, set_display_enable))
+ MCFG_315_5296_OUT_CNT2_CB(WRITELINE(*this, segas18_state, set_vdp_enable))
MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0)
MCFG_SEGA315_5313_IS_PAL(false)
- MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(segas18_state, vdp_sndirqline_callback_s18));
- MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(segas18_state, vdp_lv6irqline_callback_s18));
- MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(segas18_state, vdp_lv4irqline_callback_s18));
+ MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, segas18_state, vdp_sndirqline_callback_s18));
+ MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, segas18_state, vdp_lv6irqline_callback_s18));
+ MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, segas18_state, vdp_lv4irqline_callback_s18));
MCFG_SEGA315_5313_ALT_TIMING(1);
MCFG_SEGA315_5313_PAL_WRITE_BASE(0x2000);
MCFG_SEGA315_5313_PALETTE("palette")
@@ -1358,11 +1358,11 @@ MACHINE_CONFIG_START(segas18_state::system18)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM3438, 8000000)
+ MCFG_DEVICE_ADD("ym1", YM3438, 8000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("soundcpu", INPUT_LINE_IRQ0))
- MCFG_SOUND_ADD("ym2", YM3438, 8000000)
+ MCFG_DEVICE_ADD("ym2", YM3438, 8000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_RF5C68_ADD("rfsnd", 10000000)
@@ -1374,10 +1374,10 @@ MACHINE_CONFIG_START(segas18_state::system18_fd1094)
system18(config);
// basic machine hardware
- MCFG_CPU_REPLACE("maincpu", FD1094, 10000000)
- MCFG_CPU_PROGRAM_MAP(system18_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas18_state, irq4_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(system18_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas18_state, irq4_line_hold)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas18_state::lghost_fd1094)
@@ -1385,7 +1385,7 @@ MACHINE_CONFIG_START(segas18_state::lghost_fd1094)
// basic machine hardware
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5296_OUT_PORTC_CB(WRITE8(segas18_state, lghost_gun_recoil_w))
+ MCFG_315_5296_OUT_PORTC_CB(WRITE8(*this, segas18_state, lghost_gun_recoil_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas18_state::lghost)
@@ -1393,7 +1393,7 @@ MACHINE_CONFIG_START(segas18_state::lghost)
// basic machine hardware
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5296_OUT_PORTC_CB(WRITE8(segas18_state, lghost_gun_recoil_w))
+ MCFG_315_5296_OUT_PORTC_CB(WRITE8(*this, segas18_state, lghost_gun_recoil_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas18_state::wwally_fd1094)
@@ -1430,14 +1430,14 @@ MACHINE_CONFIG_START(segas18_state::system18_i8751)
system18(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_REMOVE()
MCFG_DEVICE_MODIFY("mapper")
MCFG_SEGA_315_5195_MCU_INT_CALLBACK(INPUTLINE("mcu", INPUT_LINE_IRQ1))
- MCFG_CPU_ADD("mcu", I8751, 8000000)
- MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", I8751, 8000000)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas18_state, irq0_line_hold)
MACHINE_CONFIG_END
@@ -1445,14 +1445,14 @@ MACHINE_CONFIG_START(segas18_state::system18_fd1094_i8751)
system18_fd1094(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_REMOVE()
MCFG_DEVICE_MODIFY("mapper")
MCFG_SEGA_315_5195_MCU_INT_CALLBACK(INPUTLINE("mcu", INPUT_LINE_IRQ1))
- MCFG_CPU_ADD("mcu", I8751, 8000000)
- MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", I8751, 8000000)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas18_state, irq0_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp
index a80e924849a..bc156c1f102 100644
--- a/src/mame/drivers/segas24.cpp
+++ b/src/mame/drivers/segas24.cpp
@@ -1870,12 +1870,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segas24_state::system24)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(system24_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(system24_cpu1_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", segas24_state, irq_vbl, "screen", 0, 1)
- MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(system24_cpu2_map)
+ MCFG_DEVICE_ADD("subcpu", M68000, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(system24_cpu2_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1883,13 +1883,13 @@ MACHINE_CONFIG_START(segas24_state::system24)
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("P2"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("P3"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas24_state, hotrod_lamps_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas24_state, hotrod_lamps_w))
MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("COINAGE"))
MCFG_315_5296_IN_PORTG_CB(IOPORT("DSW"))
- MCFG_315_5296_OUT_PORTH_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(segas24_state, cnt1))
- MCFG_315_5296_OUT_CNT2_CB(DEVWRITELINE("ymsnd", ym2151_device, reset_w))
+ MCFG_315_5296_OUT_PORTH_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas24_state, cnt1))
+ MCFG_315_5296_OUT_CNT2_CB(WRITELINE("ymsnd", ym2151_device, reset_w))
MCFG_TIMER_DRIVER_ADD("irq_timer", segas24_state, irq_timer_cb)
MCFG_TIMER_DRIVER_ADD("irq_timer_clear", segas24_state, irq_timer_clear_cb)
@@ -1912,11 +1912,11 @@ MACHINE_CONFIG_START(segas24_state::system24)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ymsnd", 4000000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(segas24_state,irq_ym))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, segas24_state,irq_ym))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1924,9 +1924,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::mahmajn)
system24(config);
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5296_IN_PORTA_CB(READ8(segas24_state, mahmajn_input_line_r))
- MCFG_315_5296_IN_PORTC_CB(READ8(segas24_state, mahmajn_inputs_r))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas24_state, mahmajn_mux_w))
+ MCFG_315_5296_IN_PORTA_CB(READ8(*this, segas24_state, mahmajn_input_line_r))
+ MCFG_315_5296_IN_PORTC_CB(READ8(*this, segas24_state, mahmajn_inputs_r))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas24_state, mahmajn_mux_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::system24_floppy)
@@ -1936,10 +1936,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::system24_floppy_hotrod)
system24_floppy(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hotrod_cpu1_map)
- MCFG_CPU_MODIFY("subcpu")
- MCFG_CPU_PROGRAM_MAP(hotrod_cpu2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hotrod_cpu1_map)
+ MCFG_DEVICE_MODIFY("subcpu")
+ MCFG_DEVICE_PROGRAM_MAP(hotrod_cpu2_map)
MCFG_DEVICE_ADD("upd1", UPD4701A, 0) // IC4 on 834-6510 I/O board
MCFG_UPD4701_PORTX("DIAL1")
@@ -1960,17 +1960,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::system24_floppy_fd1094)
system24_floppy(config);
- MCFG_CPU_REPLACE("subcpu", FD1094, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(system24_cpu2_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("subcpu", FD1094, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(system24_cpu2_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::system24_floppy_fd_upd)
system24_floppy_fd1094(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(roughrac_cpu1_map)
- MCFG_CPU_MODIFY("subcpu")
- MCFG_CPU_PROGRAM_MAP(roughrac_cpu2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(roughrac_cpu1_map)
+ MCFG_DEVICE_MODIFY("subcpu")
+ MCFG_DEVICE_PROGRAM_MAP(roughrac_cpu2_map)
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0) // IC4 on 834-6510-01 I/O board
MCFG_UPD4701_PORTX("DIAL1")
@@ -1980,15 +1980,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::dcclub)
system24(config);
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5296_IN_PORTA_CB(READ8(segas24_state, dcclub_p1_r))
- MCFG_315_5296_IN_PORTC_CB(READ8(segas24_state, dcclub_p3_r))
+ MCFG_315_5296_IN_PORTA_CB(READ8(*this, segas24_state, dcclub_p1_r))
+ MCFG_315_5296_IN_PORTC_CB(READ8(*this, segas24_state, dcclub_p3_r))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas24_state::system24_floppy_dcclub)
system24_floppy_fd1094(config);
MCFG_DEVICE_MODIFY("io")
- MCFG_315_5296_IN_PORTA_CB(READ8(segas24_state, dcclub_p1_r))
- MCFG_315_5296_IN_PORTC_CB(READ8(segas24_state, dcclub_p3_r))
+ MCFG_315_5296_IN_PORTA_CB(READ8(*this, segas24_state, dcclub_p1_r))
+ MCFG_315_5296_IN_PORTC_CB(READ8(*this, segas24_state, dcclub_p3_r))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 3cb987c21b9..89fde2bf3d1 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -2192,27 +2192,27 @@ GFXDECODE_END
MACHINE_CONFIG_START(segas32_state::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V60, MASTER_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(system32_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas32_state, start_of_vblank_int)
+ MCFG_DEVICE_ADD("maincpu", V60, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(system32_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas32_state, start_of_vblank_int)
- MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(system32_sound_map)
- MCFG_CPU_IO_MAP(system32_sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(system32_sound_map)
+ MCFG_DEVICE_IO_MAP(system32_sound_portmap)
MCFG_DEVICE_ADD("io_chip", SEGA_315_5296, 0) // unknown clock
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1_A"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("P2_A"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("PORTC_A"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas32_state, misc_output_0_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(6)
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas32_state, misc_output_0_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(6)
MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE12_A"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("SERVICE34_A"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(segas32_state, sw2_output_0_w))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(segas32_state, tilebank_external_w))
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(segas32_state, display_enable_0_w))
+ MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segas32_state, sw2_output_0_w))
+ MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segas32_state, tilebank_external_w))
+ MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas32_state, display_enable_0_w))
MCFG_315_5296_OUT_CNT2_CB(INPUTLINE("soundcpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2233,12 +2233,12 @@ MACHINE_CONFIG_START(segas32_state::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM3438, MASTER_CLOCK/4)
- MCFG_YM2612_IRQ_HANDLER(WRITELINE(segas32_state, ym3438_irq_handler))
+ MCFG_DEVICE_ADD("ym1", YM3438, MASTER_CLOCK/4)
+ MCFG_YM2612_IRQ_HANDLER(WRITELINE(*this, segas32_state, ym3438_irq_handler))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MCFG_SOUND_ADD("ym2", YM3438, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ym2", YM3438, MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
@@ -2383,14 +2383,14 @@ void segas32_state::ga2_main_map(address_map &map)
MACHINE_CONFIG_START(segas32_v25_state::device_add_mconfig)
segas32_4player_state::device_add_mconfig(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ga2_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ga2_main_map)
MCFG_DEVICE_ADD("dpram", MB8421, 0)
/* add a V25 for protection */
- MCFG_CPU_ADD("mcu", V25, 10000000)
- MCFG_CPU_PROGRAM_MAP(v25_map)
+ MCFG_DEVICE_ADD("mcu", V25, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(v25_map)
MACHINE_CONFIG_END
DEFINE_DEVICE_TYPE(SEGA_S32_V25_DEVICE, segas32_v25_state, "segas32_pcb_v25", "Sega System 32 V25 PCB")
@@ -2408,9 +2408,9 @@ MACHINE_CONFIG_START(segas32_upd7725_state::device_add_mconfig)
segas32_analog_state::device_add_mconfig(config);
/* add a upd7725; this is on the 837-8341 daughterboard which plugs into the socket on the master pcb's rom board where an fd1149 could go */
- MCFG_CPU_ADD("dsp", UPD7725, 8000000) // TODO: Find real clock speed for the upd7725; this is a canned oscillator on the 837-8341 pcb
- MCFG_CPU_PROGRAM_MAP(upd7725_prg_map)
- MCFG_CPU_DATA_MAP(upd7725_data_map)
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000) // TODO: Find real clock speed for the upd7725; this is a canned oscillator on the 837-8341 pcb
+ MCFG_DEVICE_PROGRAM_MAP(upd7725_prg_map)
+ MCFG_DEVICE_DATA_MAP(upd7725_data_map)
MCFG_DEVICE_DISABLE() // TODO: disable for now, needs DMA pins and interrupts implemented in upd7725 core
// TODO: find /INT source for upd7725
// TODO: figure out how the p0 and p1 lines from the upd7725 affect the mainboard; do they select one of four (or 8) latches to/from the mainboard?
@@ -2478,16 +2478,16 @@ MACHINE_CONFIG_START(segas32_cd_state::device_add_mconfig)
MCFG_DEVICE_ADD("mb89352", MB89352A, 8000000)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_MB89352A_IRQ_CB(WRITELINE(segas32_cd_state, scsi_irq_w))
- MCFG_MB89352A_DRQ_CB(WRITELINE(segas32_cd_state, scsi_drq_w))
+ MCFG_MB89352A_IRQ_CB(WRITELINE(*this, segas32_cd_state, scsi_irq_w))
+ MCFG_MB89352A_DRQ_CB(WRITELINE(*this, segas32_cd_state, scsi_drq_w))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "cdrom", SCSICD, SCSI_ID_0)
MCFG_SLOT_OPTION_MACHINE_CONFIG("cdrom", cdrom_config)
MCFG_DEVICE_ADD("cxdio", CXD1095, 0)
- MCFG_CXD1095_OUT_PORTA_CB(WRITE8(segas32_cd_state, lamps1_w))
- MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segas32_cd_state, lamps2_w))
+ MCFG_CXD1095_OUT_PORTA_CB(WRITE8(*this, segas32_cd_state, lamps1_w))
+ MCFG_CXD1095_OUT_PORTB_CB(WRITE8(*this, segas32_cd_state, lamps2_w))
MCFG_CXD1095_IN_PORTD_CB(CONSTANT(0xff)) // Ports C-E used for IEEE-488 printer interface
MACHINE_CONFIG_END
@@ -2502,38 +2502,38 @@ segas32_cd_state::segas32_cd_state(const machine_config &mconfig, const char *ta
MACHINE_CONFIG_START(sega_multi32_state::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(multi32_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas32_state, start_of_vblank_int)
+ MCFG_DEVICE_ADD("maincpu", V70, MULTI32_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(multi32_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas32_state, start_of_vblank_int)
- MCFG_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(multi32_sound_map)
- MCFG_CPU_IO_MAP(multi32_sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(multi32_sound_map)
+ MCFG_DEVICE_IO_MAP(multi32_sound_portmap)
MCFG_DEVICE_ADD("io_chip_0", SEGA_315_5296, 0) // unknown clock
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1_A"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("P2_A"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("PORTC_A"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas32_state, misc_output_0_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas32_state, misc_output_0_w))
MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE12_A"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("SERVICE34_A"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(segas32_state, sw2_output_0_w))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(segas32_state, tilebank_external_w))
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(segas32_state, display_enable_0_w))
+ MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segas32_state, sw2_output_0_w))
+ MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segas32_state, tilebank_external_w))
+ MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas32_state, display_enable_0_w))
MCFG_315_5296_OUT_CNT2_CB(INPUTLINE("soundcpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("io_chip_1", SEGA_315_5296, 0) // unknown clock
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1_B"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("P2_B"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("PORTC_B"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segas32_state, misc_output_1_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segas32_state, misc_output_1_w))
MCFG_315_5296_IN_PORTE_CB(IOPORT("SERVICE12_B"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("SERVICE34_B"))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(segas32_state, sw2_output_1_w))
- MCFG_315_5296_OUT_PORTH_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(6)
- MCFG_315_5296_OUT_CNT1_CB(WRITELINE(segas32_state, display_enable_1_w))
+ MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, segas32_state, sw2_output_1_w))
+ MCFG_315_5296_OUT_PORTH_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(6)
+ MCFG_315_5296_OUT_CNT1_CB(WRITELINE(*this, segas32_state, display_enable_1_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2560,12 +2560,12 @@ MACHINE_CONFIG_START(sega_multi32_state::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM3438, MASTER_CLOCK/4)
- MCFG_YM2612_IRQ_HANDLER(WRITELINE(segas32_state, ym3438_irq_handler))
+ MCFG_DEVICE_ADD("ymsnd", YM3438, MASTER_CLOCK/4)
+ MCFG_YM2612_IRQ_HANDLER(WRITELINE(*this, segas32_state, ym3438_irq_handler))
MCFG_SOUND_ROUTE(1, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.40)
- MCFG_SOUND_ADD("sega", MULTIPCM, MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("sega", MULTIPCM, MASTER_CLOCK/4)
MCFG_DEVICE_ADDRESS_MAP(0, multipcm_map)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.0)
@@ -2754,13 +2754,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas32_new_state::sega_system32_ga2)
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_V25_DEVICE, 0)
- MCFG_CPU_MODIFY("mainpcb:mcu")
+ MCFG_DEVICE_MODIFY("mainpcb:mcu")
MCFG_V25_CONFIG(segas32_v25_state::ga2_opcode_table)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas32_new_state::sega_system32_arf)
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_V25_DEVICE, 0)
- MCFG_CPU_MODIFY("mainpcb:mcu")
+ MCFG_DEVICE_MODIFY("mainpcb:mcu")
MCFG_V25_CONFIG(segas32_v25_state::arf_opcode_table)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp
index bdb61dbfe3d..bb12722213e 100644
--- a/src/mame/drivers/segasp.cpp
+++ b/src/mame/drivers/segasp.cpp
@@ -300,16 +300,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segasp_state::segasp)
naomi_aw_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(segasp_map)
- MCFG_CPU_IO_MAP(onchip_port)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(segasp_map)
+ MCFG_DEVICE_IO_MAP(onchip_port)
MCFG_EEPROM_SERIAL_93C46_ADD("main_eeprom")
MCFG_EEPROM_SERIAL_93C46_ADD("sp_eeprom")
// todo, not exactly NaomiM4 (see notes at top of driver) use custom board type here instead
MCFG_X76F100_ADD("naomibd_eeprom") // actually not present
- MCFG_NAOMI_M4_BOARD_ADD("rom_board", "pic_readout", "naomibd_eeprom", WRITE8(dc_state, g1_irq))
+ MCFG_NAOMI_M4_BOARD_ADD("rom_board", "pic_readout", "naomibd_eeprom", WRITE8(*this, dc_state, g1_irq))
MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(segasp_state, segasp)
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index c301da8bc41..f089a716643 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -778,17 +778,17 @@ void ufo_state::machine_start()
MACHINE_CONFIG_START(ufo_state::newufo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(ufo_map)
- MCFG_CPU_IO_MAP(ufo_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(ufo_map)
+ MCFG_DEVICE_IO_MAP(ufo_portmap)
MCFG_TIMER_DRIVER_ADD_PERIODIC("motor_timer", ufo_state, simulate_xyz, attotime::from_hz(MOTOR_SPEED))
MCFG_TIMER_DRIVER_ADD_PERIODIC("update_timer", ufo_state, update_info, attotime::from_hz(60))
MCFG_DEVICE_ADD("io1", SEGA_315_5296, XTAL(16'000'000))
// all ports set to input
- MCFG_315_5296_IN_PORTA_CB(READ8(ufo_state, crane_limits_r))
- MCFG_315_5296_IN_PORTB_CB(READ8(ufo_state, crane_limits_r))
+ MCFG_315_5296_IN_PORTA_CB(READ8(*this, ufo_state, crane_limits_r))
+ MCFG_315_5296_IN_PORTB_CB(READ8(*this, ufo_state, crane_limits_r))
MCFG_315_5296_IN_PORTE_CB(IOPORT("IN1"))
MCFG_315_5296_IN_PORTF_CB(IOPORT("DSW1"))
MCFG_315_5296_IN_PORTG_CB(IOPORT("DSW2"))
@@ -796,28 +796,28 @@ MACHINE_CONFIG_START(ufo_state::newufo)
MCFG_DEVICE_ADD("io2", SEGA_315_5296, XTAL(16'000'000))
// all ports set to output
- MCFG_315_5296_OUT_PORTA_CB(WRITE8(ufo_state, stepper_w))
- MCFG_315_5296_OUT_PORTB_CB(WRITE8(ufo_state, cp_lamps_w))
- MCFG_315_5296_OUT_PORTC_CB(WRITE8(ufo_state, cp_digits_w))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(ufo_state, cp_digits_w))
- MCFG_315_5296_OUT_PORTE_CB(WRITE8(ufo_state, crane_xyz_w))
- MCFG_315_5296_OUT_PORTF_CB(WRITE8(ufo_state, crane_xyz_w))
- MCFG_315_5296_OUT_PORTG_CB(WRITE8(ufo_state, ufo_lamps_w))
+ MCFG_315_5296_OUT_PORTA_CB(WRITE8(*this, ufo_state, stepper_w))
+ MCFG_315_5296_OUT_PORTB_CB(WRITE8(*this, ufo_state, cp_lamps_w))
+ MCFG_315_5296_OUT_PORTC_CB(WRITE8(*this, ufo_state, cp_digits_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, ufo_state, cp_digits_w))
+ MCFG_315_5296_OUT_PORTE_CB(WRITE8(*this, ufo_state, crane_xyz_w))
+ MCFG_315_5296_OUT_PORTF_CB(WRITE8(*this, ufo_state, crane_xyz_w))
+ MCFG_315_5296_OUT_PORTG_CB(WRITE8(*this, ufo_state, ufo_lamps_w))
MCFG_DEVICE_ADD("pit", PIT8254, XTAL(16'000'000)/2) // uPD71054C, configuration is unknown
MCFG_PIT8253_CLK0(XTAL(16'000'000)/2/256)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(ufo_state, pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, ufo_state, pit_out0))
MCFG_PIT8253_CLK1(XTAL(16'000'000)/2/256)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(ufo_state, pit_out1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, ufo_state, pit_out1))
MCFG_PIT8253_CLK2(XTAL(16'000'000)/2/256)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(ufo_state, pit_out2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, ufo_state, pit_out2))
/* no video! */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM3438, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD("ym", YM3438, XTAL(16'000'000)/2)
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("maincpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
@@ -838,29 +838,29 @@ MACHINE_CONFIG_START(ufo_state::ufo21)
newufo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(ex_ufo21_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(ex_ufo21_portmap)
MCFG_DEVICE_MODIFY("io1")
- MCFG_315_5296_IN_PORTA_CB(READ8(ufo_state, ex_crane_limits_r))
- MCFG_315_5296_IN_PORTB_CB(READ8(ufo_state, ex_crane_limits_r))
- MCFG_315_5296_IN_PORTC_CB(READ8(ufo_state, ex_crane_open_r))
+ MCFG_315_5296_IN_PORTA_CB(READ8(*this, ufo_state, ex_crane_limits_r))
+ MCFG_315_5296_IN_PORTB_CB(READ8(*this, ufo_state, ex_crane_limits_r))
+ MCFG_315_5296_IN_PORTC_CB(READ8(*this, ufo_state, ex_crane_open_r))
MCFG_DEVICE_MODIFY("io2")
- MCFG_315_5296_OUT_PORTA_CB(WRITE8(ufo_state, ex_stepper_w))
- MCFG_315_5296_OUT_PORTB_CB(WRITE8(ufo_state, ex_cp_lamps_w))
- MCFG_315_5296_OUT_PORTE_CB(WRITE8(ufo_state, ex_crane_xyz_w))
- MCFG_315_5296_OUT_PORTF_CB(WRITE8(ufo_state, ex_crane_xyz_w))
+ MCFG_315_5296_OUT_PORTA_CB(WRITE8(*this, ufo_state, ex_stepper_w))
+ MCFG_315_5296_OUT_PORTB_CB(WRITE8(*this, ufo_state, ex_cp_lamps_w))
+ MCFG_315_5296_OUT_PORTE_CB(WRITE8(*this, ufo_state, ex_crane_xyz_w))
+ MCFG_315_5296_OUT_PORTF_CB(WRITE8(*this, ufo_state, ex_crane_xyz_w))
MCFG_315_5296_OUT_PORTG_CB(NOOP)
MCFG_DEVICE_ADD("io3", SEGA_315_5338A, 0)
- MCFG_315_5338A_OUT0_CB(WRITE8(ufo_state, ex_upd_start_w))
- MCFG_315_5338A_IN1_CB(READ8(ufo_state, ex_upd_busy_r))
- MCFG_315_5338A_OUT4_CB(WRITE8(ufo_state, ex_ufo21_lamps1_w))
- MCFG_315_5338A_OUT5_CB(WRITE8(ufo_state, ex_ufo21_lamps2_w))
+ MCFG_315_5338A_OUT0_CB(WRITE8(*this, ufo_state, ex_upd_start_w))
+ MCFG_315_5338A_IN1_CB(READ8(*this, ufo_state, ex_upd_busy_r))
+ MCFG_315_5338A_OUT4_CB(WRITE8(*this, ufo_state, ex_ufo21_lamps1_w))
+ MCFG_315_5338A_OUT5_CB(WRITE8(*this, ufo_state, ex_ufo21_lamps2_w))
/* sound hardware */
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -868,22 +868,22 @@ MACHINE_CONFIG_START(ufo_state::ufo800)
newufo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(ex_ufo800_portmap)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(ex_ufo800_portmap)
MCFG_DEVICE_MODIFY("io1")
- MCFG_315_5296_IN_PORTA_CB(READ8(ufo_state, ex_crane_limits_r))
+ MCFG_315_5296_IN_PORTA_CB(READ8(*this, ufo_state, ex_crane_limits_r))
MCFG_315_5296_IN_PORTB_CB(IOPORT("IN2"))
- MCFG_315_5296_IN_PORTC_CB(READ8(ufo_state, ex_crane_open_r))
+ MCFG_315_5296_IN_PORTC_CB(READ8(*this, ufo_state, ex_crane_open_r))
MCFG_315_5296_IN_PORTD_CB(IOPORT("IN1"))
MCFG_315_5296_IN_PORTE_CB(NOOP)
MCFG_315_5296_IN_PORTH_CB(NOOP)
MCFG_DEVICE_MODIFY("io2")
- MCFG_315_5296_OUT_PORTA_CB(WRITE8(ufo_state, ex_stepper_w))
- MCFG_315_5296_OUT_PORTB_CB(WRITE8(ufo_state, ex_cp_lamps_w))
- MCFG_315_5296_OUT_PORTE_CB(WRITE8(ufo_state, ex_crane_xyz_w))
- MCFG_315_5296_OUT_PORTF_CB(WRITE8(ufo_state, ex_ufo800_lamps_w))
+ MCFG_315_5296_OUT_PORTA_CB(WRITE8(*this, ufo_state, ex_stepper_w))
+ MCFG_315_5296_OUT_PORTB_CB(WRITE8(*this, ufo_state, ex_cp_lamps_w))
+ MCFG_315_5296_OUT_PORTE_CB(WRITE8(*this, ufo_state, ex_crane_xyz_w))
+ MCFG_315_5296_OUT_PORTF_CB(WRITE8(*this, ufo_state, ex_ufo800_lamps_w))
MCFG_315_5296_OUT_PORTG_CB(NOOP)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index ad075b7f811..fcfc764e7fd 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -1704,15 +1704,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(segaxbd_state::xboard_base_mconfig )
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("subcpu", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("subcpu", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_NVRAM_ADD_0FILL("backup1")
MCFG_NVRAM_ADD_0FILL("backup2")
@@ -1727,15 +1727,15 @@ MACHINE_CONFIG_START(segaxbd_state::xboard_base_mconfig )
MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_main")
MCFG_SEGA_315_5250_TIMER_ACK(segaxbd_state, timer_ack_callback)
- MCFG_SEGA_315_5250_SOUND_WRITE_CALLBACK(WRITE8(segaxbd_state, sound_data_w))
+ MCFG_SEGA_315_5250_SOUND_WRITE_CALLBACK(WRITE8(*this, segaxbd_state, sound_data_w))
MCFG_SEGA_315_5250_COMPARE_TIMER_ADD("cmptimer_subx")
MCFG_DEVICE_ADD("iochip_0", CXD1095, 0) // IC160
MCFG_CXD1095_IN_PORTA_CB(IOPORT("IO0PORTA"))
MCFG_CXD1095_IN_PORTB_CB(IOPORT("IO0PORTB"))
- MCFG_CXD1095_OUT_PORTC_CB(WRITE8(segaxbd_state, pc_0_w))
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(segaxbd_state, pd_0_w))
+ MCFG_CXD1095_OUT_PORTC_CB(WRITE8(*this, segaxbd_state, pc_0_w))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, segaxbd_state, pd_0_w))
MCFG_DEVICE_ADD("iochip_1", CXD1095, 0) // IC159
MCFG_CXD1095_IN_PORTA_CB(IOPORT("IO1PORTA"))
@@ -1804,9 +1804,9 @@ MACHINE_CONFIG_START(segaxbd_fd1094_state::device_add_mconfig)
segaxbd_state::xboard_base_mconfig(config);
- MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -1838,8 +1838,8 @@ MACHINE_CONFIG_START(segaxbd_aburner2_state::device_add_mconfig)
// basic machine hardware
MCFG_DEVICE_MODIFY("iochip_0")
- MCFG_CXD1095_IN_PORTA_CB(READ8(segaxbd_state, aburner2_motor_r))
- MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, aburner2_motor_w))
+ MCFG_CXD1095_IN_PORTA_CB(READ8(*this, segaxbd_state, aburner2_motor_r))
+ MCFG_CXD1095_OUT_PORTB_CB(WRITE8(*this, segaxbd_state, aburner2_motor_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segaxbd_new_state::sega_aburner2)
@@ -1858,21 +1858,21 @@ MACHINE_CONFIG_START(segaxbd_lastsurv_fd1094_state::device_add_mconfig)
segaxbd_state::xboard_base_mconfig(config);
- MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
// basic machine hardware
// TODO: network board
MCFG_DEVICE_MODIFY("iochip_0")
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(segaxbd_state, lastsurv_muxer_w))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, segaxbd_state, lastsurv_muxer_w))
MCFG_DEVICE_MODIFY("iochip_1")
- MCFG_CXD1095_IN_PORTB_CB(READ8(segaxbd_state, lastsurv_port_r))
+ MCFG_CXD1095_IN_PORTB_CB(READ8(*this, segaxbd_state, lastsurv_port_r))
// sound hardware - ym2151 stereo is reversed
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(0, "rspeaker", 0.43)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.43)
@@ -1898,13 +1898,13 @@ MACHINE_CONFIG_START(segaxbd_lastsurv_state::device_add_mconfig)
// TODO: network board
MCFG_DEVICE_MODIFY("iochip_0")
- MCFG_CXD1095_OUT_PORTD_CB(WRITE8(segaxbd_state, lastsurv_muxer_w))
+ MCFG_CXD1095_OUT_PORTD_CB(WRITE8(*this, segaxbd_state, lastsurv_muxer_w))
MCFG_DEVICE_MODIFY("iochip_1")
- MCFG_CXD1095_IN_PORTB_CB(READ8(segaxbd_state, lastsurv_port_r))
+ MCFG_CXD1095_IN_PORTB_CB(READ8(*this, segaxbd_state, lastsurv_port_r))
// sound hardware - ym2151 stereo is reversed
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(0, "rspeaker", 0.43)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.43)
@@ -1925,26 +1925,26 @@ segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconf
MACHINE_CONFIG_START(segaxbd_smgp_fd1094_state::device_add_mconfig)
segaxbd_state::xboard_base_mconfig(config);
- MCFG_CPU_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", FD1094, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
// basic machine hardware
- MCFG_CPU_ADD("soundcpu2", Z80, SOUND_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(smgp_sound2_map)
- MCFG_CPU_IO_MAP(smgp_sound2_portmap)
+ MCFG_DEVICE_ADD("soundcpu2", Z80, SOUND_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(smgp_sound2_map)
+ MCFG_DEVICE_IO_MAP(smgp_sound2_portmap)
- MCFG_CPU_ADD("commcpu", Z80, XTAL(16'000'000)/2) // Z80E
- MCFG_CPU_PROGRAM_MAP(smgp_comm_map)
- MCFG_CPU_IO_MAP(smgp_comm_portmap)
+ MCFG_DEVICE_ADD("commcpu", Z80, XTAL(16'000'000)/2) // Z80E
+ MCFG_DEVICE_PROGRAM_MAP(smgp_comm_map)
+ MCFG_DEVICE_IO_MAP(smgp_comm_portmap)
- MCFG_CPU_ADD("motorcpu", Z80, XTAL(16'000'000)/2) // not verified
- MCFG_CPU_PROGRAM_MAP(smgp_airdrive_map)
- MCFG_CPU_IO_MAP(smgp_airdrive_portmap)
+ MCFG_DEVICE_ADD("motorcpu", Z80, XTAL(16'000'000)/2) // not verified
+ MCFG_DEVICE_PROGRAM_MAP(smgp_airdrive_map)
+ MCFG_DEVICE_IO_MAP(smgp_airdrive_portmap)
MCFG_DEVICE_MODIFY("iochip_0")
- MCFG_CXD1095_IN_PORTA_CB(READ8(segaxbd_state, smgp_motor_r))
- MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, smgp_motor_w))
+ MCFG_CXD1095_IN_PORTA_CB(READ8(*this, segaxbd_state, smgp_motor_r))
+ MCFG_CXD1095_OUT_PORTB_CB(WRITE8(*this, segaxbd_state, smgp_motor_w))
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
@@ -1971,21 +1971,21 @@ MACHINE_CONFIG_START(segaxbd_smgp_state::device_add_mconfig)
segaxbd_state::xboard_base_mconfig(config);
// basic machine hardware
- MCFG_CPU_ADD("soundcpu2", Z80, SOUND_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(smgp_sound2_map)
- MCFG_CPU_IO_MAP(smgp_sound2_portmap)
+ MCFG_DEVICE_ADD("soundcpu2", Z80, SOUND_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(smgp_sound2_map)
+ MCFG_DEVICE_IO_MAP(smgp_sound2_portmap)
- MCFG_CPU_ADD("commcpu", Z80, XTAL(16'000'000)/2) // Z80E
- MCFG_CPU_PROGRAM_MAP(smgp_comm_map)
- MCFG_CPU_IO_MAP(smgp_comm_portmap)
+ MCFG_DEVICE_ADD("commcpu", Z80, XTAL(16'000'000)/2) // Z80E
+ MCFG_DEVICE_PROGRAM_MAP(smgp_comm_map)
+ MCFG_DEVICE_IO_MAP(smgp_comm_portmap)
- MCFG_CPU_ADD("motorcpu", Z80, XTAL(16'000'000)/2) // not verified
- MCFG_CPU_PROGRAM_MAP(smgp_airdrive_map)
- MCFG_CPU_IO_MAP(smgp_airdrive_portmap)
+ MCFG_DEVICE_ADD("motorcpu", Z80, XTAL(16'000'000)/2) // not verified
+ MCFG_DEVICE_PROGRAM_MAP(smgp_airdrive_map)
+ MCFG_DEVICE_IO_MAP(smgp_airdrive_portmap)
MCFG_DEVICE_MODIFY("iochip_0")
- MCFG_CXD1095_IN_PORTA_CB(READ8(segaxbd_state, smgp_motor_r))
- MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, smgp_motor_w))
+ MCFG_CXD1095_IN_PORTA_CB(READ8(*this, segaxbd_state, smgp_motor_r))
+ MCFG_CXD1095_OUT_PORTB_CB(WRITE8(*this, segaxbd_state, smgp_motor_w))
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
@@ -2012,9 +2012,9 @@ MACHINE_CONFIG_START(segaxbd_rascot_state::device_add_mconfig)
segaxbd_state::xboard_base_mconfig(config);
// basic machine hardware
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(rascot_z80_map)
- MCFG_CPU_IO_MAP(rascot_z80_portmap)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(rascot_z80_map)
+ MCFG_DEVICE_IO_MAP(rascot_z80_portmap)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segaxbd_new_state::sega_rascot)
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index a05b0d7ef73..684eb6e293f 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -1274,18 +1274,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(segaybd_state::yboard)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("subx", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(subx_map)
+ MCFG_DEVICE_ADD("subx", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(subx_map)
- MCFG_CPU_ADD("suby", M68000, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(suby_map)
+ MCFG_DEVICE_ADD("suby", M68000, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(suby_map)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_NVRAM_ADD_0FILL("backupram")
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1296,11 +1296,11 @@ MACHINE_CONFIG_START(segaybd_state::yboard)
MCFG_315_5296_IN_PORTA_CB(IOPORT("P1"))
MCFG_315_5296_IN_PORTB_CB(IOPORT("GENERAL"))
MCFG_315_5296_IN_PORTC_CB(IOPORT("LIMITSW"))
- MCFG_315_5296_OUT_PORTD_CB(WRITE8(segaybd_state, output1_w))
- MCFG_315_5296_OUT_PORTE_CB(WRITE8(segaybd_state, misc_output_w))
+ MCFG_315_5296_OUT_PORTD_CB(WRITE8(*this, segaybd_state, output1_w))
+ MCFG_315_5296_OUT_PORTE_CB(WRITE8(*this, segaybd_state, misc_output_w))
MCFG_315_5296_IN_PORTF_CB(IOPORT("DSW"))
MCFG_315_5296_IN_PORTG_CB(IOPORT("COINAGE"))
- MCFG_315_5296_OUT_PORTH_CB(WRITE8(segaybd_state, output2_w))
+ MCFG_315_5296_OUT_PORTH_CB(WRITE8(*this, segaybd_state, output2_w))
// FMCS and CKOT connect to CS and OSC IN on MSM6253 below
MCFG_DEVICE_ADD("adc", MSM6253, 0)
@@ -1356,25 +1356,25 @@ MACHINE_CONFIG_START(segaybd_state::yboard_link)
yboard(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(main_map_link)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(main_map_link)
- MCFG_CPU_ADD("linkcpu", Z80, XTAL(16'000'000)/2 ) // 8 Mhz
- MCFG_CPU_PROGRAM_MAP(link_map)
- MCFG_CPU_IO_MAP(link_portmap)
+ MCFG_DEVICE_ADD("linkcpu", Z80, XTAL(16'000'000)/2 ) // 8 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(link_map)
+ MCFG_DEVICE_IO_MAP(link_portmap)
MCFG_DEVICE_ADD("mb8421", MB8421, 0)
- MCFG_MB8421_INTL_HANDLER(WRITELINE(segaybd_state, mb8421_intl))
- MCFG_MB8421_INTR_HANDLER(WRITELINE(segaybd_state, mb8421_intr))
+ MCFG_MB8421_INTL_HANDLER(WRITELINE(*this, segaybd_state, mb8421_intl))
+ MCFG_MB8421_INTR_HANDLER(WRITELINE(*this, segaybd_state, mb8421_intr))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segaybd_state::yboard_deluxe)
yboard(config);
// basic machine hardware
- MCFG_CPU_ADD("motorcpu", Z80, XTAL(16'000'000)/2 ) // 8 Mhz(guessed)
- MCFG_CPU_PROGRAM_MAP(motor_map)
-// MCFG_CPU_IO_MAP(motor_portmap)
+ MCFG_DEVICE_ADD("motorcpu", Z80, XTAL(16'000'000)/2 ) // 8 Mhz(guessed)
+ MCFG_DEVICE_PROGRAM_MAP(motor_map)
+// MCFG_DEVICE_IO_MAP(motor_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp
index fe1062e5274..0c38403f0aa 100644
--- a/src/mame/drivers/seibucats.cpp
+++ b/src/mame/drivers/seibucats.cpp
@@ -297,10 +297,10 @@ IRQ_CALLBACK_MEMBER(seibucats_state::spi_irq_callback)
MACHINE_CONFIG_START(seibucats_state::seibucats)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I386, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(seibucats_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state, spi_irq_callback)
+ MCFG_DEVICE_ADD("maincpu",I386, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(seibucats_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state, spi_irq_callback)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -324,7 +324,7 @@ MACHINE_CONFIG_START(seibucats_state::seibucats)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'384'000))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'384'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index c5657023698..9f05b264b1c 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -1863,13 +1863,13 @@ MACHINE_RESET_MEMBER(seibuspi_state,spi)
MACHINE_CONFIG_START(seibuspi_state::spi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, XTAL(50'000'000)/2) // AMD or Intel 386DX, 25MHz
- MCFG_CPU_PROGRAM_MAP(spi_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I386, XTAL(50'000'000)/2) // AMD or Intel 386DX, 25MHz
+ MCFG_DEVICE_PROGRAM_MAP(spi_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'636'363)/4) // Z84C0008PEC, 7.159MHz
- MCFG_CPU_PROGRAM_MAP(spi_soundmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'636'363)/4) // Z84C0008PEC, 7.159MHz
+ MCFG_DEVICE_PROGRAM_MAP(spi_soundmap)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -1893,16 +1893,16 @@ MACHINE_CONFIG_START(seibuspi_state::spi)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 6144)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_DECRYPT_KEY_CB(WRITE16(seibuspi_state, tile_decrypt_key_w))
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(seibuspi_state, spi_layer_enable_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(seibuspi_state, spi_layer_bank_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(seibuspi_state, scroll_w))
+ MCFG_SEIBU_CRTC_DECRYPT_KEY_CB(WRITE16(*this, seibuspi_state, tile_decrypt_key_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, seibuspi_state, spi_layer_enable_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, seibuspi_state, spi_layer_bank_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, seibuspi_state, scroll_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf", YMF271, XTAL(16'934'400))
- MCFG_YMF271_IRQ_HANDLER(WRITELINE(seibuspi_state, ymf_irqhandler))
+ MCFG_DEVICE_ADD("ymf", YMF271, XTAL(16'934'400))
+ MCFG_YMF271_IRQ_HANDLER(WRITELINE(*this, seibuspi_state, ymf_irqhandler))
MCFG_DEVICE_ADDRESS_MAP(0, spi_ymf271_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
@@ -1920,8 +1920,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seibuspi_state::rdft2)
spi(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rdft2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rdft2_map)
MACHINE_CONFIG_END
@@ -1938,11 +1938,11 @@ MACHINE_CONFIG_START(seibuspi_state::sxx2e)
spi(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sxx2e_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sxx2e_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(sxx2e_soundmap)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(sxx2e_soundmap)
MCFG_MACHINE_RESET_OVERRIDE(seibuspi_state, sxx2e)
@@ -1957,8 +1957,8 @@ MACHINE_CONFIG_START(seibuspi_state::sxx2e)
MCFG_DEVICE_REMOVE("rspeaker")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_REPLACE("ymf", YMF271, XTAL(16'934'400))
- MCFG_YMF271_IRQ_HANDLER(WRITELINE(seibuspi_state, ymf_irqhandler))
+ MCFG_DEVICE_REPLACE("ymf", YMF271, XTAL(16'934'400))
+ MCFG_YMF271_IRQ_HANDLER(WRITELINE(*this, seibuspi_state, ymf_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1967,8 +1967,8 @@ MACHINE_CONFIG_START(seibuspi_state::sxx2f)
sxx2e(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sxx2f_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sxx2f_map)
MCFG_DEVICE_REMOVE("ds2404")
@@ -1982,15 +1982,15 @@ MACHINE_CONFIG_START(seibuspi_state::sxx2g) // clocks differ, but otherwise same
sxx2f(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu") // AMD AM386DX/DX-40, 28.63636MHz
- MCFG_CPU_CLOCK(XTAL(28'636'363))
+ MCFG_DEVICE_MODIFY("maincpu") // AMD AM386DX/DX-40, 28.63636MHz
+ MCFG_DEVICE_CLOCK(XTAL(28'636'363))
- MCFG_CPU_MODIFY("audiocpu") // Z84C0004PCS, 4.9152MHz
- MCFG_CPU_CLOCK(XTAL(4'915'200))
+ MCFG_DEVICE_MODIFY("audiocpu") // Z84C0004PCS, 4.9152MHz
+ MCFG_DEVICE_CLOCK(XTAL(4'915'200))
/* sound hardware */
- MCFG_SOUND_REPLACE("ymf", YMF271, XTAL(16'384'000)) // 16.384MHz(!)
- MCFG_YMF271_IRQ_HANDLER(WRITELINE(seibuspi_state, ymf_irqhandler))
+ MCFG_DEVICE_REPLACE("ymf", YMF271, XTAL(16'384'000)) // 16.384MHz(!)
+ MCFG_YMF271_IRQ_HANDLER(WRITELINE(*this, seibuspi_state, ymf_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2001,10 +2001,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seibuspi_state::sys386i)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, XTAL(40'000'000)) // AMD 386DX, 40MHz
- MCFG_CPU_PROGRAM_MAP(sys386i_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I386, XTAL(40'000'000)) // AMD 386DX, 40MHz
+ MCFG_DEVICE_PROGRAM_MAP(sys386i_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2018,10 +2018,10 @@ MACHINE_CONFIG_START(seibuspi_state::sys386i)
MCFG_PALETTE_ADD_INIT_BLACK("palette", 6144)
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_DECRYPT_KEY_CB(WRITE16(seibuspi_state, tile_decrypt_key_w))
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(seibuspi_state, spi_layer_enable_w))
- MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(seibuspi_state, spi_layer_bank_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(seibuspi_state, scroll_w))
+ MCFG_SEIBU_CRTC_DECRYPT_KEY_CB(WRITE16(*this, seibuspi_state, tile_decrypt_key_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, seibuspi_state, spi_layer_enable_w))
+ MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, seibuspi_state, spi_layer_bank_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, seibuspi_state, scroll_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2058,10 +2058,10 @@ DRIVER_INIT_MEMBER(seibuspi_state,sys386f)
MACHINE_CONFIG_START(seibuspi_state::sys386f)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I386, XTAL(50'000'000)/2) // Intel i386DX, 25MHz
- MCFG_CPU_PROGRAM_MAP(sys386f_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I386, XTAL(50'000'000)/2) // Intel i386DX, 25MHz
+ MCFG_DEVICE_PROGRAM_MAP(sys386f_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seibuspi_state, spi_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(seibuspi_state,spi_irq_callback)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2083,7 +2083,7 @@ MACHINE_CONFIG_START(seibuspi_state::sys386f)
// Single PCBs only output mono sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'384'000))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'384'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp
index 63a84493ef3..44e7a55ad66 100644
--- a/src/mame/drivers/seicross.cpp
+++ b/src/mame/drivers/seicross.cpp
@@ -398,13 +398,13 @@ INTERRUPT_GEN_MEMBER(seicross_state::vblank_irq)
MACHINE_CONFIG_START(seicross_state::no_nvram)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000) / 6) /* D780C, 3.072 MHz? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seicross_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000) / 6) /* D780C, 3.072 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seicross_state, vblank_irq)
- MCFG_CPU_ADD("mcu", NSC8105, XTAL(18'432'000) / 6) /* ??? */
- MCFG_CPU_PROGRAM_MAP(mcu_no_nvram_map)
+ MCFG_DEVICE_ADD("mcu", NSC8105, XTAL(18'432'000) / 6) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_no_nvram_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1200)) /* 20 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
@@ -427,12 +427,12 @@ MACHINE_CONFIG_START(seicross_state::no_nvram)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000) / 12)
- MCFG_AY8910_PORT_B_READ_CB(READ8(seicross_state, portB_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(seicross_state, portB_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(18'432'000) / 12)
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, seicross_state, portB_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, seicross_state, portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.12) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.12) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -442,16 +442,16 @@ MACHINE_CONFIG_START(seicross_state::nvram)
no_nvram(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_PROGRAM_MAP(mcu_nvram_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_PROGRAM_MAP(mcu_nvram_map)
MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", seicross_state, nvram_init)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seicross_state::friskytb)
nvram(config);
- MCFG_CPU_MODIFY("mcu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("mcu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index 4fc9e274a23..e1493fc5199 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -540,15 +540,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(seicupbl_state::cupsocbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,12000000)
- MCFG_CPU_PROGRAM_MAP(cupsocbl_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seicupbl_state, irq4_line_hold) /* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000)
+ MCFG_DEVICE_PROGRAM_MAP(cupsocbl_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seicupbl_state, irq4_line_hold) /* VBL */
MCFG_DEVICE_SEIBUCOP_BOOTLEG_ADD("seibucop_boot")
/*Different Sound hardware*/
- MCFG_CPU_ADD("audiocpu", Z80,14318180/4)
- MCFG_CPU_PROGRAM_MAP(cupsocbl_sound_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80,14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(cupsocbl_sound_mem)
//MCFG_PERIODIC_INT("screen", nmi_line_pulse)
/* video hardware */
@@ -561,9 +561,9 @@ MACHINE_CONFIG_START(seicupbl_state::cupsocbl)
MCFG_SCREEN_PALETTE("palette")
//MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- //MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(seicupbl_state, tilemap_enable_w))
- //MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(seicupbl_state, tile_scroll_w))
- //MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(seicupbl_state, tile_vreg_1a_w))
+ //MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, seicupbl_state, tilemap_enable_w))
+ //MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, seicupbl_state, tile_scroll_w))
+ //MCFG_SEIBU_CRTC_REG_1A_CB(WRITE16(*this, seicupbl_state, tile_vreg_1a_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", seicupbl_csb)
diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp
index a7b7ae247e4..457890407d6 100644
--- a/src/mame/drivers/selz80.cpp
+++ b/src/mame/drivers/selz80.cpp
@@ -217,9 +217,9 @@ void selz80_state::machine_start()
MACHINE_CONFIG_START(selz80_state::selz80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000)) // it's actually a 5MHz XTAL with a NEC uPD780C-1 cpu
- MCFG_CPU_PROGRAM_MAP(selz80_mem)
- MCFG_CPU_IO_MAP(selz80_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000)) // it's actually a 5MHz XTAL with a NEC uPD780C-1 cpu
+ MCFG_DEVICE_PROGRAM_MAP(selz80_mem)
+ MCFG_DEVICE_IO_MAP(selz80_io)
MCFG_MACHINE_RESET_OVERRIDE(selz80_state, selz80 )
/* video hardware */
@@ -227,31 +227,31 @@ MACHINE_CONFIG_START(selz80_state::selz80)
/* Devices */
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MCFG_DEVICE_ADD("i8279", I8279, 5000000 / 2) // based on divider
- MCFG_I8279_OUT_SL_CB(WRITE8(selz80_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(selz80_state, digit_w)) // display A&B
- MCFG_I8279_IN_RL_CB(READ8(selz80_state, kbd_r)) // kbd RL lines
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, selz80_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, selz80_state, digit_w)) // display A&B
+ MCFG_I8279_IN_RL_CB(READ8(*this, selz80_state, kbd_r)) // kbd RL lines
MCFG_I8279_IN_SHIFT_CB(VCC) // Shift key
MCFG_I8279_IN_CTRL_CB(VCC)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(selz80_state::dagz80)
selz80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dagz80_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dagz80_mem)
MCFG_MACHINE_RESET_OVERRIDE(selz80_state, dagz80 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index 98960266fbb..bf5ceb9a1b3 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -575,12 +575,12 @@ WRITE16_MEMBER( sengokmj_state::layer_scroll_w )
MACHINE_CONFIG_START(sengokmj_state::sengokmj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, 16000000/2) /* V30-8 */
- MCFG_CPU_PROGRAM_MAP(sengokmj_map)
- MCFG_CPU_IO_MAP(sengokmj_io_map)
+ MCFG_DEVICE_ADD("maincpu", V30, 16000000/2) /* V30-8 */
+ MCFG_DEVICE_PROGRAM_MAP(sengokmj_map)
+ MCFG_DEVICE_IO_MAP(sengokmj_io_map)
- MCFG_CPU_ADD("audiocpu", Z80, 14318180/4)
- MCFG_CPU_PROGRAM_MAP(seibu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 14318180/4)
+ MCFG_DEVICE_PROGRAM_MAP(seibu_sound_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -592,11 +592,11 @@ MACHINE_CONFIG_START(sengokmj_state::sengokmj)
MCFG_SCREEN_VISIBLE_AREA(0, 320-1, 16, 256-1) //TODO: dynamic resolution
MCFG_SCREEN_UPDATE_DRIVER(sengokmj_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sengokmj_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sengokmj_state, vblank_irq))
MCFG_DEVICE_ADD("crtc", SEIBU_CRTC, 0)
- MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(sengokmj_state, layer_en_w))
- MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(sengokmj_state, layer_scroll_w))
+ MCFG_SEIBU_CRTC_LAYER_EN_CB(WRITE16(*this, sengokmj_state, layer_en_w))
+ MCFG_SEIBU_CRTC_LAYER_SCROLL_CB(WRITE16(*this, sengokmj_state, layer_scroll_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sengokmj)
MCFG_PALETTE_ADD("palette", 0x800)
@@ -605,8 +605,8 @@ MACHINE_CONFIG_START(sengokmj_state::sengokmj)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 14318180/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
@@ -615,8 +615,8 @@ MACHINE_CONFIG_START(sengokmj_state::sengokmj)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp
index 0aa1069e66b..a2a911b24c3 100644
--- a/src/mame/drivers/senjyo.cpp
+++ b/src/mame/drivers/senjyo.cpp
@@ -551,23 +551,23 @@ GFXDECODE_END
MACHINE_CONFIG_START(senjyo_state::senjyo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(senjyo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(senjyo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
- MCFG_CPU_ADD("sub", Z80, 2000000) /* 2 MHz? */
+ MCFG_DEVICE_ADD("sub", Z80, 2000000) /* 2 MHz? */
MCFG_Z80_DAISY_CHAIN(senjyo_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(senjyo_sound_map)
- MCFG_CPU_IO_MAP(senjyo_sound_io_map)
+ MCFG_DEVICE_PROGRAM_MAP(senjyo_sound_map)
+ MCFG_DEVICE_IO_MAP(senjyo_sound_io_map)
MCFG_DEVICE_ADD("z80pio", Z80PIO, 2000000)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("sub", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(senjyo_state, pio_pa_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, senjyo_state, pio_pa_r))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, 2000000 /* same as "sub" */)
MCFG_Z80CTC_INTR_CB(INPUTLINE("sub", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(senjyo_state, sound_line_clock))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("z80ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, senjyo_state, sound_line_clock))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -588,16 +588,16 @@ MACHINE_CONFIG_START(senjyo_state::senjyo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("sn1", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn1", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("sn2", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn2", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("sn3", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn3", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.05) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -606,19 +606,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(senjyo_state::senjyox_e)
senjyo(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5015, 4000000) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(senjyo_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5015, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(senjyo_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(senjyo_state::senjyox_a)
senjyo(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5018, 4000000) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(senjyo_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5018, 4000000) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(senjyo_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", senjyo_state, irq0_line_assert)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -627,11 +627,11 @@ MACHINE_CONFIG_START(senjyo_state::starforb)
senjyox_e(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(starforb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(starforb_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(starforb_sound_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(starforb_sound_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index 1c2b49291b3..36c5aa3242b 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -7814,12 +7814,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::tndrcade_sub_interrupt)
MACHINE_CONFIG_START(seta_state::tndrcade)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(tndrcade_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tndrcade_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
- MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(tndrcade_sub_map)
+ MCFG_DEVICE_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tndrcade_sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, tndrcade_sub_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -7843,13 +7843,13 @@ MACHINE_CONFIG_START(seta_state::tndrcade)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */
- MCFG_AY8910_PORT_A_READ_CB(READ8(seta_state, dsw1_r)) /* input A: DSW 1 */
- MCFG_AY8910_PORT_B_READ_CB(READ8(seta_state, dsw2_r)) /* input B: DSW 2 */
+ MCFG_DEVICE_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, seta_state, dsw1_r)) /* input A: DSW 1 */
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, seta_state, dsw2_r)) /* input B: DSW 2 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MCFG_SOUND_ADD("ym2", YM3812, 16000000/4) /* 4 MHz */
+ MCFG_DEVICE_ADD("ym2", YM3812, 16000000/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -7868,12 +7868,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::twineagl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(downtown_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(downtown_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
- MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(twineagl_sub_map)
+ MCFG_DEVICE_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(twineagl_sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("s_scantimer", seta_state, seta_sub_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -7900,7 +7900,7 @@ MACHINE_CONFIG_START(seta_state::twineagl)
MCFG_GENERIC_LATCH_8_ADD("soundlatch1")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -7914,12 +7914,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::downtown)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(downtown_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(downtown_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("m_scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M65C02, XTAL(16'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(downtown_sub_map)
+ MCFG_DEVICE_ADD("sub", M65C02, XTAL(16'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(downtown_sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("s_scantimer", seta_state, seta_sub_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -7946,7 +7946,7 @@ MACHINE_CONFIG_START(seta_state::downtown)
MCFG_GENERIC_LATCH_8_ADD("soundlatch1")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -7982,23 +7982,23 @@ MACHINE_START_MEMBER(seta_state, usclssic)
MACHINE_CONFIG_START(seta_state::usclssic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(usclssic_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(usclssic_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, calibr50_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(calibr50_sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(calibr50_sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq0_line_assert)
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0)
MCFG_UPD4701_PORTX("TRACKX")
MCFG_UPD4701_PORTY("TRACKY")
MCFG_DEVICE_ADD("buttonmux", HC157, 0)
- MCFG_74157_OUT_CB(DEVWRITELINE("upd4701", upd4701_device, middle_w)) MCFG_DEVCB_BIT(0)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, right_w)) MCFG_DEVCB_BIT(1)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("upd4701", upd4701_device, left_w)) MCFG_DEVCB_BIT(2)
+ MCFG_74157_OUT_CB(WRITELINE("upd4701", upd4701_device, middle_w)) MCFG_DEVCB_BIT(0)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, right_w)) MCFG_DEVCB_BIT(1)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("upd4701", upd4701_device, left_w)) MCFG_DEVCB_BIT(2)
MCFG_MACHINE_START_OVERRIDE(seta_state,usclssic)
MCFG_MACHINE_RESET_OVERRIDE(seta_state,calibr50)
@@ -8031,7 +8031,7 @@ MACHINE_CONFIG_START(seta_state::usclssic)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("sub", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_X1_010_ADDRESS_XOR(0x1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8049,14 +8049,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::calibr50)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(calibr50_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(calibr50_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, calibr50_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("sub", M65C02, XTAL(16'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(calibr50_sub_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(seta_state, irq0_line_assert, 4*60) // IRQ: 4/frame
+ MCFG_DEVICE_ADD("sub", M65C02, XTAL(16'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(calibr50_sub_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(seta_state, irq0_line_assert, 4*60) // IRQ: 4/frame
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0)
MCFG_UPD4701_PORTX("ROT1")
@@ -8091,7 +8091,7 @@ MACHINE_CONFIG_START(seta_state::calibr50)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_X1_010_ADDRESS_XOR(0x1000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -8106,12 +8106,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::metafox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(downtown_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(downtown_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
- MCFG_CPU_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(metafox_sub_map)
+ MCFG_DEVICE_ADD("sub", M65C02, 16000000/8) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(metafox_sub_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("s_scantimer", seta_state, seta_sub_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8138,7 +8138,7 @@ MACHINE_CONFIG_START(seta_state::metafox)
MCFG_GENERIC_LATCH_8_ADD("soundlatch1")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8150,8 +8150,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::atehate)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(atehate_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(atehate_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8175,7 +8175,7 @@ MACHINE_CONFIG_START(seta_state::atehate)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8193,8 +8193,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::blandia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(blandia_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(blandia_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8209,7 +8209,7 @@ MACHINE_CONFIG_START(seta_state::blandia)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta_state, screen_vblank_seta_buffer_sprites))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", blandia)
@@ -8223,15 +8223,15 @@ MACHINE_CONFIG_START(seta_state::blandia)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::blandiap)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(blandiap_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(blandiap_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8246,7 +8246,7 @@ MACHINE_CONFIG_START(seta_state::blandiap)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta_state, screen_vblank_seta_buffer_sprites))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", blandia)
@@ -8260,7 +8260,7 @@ MACHINE_CONFIG_START(seta_state::blandiap)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8272,9 +8272,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::blockcar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(blockcar_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(blockcar_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -8297,7 +8297,7 @@ MACHINE_CONFIG_START(seta_state::blockcar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8322,13 +8322,13 @@ MACHINE_CONFIG_START(seta_state::blockcarb)
blockcar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(blockcarb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(blockcarb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // unk freq
- MCFG_CPU_PROGRAM_MAP(blockcarb_sound_map)
- MCFG_CPU_IO_MAP(blockcarb_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // unk freq
+ MCFG_DEVICE_PROGRAM_MAP(blockcarb_sound_map)
+ MCFG_DEVICE_IO_MAP(blockcarb_sound_portmap)
/* the sound hardware / program is ripped from Tetris (S16B) */
MCFG_DEVICE_REMOVE("x1snd")
@@ -8346,8 +8346,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::daioh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz, MC68000-16, Verified from PCB */
- MCFG_CPU_PROGRAM_MAP(daioh_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz, MC68000-16, Verified from PCB */
+ MCFG_DEVICE_PROGRAM_MAP(daioh_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8371,7 +8371,7 @@ MACHINE_CONFIG_START(seta_state::daioh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz, Verified from PCB audio */
+ MCFG_DEVICE_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz, Verified from PCB audio */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8383,8 +8383,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::daiohp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz, MC68000-16, Verified from PCB */
- MCFG_CPU_PROGRAM_MAP(daiohp_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz, MC68000-16, Verified from PCB */
+ MCFG_DEVICE_PROGRAM_MAP(daiohp_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8408,7 +8408,7 @@ MACHINE_CONFIG_START(seta_state::daiohp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz, Verified from PCB audio */
+ MCFG_DEVICE_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz, Verified from PCB audio */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8425,8 +8425,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::drgnunit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(drgnunit_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(drgnunit_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8440,7 +8440,7 @@ MACHINE_CONFIG_START(seta_state::drgnunit)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta_state, screen_vblank_seta_buffer_sprites))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", downtown)
@@ -8451,7 +8451,7 @@ MACHINE_CONFIG_START(seta_state::drgnunit)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8461,8 +8461,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::qzkklgy2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(drgnunit_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(drgnunit_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8476,7 +8476,7 @@ MACHINE_CONFIG_START(seta_state::qzkklgy2)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta_state, screen_vblank_seta_buffer_sprites))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", qzkklgy2)
@@ -8487,7 +8487,7 @@ MACHINE_CONFIG_START(seta_state::qzkklgy2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8512,8 +8512,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(setaroul_state::interrupt)
MACHINE_CONFIG_START(setaroul_state::setaroul)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(setaroul_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(setaroul_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", setaroul_state, interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -8537,7 +8537,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(setaroul_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(setaroul_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, setaroul_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", setaroul)
@@ -8550,7 +8550,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, XTAL(16'000'000)) /* 16 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -8565,8 +8565,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::eightfrc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -8591,7 +8591,7 @@ MACHINE_CONFIG_START(seta_state::eightfrc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8608,8 +8608,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::extdwnhl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(extdwnhl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(extdwnhl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -8637,7 +8637,7 @@ MACHINE_CONFIG_START(seta_state::extdwnhl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8666,8 +8666,8 @@ MACHINE_START_MEMBER(seta_state,wrofaero){ uPD71054_timer_init(); }
MACHINE_CONFIG_START(seta_state::gundhara)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
#if __uPD71054_TIMER
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
#else
@@ -8704,7 +8704,7 @@ MACHINE_CONFIG_START(seta_state::gundhara)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8716,8 +8716,8 @@ MACHINE_CONFIG_START(seta_state::zombraid)
gundhara(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zombraid_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zombraid_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -8736,8 +8736,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::jjsquawk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -8765,15 +8765,15 @@ MACHINE_CONFIG_START(seta_state::jjsquawk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::jjsquawb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(jjsquawb_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(jjsquawb_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8800,7 +8800,7 @@ MACHINE_CONFIG_START(seta_state::jjsquawb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8812,14 +8812,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::kamenrid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(kamenrid_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kamenrid_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_DEVICE_ADD("pit", PIT8254, 0) // uPD71054C
MCFG_PIT8253_CLK0(16000000/2/8)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(seta_state, pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, seta_state, pit_out0))
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -8842,7 +8842,7 @@ MACHINE_CONFIG_START(seta_state::kamenrid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8855,8 +8855,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::orbs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
- MCFG_CPU_PROGRAM_MAP(orbs_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(orbs_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -8880,7 +8880,7 @@ MACHINE_CONFIG_START(seta_state::orbs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8895,8 +8895,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::keroppij)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
- MCFG_CPU_PROGRAM_MAP(keroppi_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(keroppi_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_MACHINE_START_OVERRIDE(seta_state,keroppi)
@@ -8922,7 +8922,7 @@ MACHINE_CONFIG_START(seta_state::keroppij)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 14318180) /* 14.318180 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -8939,8 +8939,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::krzybowl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(krzybowl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(krzybowl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("upd1", UPD4701A, 0)
@@ -8972,7 +8972,7 @@ MACHINE_CONFIG_START(seta_state::krzybowl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8985,13 +8985,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::madshark)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(madshark_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(madshark_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
MCFG_DEVICE_ADD("pit", PIT8254, 0) // uPD71054C
MCFG_PIT8253_CLK0(16000000/2/8)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(seta_state, pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, seta_state, pit_out0))
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9019,7 +9019,7 @@ MACHINE_CONFIG_START(seta_state::madshark)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9031,15 +9031,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::magspeed)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(magspeed_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(magspeed_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_DEVICE_ADD("pit", PIT8254, 0) // uPD71054C
MCFG_PIT8253_CLK0(16000000/2/8)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(seta_state, pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, seta_state, pit_out0))
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9062,7 +9062,7 @@ MACHINE_CONFIG_START(seta_state::magspeed)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9076,13 +9076,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::msgundam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(msgundam_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(msgundam_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
MCFG_DEVICE_ADD("pit", PIT8254, 0) // uPD71054C
MCFG_PIT8253_CLK0(16000000/2/8)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(seta_state, pit_out0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, seta_state, pit_out0))
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9095,7 +9095,7 @@ MACHINE_CONFIG_START(seta_state::msgundam)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 48*8-1, 1*8, 31*8-1)
MCFG_SCREEN_UPDATE_DRIVER(seta_state, screen_update_seta)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta_state, screen_vblank_seta_buffer_sprites))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta_state, screen_vblank_seta_buffer_sprites))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", msgundam)
@@ -9106,7 +9106,7 @@ MACHINE_CONFIG_START(seta_state::msgundam)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9119,8 +9119,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::oisipuzl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(oisipuzl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(oisipuzl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -9144,7 +9144,7 @@ MACHINE_CONFIG_START(seta_state::oisipuzl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -9158,9 +9158,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::triplfun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(triplfun_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(triplfun_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9195,13 +9195,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::kiwame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(kiwame_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kiwame_map)
/* lev 1-7 are the same. WARNING: the interrupt table is written to. */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq1_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq1_line_hold)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(seta_state, kiwame_row_select_w))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, seta_state, kiwame_row_select_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -9226,7 +9226,7 @@ MACHINE_CONFIG_START(seta_state::kiwame)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -9242,8 +9242,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::rezon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -9268,7 +9268,7 @@ MACHINE_CONFIG_START(seta_state::rezon)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9283,9 +9283,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::thunderl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(thunderl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(thunderl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9308,7 +9308,7 @@ MACHINE_CONFIG_START(seta_state::thunderl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9334,13 +9334,13 @@ MACHINE_CONFIG_START(seta_state::thunderlbl)
thunderl(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(thunderlbl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(thunderlbl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 10000000/2)
- MCFG_CPU_PROGRAM_MAP(thunderlbl_sound_map)
- MCFG_CPU_IO_MAP(thunderlbl_sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 10000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(thunderlbl_sound_map)
+ MCFG_DEVICE_IO_MAP(thunderlbl_sound_portmap)
/* the sound hardware / program is ripped from Tetris (S16B) */
MCFG_DEVICE_REMOVE("x1snd")
@@ -9356,12 +9356,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::wiggie)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(wiggie_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wiggie_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(wiggie_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wiggie_sound_map)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9400,9 +9400,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::wits)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(thunderl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(thunderl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq2_line_assert)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9425,7 +9425,7 @@ MACHINE_CONFIG_START(seta_state::wits)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9437,9 +9437,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::umanclub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(umanclub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(umanclub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9462,7 +9462,7 @@ MACHINE_CONFIG_START(seta_state::umanclub)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9474,13 +9474,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::utoukond)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(utoukond_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(utoukond_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(utoukond_sound_map)
- MCFG_CPU_IO_MAP(utoukond_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(utoukond_sound_map)
+ MCFG_DEVICE_IO_MAP(utoukond_sound_io_map)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9507,12 +9507,12 @@ MACHINE_CONFIG_START(seta_state::utoukond)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM3438, 16000000/4) /* 4 MHz */
- MCFG_YM2612_IRQ_HANDLER(WRITELINE(seta_state, utoukond_ym3438_interrupt))
+ MCFG_DEVICE_ADD("ymsnd", YM3438, 16000000/4) /* 4 MHz */
+ MCFG_YM2612_IRQ_HANDLER(WRITELINE(*this, seta_state, utoukond_ym3438_interrupt))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
@@ -9525,10 +9525,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::wrofaero)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(wrofaero_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
#if __uPD71054_TIMER
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, wrofaero_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, wrofaero_interrupt)
#else
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_2_and_4, "screen", 0, 1)
#endif // __uPD71054_TIMER
@@ -9560,7 +9560,7 @@ MACHINE_CONFIG_START(seta_state::wrofaero)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9579,9 +9579,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::zingzip)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(wrofaero_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wrofaero_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta_state, irq3_line_hold)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
MCFG_SETA001_SPRITE_GFXDECODE("gfxdecode")
@@ -9609,7 +9609,7 @@ MACHINE_CONFIG_START(seta_state::zingzip)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9620,8 +9620,8 @@ MACHINE_CONFIG_START(seta_state::zingzipbl)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(zingzipbl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(zingzipbl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_REMOVE("x1snd")
@@ -9637,8 +9637,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta_state::pairlove)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(pairlove_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pairlove_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, seta_interrupt_1_and_2, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -9662,7 +9662,7 @@ MACHINE_CONFIG_START(seta_state::pairlove)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000) /* 16 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9685,8 +9685,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::crazyfgt_interrupt)
MACHINE_CONFIG_START(seta_state::crazyfgt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(crazyfgt_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(crazyfgt_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta_state, crazyfgt_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD("spritegen", SETA001_SPRITE, 0)
@@ -9713,7 +9713,7 @@ MACHINE_CONFIG_START(seta_state::crazyfgt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, 16000000/4) /* 4 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 16000000/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock?
@@ -9746,8 +9746,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(jockeyc_state::interrupt)
MACHINE_CONFIG_START(jockeyc_state::jockeyc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // TMP68000N-8
- MCFG_CPU_PROGRAM_MAP(jockeyc_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // TMP68000N-8
+ MCFG_DEVICE_PROGRAM_MAP(jockeyc_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", jockeyc_state, interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(2.0)) // jockeyc: watchdog test error if over 2.5s
@@ -9783,7 +9783,7 @@ MACHINE_CONFIG_START(jockeyc_state::jockeyc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("x1snd", X1_010, 16000000)
+ MCFG_DEVICE_ADD("x1snd", X1_010, 16000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -9799,8 +9799,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jockeyc_state::inttoote)
jockeyc(config);
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) // TMP68HC000N-16
- MCFG_CPU_PROGRAM_MAP(inttoote_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) // TMP68HC000N-16
+ MCFG_DEVICE_PROGRAM_MAP(inttoote_map)
// I/O board (not hooked up yet)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index b2da542dac8..8aa50eb861b 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -2523,10 +2523,10 @@ INTERRUPT_GEN_MEMBER(seta2_state::samshoot_interrupt)
}
MACHINE_CONFIG_START(seta2_state::seta2)
- MCFG_CPU_ADD("maincpu", M68301, XTAL(50'000'000)/3) // !! TMP68301 !!
- MCFG_CPU_PROGRAM_MAP(mj4simai_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68301, XTAL(50'000'000)/3) // !! TMP68301 !!
+ MCFG_DEVICE_PROGRAM_MAP(mj4simai_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0)
MCFG_TMP68301_CPU("maincpu")
@@ -2540,7 +2540,7 @@ MACHINE_CONFIG_START(seta2_state::seta2)
MCFG_SCREEN_SIZE(0x200, 0x200)
MCFG_SCREEN_VISIBLE_AREA(0x40, 0x1c0-1, 0x80, 0x170-1)
MCFG_SCREEN_UPDATE_DRIVER(seta2_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta2_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta2_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", seta2)
@@ -2550,7 +2550,7 @@ MACHINE_CONFIG_START(seta2_state::seta2)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("x1snd", X1_010, XTAL(50'000'000)/3) // clock?
+ MCFG_DEVICE_ADD("x1snd", X1_010, XTAL(50'000'000)/3) // clock?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2564,12 +2564,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::gundamex)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gundamex_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gundamex_map)
MCFG_DEVICE_MODIFY("tmp68301")
- MCFG_TMP68301_IN_PARALLEL_CB(READ16(seta2_state, gundamex_eeprom_r))
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(seta2_state, gundamex_eeprom_w))
+ MCFG_TMP68301_IN_PARALLEL_CB(READ16(*this, seta2_state, gundamex_eeprom_r))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, seta2_state, gundamex_eeprom_w))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2581,8 +2581,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::grdians)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(grdians_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(grdians_map)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -2592,8 +2592,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::myangel)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(myangel_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(myangel_map)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -2605,8 +2605,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::myangel2)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(myangel2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(myangel2_map)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -2618,8 +2618,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::pzlbowl)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pzlbowl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pzlbowl_map)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -2629,8 +2629,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::penbros)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(penbros_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(penbros_map)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -2639,20 +2639,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::ablastb)
penbros(config);
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(16'000'000)) // TMP68HC000P-16
- MCFG_CPU_PROGRAM_MAP(ablastb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, irq2_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(16'000'000)) // TMP68HC000P-16
+ MCFG_DEVICE_PROGRAM_MAP(ablastb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta2_state, irq2_line_hold)
MCFG_DEVICE_REMOVE("tmp68301")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::reelquak)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(reelquak_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(reelquak_map)
MCFG_DEVICE_MODIFY("tmp68301")
- MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(seta2_state, reelquak_leds_w))
+ MCFG_TMP68301_OUT_PARALLEL_CB(WRITE16(*this, seta2_state, reelquak_leds_w))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_TICKET_DISPENSER_ADD("dispenser", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
@@ -2667,9 +2667,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::samshoot)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(samshoot_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(seta2_state, samshoot_interrupt, 60)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(samshoot_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(seta2_state, samshoot_interrupt, 60)
MCFG_DEVICE_MODIFY("tmp68301")
MCFG_TMP68301_IN_PARALLEL_CB(IOPORT("DSW2"))
@@ -2684,8 +2684,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(staraudi_state::staraudi)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(staraudi_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(staraudi_map)
MCFG_SHARP_LH28F016S_16BIT_ADD("flash")
MCFG_UPD4992_ADD("rtc")
@@ -2701,8 +2701,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::telpacfl)
seta2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(telpacfl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(telpacfl_map)
MCFG_DEVICE_MODIFY("tmp68301")
MCFG_TMP68301_IN_PARALLEL_CB(IOPORT("KNOB"))
@@ -2748,18 +2748,18 @@ MACHINE_RESET_MEMBER(seta2_state, funcube)
MACHINE_CONFIG_START(seta2_state::funcube)
- MCFG_CPU_ADD("maincpu", MCF5206E, XTAL(25'447'000))
- MCFG_CPU_PROGRAM_MAP(funcube_map)
+ MCFG_DEVICE_ADD("maincpu", MCF5206E, XTAL(25'447'000))
+ MCFG_DEVICE_PROGRAM_MAP(funcube_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", seta2_state, funcube_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("sub", H83007, FUNCUBE_SUB_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(funcube_sub_map)
- MCFG_CPU_IO_MAP(funcube_sub_io)
+ MCFG_DEVICE_ADD("sub", H83007, FUNCUBE_SUB_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(funcube_sub_map)
+ MCFG_DEVICE_IO_MAP(funcube_sub_io)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
MCFG_FUNCUBE_TOUCHSCREEN_ADD("touchscreen", 200)
- MCFG_FUNCUBE_TOUCHSCREEN_TX_CALLBACK(DEVWRITELINE(":sub:sci1", h8_sci_device, rx_w))
+ MCFG_FUNCUBE_TOUCHSCREEN_TX_CALLBACK(WRITELINE(":sub:sci1", h8_sci_device, rx_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2775,7 +2775,7 @@ MACHINE_CONFIG_START(seta2_state::funcube)
MCFG_SCREEN_SIZE(0x200, 0x200)
MCFG_SCREEN_VISIBLE_AREA(0x0+1, 0x140-1+1, 0x80, 0x170-1)
MCFG_SCREEN_UPDATE_DRIVER(seta2_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta2_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta2_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", funcube)
@@ -2793,11 +2793,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::funcube2)
funcube(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(funcube2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(funcube2_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_IO_MAP(funcube2_sub_io)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_IO_MAP(funcube2_sub_io)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -2814,10 +2814,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(seta2_state::namcostr)
- MCFG_CPU_ADD("maincpu", M68301, XTAL(50'000'000)/3) // !! TMP68301 !!
- MCFG_CPU_PROGRAM_MAP(namcostr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", M68301, XTAL(50'000'000)/3) // !! TMP68301 !!
+ MCFG_DEVICE_PROGRAM_MAP(namcostr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("tmp68301",tmp68301_device,irq_callback)
MCFG_DEVICE_ADD("tmp68301", TMP68301, 0) // does this have a ticket dispenser?
MCFG_TMP68301_CPU("maincpu")
@@ -2829,7 +2829,7 @@ MACHINE_CONFIG_START(seta2_state::namcostr)
MCFG_SCREEN_SIZE(0x200, 0x200)
MCFG_SCREEN_VISIBLE_AREA(0x40, 0x1c0-1, 0x80, 0x170-1)
MCFG_SCREEN_UPDATE_DRIVER(seta2_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(seta2_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, seta2_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", funcube)
diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp
index 368756ec45f..412fdd4f61c 100644
--- a/src/mame/drivers/sf.cpp
+++ b/src/mame/drivers/sf.cpp
@@ -543,17 +543,17 @@ void sf_state::machine_reset()
MACHINE_CONFIG_START(sf_state::sfan)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(sfan_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sfan_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sf_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* ? xtal is 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* ? xtal is 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
- MCFG_CPU_ADD("audio2", Z80, XTAL(3'579'545)) /* ? xtal is 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(sound2_map)
- MCFG_CPU_IO_MAP(sound2_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(sf_state, irq0_line_hold, 8000) // ?
+ MCFG_DEVICE_ADD("audio2", Z80, XTAL(3'579'545)) /* ? xtal is 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound2_map)
+ MCFG_DEVICE_IO_MAP(sound2_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(sf_state, irq0_line_hold, 8000) // ?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -579,12 +579,12 @@ MACHINE_CONFIG_START(sf_state::sfan)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 8KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 8KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -595,8 +595,8 @@ MACHINE_CONFIG_START(sf_state::sfus)
sfan(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sfus_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sfus_map)
MACHINE_CONFIG_END
@@ -604,8 +604,8 @@ MACHINE_CONFIG_START(sf_state::sfjp)
sfan(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sfjp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sfjp_map)
MACHINE_CONFIG_END
@@ -613,8 +613,8 @@ MACHINE_CONFIG_START(sf_state::sfp)
sfan(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sf_state, irq6_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sf_state, irq6_line_hold)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index f6d1521b08a..d76630455e0 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -1368,11 +1368,11 @@ void sfbonus_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(sfbonus_state::sfbonus)
- MCFG_CPU_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
- MCFG_CPU_PROGRAM_MAP(sfbonus_map)
- MCFG_CPU_IO_MAP(sfbonus_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sfbonus_state, irq0_line_hold)
- //MCFG_CPU_PERIODIC_INT_DRIVER(sfbonus_state, nmi_line_pulse, 100)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
+ MCFG_DEVICE_PROGRAM_MAP(sfbonus_map)
+ MCFG_DEVICE_IO_MAP(sfbonus_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sfbonus_state, irq0_line_hold)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(sfbonus_state, nmi_line_pulse, 100)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp
index 7b46130f3d5..2751ada8d9c 100644
--- a/src/mame/drivers/sfcbox.cpp
+++ b/src/mame/drivers/sfcbox.cpp
@@ -457,26 +457,26 @@ void sfcbox_state::machine_reset()
MACHINE_CONFIG_START(sfcbox_state::sfcbox)
/* base snes hardware */
- MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
- MCFG_CPU_PROGRAM_MAP(snes_map)
+ MCFG_DEVICE_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(snes_map)
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
- MCFG_CPU_PROGRAM_MAP(spc_mem)
+ MCFG_DEVICE_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
+ MCFG_DEVICE_PROGRAM_MAP(spc_mem)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
/* sfcbox hardware */
- MCFG_CPU_ADD("bios", Z180, XTAL(12'000'000) / 2) /* HD64180RF6X */
- MCFG_CPU_PROGRAM_MAP(sfcbox_map)
- MCFG_CPU_IO_MAP(sfcbox_io)
+ MCFG_DEVICE_ADD("bios", Z180, XTAL(12'000'000) / 2) /* HD64180RF6X */
+ MCFG_DEVICE_PROGRAM_MAP(sfcbox_map)
+ MCFG_DEVICE_IO_MAP(sfcbox_io)
MCFG_MB90082_ADD("mb90082",XTAL(12'000'000) / 2) /* TODO: correct clock */
MCFG_S3520CF_ADD("s3520cf") /* RTC */
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_DEVICE_ADD("spc700", SNES_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
@@ -490,7 +490,7 @@ MACHINE_CONFIG_START(sfcbox_state::sfcbox)
MCFG_SCREEN_UPDATE_DRIVER( snes_state, screen_update )
MCFG_DEVICE_ADD("ppu", SNES_PPU, 0)
- MCFG_SNES_PPU_OPENBUS_CB(READ8(snes_state, snes_open_bus_r))
+ MCFG_SNES_PPU_OPENBUS_CB(READ8(*this, snes_state, snes_open_bus_r))
MCFG_VIDEO_SET_SCREEN("screen")
// SFCBOX
diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp
index 00aa18f8301..5e959ea9066 100644
--- a/src/mame/drivers/sfkick.cpp
+++ b/src/mame/drivers/sfkick.cpp
@@ -595,31 +595,31 @@ WRITE_LINE_MEMBER(sfkick_state::irqhandler)
MACHINE_CONFIG_START(sfkick_state::sfkick)
- MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(sfkick_map)
- MCFG_CPU_IO_MAP(sfkick_io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80,MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(sfkick_map)
+ MCFG_DEVICE_IO_MAP(sfkick_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
- MCFG_CPU_ADD("soundcpu",Z80,MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(sfkick_sound_map)
- MCFG_CPU_IO_MAP(sfkick_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu",Z80,MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(sfkick_sound_map)
+ MCFG_DEVICE_IO_MAP(sfkick_sound_io_map)
MCFG_V9938_ADD("v9938", "screen", 0x80000, MASTER_CLOCK)
MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", MASTER_CLOCK)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(sfkick_state, ppi_port_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(sfkick_state, ppi_port_b_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sfkick_state, ppi_port_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, sfkick_state, ppi_port_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, sfkick_state, ppi_port_b_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sfkick_state, ppi_port_c_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/6)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(sfkick_state, irqhandler))
+ MCFG_DEVICE_ADD("ym1", YM2203, MASTER_CLOCK/6)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, sfkick_state, irqhandler))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp
index fe97d63b09a..a66a41fb001 100644
--- a/src/mame/drivers/sg1000.cpp
+++ b/src/mame/drivers/sg1000.cpp
@@ -529,9 +529,9 @@ void sf7000_state::machine_reset()
MACHINE_CONFIG_START(sg1000_state::sg1000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(sg1000_map)
- MCFG_CPU_IO_MAP(sg1000_io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(sg1000_map)
+ MCFG_DEVICE_IO_MAP(sg1000_io_map)
/* video hardware */
MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL(10'738'635) / 2 )
@@ -543,7 +543,7 @@ MACHINE_CONFIG_START(sg1000_state::sg1000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* expansion slot */
@@ -566,9 +566,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sg1000_state::omv)
sg1000(config);
- MCFG_CPU_MODIFY(Z80_TAG)
- MCFG_CPU_PROGRAM_MAP(omv_map)
- MCFG_CPU_IO_MAP(omv_io_map)
+ MCFG_DEVICE_MODIFY(Z80_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(omv_map)
+ MCFG_DEVICE_IO_MAP(omv_io_map)
MCFG_DEVICE_REMOVE(CARTSLOT_TAG)
MCFG_OMV_CARTRIDGE_ADD(CARTSLOT_TAG, sg1000_cart, nullptr)
@@ -583,9 +583,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sc3000_state::sc3000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3) // LH0080A
- MCFG_CPU_PROGRAM_MAP(sc3000_map)
- MCFG_CPU_IO_MAP(sc3000_io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3) // LH0080A
+ MCFG_DEVICE_PROGRAM_MAP(sc3000_map)
+ MCFG_DEVICE_IO_MAP(sc3000_io_map)
/* video hardware */
MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL(10'738'635) / 2 )
@@ -597,7 +597,7 @@ MACHINE_CONFIG_START(sc3000_state::sc3000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* sc3000 has all sk1100 features built-in, so add it as a fixed slot */
@@ -621,9 +621,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sf7000_state::sf7000)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(sf7000_map)
- MCFG_CPU_IO_MAP(sf7000_io_map)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(sf7000_map)
+ MCFG_DEVICE_IO_MAP(sf7000_io_map)
/* video hardware */
MCFG_DEVICE_ADD( TMS9918A_TAG, TMS9918A, XTAL(10'738'635) / 2 )
@@ -635,23 +635,23 @@ MACHINE_CONFIG_START(sf7000_state::sf7000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
MCFG_DEVICE_ADD(UPD9255_1_TAG, I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(sf7000_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sf7000_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, sf7000_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sf7000_state, ppi_pc_w))
MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UPD8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(UPD8251_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UPD8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(UPD8251_TAG, i8251_device, write_dsr))
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", sf7000_floppies, "3ssdd", sf7000_state::floppy_formats)
diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp
index 22c6e16dae6..b75bc0d402e 100644
--- a/src/mame/drivers/sg1000a.cpp
+++ b/src/mame/drivers/sg1000a.cpp
@@ -467,15 +467,15 @@ WRITE8_MEMBER(sg1000a_state::sg1000a_coin_counter_w)
MACHINE_CONFIG_START(sg1000a_state::sg1000a)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
MCFG_I8255_IN_PORTC_CB(IOPORT("DSW"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sg1000a_state, sg1000a_coin_counter_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sg1000a_state, sg1000a_coin_counter_w))
/* video hardware */
MCFG_DEVICE_ADD( "tms9928a", TMS9928A, XTAL(10'738'635) / 2 )
@@ -488,24 +488,24 @@ MACHINE_CONFIG_START(sg1000a_state::sg1000a)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("snsnd", SN76489A, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sg1000a_state::sg1000ax)
sg1000a(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5033, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sg1000a_state::sderby2s)
sg1000a(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(10'738'635) / 3)
- MCFG_CPU_IO_MAP(sderby2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(10'738'635) / 3)
+ MCFG_DEVICE_IO_MAP(sderby2_io_map)
// Actually uses a Sega 315-5066 chip, which is a TMS9918 and SN76489 in the same package but with RGB output
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp
index 5664c49e4c6..f5b2bb93b1c 100644
--- a/src/mame/drivers/sh4robot.cpp
+++ b/src/mame/drivers/sh4robot.cpp
@@ -68,7 +68,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sh4robot_state::sh4robot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH4LE, 200000000) // SH7750
+ MCFG_DEVICE_ADD("maincpu", SH4LE, 200000000) // SH7750
MCFG_SH4_MD0(1)
MCFG_SH4_MD1(0)
MCFG_SH4_MD2(1)
@@ -79,8 +79,8 @@ MACHINE_CONFIG_START(sh4robot_state::sh4robot)
MCFG_SH4_MD7(1)
MCFG_SH4_MD8(0)
MCFG_SH4_CLOCK(200000000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_CPU_FORCE_NO_DRC()
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp
index e321f19ba33..f70c0a75972 100644
--- a/src/mame/drivers/shadfrce.cpp
+++ b/src/mame/drivers/shadfrce.cpp
@@ -537,19 +537,19 @@ GFXDECODE_END
MACHINE_CONFIG_START(shadfrce_state::shadfrce)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(shadfrce_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000) / 2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(shadfrce_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", shadfrce_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(shadfrce_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(shadfrce_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */
MCFG_SCREEN_UPDATE_DRIVER(shadfrce_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(shadfrce_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shadfrce_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", shadfrce)
diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp
index 87ca8d70ca2..334c71753f9 100644
--- a/src/mame/drivers/shangha3.cpp
+++ b/src/mame/drivers/shangha3.cpp
@@ -451,9 +451,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(shangha3_state::shangha3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 48_MHz_XTAL/3) // TMP68HC000N-16
- MCFG_CPU_PROGRAM_MAP(shangha3_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 48_MHz_XTAL/3) // TMP68HC000N-16
+ MCFG_DEVICE_PROGRAM_MAP(shangha3_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -475,7 +475,7 @@ MACHINE_CONFIG_START(shangha3_state::shangha3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, 48_MHz_XTAL/32) // 1.5MHz
+ MCFG_DEVICE_ADD("aysnd", YM2149, 48_MHz_XTAL/32) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
@@ -488,13 +488,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shangha3_state::heberpop)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 48_MHz_XTAL/3) // TMP68HC000N-16 like the others??
- MCFG_CPU_PROGRAM_MAP(heberpop_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 48_MHz_XTAL/3) // TMP68HC000N-16 like the others??
+ MCFG_DEVICE_PROGRAM_MAP(heberpop_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 48_MHz_XTAL/8) /* 6 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(heberpop_sound_map)
- MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 48_MHz_XTAL/8) /* 6 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(heberpop_sound_map)
+ MCFG_DEVICE_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -519,7 +519,7 @@ MACHINE_CONFIG_START(shangha3_state::heberpop)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3438, 48_MHz_XTAL/6) /* 8 MHz? */
+ MCFG_DEVICE_ADD("ymsnd", YM3438, 48_MHz_XTAL/6) /* 8 MHz? */
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
@@ -532,13 +532,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shangha3_state::blocken)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 48_MHz_XTAL/3) // TMP68HC000N-16
- MCFG_CPU_PROGRAM_MAP(blocken_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, 48_MHz_XTAL/3) // TMP68HC000N-16
+ MCFG_DEVICE_PROGRAM_MAP(blocken_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, 48_MHz_XTAL/8) /* 6 MHz? */
- MCFG_CPU_PROGRAM_MAP(heberpop_sound_map)
- MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 48_MHz_XTAL/8) /* 6 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(heberpop_sound_map)
+ MCFG_DEVICE_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -563,7 +563,7 @@ MACHINE_CONFIG_START(shangha3_state::blocken)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3438, 48_MHz_XTAL/6) /* 8 MHz? */
+ MCFG_DEVICE_ADD("ymsnd", YM3438, 48_MHz_XTAL/6) /* 8 MHz? */
MCFG_YM2612_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp
index 1ac41f51b5e..d6222e1a98f 100644
--- a/src/mame/drivers/shanghai.cpp
+++ b/src/mame/drivers/shanghai.cpp
@@ -398,10 +398,10 @@ void shanghai_state::hd63484_map(address_map &map)
MACHINE_CONFIG_START(shanghai_state::shanghai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000)/2) /* NEC D70116C-8 */
- MCFG_CPU_PROGRAM_MAP(shanghai_map)
- MCFG_CPU_IO_MAP(shanghai_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", V30, XTAL(16'000'000)/2) /* NEC D70116C-8 */
+ MCFG_DEVICE_PROGRAM_MAP(shanghai_map)
+ MCFG_DEVICE_IO_MAP(shanghai_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -421,7 +421,7 @@ MACHINE_CONFIG_START(shanghai_state::shanghai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -434,10 +434,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shanghai_state::shangha2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000)/2) /* ? */
- MCFG_CPU_PROGRAM_MAP(shangha2_map)
- MCFG_CPU_IO_MAP(shangha2_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", V30, XTAL(16'000'000)/2) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(shangha2_map)
+ MCFG_DEVICE_IO_MAP(shangha2_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(shanghai_state::shangha2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -469,12 +469,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shanghai_state::kothello)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(kothello_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", V30, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(kothello_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shanghai_state, half_vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(kothello_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(kothello_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -497,8 +497,8 @@ MACHINE_CONFIG_START(shanghai_state::kothello)
MCFG_SPEAKER_STANDARD_MONO("mono")
/* same as standard seibu ym2203, but also reads "DSW" */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(16'000'000)/4)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
@@ -506,10 +506,10 @@ MACHINE_CONFIG_START(shanghai_state::kothello)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym2203_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2203_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym2203_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym2203_device, write))
- MCFG_SOUND_ADD("adpcm", SEIBU_ADPCM, 8000) // actually MSM5205
+ MCFG_DEVICE_ADD("adpcm", SEIBU_ADPCM, 8000) // actually MSM5205
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp
index 95ef35bdc6b..36755c29b85 100644
--- a/src/mame/drivers/shangkid.cpp
+++ b/src/mame/drivers/shangkid.cpp
@@ -378,27 +378,27 @@ void shangkid_state::sound_portmap(address_map &map)
MACHINE_CONFIG_START(shangkid_state::chinhero)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(chinhero_main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(chinhero_main_map)
- MCFG_CPU_ADD("bbx", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(chinhero_bbx_map)
- MCFG_CPU_IO_MAP(chinhero_bbx_portmap)
+ MCFG_DEVICE_ADD("bbx", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(chinhero_bbx_map)
+ MCFG_DEVICE_IO_MAP(chinhero_bbx_portmap)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(chinhero_sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(chinhero_sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(INPUTLINE("bbx", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // RESET2
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // RESET3
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(shangkid_state, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(shangkid_state, int_enable_1_w)) // INTE1
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(shangkid_state, int_enable_2_w)) // INTE2
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(shangkid_state, nmi_enable_1_w)) // NMIE1
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(shangkid_state, nmi_enable_2_w)) // NMIE2
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(shangkid_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(shangkid_state, coin_counter_2_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, shangkid_state, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, shangkid_state, int_enable_1_w)) // INTE1
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, shangkid_state, int_enable_2_w)) // INTE2
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, shangkid_state, nmi_enable_1_w)) // NMIE1
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, shangkid_state, nmi_enable_2_w)) // NMIE2
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, shangkid_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, shangkid_state, coin_counter_2_w))
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -410,8 +410,8 @@ MACHINE_CONFIG_START(shangkid_state::chinhero)
MCFG_SCREEN_VISIBLE_AREA(16, 319-16, 0, 223)
MCFG_SCREEN_UPDATE_DRIVER(shangkid_state, screen_update_shangkid)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(shangkid_state, irq_1_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(shangkid_state, irq_2_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shangkid_state, irq_1_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, shangkid_state, irq_2_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", chinhero)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
@@ -420,13 +420,13 @@ MACHINE_CONFIG_START(shangkid_state::chinhero)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shangkid_state, chinhero_ay8910_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shangkid_state, ay8910_portb_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, shangkid_state, chinhero_ay8910_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, shangkid_state, ay8910_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MACHINE_CONFIG_END
@@ -435,15 +435,15 @@ MACHINE_CONFIG_START(shangkid_state::shangkid)
chinhero(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(shangkid_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(shangkid_main_map)
- MCFG_CPU_MODIFY("bbx")
- MCFG_CPU_PROGRAM_MAP(shangkid_bbx_map)
- MCFG_CPU_IO_MAP(shangkid_bbx_portmap)
+ MCFG_DEVICE_MODIFY("bbx")
+ MCFG_DEVICE_PROGRAM_MAP(shangkid_bbx_map)
+ MCFG_DEVICE_IO_MAP(shangkid_bbx_portmap)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(shangkid_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(shangkid_sound_map)
MCFG_DEVICE_MODIFY("mainlatch")
// Q1 should *not* reset the AY-3-8910 here, or else banking writes will be lost!
@@ -455,9 +455,9 @@ MACHINE_CONFIG_START(shangkid_state::shangkid)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", shangkid)
- MCFG_SOUND_MODIFY("aysnd")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shangkid_state, shangkid_ay8910_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shangkid_state, ay8910_portb_w))
+ MCFG_DEVICE_MODIFY("aysnd")
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, shangkid_state, shangkid_ay8910_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, shangkid_state, ay8910_portb_w))
MACHINE_CONFIG_END
@@ -487,12 +487,12 @@ void shangkid_state::dynamski_portmap(address_map &map)
MACHINE_CONFIG_START(shangkid_state::dynamski)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(dynamski_map)
- MCFG_CPU_IO_MAP(dynamski_portmap)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(dynamski_map)
+ MCFG_DEVICE_IO_MAP(dynamski_portmap)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(shangkid_state, int_enable_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, shangkid_state, int_enable_1_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // screen flip?
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // screen flip?
@@ -504,7 +504,7 @@ MACHINE_CONFIG_START(shangkid_state::dynamski)
MCFG_SCREEN_VISIBLE_AREA(0, 255+32, 16, 255-16)
MCFG_SCREEN_UPDATE_DRIVER(shangkid_state, screen_update_dynamski)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(shangkid_state, irq_1_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, shangkid_state, irq_1_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", dynamski)
MCFG_PALETTE_ADD("palette", 16*4+16*4)
@@ -514,7 +514,7 @@ MACHINE_CONFIG_START(shangkid_state::dynamski)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp
index aa924427305..953668dc1fe 100644
--- a/src/mame/drivers/shaolins.cpp
+++ b/src/mame/drivers/shaolins.cpp
@@ -196,8 +196,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(shaolins_state::shaolins)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(shaolins_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(shaolins_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", shaolins_state, interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -218,10 +218,10 @@ MACHINE_CONFIG_START(shaolins_state::shaolins)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, MASTER_CLOCK/12) /* verified on pcb */
+ MCFG_DEVICE_ADD("sn1", SN76489A, MASTER_CLOCK/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76489A, MASTER_CLOCK/6) /* verified on pcb */
+ MCFG_DEVICE_ADD("sn2", SN76489A, MASTER_CLOCK/6) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -229,10 +229,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( shaolinb )
shaolins(config);
- MCFG_SOUND_REPLACE("sn1", SN76489, MASTER_CLOCK/12) /* only type verified on pcb */
+ MCFG_DEVICE_REPLACE("sn1", SN76489, MASTER_CLOCK/12) /* only type verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_REPLACE("sn2", SN76489, MASTER_CLOCK/6) /* only type verified on pcb */
+ MCFG_DEVICE_REPLACE("sn2", SN76489, MASTER_CLOCK/6) /* only type verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
#endif
diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp
index 0eb90bc92f4..0430b4cff29 100644
--- a/src/mame/drivers/shisen.cpp
+++ b/src/mame/drivers/shisen.cpp
@@ -216,17 +216,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(shisen_state::shisen)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */
- MCFG_CPU_PROGRAM_MAP(shisen_map)
- MCFG_CPU_IO_MAP(shisen_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shisen_state, irq0_line_hold)
-
- MCFG_CPU_ADD("soundcpu", Z80, 3579645)
- MCFG_CPU_PROGRAM_MAP(shisen_sound_map)
- MCFG_CPU_IO_MAP(shisen_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(shisen_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(shisen_map)
+ MCFG_DEVICE_IO_MAP(shisen_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shisen_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, 3579645)
+ MCFG_DEVICE_PROGRAM_MAP(shisen_sound_map)
+ MCFG_DEVICE_IO_MAP(shisen_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(shisen_state, nmi_line_pulse, 128*55) /* clocked by V1? (Vigilante) */
/* IRQs are generated by main Z80 and YM2151 */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -245,20 +245,20 @@ MACHINE_CONFIG_START(shisen_state::shisen)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
- MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
+ MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO)
MCFG_YM2151_ADD("ymsnd", 3579545)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shootaway2.cpp b/src/mame/drivers/shootaway2.cpp
index 07e97042578..0c1d2aed5e3 100644
--- a/src/mame/drivers/shootaway2.cpp
+++ b/src/mame/drivers/shootaway2.cpp
@@ -81,11 +81,11 @@ static INPUT_PORTS_START( m74 )
INPUT_PORTS_END
MACHINE_CONFIG_START(m74_state::m74)
- MCFG_CPU_ADD("maincpu", M37450, XTAL(8'000'000)) /* C68 @ 8.0MHz - main CPU */
- MCFG_CPU_PROGRAM_MAP(c68_map)
+ MCFG_DEVICE_ADD("maincpu", M37450, XTAL(8'000'000)) /* C68 @ 8.0MHz - main CPU */
+ MCFG_DEVICE_PROGRAM_MAP(c68_map)
- MCFG_CPU_ADD("subcpu", TMPZ84C011, XTAL(12'000'000) / 3) /* Z84C011 @ 4 MHz - sub CPU */
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("subcpu", TMPZ84C011, XTAL(12'000'000) / 3) /* Z84C011 @ 4 MHz - sub CPU */
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp
index fef4f6ed17e..353de8db649 100644
--- a/src/mame/drivers/shootout.cpp
+++ b/src/mame/drivers/shootout.cpp
@@ -279,11 +279,11 @@ void shootout_state::machine_reset ()
MACHINE_CONFIG_START(shootout_state::shootout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz?
- MCFG_CPU_PROGRAM_MAP(shootout_map)
+ MCFG_DEVICE_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz?
+ MCFG_DEVICE_PROGRAM_MAP(shootout_map)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000) / 8) // 1.5 MHz
- MCFG_CPU_PROGRAM_MAP(shootout_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, XTAL(12'000'000) / 8) // 1.5 MHz
+ MCFG_DEVICE_PROGRAM_MAP(shootout_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -303,7 +303,7 @@ MACHINE_CONFIG_START(shootout_state::shootout)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000) / 8) // 1.5 MHz
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000) / 8) // 1.5 MHz
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -312,8 +312,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(shootout_state::shootouj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
- MCFG_CPU_PROGRAM_MAP(shootouj_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
+ MCFG_DEVICE_PROGRAM_MAP(shootouj_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -333,10 +333,10 @@ MACHINE_CONFIG_START(shootout_state::shootouj)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000) / 8) // 1.5 MHz (Assuming the same XTAL as DE-0219 pcb)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000) / 8) // 1.5 MHz (Assuming the same XTAL as DE-0219 pcb)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(shootout_state, bankswitch_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(shootout_state, flipscreen_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, shootout_state, bankswitch_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, shootout_state, flipscreen_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -344,8 +344,8 @@ MACHINE_CONFIG_START(shootout_state::shootouk)
shootouj(config);
/* the Korean 'bootleg' has the usual DECO222 style encryption */
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
- MCFG_CPU_PROGRAM_MAP(shootouj_map)
+ MCFG_DEVICE_ADD("maincpu", DECO_222, XTAL(12'000'000) / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
+ MCFG_DEVICE_PROGRAM_MAP(shootouj_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp
index 337633c137b..4ab2fc3463e 100644
--- a/src/mame/drivers/shougi.cpp
+++ b/src/mame/drivers/shougi.cpp
@@ -373,22 +373,22 @@ INTERRUPT_GEN_MEMBER(shougi_state::vblank_nmi)
MACHINE_CONFIG_START(shougi_state::shougi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", shougi_state, vblank_nmi)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", shougi_state, vblank_nmi)
- MCFG_CPU_ADD("sub", Z80, XTAL(10'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(sub_map)
- MCFG_CPU_IO_MAP(readport_sub)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(10'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_IO_MAP(readport_sub)
MCFG_DEVICE_ADD("alpha_8201", ALPHA_8201, XTAL(10'000'000)/4/8)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // 0: sharedram = sub, 1: sharedram = main (TODO!)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(shougi_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, shougi_state, nmi_enable_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // ?
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("alpha_8201", alpha_8201_device, mcu_start_w)) // start/halt ALPHA-8201
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("alpha_8201", alpha_8201_device, bus_dir_w)) MCFG_DEVCB_INVERT // ALPHA-8201 shared RAM bus direction: 0: mcu, 1: maincpu
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("alpha_8201", alpha_8201_device, mcu_start_w)) // start/halt ALPHA-8201
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("alpha_8201", alpha_8201_device, bus_dir_w)) MCFG_DEVCB_INVERT // ALPHA-8201 shared RAM bus direction: 0: mcu, 1: maincpu
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // nothing? connected to +5v via resistor
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -411,7 +411,7 @@ MACHINE_CONFIG_START(shougi_state::shougi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(10'000'000)/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(10'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp
index c798fdf6e8e..97df211a941 100644
--- a/src/mame/drivers/shtzone.cpp
+++ b/src/mame/drivers/shtzone.cpp
@@ -99,8 +99,8 @@ uint32_t shtzone_state::screen_update_shtzone(screen_device &screen, bitmap_ind1
MACHINE_CONFIG_START(shtzone_state::shtzone)
/* basic machine hardware */
- MCFG_CPU_ADD("timercpu", Z80,10738000/4)
- MCFG_CPU_PROGRAM_MAP(shtzone_map)
+ MCFG_DEVICE_ADD("timercpu", Z80,10738000/4)
+ MCFG_DEVICE_PROGRAM_MAP(shtzone_map)
/* + SMS CPU */
diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp
index 1013b97fec1..2937247abd0 100644
--- a/src/mame/drivers/shuuz.cpp
+++ b/src/mame/drivers/shuuz.cpp
@@ -235,8 +235,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(shuuz_state::shuuz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -248,7 +248,7 @@ MACHINE_CONFIG_START(shuuz_state::shuuz)
MCFG_PALETTE_ADD("palette", 1024)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
- MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(shuuz_state, scanline_int_write_line))
+ MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(*this, shuuz_state, scanline_int_write_line))
MCFG_ATARI_VAD_PLAYFIELD(shuuz_state, "gfxdecode", get_playfield_tile_info)
MCFG_ATARI_VAD_MOB(shuuz_state::s_mob_config, "gfxdecode")
diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp
index 668791528ab..56f044a46ec 100644
--- a/src/mame/drivers/sidearms.cpp
+++ b/src/mame/drivers/sidearms.cpp
@@ -602,12 +602,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(sidearms_state::sidearms)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(sidearms_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(sidearms_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(sidearms_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(sidearms_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -620,7 +620,7 @@ MACHINE_CONFIG_START(sidearms_state::sidearms)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(sidearms_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sidearms)
@@ -633,14 +633,14 @@ MACHINE_CONFIG_START(sidearms_state::sidearms)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 4000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -651,12 +651,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sidearms_state::turtship)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(turtship_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(turtship_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(sidearms_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(sidearms_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -668,7 +668,7 @@ MACHINE_CONFIG_START(sidearms_state::turtship)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_UPDATE_DRIVER(sidearms_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -682,14 +682,14 @@ MACHINE_CONFIG_START(sidearms_state::turtship)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 4000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
@@ -699,14 +699,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sidearms_state::whizz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(whizz_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(whizz_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(whizz_sound_map)
- MCFG_CPU_IO_MAP(whizz_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(whizz_sound_map)
+ MCFG_DEVICE_IO_MAP(whizz_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sidearms_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(60000))
@@ -721,7 +721,7 @@ MACHINE_CONFIG_START(sidearms_state::whizz)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(8*8, (64-8)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(sidearms_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", turtship)
diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp
index 0599cf7bc8a..71fa6f1f04e 100644
--- a/src/mame/drivers/sidepckt.cpp
+++ b/src/mame/drivers/sidepckt.cpp
@@ -372,11 +372,11 @@ void sidepckt_state::machine_reset()
MACHINE_CONFIG_START(sidepckt_state::sidepckt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000) /* MC68B09EP, 2 MHz */
- MCFG_CPU_PROGRAM_MAP(sidepckt_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) /* MC68B09EP, 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sidepckt_map)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* 1.5 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* 1.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -398,10 +398,10 @@ MACHINE_CONFIG_START(sidepckt_state::sidepckt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ym1", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM3526, 3000000)
+ MCFG_DEVICE_ADD("ym2", YM3526, 3000000)
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -410,8 +410,8 @@ MACHINE_CONFIG_START(sidepckt_state::sidepcktb)
sidepckt(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sidepcktb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sidepcktb_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index fe592cd52e5..9ebe60f35c6 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -593,17 +593,17 @@ void sigmab52_state::machine_reset()
MACHINE_CONFIG_START(sigmab52_state::jwildb52)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(jwildb52_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(jwildb52_map)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(sound_prog_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sound_prog_map)
MCFG_DEVICE_ADD("6840ptm_1", PTM6840, XTAL(8'000'000)/4) // FIXME
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("6840ptm_2", PTM6840, XTAL(8'000'000)/8) // FIXME
- MCFG_PTM6840_IRQ_CB(WRITELINE(sigmab52_state, ptm2_irq))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, sigmab52_state, ptm2_irq))
MCFG_NVRAM_ADD_NO_FILL("nvram")
@@ -624,7 +624,7 @@ MACHINE_CONFIG_START(sigmab52_state::jwildb52)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 350620369c4..b9e434b7480 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -2834,10 +2834,10 @@ INTERRUPT_GEN_MEMBER(sigmab98_state::sigmab98_vblank_interrupt)
}
MACHINE_CONFIG_START(sigmab98_state::sigmab98)
- MCFG_CPU_ADD("maincpu", Z80, 10000000) // !! TAXAN KY-80, clock @X1? !!
- MCFG_CPU_PROGRAM_MAP(gegege_mem_map)
- MCFG_CPU_IO_MAP(gegege_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sigmab98_state, sigmab98_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 10000000) // !! TAXAN KY-80, clock @X1? !!
+ MCFG_DEVICE_PROGRAM_MAP(gegege_mem_map)
+ MCFG_DEVICE_IO_MAP(gegege_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sigmab98_state, sigmab98_vblank_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sigmab98)
@@ -2865,30 +2865,30 @@ MACHINE_CONFIG_START(sigmab98_state::sigmab98)
// sound hardware
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400) // clock @X2?
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400) // clock @X2?
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::dodghero)
sigmab98(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( dodghero_mem_map )
- MCFG_CPU_IO_MAP( dodghero_io_map )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( dodghero_mem_map )
+ MCFG_DEVICE_IO_MAP( dodghero_io_map )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::gegege)
sigmab98(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( gegege_mem_map )
- MCFG_CPU_IO_MAP( gegege_io_map )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( gegege_mem_map )
+ MCFG_DEVICE_IO_MAP( gegege_io_map )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::dashhero)
sigmab98(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( gegege_mem_map )
- MCFG_CPU_IO_MAP( dashhero_io_map )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( gegege_mem_map )
+ MCFG_DEVICE_IO_MAP( dashhero_io_map )
MCFG_DEVICE_REMOVE("nvram") // FIXME: does not survive between sessions otherwise
MACHINE_CONFIG_END
@@ -2917,9 +2917,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(lufykzku_state::lufykzku_irq)
}
MACHINE_CONFIG_START(lufykzku_state::lufykzku)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000) / 2) // !! TAXAN KY-80, clock @X1? !!
- MCFG_CPU_PROGRAM_MAP(lufykzku_mem_map)
- MCFG_CPU_IO_MAP(lufykzku_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(20'000'000) / 2) // !! TAXAN KY-80, clock @X1? !!
+ MCFG_DEVICE_PROGRAM_MAP(lufykzku_mem_map)
+ MCFG_DEVICE_IO_MAP(lufykzku_io_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", lufykzku_state, lufykzku_irq, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(lufykzku_state, lufykzku)
@@ -2933,11 +2933,11 @@ MACHINE_CONFIG_START(lufykzku_state::lufykzku)
// 2 x 8-bit parallel/serial converters
MCFG_TTL165_ADD("ttl165_1")
MCFG_TTL165_DATA_CB(IOPORT("DSW2"))
- MCFG_TTL165_QH_CB(DEVWRITELINE("ttl165_2", ttl165_device, serial_w))
+ MCFG_TTL165_QH_CB(WRITELINE("ttl165_2", ttl165_device, serial_w))
MCFG_TTL165_ADD("ttl165_2")
MCFG_TTL165_DATA_CB(IOPORT("DSW1"))
- MCFG_TTL165_QH_CB(WRITELINE(lufykzku_state, dsw_w))
+ MCFG_TTL165_QH_CB(WRITELINE(*this, lufykzku_state, dsw_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2987,9 +2987,9 @@ TIMER_DEVICE_CALLBACK_MEMBER(sigmab98_state::sammymdl_irq)
}
MACHINE_CONFIG_START(sigmab98_state::sammymdl)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000) / 2) // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !!
- MCFG_CPU_PROGRAM_MAP( animalc_map )
- MCFG_CPU_IO_MAP( animalc_io )
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(20'000'000) / 2) // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !!
+ MCFG_DEVICE_PROGRAM_MAP( animalc_map )
+ MCFG_DEVICE_IO_MAP( animalc_io )
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sigmab98_state, sammymdl_irq, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sammymdl )
@@ -3008,7 +3008,7 @@ MACHINE_CONFIG_START(sigmab98_state::sammymdl)
MCFG_SCREEN_SIZE(0x140, 0x100)
MCFG_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xf0-1)
MCFG_SCREEN_UPDATE_DRIVER(sigmab98_state, screen_update_sigmab98)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sigmab98_state, screen_vblank_sammymdl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sigmab98_state, screen_vblank_sammymdl))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sigmab98)
@@ -3028,16 +3028,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::animalc)
sammymdl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( animalc_map )
- MCFG_CPU_IO_MAP( animalc_io )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( animalc_map )
+ MCFG_DEVICE_IO_MAP( animalc_io )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::gocowboy)
sammymdl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( gocowboy_map )
- MCFG_CPU_IO_MAP( gocowboy_io )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( gocowboy_map )
+ MCFG_DEVICE_IO_MAP( gocowboy_io )
MCFG_DEVICE_REMOVE("hopper")
MCFG_TICKET_DISPENSER_ADD("hopper_small", attotime::from_msec(1000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW )
@@ -3046,30 +3046,30 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::haekaka)
sammymdl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( haekaka_map )
- MCFG_CPU_IO_MAP( haekaka_io )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( haekaka_map )
+ MCFG_DEVICE_IO_MAP( haekaka_io )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::itazuram)
sammymdl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( itazuram_map )
- MCFG_CPU_IO_MAP( itazuram_io )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( itazuram_map )
+ MCFG_DEVICE_IO_MAP( itazuram_io )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::pyenaget)
sammymdl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( haekaka_map )
- MCFG_CPU_IO_MAP( pyenaget_io )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( haekaka_map )
+ MCFG_DEVICE_IO_MAP( pyenaget_io )
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sigmab98_state::tdoboon)
sammymdl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( tdoboon_map )
- MCFG_CPU_IO_MAP( tdoboon_io )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( tdoboon_map )
+ MCFG_DEVICE_IO_MAP( tdoboon_io )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0,0x140-1, 0+4,0xf0+4-1)
diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp
index 2d90454a7bf..ca39f4c70e0 100644
--- a/src/mame/drivers/silkroad.cpp
+++ b/src/mame/drivers/silkroad.cpp
@@ -277,9 +277,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(silkroad_state::silkroad)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", silkroad_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(32'000'000)/2) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", silkroad_state, irq4_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index 4113782740e..03db675c98f 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -405,12 +405,12 @@ void silvmil_state::silvmil_sound_map(address_map &map)
MACHINE_CONFIG_START(silvmil_state::silvmil)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* Verified */
- MCFG_CPU_PROGRAM_MAP(silvmil_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", silvmil_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* Verified */
+ MCFG_DEVICE_PROGRAM_MAP(silvmil_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", silvmil_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'096'000)) /* Verified */
- MCFG_CPU_PROGRAM_MAP(silvmil_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'096'000)) /* Verified */
+ MCFG_DEVICE_PROGRAM_MAP(silvmil_sound_map)
/* video hardware */
@@ -448,8 +448,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(silvmil_state::puzzlove)
silvmil(config);
MCFG_DEVICE_REMOVE("audiocpu")
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) /* Verified */
- MCFG_CPU_PROGRAM_MAP(silvmil_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000)) /* Verified */
+ MCFG_DEVICE_PROGRAM_MAP(silvmil_sound_map)
MCFG_DEVICE_MODIFY("spritegen")
MCFG_DECO_SPRITE_BOOTLEG_TYPE(1)
diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp
index 0d7bf4007b5..54f71953d32 100644
--- a/src/mame/drivers/simpl156.cpp
+++ b/src/mame/drivers/simpl156.cpp
@@ -404,9 +404,9 @@ DECOSPR_PRIORITY_CB_MEMBER(simpl156_state::pri_callback)
MACHINE_CONFIG_START(simpl156_state::chainrec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */
- MCFG_CPU_PROGRAM_MAP(chainrec_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", simpl156_state, simpl156_vbl_interrupt)
+ MCFG_DEVICE_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */
+ MCFG_DEVICE_PROGRAM_MAP(chainrec_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", simpl156_state, simpl156_vbl_interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") // 93C45
@@ -461,32 +461,32 @@ MACHINE_CONFIG_START(simpl156_state::magdrop)
chainrec(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(magdrop_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(magdrop_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(simpl156_state::magdropp)
chainrec(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(magdropp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(magdropp_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(simpl156_state::joemacr)
chainrec(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(joemacr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(joemacr_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(simpl156_state::mitchell156)
chainrec(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mitchell156_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mitchell156_map)
MCFG_OKIM6295_REPLACE("okimusic", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
diff --git a/src/mame/drivers/simple_st0016.cpp b/src/mame/drivers/simple_st0016.cpp
index 591d2585d7c..b60e3af8fef 100644
--- a/src/mame/drivers/simple_st0016.cpp
+++ b/src/mame/drivers/simple_st0016.cpp
@@ -469,9 +469,9 @@ uint32_t st0016_state::screen_update_st0016(screen_device &screen, bitmap_ind16
MACHINE_CONFIG_START(st0016_state::st0016)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(st0016_mem)
- MCFG_CPU_IO_MAP(st0016_io)
+ MCFG_DEVICE_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(st0016_mem)
+ MCFG_DEVICE_IO_MAP(st0016_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", st0016_state, st0016_int, "screen", 0, 1)
/* video hardware */
@@ -490,17 +490,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(st0016_state::mayjinsn)
st0016(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(st0016_m2_io)
- MCFG_CPU_ADD("sub", V810, 10000000)//25 Mhz ?
- MCFG_CPU_PROGRAM_MAP(v810_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(st0016_m2_io)
+ MCFG_DEVICE_ADD("sub", V810, 10000000)//25 Mhz ?
+ MCFG_DEVICE_PROGRAM_MAP(v810_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(st0016_state::renju)
st0016(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(renju_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(renju_mem)
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index 20e08623ae4..05c54d23deb 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -324,13 +324,13 @@ INTERRUPT_GEN_MEMBER(simpsons_state::simpsons_irq)
MACHINE_CONFIG_START(simpsons_state::simpsons)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", simpsons_state, simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
- MCFG_KONAMICPU_LINE_CB(WRITE8(simpsons_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", simpsons_state, simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, simpsons_state, banking_callback))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(z80_map) /* NMIs are generated by the 053260 */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(z80_map) /* NMIs are generated by the 053260 */
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(simpsons_state::simpsons)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.0)
- MCFG_SOUND_ADD("k053260", K053260, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("k053260", K053260, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp
index 02d22b51964..ba81677ca23 100644
--- a/src/mame/drivers/sitcom.cpp
+++ b/src/mame/drivers/sitcom.cpp
@@ -349,11 +349,11 @@ void sitcom_timer_state::update_dac(uint8_t value)
MACHINE_CONFIG_START(sitcom_state::sitcom)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) // 3.072MHz can be used for an old slow 8085
- MCFG_CPU_PROGRAM_MAP(sitcom_mem)
- MCFG_CPU_IO_MAP(sitcom_io)
- MCFG_I8085A_SID(READLINE(sitcom_state, sid_line))
- MCFG_I8085A_SOD(WRITELINE(sitcom_state, sod_led))
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6.144_MHz_XTAL) // 3.072MHz can be used for an old slow 8085
+ MCFG_DEVICE_PROGRAM_MAP(sitcom_mem)
+ MCFG_DEVICE_IO_MAP(sitcom_io)
+ MCFG_I8085A_SID(READLINE(*this, sitcom_state, sid_line))
+ MCFG_I8085A_SOD(WRITELINE(*this, sitcom_state, sod_led))
MCFG_DEVICE_ADD("bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(sitcom_bank)
@@ -366,19 +366,19 @@ MACHINE_CONFIG_START(sitcom_state::sitcom)
MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", I8085_RST75_LINE))
MCFG_DEVICE_ADD("pia", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(sitcom_state, update_pia_pa))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(sitcom_state, update_pia_pb))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, sitcom_state, update_pia_pa))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, sitcom_state, update_pia_pb))
MCFG_I8255_IN_PORTC_CB(IOPORT("PORTC"))
// video hardware
MCFG_DEVICE_ADD("ds0", DL1414T, u32(0)) // left display
- MCFG_DL1414_UPDATE_HANDLER(WRITE16(sitcom_state, update_ds<0>))
+ MCFG_DL1414_UPDATE_HANDLER(WRITE16(*this, sitcom_state, update_ds<0>))
MCFG_DEVICE_ADD("ds1", DL1414T, u32(0)) // right display
- MCFG_DL1414_UPDATE_HANDLER(WRITE16(sitcom_state, update_ds<1>))
+ MCFG_DL1414_UPDATE_HANDLER(WRITE16(*this, sitcom_state, update_ds<1>))
// host interface
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(WRITELINE(sitcom_state, update_rxd))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, sitcom_state, update_rxd))
MCFG_SOFTWARE_LIST_ADD("bitb_list", "sitcom")
MCFG_DEFAULT_LAYOUT(layout_sitcom)
@@ -389,7 +389,7 @@ MACHINE_CONFIG_START(sitcom_timer_state::sitcomtmr)
sitcom(config);
MCFG_DEVICE_ADD("ds2", DL1414T, u32(0)) // remote display
- MCFG_DL1414_UPDATE_HANDLER(WRITE16(sitcom_timer_state, update_ds<2>))
+ MCFG_DL1414_UPDATE_HANDLER(WRITE16(*this, sitcom_timer_state, update_ds<2>))
MCFG_DEFAULT_LAYOUT(layout_sitcomtmr)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp
index b6bb4c1b0af..65f49f3c604 100644
--- a/src/mame/drivers/skeetsht.cpp
+++ b/src/mame/drivers/skeetsht.cpp
@@ -236,18 +236,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(skeetsht_state::skeetsht)
- MCFG_CPU_ADD("68hc11", MC68HC11, 4000000) // ?
- MCFG_CPU_PROGRAM_MAP(hc11_pgm_map)
- MCFG_CPU_IO_MAP(hc11_io_map)
+ MCFG_DEVICE_ADD("68hc11", MC68HC11, 4000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(hc11_pgm_map)
+ MCFG_DEVICE_IO_MAP(hc11_io_map)
MCFG_MC68HC11_CONFIG( 0, 0x100, 0x01 ) // And 512 bytes EEPROM? (68HC11A1)
- MCFG_CPU_ADD("tms", TMS34010, 48000000)
- MCFG_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_DEVICE_ADD("tms", TMS34010, 48000000)
+ MCFG_DEVICE_PROGRAM_MAP(tms_program_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(48000000 / 8) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(skeetsht_state, scanline_update) /* scanline updater (rgb32) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(skeetsht_state, tms_irq))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, skeetsht_state, tms_irq))
MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT)
@@ -258,7 +258,7 @@ MACHINE_CONFIG_START(skeetsht_state::skeetsht)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000) // ?
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp
index af758ee0551..d0e0015626d 100644
--- a/src/mame/drivers/skimaxx.cpp
+++ b/src/mame/drivers/skimaxx.cpp
@@ -500,22 +500,22 @@ void skimaxx_state::machine_reset()
*************************************/
MACHINE_CONFIG_START(skimaxx_state::skimaxx)
- MCFG_CPU_ADD("maincpu", M68EC030, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(m68030_1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", skimaxx_state, irq3_line_hold) // 1,3,7 are identical, rest is RTE
+ MCFG_DEVICE_ADD("maincpu", M68EC030, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(m68030_1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skimaxx_state, irq3_line_hold) // 1,3,7 are identical, rest is RTE
- MCFG_CPU_ADD("subcpu", M68EC030, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(m68030_2_map)
+ MCFG_DEVICE_ADD("subcpu", M68EC030, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(m68030_2_map)
/* video hardware */
- MCFG_CPU_ADD("tms", TMS34010, XTAL(50'000'000))
- MCFG_CPU_PROGRAM_MAP(tms_program_map)
+ MCFG_DEVICE_ADD("tms", TMS34010, XTAL(50'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tms_program_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(50000000/8) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_IND16_CB(skimaxx_state, scanline_update) /* scanline updater (indexed16) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(skimaxx_state, tms_irq))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, skimaxx_state, tms_irq))
MCFG_TMS340X0_TO_SHIFTREG_CB(skimaxx_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(skimaxx_state, from_shiftreg) /* read from shiftreg function */
diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp
index 457f1e84d68..92784992f3e 100644
--- a/src/mame/drivers/skullxbo.cpp
+++ b/src/mame/drivers/skullxbo.cpp
@@ -228,8 +228,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(skullxbo_state::skullxbo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD("scan_timer", skullxbo_state, scanline_timer)
@@ -255,7 +255,7 @@ MACHINE_CONFIG_START(skullxbo_state::skullxbo)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(skullxbo_state, screen_update_skullxbo)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(skullxbo_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, skullxbo_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp
index 4ec8c11f20c..7af8e738fc0 100644
--- a/src/mame/drivers/skyarmy.cpp
+++ b/src/mame/drivers/skyarmy.cpp
@@ -322,17 +322,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(skyarmy_state::skyarmy)
- MCFG_CPU_ADD("maincpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(skyarmy_map)
- MCFG_CPU_IO_MAP(skyarmy_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", skyarmy_state, irq0_line_hold)
- MCFG_CPU_PERIODIC_INT_DRIVER(skyarmy_state, nmi_source, 650) /* Hz */
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(skyarmy_map)
+ MCFG_DEVICE_IO_MAP(skyarmy_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skyarmy_state, irq0_line_hold)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(skyarmy_state, nmi_source, 650) /* Hz */
MCFG_DEVICE_ADD("latch", LS259, 0) // 11C
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(skyarmy_state, coin_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(skyarmy_state, nmi_enable_w)) // ???
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(skyarmy_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(skyarmy_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, skyarmy_state, coin_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, skyarmy_state, nmi_enable_w)) // ???
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, skyarmy_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, skyarmy_state, flip_screen_y_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // video RAM buffering?
/* video hardware */
@@ -350,9 +350,9 @@ MACHINE_CONFIG_START(skyarmy_state::skyarmy)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay0", AY8910, 2500000)
+ MCFG_DEVICE_ADD("ay0", AY8910, 2500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_SOUND_ADD("ay1", AY8910, 2500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 2500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp
index b29bf2ee3ff..08560baef22 100644
--- a/src/mame/drivers/skydiver.cpp
+++ b/src/mame/drivers/skydiver.cpp
@@ -350,37 +350,37 @@ GFXDECODE_END
MACHINE_CONFIG_START(skydiver_state::skydiver)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */
- MCFG_CPU_PROGRAM_MAP(skydiver_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(skydiver_state, interrupt, 5*60)
+ MCFG_DEVICE_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */
+ MCFG_DEVICE_PROGRAM_MAP(skydiver_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(skydiver_state, interrupt, 5*60)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8) // 128V clocks the same as VBLANK
MCFG_DEVICE_ADD("latch1", F9334, 0) // F12
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(skydiver_state, lamp_s_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(skydiver_state, lamp_k_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(skydiver_state, start_lamp_1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(skydiver_state, start_lamp_2_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(skydiver_state, lamp_y_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(skydiver_state, lamp_d_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SKYDIVER_SOUND_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, skydiver_state, lamp_s_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, skydiver_state, lamp_k_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, skydiver_state, start_lamp_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, skydiver_state, start_lamp_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, skydiver_state, lamp_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, skydiver_state, lamp_d_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SKYDIVER_SOUND_EN>))
MCFG_DEVICE_ADD("latch2", F9334, 0) // H12
- //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(skydiver_state, jump1_lamps_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(skydiver_state, coin_lockout_w))
- //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(skydiver_state, jump2_lamps_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SKYDIVER_WHISTLE1_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SKYDIVER_WHISTLE2_EN>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(skydiver_state, nmion_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(skydiver_state, width_w))
+ //MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, skydiver_state, jump1_lamps_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, skydiver_state, coin_lockout_w))
+ //MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, skydiver_state, jump2_lamps_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SKYDIVER_WHISTLE1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SKYDIVER_WHISTLE2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, skydiver_state, nmion_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, skydiver_state, width_w))
MCFG_DEVICE_ADD("latch3", F9334, 0) // A11
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(skydiver_state, lamp_i_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(skydiver_state, lamp_v_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(skydiver_state, lamp_e_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(skydiver_state, lamp_r_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SKYDIVER_OCT1_EN>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SKYDIVER_OCT2_EN>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SKYDIVER_NOISE_RST>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, skydiver_state, lamp_i_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, skydiver_state, lamp_v_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, skydiver_state, lamp_e_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, skydiver_state, lamp_r_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SKYDIVER_OCT1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SKYDIVER_OCT2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SKYDIVER_NOISE_RST>))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -399,7 +399,7 @@ MACHINE_CONFIG_START(skydiver_state::skydiver)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(skydiver)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp
index 5d68ab440fb..0a5a1e39c39 100644
--- a/src/mame/drivers/skyfox.cpp
+++ b/src/mame/drivers/skyfox.cpp
@@ -225,12 +225,12 @@ void skyfox_state::machine_reset()
MACHINE_CONFIG_START(skyfox_state::skyfox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* Verified at 4MHz */
- MCFG_CPU_PROGRAM_MAP(skyfox_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", skyfox_state, skyfox_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* Verified at 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(skyfox_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skyfox_state, skyfox_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
- MCFG_CPU_PROGRAM_MAP(skyfox_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
+ MCFG_DEVICE_PROGRAM_MAP(skyfox_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -250,10 +250,10 @@ MACHINE_CONFIG_START(skyfox_state::skyfox)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(14'318'181)/8) /* Verified at 1.789772MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp
index c707fb0c182..7ee7da6a659 100644
--- a/src/mame/drivers/skykid.cpp
+++ b/src/mame/drivers/skykid.cpp
@@ -436,12 +436,12 @@ WRITE_LINE_MEMBER(skykid_state::vblank_irq)
MACHINE_CONFIG_START(skykid_state::skykid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(skykid_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(skykid_map)
- MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* or compatible 6808 with extra instructions */
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_IO_MAP(mcu_port_map)
+ MCFG_DEVICE_ADD("mcu", HD63701, XTAL(49'152'000)/8) /* or compatible 6808 with extra instructions */
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_port_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* we need heavy synch */
@@ -455,7 +455,7 @@ MACHINE_CONFIG_START(skykid_state::skykid)
MCFG_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(skykid_state, screen_update_skykid)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(skykid_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, skykid_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", skykid)
MCFG_PALETTE_ADD("palette", 64*4+128*4+64*8)
@@ -465,7 +465,7 @@ MACHINE_CONFIG_START(skykid_state::skykid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, 49152000/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index d83c73f7a3f..4cbb51ddba3 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -1637,10 +1637,10 @@ INTERRUPT_GEN_MEMBER(skylncr_state::skylncr_vblank_interrupt)
MACHINE_CONFIG_START(skylncr_state::skylncr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(mem_map_skylncr)
- MCFG_CPU_IO_MAP(io_map_skylncr)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", skylncr_state, skylncr_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map_skylncr)
+ MCFG_DEVICE_IO_MAP(io_map_skylncr)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skylncr_state, skylncr_vblank_interrupt)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1677,7 +1677,7 @@ MACHINE_CONFIG_START(skylncr_state::skylncr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW3"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW4"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1687,8 +1687,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(skylncr_state::mbutrfly)
skylncr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(io_map_mbutrfly)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(io_map_mbutrfly)
MACHINE_CONFIG_END
@@ -1696,7 +1696,7 @@ MACHINE_CONFIG_START(skylncr_state::neraidou)
skylncr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_GFXDECODE_MODIFY("gfxdecode", neraidou)
MACHINE_CONFIG_END
@@ -1705,7 +1705,7 @@ MACHINE_CONFIG_START(skylncr_state::sstar97)
skylncr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_GFXDECODE_MODIFY("gfxdecode", sstar97)
MACHINE_CONFIG_END
@@ -1714,8 +1714,8 @@ MACHINE_CONFIG_START(skylncr_state::bdream97)
skylncr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(bdream97_opcode_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(bdream97_opcode_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", bdream97)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp
index 4117dc63bf7..58c86c78903 100644
--- a/src/mame/drivers/skyraid.cpp
+++ b/src/mame/drivers/skyraid.cpp
@@ -225,9 +225,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(skyraid_state::skyraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12096000 / 12)
- MCFG_CPU_PROGRAM_MAP(skyraid_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", skyraid_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 12)
+ MCFG_DEVICE_PROGRAM_MAP(skyraid_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", skyraid_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 4)
@@ -249,7 +249,7 @@ MACHINE_CONFIG_START(skyraid_state::skyraid)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(skyraid)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp
index eadd7350f00..d0d6c514c6e 100644
--- a/src/mame/drivers/slapfght.cpp
+++ b/src/mame/drivers/slapfght.cpp
@@ -892,19 +892,19 @@ GFXDECODE_END
MACHINE_CONFIG_START(slapfght_state::perfrman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/4) // 4MHz? XTAL is known, divider is guessed
- MCFG_CPU_PROGRAM_MAP(perfrman_map)
- MCFG_CPU_IO_MAP(io_map_nomcu)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/4) // 4MHz? XTAL is known, divider is guessed
+ MCFG_DEVICE_PROGRAM_MAP(perfrman_map)
+ MCFG_DEVICE_IO_MAP(io_map_nomcu)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(slapfght_state, sound_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(slapfght_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slapfght_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(slapfght_state, palette_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, slapfght_state, sound_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, slapfght_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, slapfght_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, slapfght_state, palette_bank_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/8) // 2MHz? XTAL is known, divider is guessed
- MCFG_CPU_PROGRAM_MAP(perfrman_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 240) // music speed, verified
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/8) // 2MHz? XTAL is known, divider is guessed
+ MCFG_DEVICE_PROGRAM_MAP(perfrman_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 240) // music speed, verified
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -917,8 +917,8 @@ MACHINE_CONFIG_START(slapfght_state::perfrman)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(slapfght_state, screen_update_perfrman)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(slapfght_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, slapfght_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", perfrman)
@@ -928,12 +928,12 @@ MACHINE_CONFIG_START(slapfght_state::perfrman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(16'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(16'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(16'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(16'000'000)/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -943,18 +943,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapfght_state::tigerh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(36'000'000)/6) // 6MHz
- MCFG_CPU_PROGRAM_MAP(tigerh_map_mcu)
- MCFG_CPU_IO_MAP(io_map_mcu)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(36'000'000)/6) // 6MHz
+ MCFG_DEVICE_PROGRAM_MAP(tigerh_map_mcu)
+ MCFG_DEVICE_IO_MAP(io_map_mcu)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(slapfght_state, sound_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(slapfght_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slapfght_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, slapfght_state, sound_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, slapfght_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, slapfght_state, irq_enable_w))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz
- MCFG_CPU_PROGRAM_MAP(tigerh_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 360) // music speed, verified with pcb recording
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz
+ MCFG_DEVICE_PROGRAM_MAP(tigerh_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 360) // music speed, verified with pcb recording
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU_TIGER, XTAL(36'000'000)/12) // 3MHz
@@ -969,8 +969,8 @@ MACHINE_CONFIG_START(slapfght_state::tigerh)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8-1, 32*8-1-1)
MCFG_SCREEN_UPDATE_DRIVER(slapfght_state, screen_update_slapfight)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(slapfght_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, slapfght_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapfght)
@@ -980,12 +980,12 @@ MACHINE_CONFIG_START(slapfght_state::tigerh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(36'000'000)/24) // 1.5MHz
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(36'000'000)/24) // 1.5MHz
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -995,9 +995,9 @@ MACHINE_CONFIG_START(slapfght_state::tigerhb1)
tigerh(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tigerhb1_map)
- MCFG_CPU_IO_MAP(io_map_nomcu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tigerhb1_map)
+ MCFG_DEVICE_IO_MAP(io_map_nomcu)
MCFG_DEVICE_REMOVE("bmcu")
MACHINE_CONFIG_END
@@ -1006,30 +1006,30 @@ MACHINE_CONFIG_START(slapfght_state::tigerhb2)
tigerhb1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tigerhb2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tigerhb2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapfght_state::slapfigh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(36'000'000)/6) // 6MHz
- MCFG_CPU_PROGRAM_MAP(slapfigh_map_mcu)
- MCFG_CPU_IO_MAP(io_map_mcu)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(36'000'000)/6) // 6MHz
+ MCFG_DEVICE_PROGRAM_MAP(slapfigh_map_mcu)
+ MCFG_DEVICE_IO_MAP(io_map_mcu)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(slapfght_state, sound_reset_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(slapfght_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slapfght_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, slapfght_state, sound_reset_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, slapfght_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, slapfght_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(MEMBANK("bank1"))
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz
- MCFG_CPU_PROGRAM_MAP(tigerh_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 180)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(36'000'000)/12) // 3MHz
+ MCFG_DEVICE_PROGRAM_MAP(tigerh_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(slapfght_state, sound_nmi, 180)
MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, XTAL(36'000'000)/12) // 3MHz
- MCFG_TAITO_M68705_AUX_STROBE_CB(WRITE8(slapfght_state, scroll_from_mcu_w))
+ MCFG_TAITO_M68705_AUX_STROBE_CB(WRITE8(*this, slapfght_state, scroll_from_mcu_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1042,8 +1042,8 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(1*8, 36*8-1, 2*8-1, 32*8-1-1)
MCFG_SCREEN_UPDATE_DRIVER(slapfght_state, screen_update_slapfight)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(slapfght_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, slapfght_state, vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapfght)
@@ -1053,12 +1053,12 @@ MACHINE_CONFIG_START(slapfght_state::slapfigh)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(36'000'000)/24) // 1.5MHz
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(36'000'000)/24) // 1.5MHz
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(36'000'000)/24) // 1.5MHz
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -1068,9 +1068,9 @@ MACHINE_CONFIG_START(slapfght_state::slapfighb1)
slapfigh(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(slapfighb1_map)
- MCFG_CPU_IO_MAP(io_map_nomcu)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(slapfighb1_map)
+ MCFG_DEVICE_IO_MAP(io_map_nomcu)
MCFG_DEVICE_REMOVE("bmcu")
MACHINE_CONFIG_END
@@ -1079,25 +1079,25 @@ MACHINE_CONFIG_START(slapfght_state::slapfighb2)
slapfighb1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(slapfighb2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(slapfighb2_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapfght_state::getstarb1)
slapfighb1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(getstarb1_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(getstarb1_io_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapfght_state::getstarb2)
slapfighb1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(getstar_map)
- MCFG_CPU_IO_MAP(getstarb2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(getstar_map)
+ MCFG_DEVICE_IO_MAP(getstarb2_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp
index ee0c571fdf4..c0866427229 100644
--- a/src/mame/drivers/slapshot.cpp
+++ b/src/mame/drivers/slapshot.cpp
@@ -444,12 +444,12 @@ void slapshot_state::machine_start()
MACHINE_CONFIG_START(slapshot_state::slapshot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
- MCFG_CPU_PROGRAM_MAP(slapshot_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", slapshot_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
+ MCFG_DEVICE_PROGRAM_MAP(slapshot_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", slapshot_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(opwolf3_z80_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -457,7 +457,7 @@ MACHINE_CONFIG_START(slapshot_state::slapshot)
MCFG_TC0640FIO_READ_1_CB(IOPORT("COINS"))
MCFG_TC0640FIO_READ_2_CB(IOPORT("BUTTONS"))
MCFG_TC0640FIO_READ_3_CB(IOPORT("SYSTEM"))
- MCFG_TC0640FIO_WRITE_4_CB(WRITE8(slapshot_state, coin_control_w))
+ MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, slapshot_state, coin_control_w))
MCFG_TC0640FIO_READ_7_CB(IOPORT("JOY"))
/* video hardware */
@@ -467,7 +467,7 @@ MACHINE_CONFIG_START(slapshot_state::slapshot)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(slapshot_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(slapshot_state, screen_vblank_taito_no_buffer))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, slapshot_state, screen_vblank_taito_no_buffer))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapshot)
@@ -488,7 +488,7 @@ MACHINE_CONFIG_START(slapshot_state::slapshot)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -505,12 +505,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(slapshot_state::opwolf3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
- MCFG_CPU_PROGRAM_MAP(opwolf3_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", slapshot_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
+ MCFG_DEVICE_PROGRAM_MAP(opwolf3_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", slapshot_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(opwolf3_z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,32000000/8) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(opwolf3_z80_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -525,7 +525,7 @@ MACHINE_CONFIG_START(slapshot_state::opwolf3)
MCFG_TC0640FIO_READ_1_CB(IOPORT("COINS"))
MCFG_TC0640FIO_READ_2_CB(IOPORT("BUTTONS"))
MCFG_TC0640FIO_READ_3_CB(IOPORT("SYSTEM"))
- MCFG_TC0640FIO_WRITE_4_CB(WRITE8(slapshot_state, coin_control_w))
+ MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, slapshot_state, coin_control_w))
MCFG_TC0640FIO_READ_7_CB(IOPORT("JOY"))
/* video hardware */
@@ -535,7 +535,7 @@ MACHINE_CONFIG_START(slapshot_state::opwolf3)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(slapshot_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(slapshot_state, screen_vblank_taito_no_buffer))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, slapshot_state, screen_vblank_taito_no_buffer))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", slapshot)
@@ -556,7 +556,7 @@ MACHINE_CONFIG_START(slapshot_state::opwolf3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp
index ee7b30464b6..98b272a4fa2 100644
--- a/src/mame/drivers/slc1.cpp
+++ b/src/mame/drivers/slc1.cpp
@@ -270,16 +270,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(slc1_state::slc1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2500000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2500000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_slc1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sleic.cpp b/src/mame/drivers/sleic.cpp
index 09aa81bd0a5..94a15fafd7c 100644
--- a/src/mame/drivers/sleic.cpp
+++ b/src/mame/drivers/sleic.cpp
@@ -69,8 +69,8 @@ DRIVER_INIT_MEMBER(sleic_state,sleic)
MACHINE_CONFIG_START(sleic_state::sleic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8088, 8000000)
- MCFG_CPU_PROGRAM_MAP(sleic_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(sleic_map)
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp
index 0187d05b858..5b3f9bd1fef 100644
--- a/src/mame/drivers/slicer.cpp
+++ b/src/mame/drivers/slicer.cpp
@@ -90,45 +90,45 @@ static void slicer_floppies(device_slot_interface &device)
}
MACHINE_CONFIG_START(slicer_state::slicer)
- MCFG_CPU_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(slicer_map)
- MCFG_CPU_IO_MAP(slicer_io)
+ MCFG_DEVICE_ADD("maincpu", I80186, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(slicer_map)
+ MCFG_DEVICE_IO_MAP(slicer_io)
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
- MCFG_MC68681_IRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int0_w))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("rs232_1", rs232_port_device, write_txd))
- MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("rs232_2", rs232_port_device, write_txd))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(slicer_state, sio_out_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int0_w))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("rs232_1", rs232_port_device, write_txd))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE("rs232_2", rs232_port_device, write_txd))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, slicer_state, sio_out_w))
- MCFG_RS232_PORT_ADD("rs232_1", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_a_w))
- MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_b_w))
+ MCFG_DEVICE_ADD("rs232_1", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w))
+ MCFG_DEVICE_ADD("rs232_2", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_b_w))
MCFG_FD1797_ADD("fdc", XTAL(16'000'000)/2/8)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int1_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, int1_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("maincpu", i80186_cpu_device, drq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", slicer_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", slicer_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:2", slicer_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:3", slicer_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("drivelatch", LS259, 0) // U29
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("sasi", scsi_port_device, write_sel))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("sasi", scsi_port_device, write_rst))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(slicer_state, drive_sel_w<3>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(slicer_state, drive_sel_w<2>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(slicer_state, drive_sel_w<1>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(slicer_state, drive_sel_w<0>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("fdc", fd1797_device, dden_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("sasi", scsi_port_device, write_sel))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("sasi", scsi_port_device, write_rst))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, slicer_state, drive_sel_w<3>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, slicer_state, drive_sel_w<2>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, slicer_state, drive_sel_w<1>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, slicer_state, drive_sel_w<0>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("fdc", fd1797_device, dden_w))
MCFG_DEVICE_ADD("sasi", SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in")
- MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit3))
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit4))
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit5))
- MCFG_SCSI_REQ_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit6))
- MCFG_SCSI_IO_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit7))
+ MCFG_SCSI_BSY_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit3))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit4))
+ MCFG_SCSI_CD_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit5))
+ MCFG_SCSI_REQ_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit6))
+ MCFG_SCSI_IO_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit7))
MCFG_SCSI_OUTPUT_LATCH_ADD("sasi_data_out", "sasi")
MCFG_DEVICE_ADD("sasi_data_in", INPUT_BUFFER, 0)
diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp
index 84cb7905203..caec805b802 100644
--- a/src/mame/drivers/sliver.cpp
+++ b/src/mame/drivers/sliver.cpp
@@ -514,16 +514,16 @@ TIMER_DEVICE_CALLBACK_MEMBER ( sliver_state::obj_irq_cb )
}
MACHINE_CONFIG_START(sliver_state::sliver)
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(sliver_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sliver_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(sliver_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sliver_state, irq4_line_hold)
MCFG_TIMER_DRIVER_ADD_PERIODIC("obj_actel", sliver_state, obj_irq_cb, attotime::from_hz(60)) /* unknown clock, causes "obj actel ready error" without this */
// irq 2 valid but not used?
- MCFG_CPU_ADD("audiocpu", I8051, 8000000)
- MCFG_CPU_PROGRAM_MAP(soundmem_prg)
- MCFG_CPU_IO_MAP(soundmem_io)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(sliver_state, oki_setbank))
+ MCFG_DEVICE_ADD("audiocpu", I8051, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(soundmem_prg)
+ MCFG_DEVICE_IO_MAP(soundmem_io)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, sliver_state, oki_setbank))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp
index 286798e6947..d947c8e06e7 100644
--- a/src/mame/drivers/slotcarn.cpp
+++ b/src/mame/drivers/slotcarn.cpp
@@ -543,9 +543,9 @@ void slotcarn_state::machine_start()
MACHINE_CONFIG_START(slotcarn_state::slotcarn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz?
- MCFG_CPU_PROGRAM_MAP(slotcarn_map)
- MCFG_CPU_IO_MAP(spielbud_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz?
+ MCFG_DEVICE_PROGRAM_MAP(slotcarn_map)
+ MCFG_DEVICE_IO_MAP(spielbud_io_map)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -569,7 +569,7 @@ MACHINE_CONFIG_START(slotcarn_state::slotcarn)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(slotcarn_state, crtc_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(slotcarn_state, crtc_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(slotcarn_state, hsync_changed))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, slotcarn_state, hsync_changed))
MCFG_MC6845_OUT_VSYNC_CB(INPUTLINE("maincpu", 0))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", slotcarn)
@@ -578,7 +578,7 @@ MACHINE_CONFIG_START(slotcarn_state::slotcarn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd",AY8910, SND_CLOCK)
+ MCFG_DEVICE_ADD("aysnd",AY8910, SND_CLOCK)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp
index f2d48c5ae90..dd11f354d91 100644
--- a/src/mame/drivers/sm1800.cpp
+++ b/src/mame/drivers/sm1800.cpp
@@ -160,11 +160,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(sm1800_state::sm1800)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(sm1800_mem)
- MCFG_CPU_IO_MAP(sm1800_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sm1800_state, sm1800_vblank_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(sm1800_state,sm1800_irq_callback)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sm1800_mem)
+ MCFG_DEVICE_IO_MAP(sm1800_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sm1800_state, sm1800_vblank_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(sm1800_state,sm1800_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -180,10 +180,10 @@ MACHINE_CONFIG_START(sm1800_state::sm1800)
/* Devices */
MCFG_DEVICE_ADD("i8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(sm1800_state, sm1800_8255_porta_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(sm1800_state, sm1800_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(sm1800_state, sm1800_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sm1800_state, sm1800_8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, sm1800_state, sm1800_8255_porta_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, sm1800_state, sm1800_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, sm1800_state, sm1800_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sm1800_state, sm1800_8255_portc_w))
MCFG_DEVICE_ADD("i8275", I8275, 2000000)
MCFG_I8275_CHARACTER_WIDTH(8)
diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp
index c08ec66df36..9202a559cb0 100644
--- a/src/mame/drivers/sm7238.cpp
+++ b/src/mame/drivers/sm7238.cpp
@@ -361,10 +361,10 @@ PALETTE_INIT_MEMBER(sm7238_state, sm7238)
}
MACHINE_CONFIG_START(sm7238_state::sm7238)
- MCFG_CPU_ADD("maincpu", I8080, 16.5888_MHz_XTAL/9)
- MCFG_CPU_PROGRAM_MAP(sm7238_mem)
- MCFG_CPU_IO_MAP(sm7238_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, 16.5888_MHz_XTAL/9)
+ MCFG_DEVICE_PROGRAM_MAP(sm7238_mem)
+ MCFG_DEVICE_IO_MAP(sm7238_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("videobank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(videobank_map)
@@ -377,7 +377,7 @@ MACHINE_CONFIG_START(sm7238_state::sm7238)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(20.625_MHz_XTAL, KSM_TOTAL_HORZ, 0, KSM_DISP_HORZ, KSM_TOTAL_VERT, 0, KSM_DISP_VERT);
MCFG_SCREEN_UPDATE_DRIVER(sm7238_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("pic8259", pic8259_device, ir2_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("pic8259", pic8259_device, ir2_w))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 3)
@@ -389,49 +389,49 @@ MACHINE_CONFIG_START(sm7238_state::sm7238)
MCFG_DEVICE_ADD("t_hblank", PIT8253, 0)
MCFG_PIT8253_CLK1(16.384_MHz_XTAL/9) // XXX workaround -- keyboard is slower and doesn't sync otherwise
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(sm7238_state, write_keyboard_clock))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, sm7238_state, write_keyboard_clock))
MCFG_DEVICE_ADD("t_vblank", PIT8253, 0)
MCFG_PIT8253_CLK2(16.5888_MHz_XTAL/9)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sm7238_state, write_printer_clock))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, sm7238_state, write_printer_clock))
MCFG_DEVICE_ADD("t_color", PIT8253, 0)
MCFG_DEVICE_ADD("t_iface", PIT8253, 0)
MCFG_PIT8253_CLK1(16.5888_MHz_XTAL/9)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_txc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("i8251line", i8251_device, write_txc))
MCFG_PIT8253_CLK2(16.5888_MHz_XTAL/9)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("i8251line", i8251_device, write_rxc))
// serial connection to host
MCFG_DEVICE_ADD("i8251line", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir1_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir1_w))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251line", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("i8251line", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251line", i8251_device, write_dsr))
// serial connection to KM-035 keyboard
MCFG_DEVICE_ADD("i8251kbd", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", km035_device, write_rxd))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("keyboard", km035_device, write_rxd))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir3_w))
MCFG_DEVICE_ADD("keyboard", KM035, 0)
- MCFG_KM035_TX_HANDLER(DEVWRITELINE("i8251kbd", i8251_device, write_rxd))
- MCFG_KM035_RTS_HANDLER(DEVWRITELINE("i8251kbd", i8251_device, write_cts))
+ MCFG_KM035_TX_HANDLER(WRITELINE("i8251kbd", i8251_device, write_rxd))
+ MCFG_KM035_RTS_HANDLER(WRITELINE("i8251kbd", i8251_device, write_cts))
// serial connection to printer
MCFG_DEVICE_ADD("i8251prn", I8251, 0)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("pic8259", pic8259_device, ir3_w))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("pic8259", pic8259_device, ir3_w))
- MCFG_RS232_PORT_ADD("prtr", default_rs232_devices, 0)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251prn", i8251_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("i8251prn", i8251_device, write_cts))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251prn", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("prtr", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251prn", i8251_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("i8251prn", i8251_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251prn", i8251_device, write_dsr))
MACHINE_CONFIG_END
ROM_START( sm7238 )
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index 919fa1aabe6..4be386bcb5c 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -1024,10 +1024,10 @@ static void smc777_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(smc777_state::smc777)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(smc777_mem)
- MCFG_CPU_IO_MAP(smc777_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", smc777_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu",Z80, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(smc777_mem)
+ MCFG_DEVICE_IO_MAP(smc777_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", smc777_state, vblank_irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1049,8 +1049,8 @@ MACHINE_CONFIG_START(smc777_state::smc777)
// floppy controller
MCFG_MB8876_ADD("fdc", XTAL(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(smc777_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(smc777_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, smc777_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, smc777_state, fdc_drq_w))
// does it really support 16 of them?
MCFG_FLOPPY_DRIVE_ADD("fdc:0", smc777_floppies, "ssdd", floppy_image_device::default_floppy_formats)
@@ -1062,10 +1062,10 @@ MACHINE_CONFIG_START(smc777_state::smc777)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489A, MASTER_CLOCK) // unknown clock / divider
+ MCFG_DEVICE_ADD("sn1", SN76489A, MASTER_CLOCK) // unknown clock / divider
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("beeper", BEEP, 300) // TODO: correct frequency
+ MCFG_DEVICE_ADD("beeper", BEEP, 300) // TODO: correct frequency
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", smc777_state, keyboard_callback, attotime::from_hz(240/32))
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp
index 4bb8bbcc9c9..423f0b378f4 100644
--- a/src/mame/drivers/sms.cpp
+++ b/src/mame/drivers/sms.cpp
@@ -506,24 +506,24 @@ MACHINE_CONFIG_START(sms_state::sms_base)
MCFG_SOFTWARE_LIST_ADD("cart_list","sms")
MCFG_SMS_CONTROL_PORT_ADD(CONTROL1_TAG, sms_control_port_devices, "joypad")
- MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_state, sms_ctrl1_th_input))
- MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color))
+ MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_state, sms_ctrl1_th_input))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_state, sms_pixel_color))
MCFG_SMS_CONTROL_PORT_ADD(CONTROL2_TAG, sms_control_port_devices, "joypad")
- MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_state, sms_ctrl2_th_input))
- MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color))
+ MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_state, sms_ctrl2_th_input))
+ MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(*this, sms_state, sms_pixel_color))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms_ntsc_base)
sms_base(config);
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(sms_mem)
- MCFG_CPU_IO_MAP(sms_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(sms_mem)
+ MCFG_DEVICE_IO_MAP(sms_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* actually, PSG is embedded in the VDP chip */
- MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -586,15 +586,15 @@ MACHINE_CONFIG_START(sms_state::sms2_ntsc)
MCFG_SEGA315_5246_SET_SCREEN("screen")
MCFG_SEGA315_5246_IS_PAL(false)
MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms1_ntsc)
sms_ntsc_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -609,7 +609,7 @@ MACHINE_CONFIG_START(sms_state::sms1_ntsc)
MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(XTAL(10'738'635)/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1))
MCFG_DEFAULT_LAYOUT(layout_sms1)
@@ -620,7 +620,7 @@ MACHINE_CONFIG_START(sms_state::sms1_ntsc)
MCFG_SEGA315_5124_SET_SCREEN("screen")
MCFG_SEGA315_5124_IS_PAL(false)
MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
// card and expansion slots, not present in Master System II
MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr)
@@ -631,12 +631,12 @@ MACHINE_CONFIG_START(smssdisp_state::sms_sdisp)
sms1_ntsc(config);
MCFG_DEVICE_MODIFY("sms_vdp")
- MCFG_SEGA315_5124_INT_CB(WRITELINE(smssdisp_state, sms_store_int_callback))
+ MCFG_SEGA315_5124_INT_CB(WRITELINE(*this, smssdisp_state, sms_store_int_callback))
- MCFG_CPU_ADD("control", Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(sms_store_mem)
+ MCFG_DEVICE_ADD("control", Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(sms_store_mem)
/* Both CPUs seem to communicate with the VDP etc? */
- MCFG_CPU_IO_MAP(sms_io)
+ MCFG_DEVICE_IO_MAP(sms_io)
MCFG_DEVICE_REMOVE("mycard")
MCFG_DEVICE_REMOVE("smsexp")
@@ -678,14 +678,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms_pal_base)
sms_base(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PAL/15)
- MCFG_CPU_PROGRAM_MAP(sms_mem)
- MCFG_CPU_IO_MAP(sms_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_PAL/15)
+ MCFG_DEVICE_PROGRAM_MAP(sms_mem)
+ MCFG_DEVICE_IO_MAP(sms_io)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
/* actually, PSG is embedded in the VDP chip */
- MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PAL/15)
+ MCFG_DEVICE_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PAL/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -701,14 +701,14 @@ MACHINE_CONFIG_START(sms_state::sms2_pal)
MCFG_SEGA315_5246_SET_SCREEN("screen")
MCFG_SEGA315_5246_IS_PAL(true)
MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms1_pal)
sms_pal_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -723,7 +723,7 @@ MACHINE_CONFIG_START(sms_state::sms1_pal)
MCFG_SCREEN_SMS_PAL_RAW_PARAMS(MASTER_CLOCK_PAL/10)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1))
MCFG_DEFAULT_LAYOUT(layout_sms1)
@@ -734,7 +734,7 @@ MACHINE_CONFIG_START(sms_state::sms1_pal)
MCFG_SEGA315_5124_SET_SCREEN("screen")
MCFG_SEGA315_5124_IS_PAL(true)
MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
// card and expansion slots, not present in Master System II
MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr)
@@ -745,14 +745,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms_paln_base)
sms_base(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PALN/3)
- MCFG_CPU_PROGRAM_MAP(sms_mem)
- MCFG_CPU_IO_MAP(sms_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_PALN/3)
+ MCFG_DEVICE_PROGRAM_MAP(sms_mem)
+ MCFG_DEVICE_IO_MAP(sms_io)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
/* actually, PSG is embedded in the VDP chip */
- MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALN/3)
+ MCFG_DEVICE_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALN/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -768,14 +768,14 @@ MACHINE_CONFIG_START(sms_state::sms3_paln)
MCFG_SEGA315_5246_SET_SCREEN("screen")
MCFG_SEGA315_5246_IS_PAL(true)
MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms1_paln)
sms_paln_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -790,7 +790,7 @@ MACHINE_CONFIG_START(sms_state::sms1_paln)
MCFG_SCREEN_SMS_PAL_RAW_PARAMS(MASTER_CLOCK_PALN/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1))
MCFG_DEFAULT_LAYOUT(layout_sms1)
@@ -801,7 +801,7 @@ MACHINE_CONFIG_START(sms_state::sms1_paln)
MCFG_SEGA315_5124_SET_SCREEN("screen")
MCFG_SEGA315_5124_IS_PAL(true)
MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
// card and expansion slots, not present in Tec Toy Master System III
MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr)
@@ -812,15 +812,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms_br_base)
sms_base(config);
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_PALM/3)
- MCFG_CPU_PROGRAM_MAP(sms_mem)
- MCFG_CPU_IO_MAP(sms_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_PALM/3)
+ MCFG_DEVICE_PROGRAM_MAP(sms_mem)
+ MCFG_DEVICE_IO_MAP(sms_io)
// PAL-M has near the same frequency of NTSC
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* actually, PSG is embedded in the VDP chip */
- MCFG_SOUND_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALM/3)
+ MCFG_DEVICE_ADD("segapsg", SEGAPSG, MASTER_CLOCK_PALM/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -836,14 +836,14 @@ MACHINE_CONFIG_START(sms_state::sms3_br)
MCFG_SEGA315_5246_SET_SCREEN("screen")
MCFG_SEGA315_5246_IS_PAL(false) // PAL-M has same line count of NTSC
MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms1_br)
sms_br_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sms1_mem) // This adds the SegaScope handlers for 3-D glasses
/* video hardware */
// PAL-M height/width parameters are the same of NTSC screens.
@@ -859,7 +859,7 @@ MACHINE_CONFIG_START(sms_state::sms1_br)
MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(MASTER_CLOCK_PALM/2)
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sms_state, screen_vblank_sms1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1))
MCFG_DEFAULT_LAYOUT(layout_sms1)
@@ -870,7 +870,7 @@ MACHINE_CONFIG_START(sms_state::sms1_br)
MCFG_SEGA315_5124_SET_SCREEN("screen")
MCFG_SEGA315_5124_IS_PAL(false) // PAL-M has same line count of NTSC
MCFG_SEGA315_5124_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5124_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
// card and expansion slots, not present in Tec Toy Master System III
MCFG_SMS_CARD_ADD("mycard", sms_cart, nullptr)
@@ -880,8 +880,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms2_kr)
sms2_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(smskr_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(smskr_io)
MCFG_DEVICE_REMOVE("slot")
MCFG_SG1000MK3_CARTRIDGE_ADD("slot", sg1000mk3_cart, nullptr)
@@ -890,8 +890,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sms1_kr)
sms1_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(smskr_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(smskr_io)
// need to replace the cartridge slot with the Japanese version, so to
// keep the usual media order, remove and reinsert all of them.
@@ -905,15 +905,15 @@ MACHINE_CONFIG_START(sms_state::sms1_kr)
MCFG_SOFTWARE_LIST_ADD("cart_list2","sg1000")
MCFG_DEVICE_MODIFY("sms_vdp")
- MCFG_SEGA315_5124_CSYNC_CB(WRITELINE(sms_state, sms_csync_callback))
+ MCFG_SEGA315_5124_CSYNC_CB(WRITELINE(*this, sms_state, sms_csync_callback))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::smsj)
sms1_kr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(smsj_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(smsj_io)
- MCFG_SOUND_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/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 the Mark III FM Unit.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -921,8 +921,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::sg1000m3)
sms1_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(sg1000m3_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(sg1000m3_io)
// Remove and reinsert all media slots, as done with the sms1_kr config,
// and also replace the expansion slot with the SG-1000 version.
@@ -944,9 +944,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sms_state::gamegear)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_GG/9)
- MCFG_CPU_PROGRAM_MAP(sms_mem)
- MCFG_CPU_IO_MAP(gg_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK_GG/9)
+ MCFG_DEVICE_PROGRAM_MAP(sms_mem)
+ MCFG_DEVICE_IO_MAP(gg_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -965,13 +965,13 @@ MACHINE_CONFIG_START(sms_state::gamegear)
MCFG_SEGA315_5378_SET_SCREEN("screen")
MCFG_SEGA315_5378_IS_PAL(false)
MCFG_SEGA315_5378_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5378_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5378_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
/* actually, PSG is embedded in the VDP chip */
- MCFG_SOUND_ADD("gamegear", GAMEGEAR, MASTER_CLOCK_GG/9)
+ MCFG_DEVICE_ADD("gamegear", GAMEGEAR, MASTER_CLOCK_GG/9)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
@@ -981,9 +981,9 @@ MACHINE_CONFIG_START(sms_state::gamegear)
MCFG_SOFTWARE_LIST_ADD("cart_list", "gamegear")
MCFG_GG_EXT_PORT_ADD("ext", gg_ext_port_devices, nullptr)
- MCFG_GG_EXT_PORT_TH_INPUT_HANDLER(WRITELINE(sms_state, gg_ext_th_input))
+ MCFG_GG_EXT_PORT_TH_INPUT_HANDLER(WRITELINE(*this, sms_state, gg_ext_th_input))
// only for GG-TV mod (may be simulated with a driver modified with SMS screen settings)
- //MCFG_GG_EXT_PORT_PIXEL_HANDLER(READ32(sms_state, sms_pixel_color))
+ //MCFG_GG_EXT_PORT_PIXEL_HANDLER(READ32(*this, sms_state, sms_pixel_color))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp
index 07a578aa747..5c441f4ddcb 100644
--- a/src/mame/drivers/sms_bootleg.cpp
+++ b/src/mame/drivers/sms_bootleg.cpp
@@ -275,9 +275,9 @@ void smsbootleg_state::sms_supergame_io(address_map &map)
MACHINE_CONFIG_START(smsbootleg_state::sms_supergame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635)/3)
- MCFG_CPU_PROGRAM_MAP(sms_supergame_map)
- MCFG_CPU_IO_MAP(sms_supergame_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635)/3)
+ MCFG_DEVICE_PROGRAM_MAP(sms_supergame_map)
+ MCFG_DEVICE_IO_MAP(sms_supergame_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -287,7 +287,7 @@ MACHINE_CONFIG_START(smsbootleg_state::sms_supergame)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3)
+ MCFG_DEVICE_ADD("segapsg", SEGAPSG, XTAL(10'738'635)/3)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SCREEN_ADD("screen", RASTER)
@@ -301,7 +301,7 @@ MACHINE_CONFIG_START(smsbootleg_state::sms_supergame)
MCFG_SEGA315_5246_SET_SCREEN("screen")
MCFG_SEGA315_5246_IS_PAL(false)
MCFG_SEGA315_5246_INT_CB(INPUTLINE("maincpu", 0))
- MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(sms_state, sms_pause_callback))
+ MCFG_SEGA315_5246_PAUSE_CB(WRITELINE(*this, sms_state, sms_pause_callback))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index 37f11e1e3d7..54c464a26ef 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -542,18 +542,18 @@ void smsmfg_state::machine_reset()
}
MACHINE_CONFIG_START(smsmfg_state::sms)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sms_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sms_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(smsmfg_state, ppi0_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(smsmfg_state, ppi0_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(smsmfg_state, ppi0_c_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, smsmfg_state, ppi0_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, smsmfg_state, ppi0_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, smsmfg_state, ppi0_c_r))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -576,15 +576,15 @@ MACHINE_CONFIG_START(smsmfg_state::sms)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(16'000'000)/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(16'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(smsmfg_state::sureshot)
sms(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sureshot_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sureshot_map)
MCFG_MACHINE_START_OVERRIDE(smsmfg_state,sureshot)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp
index e84729717f0..1b22ef8a599 100644
--- a/src/mame/drivers/snes.cpp
+++ b/src/mame/drivers/snes.cpp
@@ -1334,12 +1334,12 @@ void snes_console_state::machine_reset()
MACHINE_CONFIG_START(snes_console_state::snes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68 MHz, also 3.58 MHz */
- MCFG_CPU_PROGRAM_MAP(snes_map)
+ MCFG_DEVICE_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68 MHz, also 3.58 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(snes_map)
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
- MCFG_CPU_PROGRAM_MAP(spc_map)
+ MCFG_DEVICE_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
+ MCFG_DEVICE_PROGRAM_MAP(spc_map)
//MCFG_QUANTUM_TIME(attotime::from_hz(48000))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1350,7 +1350,7 @@ MACHINE_CONFIG_START(snes_console_state::snes)
MCFG_SCREEN_UPDATE_DRIVER( snes_state, screen_update )
MCFG_DEVICE_ADD("ppu", SNES_PPU, 0)
- MCFG_SNES_PPU_OPENBUS_CB(READ8(snes_state, snes_open_bus_r))
+ MCFG_SNES_PPU_OPENBUS_CB(READ8(*this, snes_state, snes_open_bus_r))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SNES_CONTROL_PORT_ADD("ctrl1", snes_control_port_devices, "joypad")
@@ -1361,7 +1361,7 @@ MACHINE_CONFIG_START(snes_console_state::snes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_DEVICE_ADD("spc700", SNES_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
@@ -1373,8 +1373,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snes_console_state::snespal)
snes(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_CLOCK( MCLK_PAL )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_CLOCK( MCLK_PAL )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(DOTCLK_PAL, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_PAL, 0, SNES_SCR_HEIGHT_PAL)
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index 06da68016be..09a0015a52d 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -697,13 +697,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(snesb_state::kinstb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
- MCFG_CPU_PROGRAM_MAP(snesb_map)
+ MCFG_DEVICE_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
+ MCFG_DEVICE_PROGRAM_MAP(snesb_map)
/* audio CPU */
// runs at 24.576 MHz / 12 = 2.048 MHz
- MCFG_CPU_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
- MCFG_CPU_PROGRAM_MAP(spc_mem)
+ MCFG_DEVICE_ADD("soundcpu", SPC700, XTAL(24'576'000) / 12)
+ MCFG_DEVICE_PROGRAM_MAP(spc_mem)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -713,12 +713,12 @@ MACHINE_CONFIG_START(snesb_state::kinstb)
MCFG_SCREEN_UPDATE_DRIVER( snes_state, screen_update )
MCFG_DEVICE_ADD("ppu", SNES_PPU, 0)
- MCFG_SNES_PPU_OPENBUS_CB(READ8(snes_state, snes_open_bus_r))
+ MCFG_SNES_PPU_OPENBUS_CB(READ8(*this, snes_state, snes_open_bus_r))
MCFG_VIDEO_SET_SCREEN("screen")
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("spc700", SNES, 0)
+ MCFG_DEVICE_ADD("spc700", SNES_SOUND)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
@@ -731,8 +731,8 @@ void snesb_state::mcu_io_map(address_map &map)
MACHINE_CONFIG_START(snesb_state::mk3snes)
kinstb(config);
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp
index 1a409eaa9b9..743dfd43d19 100644
--- a/src/mame/drivers/snk.cpp
+++ b/src/mame/drivers/snk.cpp
@@ -3650,18 +3650,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(snk_state::marvins)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */
- MCFG_CPU_PROGRAM_MAP(marvins_cpuA_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(marvins_cpuA_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 3360000) /* 3.36 MHz */
- MCFG_CPU_PROGRAM_MAP(marvins_cpuB_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 3360000) /* 3.36 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(marvins_cpuB_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
- MCFG_CPU_PROGRAM_MAP(marvins_sound_map)
- MCFG_CPU_IO_MAP(marvins_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(snk_state, nmi_line_assert, 244) // schematics show a separate 244Hz timer
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* verified on schematics */
+ MCFG_DEVICE_PROGRAM_MAP(marvins_sound_map)
+ MCFG_DEVICE_IO_MAP(marvins_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(snk_state, nmi_line_assert, 244) // schematics show a separate 244Hz timer
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3686,10 +3686,10 @@ MACHINE_CONFIG_START(snk_state::marvins)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000) /* verified on schematics */
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000) /* verified on schematics */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000) /* verified on schematics */
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000) /* verified on schematics */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MCFG_SNKWAVE_ADD("wave", 8000000) /* verified on schematics */
@@ -3701,11 +3701,11 @@ MACHINE_CONFIG_START(snk_state::vangrd2)
marvins(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(madcrash_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(madcrash_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(madcrash_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(madcrash_cpuB_map)
MACHINE_CONFIG_END
@@ -3713,29 +3713,29 @@ MACHINE_CONFIG_START(snk_state::madcrush)
marvins(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(madcrush_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(madcrush_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(madcrush_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(madcrush_cpuB_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::jcross)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3350000) /* NOT verified */
- MCFG_CPU_PROGRAM_MAP(jcross_cpuA_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3350000) /* NOT verified */
+ MCFG_DEVICE_PROGRAM_MAP(jcross_cpuA_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 3350000) /* NOT verified */
- MCFG_CPU_PROGRAM_MAP(jcross_cpuB_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 3350000) /* NOT verified */
+ MCFG_DEVICE_PROGRAM_MAP(jcross_cpuB_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* NOT verified */
- MCFG_CPU_PROGRAM_MAP(jcross_sound_map)
- MCFG_CPU_IO_MAP(jcross_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(snk_state, irq0_line_assert, 244) // Marvin's frequency, sounds ok
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* NOT verified */
+ MCFG_DEVICE_PROGRAM_MAP(jcross_sound_map)
+ MCFG_DEVICE_IO_MAP(jcross_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(snk_state, irq0_line_assert, 244) // Marvin's frequency, sounds ok
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3760,10 +3760,10 @@ MACHINE_CONFIG_START(snk_state::jcross)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000) /* NOT verified */
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000) /* NOT verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MCFG_SOUND_ADD("ay2", AY8910, 2000000) /* NOT verified */
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000) /* NOT verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
@@ -3772,11 +3772,11 @@ MACHINE_CONFIG_START(snk_state::sgladiat)
jcross(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sgladiat_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sgladiat_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(sgladiat_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(sgladiat_cpuB_map)
/* video hardware */
/* visible area is correct. Debug info is shown in the black bars at the sides
@@ -3790,16 +3790,16 @@ MACHINE_CONFIG_START(snk_state::hal21)
jcross(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hal21_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hal21_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(hal21_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(hal21_cpuB_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(hal21_sound_map)
- MCFG_CPU_IO_MAP(hal21_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(snk_state, irq0_line_hold, 220) // music tempo, hand tuned
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(hal21_sound_map)
+ MCFG_DEVICE_IO_MAP(hal21_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(snk_state, irq0_line_hold, 220) // music tempo, hand tuned
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(snk_state,hal21)
@@ -3809,16 +3809,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::tnk3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(13'400'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tnk3_cpuA_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'400'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tnk3_cpuA_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(13'400'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tnk3_cpuB_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(13'400'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tnk3_cpuB_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tnk3_YM3526_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tnk3_YM3526_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3843,8 +3843,8 @@ MACHINE_CONFIG_START(snk_state::tnk3)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
+ MCFG_DEVICE_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3853,14 +3853,14 @@ MACHINE_CONFIG_START(snk_state::aso)
tnk3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(aso_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(aso_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(aso_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(aso_cpuB_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(aso_YM3526_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(aso_YM3526_sound_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(snk_state,aso)
@@ -3871,12 +3871,12 @@ MACHINE_CONFIG_START(snk_state::athena)
tnk3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(YM3526_YM3526_sound_map)
/* sound hardware */
- MCFG_SOUND_ADD("ym2", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
+ MCFG_DEVICE_ADD("ym2", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3885,13 +3885,13 @@ MACHINE_CONFIG_START(snk_state::fitegolf)
tnk3(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
+ MCFG_DEVICE_MODIFY("audiocpu")
// xtal is 4MHz instead of 8MHz/2 but the end result is the same
- MCFG_CPU_PROGRAM_MAP(YM3812_sound_map)
+ MCFG_DEVICE_PROGRAM_MAP(YM3812_sound_map)
/* sound hardware */
- MCFG_SOUND_REPLACE("ym1", YM3812, XTAL(4'000'000)) /* verified on pcb */
- MCFG_YM3812_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
+ MCFG_DEVICE_REPLACE("ym1", YM3812, XTAL(4'000'000)) /* verified on pcb */
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3905,16 +3905,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::ikari)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(13'400'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(ikari_cpuA_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'400'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(ikari_cpuA_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(13'400'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(ikari_cpuB_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(13'400'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(ikari_cpuB_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(YM3526_YM3526_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -3938,12 +3938,12 @@ MACHINE_CONFIG_START(snk_state::ikari)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
+ MCFG_DEVICE_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MCFG_SOUND_ADD("ym2", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
+ MCFG_DEVICE_ADD("ym2", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3952,12 +3952,12 @@ MACHINE_CONFIG_START(snk_state::victroad)
ikari(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(YM3526_Y8950_sound_map)
/* sound hardware */
- MCFG_SOUND_REPLACE("ym2", Y8950, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_Y8950_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
+ MCFG_DEVICE_REPLACE("ym2", Y8950, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_Y8950_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -3965,16 +3965,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::bermudat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(bermudat_cpuA_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(bermudat_cpuA_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(bermudat_cpuB_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(bermudat_cpuB_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(YM3526_Y8950_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(24000))
@@ -3996,12 +3996,12 @@ MACHINE_CONFIG_START(snk_state::bermudat)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
+ MCFG_DEVICE_ADD("ym1", YM3526, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MCFG_SOUND_ADD("ym2", Y8950, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_Y8950_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
+ MCFG_DEVICE_ADD("ym2", Y8950, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_Y8950_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MACHINE_CONFIG_END
@@ -4018,11 +4018,11 @@ MACHINE_CONFIG_START(snk_state::gwar)
bermudat(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gwar_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gwar_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(gwar_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(gwar_cpuB_map)
MACHINE_CONFIG_END
@@ -4031,11 +4031,11 @@ MACHINE_CONFIG_START(snk_state::gwara)
bermudat(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gwara_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gwara_cpuA_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(gwara_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(gwara_cpuB_map)
MACHINE_CONFIG_END
@@ -4043,15 +4043,15 @@ MACHINE_CONFIG_START(snk_state::chopper1)
bermudat(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(gwar_cpuB_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(gwar_cpuB_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(YM3812_Y8950_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(YM3812_Y8950_sound_map)
/* sound hardware */
- MCFG_SOUND_REPLACE("ym1", YM3812, 4000000)
- MCFG_YM3812_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
+ MCFG_DEVICE_REPLACE("ym1", YM3812, 4000000)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4060,24 +4060,24 @@ MACHINE_CONFIG_START(snk_state::choppera)
chopper1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gwar_cpuA_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gwar_cpuA_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk_state::tdfever)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(tdfever_cpuA_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(tdfever_cpuA_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(tdfever_cpuB_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(tdfever_cpuB_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(YM3526_Y8950_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -4101,12 +4101,12 @@ MACHINE_CONFIG_START(snk_state::tdfever)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM3526, 4000000)
- MCFG_YM3526_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_1))
+ MCFG_DEVICE_ADD("ym1", YM3526, 4000000)
+ MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym2", Y8950, 4000000)
- MCFG_Y8950_IRQ_HANDLER(WRITELINE(snk_state, ymirq_callback_2))
+ MCFG_DEVICE_ADD("ym2", Y8950, 4000000)
+ MCFG_Y8950_IRQ_HANDLER(WRITELINE(*this, snk_state, ymirq_callback_2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4115,8 +4115,8 @@ MACHINE_CONFIG_START(snk_state::tdfever2)
tdfever(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(Y8950_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(Y8950_sound_map)
/* sound hardware */
diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp
index 3db13e11ee0..4e5be7d07e4 100644
--- a/src/mame/drivers/snk6502.cpp
+++ b/src/mame/drivers/snk6502.cpp
@@ -836,9 +836,9 @@ MACHINE_RESET_MEMBER(snk6502_state,pballoon)
MACHINE_CONFIG_START(snk6502_state::sasuke)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz
- MCFG_CPU_PROGRAM_MAP(sasuke_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk6502_state, satansat_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz
+ MCFG_DEVICE_PROGRAM_MAP(sasuke_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk6502_state, satansat_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,sasuke)
@@ -867,16 +867,16 @@ MACHINE_CONFIG_START(snk6502_state::sasuke)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snk6502", SNK6502, 0)
+ MCFG_DEVICE_ADD("snk6502", SNK6502, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(sasuke_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("sn76477.1", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477.1", SN76477)
// ic48 GND: 2,22,26,27,28 +5V: 1,15,25
MCFG_SN76477_NOISE_PARAMS(RES_K(470), RES_K(150), CAP_P(4700)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(22)) // decay_res
@@ -893,7 +893,7 @@ MACHINE_CONFIG_START(snk6502_state::sasuke)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn76477.2", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477.2", SN76477)
// ic51 GND: 2,26,27 +5V: 1,15,22,25,28
MCFG_SN76477_NOISE_PARAMS(RES_K(340), RES_K(47), CAP_P(100)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(470)) // decay_res
@@ -910,7 +910,7 @@ MACHINE_CONFIG_START(snk6502_state::sasuke)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn76477.3", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477.3", SN76477)
// ic52 GND: 2,22,27,28 +5V: 1,15,25,26
MCFG_SN76477_NOISE_PARAMS(RES_K(330), RES_K(47), CAP_P(100)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(1)) // decay_res
@@ -931,8 +931,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk6502_state::satansat)
sasuke(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(satansat_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(satansat_map)
MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,satansat)
@@ -940,12 +940,12 @@ MACHINE_CONFIG_START(snk6502_state::satansat)
MCFG_GFXDECODE_MODIFY("gfxdecode", satansat)
// sound hardware
- MCFG_SOUND_MODIFY("samples")
+ MCFG_DEVICE_MODIFY("samples")
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(vanguard_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_REPLACE("sn76477.1", SN76477, 0)
+ MCFG_DEVICE_REPLACE("sn76477.1", SN76477, 0)
// ??? GND: 2,26,27 +5V: 15,25
MCFG_SN76477_NOISE_PARAMS(RES_K(470), RES_M(1.5), CAP_P(220)) // noise + filter
MCFG_SN76477_DECAY_RES(0) // decay_res
@@ -969,10 +969,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk6502_state::vanguard)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // adjusted using common divisor
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 16) // adjusted using common divisor
- MCFG_CPU_PROGRAM_MAP(vanguard_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk6502_state, snk6502_interrupt)
+ MCFG_DEVICE_PROGRAM_MAP(vanguard_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk6502_state, snk6502_interrupt)
MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,vanguard)
@@ -999,15 +999,15 @@ MACHINE_CONFIG_START(snk6502_state::vanguard)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snk6502", SNK6502, 0)
+ MCFG_DEVICE_ADD("snk6502", SNK6502, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(vanguard_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("sn76477.1", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477.1", SN76477)
// SHOT A GND: 2,9,26,27 +5V: 15,25
MCFG_SN76477_NOISE_PARAMS(RES_K(470), RES_M(1.5), CAP_P(220)) // noise + filter
MCFG_SN76477_DECAY_RES(0) // decay_res
@@ -1024,7 +1024,7 @@ MACHINE_CONFIG_START(snk6502_state::vanguard)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn76477.2", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477.2", SN76477)
// SHOT B GND: 1,2,26,27 +5V: 15,25,28
MCFG_SN76477_NOISE_PARAMS(RES_K(10), RES_K(30), 0) // noise + filter
MCFG_SN76477_DECAY_RES(0) // decay_res
@@ -1045,16 +1045,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk6502_state::fantasy)
vanguard(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(fantasy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(fantasy_map)
// sound hardware
- MCFG_SOUND_MODIFY("samples")
+ MCFG_DEVICE_MODIFY("samples")
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(fantasy_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_REPLACE("sn76477.1", SN76477, 0)
+ MCFG_DEVICE_REPLACE("sn76477.1", SN76477, 0)
// BOMB GND: 2,9,26,27 +5V: 15,25
MCFG_SN76477_NOISE_PARAMS(RES_K(470), RES_M(1.5), CAP_P(220)) // noise + filter
MCFG_SN76477_DECAY_RES(0) // decay_res
@@ -1073,7 +1073,7 @@ MACHINE_CONFIG_START(snk6502_state::fantasy)
MCFG_SN76477_ENABLE(0) // enable
MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(fantasy)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
@@ -1090,8 +1090,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk6502_state::pballoon)
nibbler(config);
// basic machine hardware
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pballoon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pballoon_map)
MCFG_MACHINE_RESET_OVERRIDE(snk6502_state,pballoon)
diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp
index c312f5386ca..f6206161edd 100644
--- a/src/mame/drivers/snk68.cpp
+++ b/src/mame/drivers/snk68.cpp
@@ -595,13 +595,13 @@ void snk68_state::tile_callback_notpow(int &tile, int& fx, int& fy, int& region)
MACHINE_CONFIG_START(snk68_state::pow)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(18'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(pow_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snk68_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(18'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(pow_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snk68_state, irq1_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -626,11 +626,11 @@ MACHINE_CONFIG_START(snk68_state::pow)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(8'000'000)/2) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -643,8 +643,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snk68_state::searchar)
streetsm(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(searchar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(searchar_map)
MCFG_VIDEO_START_OVERRIDE(snk68_state,searchar)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp
index ef251605849..800c3d3baf5 100644
--- a/src/mame/drivers/snookr10.cpp
+++ b/src/mame/drivers/snookr10.cpp
@@ -1043,8 +1043,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(snookr10_state::snookr10)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */
- MCFG_CPU_PROGRAM_MAP(snookr10_map)
+ MCFG_DEVICE_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */
+ MCFG_DEVICE_PROGRAM_MAP(snookr10_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1074,7 +1074,7 @@ MACHINE_CONFIG_START(snookr10_state::apple10)
snookr10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1087,8 +1087,8 @@ MACHINE_CONFIG_START(snookr10_state::tenballs)
snookr10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tenballs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tenballs_map)
MACHINE_CONFIG_END
@@ -1096,8 +1096,8 @@ MACHINE_CONFIG_START(snookr10_state::crystalc)
snookr10(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(crystalc_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(crystalc_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(snookr10_state, crystalc)
diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp
index e3513bd67a5..ef1b44654c2 100644
--- a/src/mame/drivers/snowbros.cpp
+++ b/src/mame/drivers/snowbros.cpp
@@ -1727,14 +1727,14 @@ MACHINE_RESET_MEMBER(snowbros_state,finalttr)
MACHINE_CONFIG_START(snowbros_state::snowbros)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 Mhz - confirmed */
- MCFG_CPU_PROGRAM_MAP(snowbros_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* 8 Mhz - confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(snowbros_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(12'000'000)/2) /* 6 MHz - confirmed */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(12'000'000)/2) /* 6 MHz - confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1743,7 +1743,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbros)
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(snowbros_state, screen_update_snowbros)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(snowbros_state, screen_vblank_snowbros))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, snowbros_state, screen_vblank_snowbros))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", snowbros)
@@ -1761,7 +1761,7 @@ MACHINE_CONFIG_START(snowbros_state::snowbros)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000)/4) /* 3 MHz - confirmed */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(12'000'000)/4) /* 3 MHz - confirmed */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1771,9 +1771,9 @@ MACHINE_CONFIG_START(snowbros_state::wintbob)
snowbros(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(10000000) /* 10mhz - Confirmed */
- MCFG_CPU_PROGRAM_MAP(wintbob_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(10000000) /* 10mhz - Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(wintbob_map)
MCFG_DEVICE_REMOVE("pandora")
@@ -1789,13 +1789,13 @@ MACHINE_CONFIG_START(snowbros_state::semicom)
snowbros(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(12'000'000)) /* 12MHz - Confirmed */
- MCFG_CPU_PROGRAM_MAP(hyperpac_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(12'000'000)) /* 12MHz - Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(hyperpac_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_CLOCK(XTAL(16'000'000)/4) /* 4MHz - Confirmed */
- MCFG_CPU_PROGRAM_MAP(hyperpac_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_CLOCK(XTAL(16'000'000)/4) /* 4MHz - Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(hyperpac_sound_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_IO)
MCFG_GFXDECODE_MODIFY("gfxdecode", hyperpac)
@@ -1806,7 +1806,7 @@ MACHINE_CONFIG_START(snowbros_state::semicom)
MCFG_DEVICE_REMOVE("soundlatch2")
/* sound hardware */
- MCFG_SOUND_REPLACE("ymsnd", YM2151, XTAL(16'000'000)/4) /* 4MHz - Confirmed */
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, XTAL(16'000'000)/4) /* 4MHz - Confirmed */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
@@ -1821,10 +1821,10 @@ MACHINE_CONFIG_START(snowbros_state::semicom_mcu)
/* basic machine hardware */
- MCFG_CPU_ADD("protection", I80C52, XTAL(16'000'000)) // AT89C52
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(snowbros_state, prot_p0_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(snowbros_state, prot_p1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(snowbros_state, prot_p2_w))
+ MCFG_DEVICE_ADD("protection", I80C52, XTAL(16'000'000)) // AT89C52
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, snowbros_state, prot_p0_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, snowbros_state, prot_p1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, snowbros_state, prot_p2_w))
MACHINE_CONFIG_END
@@ -1837,13 +1837,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::honeydol)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P12 @ 12MHz */
- MCFG_CPU_PROGRAM_MAP(honeydol_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P12 @ 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(honeydol_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
- MCFG_CPU_PROGRAM_MAP(honeydol_sound_map)
- MCFG_CPU_IO_MAP(honeydol_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
+ MCFG_DEVICE_PROGRAM_MAP(honeydol_sound_map)
+ MCFG_DEVICE_IO_MAP(honeydol_sound_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1864,7 +1864,7 @@ MACHINE_CONFIG_START(snowbros_state::honeydol)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000)/4) /* 3Mhz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(12'000'000)/4) /* 3Mhz */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1876,15 +1876,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::twinadv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12MHz like Honey Dolls ? */
- MCFG_CPU_PROGRAM_MAP(twinadv_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* 12MHz like Honey Dolls ? */
+ MCFG_DEVICE_PROGRAM_MAP(twinadv_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(twinadv_sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", snowbros_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(16'000'000)/4) /* 4Mhz (16MHz/4) like SemiCom or 6MHz (12MHz/2) like snowbros??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(twinadv_sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", snowbros_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1934,16 +1934,16 @@ Intel P8752 (mcu)
MACHINE_CONFIG_START(snowbros_state::finalttr)
semicom(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(finalttr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(finalttr_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_CLOCK(XTAL(3'579'545))
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_CLOCK(XTAL(3'579'545))
MCFG_MACHINE_RESET_OVERRIDE (snowbros_state, finalttr )
- MCFG_SOUND_REPLACE("ymsnd", YM2151, XTAL(3'579'545)) /* possible but less likely 4MHz (12MHz/3) */
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, XTAL(3'579'545)) /* possible but less likely 4MHz (12MHz/3) */
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.08)
MCFG_SOUND_ROUTE(1, "mono", 0.08)
@@ -1963,8 +1963,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::snowbro3) /* PCB has 16MHz & 12MHz OSCs */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */
- MCFG_CPU_PROGRAM_MAP(snowbros3_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */
+ MCFG_DEVICE_PROGRAM_MAP(snowbros3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros3_irq, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -1993,8 +1993,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(snowbros_state::yutnori)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(yutnori_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(yutnori_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", snowbros_state, snowbros_irq, "screen", 0, 1)
// MCFG_WATCHDOG_ADD("watchdog") // maybe
@@ -2006,7 +2006,7 @@ MACHINE_CONFIG_START(snowbros_state::yutnori)
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(snowbros_state, screen_update_snowbros)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(snowbros_state, screen_vblank_snowbros))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, snowbros_state, screen_vblank_snowbros))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", hyperpac)
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp
index 70d57681b05..8f35a9c9f49 100644
--- a/src/mame/drivers/socrates.cpp
+++ b/src/mame/drivers/socrates.cpp
@@ -1464,11 +1464,11 @@ TIMER_CALLBACK_MEMBER(socrates_state::kbmcu_sim_cb)
MACHINE_CONFIG_START(socrates_state::socrates)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* Toshiba TMPZ84C00AP @ 3.579545 MHz, verified, xtal is divided by 6 */
- MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272)/6) /* Toshiba TMPZ84C00AP @ 3.579545 MHz, verified, xtal is divided by 6 */
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", socrates_state, assert_irq)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", socrates_state, assert_irq)
MCFG_DEVICE_ADD("rombank1", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(socrates_rombank_map)
@@ -1502,7 +1502,7 @@ MACHINE_CONFIG_START(socrates_state::socrates)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("soc_snd", SOCRATES_SOUND, XTAL(21'477'272)/(512+256)) // this is correct, as strange as it sounds.
+ MCFG_DEVICE_ADD("soc_snd", SOCRATES_SOUND, XTAL(21'477'272)/(512+256)) // this is correct, as strange as it sounds.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "socrates_cart")
@@ -1513,11 +1513,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(socrates_state::socrates_pal)
socrates(config);
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL(26'601'712)/8)
- MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, XTAL(26'601'712)/8)
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", socrates_state, assert_irq)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", socrates_state, assert_irq)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50)
@@ -1526,16 +1526,16 @@ MACHINE_CONFIG_START(socrates_state::socrates_pal)
MCFG_SCREEN_VISIBLE_AREA(0, 263, 0, 229) // the last few rows are usually cut off by the screen bottom but are indeed displayed if you mess with v-hold
MCFG_SCREEN_UPDATE_DRIVER(socrates_state, screen_update_socrates)
- MCFG_SOUND_REPLACE("soc_snd", SOCRATES_SOUND, XTAL(26'601'712)/(512+256)) // this is correct, as strange as it sounds.
+ MCFG_DEVICE_REPLACE("soc_snd", SOCRATES_SOUND, XTAL(26'601'712)/(512+256)) // this is correct, as strange as it sounds.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(iqunlimz_state::iqunlimz)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) /* not accurate */
- MCFG_CPU_PROGRAM_MAP(iqunlimz_mem)
- MCFG_CPU_IO_MAP(iqunlimz_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", iqunlimz_state, assert_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000)) /* not accurate */
+ MCFG_DEVICE_PROGRAM_MAP(iqunlimz_mem)
+ MCFG_DEVICE_IO_MAP(iqunlimz_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", iqunlimz_state, assert_irq)
MCFG_DEVICE_ADD("rombank1", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(iqunlimz_rombank_map)
@@ -1575,7 +1575,7 @@ MACHINE_CONFIG_START(iqunlimz_state::iqunlimz)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("soc_snd", SOCRATES_SOUND, XTAL(21'477'272)/(512+256))
+ MCFG_DEVICE_ADD("soc_snd", SOCRATES_SOUND, XTAL(21'477'272)/(512+256))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, nullptr)
diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp
index dcca744fc8e..61824682bf9 100644
--- a/src/mame/drivers/softbox.cpp
+++ b/src/mame/drivers/softbox.cpp
@@ -372,36 +372,36 @@ void softbox_state::ieee488_ifc(int state)
MACHINE_CONFIG_START(softbox_state::softbox)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(softbox_mem)
- MCFG_CPU_IO_MAP(softbox_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(softbox_mem)
+ MCFG_DEVICE_IO_MAP(softbox_io)
// devices
MCFG_DEVICE_ADD(I8251_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD(I8255_0_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(softbox_state, ppi0_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(softbox_state, ppi0_pb_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, softbox_state, ppi0_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, softbox_state, ppi0_pb_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("SW1"))
MCFG_DEVICE_ADD(I8255_1_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(softbox_state, ppi1_pa_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(softbox_state, ppi1_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(softbox_state, ppi1_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(softbox_state, ppi1_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, softbox_state, ppi1_pa_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, softbox_state, ppi1_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, softbox_state, ppi1_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, softbox_state, ppi1_pc_w))
MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(I8251_TAG, i8251_device, write_txc))
MCFG_CBM_IEEE488_ADD("c8050")
diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp
index 0a87bf46148..806701d20a7 100644
--- a/src/mame/drivers/solomon.cpp
+++ b/src/mame/drivers/solomon.cpp
@@ -212,14 +212,14 @@ INTERRUPT_GEN_MEMBER(solomon_state::vblank_irq)
MACHINE_CONFIG_START(solomon_state::solomon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", solomon_state, vblank_irq)
-
- MCFG_CPU_ADD("audiocpu", Z80, 3072000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(solomon_state, irq0_line_hold, 2*60) /* ??? */
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", solomon_state, vblank_irq)
+
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3072000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(solomon_state, irq0_line_hold, 2*60) /* ??? */
/* NMIs are caused by the main CPU */
/* video hardware */
@@ -240,13 +240,13 @@ MACHINE_CONFIG_START(solomon_state::solomon)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
- MCFG_SOUND_ADD("ay3", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay3", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.12)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp
index eb416d6d168..d3c9c7c082e 100644
--- a/src/mame/drivers/sonson.cpp
+++ b/src/mame/drivers/sonson.cpp
@@ -228,19 +228,19 @@ GFXDECODE_END
MACHINE_CONFIG_START(sonson_state::sonson)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(12'000'000)/2) // HD68B09P (/4 internally)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sonson_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(12'000'000)/2) // HD68B09P (/4 internally)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sonson_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/2) // HD68B09P (/4 internally)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(sonson_state, irq0_line_hold, 4*60) /* FIRQs are triggered by the main CPU */
+ MCFG_DEVICE_ADD("audiocpu", MC6809, XTAL(12'000'000)/2) // HD68B09P (/4 internally)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(sonson_state, irq0_line_hold, 4*60) /* FIRQs are triggered by the main CPU */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // A9
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(sonson_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(sonson_state, sh_irqtrigger_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(sonson_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(sonson_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, sonson_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, sonson_state, sh_irqtrigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, sonson_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, sonson_state, coin1_counter_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -261,10 +261,10 @@ MACHINE_CONFIG_START(sonson_state::sonson)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp
index b4c1e25614f..1c470fca3c3 100644
--- a/src/mame/drivers/sorcerer.cpp
+++ b/src/mame/drivers/sorcerer.cpp
@@ -418,9 +418,9 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sorcerer_state::sorcerer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, ES_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sorcerer_mem)
- MCFG_CPU_IO_MAP(sorcerer_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, ES_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sorcerer_mem)
+ MCFG_DEVICE_IO_MAP(sorcerer_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -446,7 +446,7 @@ MACHINE_CONFIG_START(sorcerer_state::sorcerer)
MCFG_AY31015_RX_CLOCK(ES_UART_CLOCK)
MCFG_AY31015_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "null_modem")
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "null_modem")
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
/* printer */
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(sorcerer_state::sorcerer)
/* The use of the parallel port as a general purpose port is not emulated.
Currently the only use is to read the printer status in the Centronics CENDRV bios routine. */
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
@@ -488,8 +488,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sorcerer_state::sorcererd)
sorcerer(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sorcererd_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sorcererd_mem)
MCFG_MACHINE_START_OVERRIDE(sorcerer_state, sorcererd )
diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp
index 5b13d7ad3f4..4e951af561f 100644
--- a/src/mame/drivers/sothello.cpp
+++ b/src/mame/drivers/sothello.cpp
@@ -358,16 +358,16 @@ void sothello_state::machine_reset()
MACHINE_CONFIG_START(sothello_state::sothello)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(21'477'272) / 6)
- MCFG_CPU_PROGRAM_MAP(maincpu_mem_map)
- MCFG_CPU_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(21'477'272) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_mem_map)
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(21'477'272) / 6)
- MCFG_CPU_PROGRAM_MAP(soundcpu_mem_map)
- MCFG_CPU_IO_MAP(soundcpu_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(21'477'272) / 6)
+ MCFG_DEVICE_PROGRAM_MAP(soundcpu_mem_map)
+ MCFG_DEVICE_IO_MAP(soundcpu_io_map)
- MCFG_CPU_ADD("subcpu", MC6809, XTAL(8'000'000)) // divided by 4 internally
- MCFG_CPU_PROGRAM_MAP(subcpu_mem_map)
+ MCFG_DEVICE_ADD("subcpu", MC6809, XTAL(8'000'000)) // divided by 4 internally
+ MCFG_DEVICE_PROGRAM_MAP(subcpu_mem_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -381,7 +381,7 @@ MACHINE_CONFIG_START(sothello_state::sothello)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(21'477'272) / 12)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(21'477'272) / 12)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("subcpu", 0))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
@@ -392,8 +392,8 @@ MACHINE_CONFIG_START(sothello_state::sothello)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(sothello_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, sothello_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* changed on the fly */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp
index 785814b93aa..b94b49908ab 100644
--- a/src/mame/drivers/spacefb.cpp
+++ b/src/mame/drivers/spacefb.cpp
@@ -334,16 +334,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(spacefb_state::spacefb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(spacefb_main_map)
- MCFG_CPU_IO_MAP(spacefb_main_io_map)
-
- MCFG_CPU_ADD("audiocpu", I8035, SPACEFB_AUDIO_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(spacefb_audio_map)
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(spacefb_state, audio_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(spacefb_state, audio_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(spacefb_state, audio_t1_r))
+ MCFG_DEVICE_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(spacefb_main_map)
+ MCFG_DEVICE_IO_MAP(spacefb_main_io_map)
+
+ MCFG_DEVICE_ADD("audiocpu", I8035, SPACEFB_AUDIO_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(spacefb_audio_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, spacefb_state, audio_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, spacefb_state, audio_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, spacefb_state, audio_t1_r))
MCFG_QUANTUM_TIME(attotime::from_hz(180))
diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp
index 6d170f73c52..7526d6ab6c3 100644
--- a/src/mame/drivers/spaceg.cpp
+++ b/src/mame/drivers/spaceg.cpp
@@ -509,8 +509,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(spaceg_state::spaceg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */
- MCFG_CPU_PROGRAM_MAP(spaceg_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,2500000) /* 2.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(spaceg_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -529,7 +529,7 @@ MACHINE_CONFIG_START(spaceg_state::spaceg)
MCFG_SPEAKER_STANDARD_MONO("mono")
// HACK: SN76477 parameters copied from space invaders
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C
MCFG_SN76477_DECAY_RES(0) // decay_res: N/C
MCFG_SN76477_ATTACK_PARAMS(0, RES_K(100)) // attack_decay_cap + attack_res
@@ -546,7 +546,7 @@ MACHINE_CONFIG_START(spaceg_state::spaceg)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
// HACK: samples copied from space invaders
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(invaders_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
index 3fc96c73980..3d3c0178fac 100644
--- a/src/mame/drivers/spartanxtec.cpp
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -364,15 +364,15 @@ PALETTE_INIT_MEMBER(spartanxtec_state, spartanxtec)
MACHINE_CONFIG_START(spartanxtec_state::spartanxtec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(spartanxtec_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(spartanxtec_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(spartanxtec_sound_map)
- MCFG_CPU_IO_MAP(spartanxtec_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(spartanxtec_state, irq0_line_assert, 1000) // controls speed of music
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(spartanxtec_sound_map)
+ MCFG_DEVICE_IO_MAP(spartanxtec_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(spartanxtec_state, irq0_line_assert, 1000) // controls speed of music
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold)
/* video hardware */
// todo, proper screen timings for this bootleg PCB - as visible area is less it's probably ~60hz, not 55
@@ -395,11 +395,11 @@ MACHINE_CONFIG_START(spartanxtec_state::spartanxtec)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8912, 1000000)
+ MCFG_DEVICE_ADD("ay1", AY8912, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8912, 1000000)
+ MCFG_DEVICE_ADD("ay2", AY8912, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8912, 1000000)
+ MCFG_DEVICE_ADD("ay3", AY8912, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp
index dd9df6c5603..9c5aa67ba4e 100644
--- a/src/mame/drivers/spbactn.cpp
+++ b/src/mame/drivers/spbactn.cpp
@@ -409,12 +409,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(spbactn_state::spbactn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(spbactn_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, irq3_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spbactn_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spbactn_state, irq3_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(spbactn_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spbactn_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -450,7 +450,7 @@ MACHINE_CONFIG_START(spbactn_state::spbactn)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* Was 3.579545MHz, a common clock, but no way to generate via on PCB OSCs */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(4'000'000)) /* Was 3.579545MHz, a common clock, but no way to generate via on PCB OSCs */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -462,18 +462,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(spbactn_state::spbactnp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(spbactnp_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, irq3_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spbactnp_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spbactn_state, irq3_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(spbactn_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spbactn_sound_map)
// yes another cpu..
- MCFG_CPU_ADD("extracpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(spbactnp_extra_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, irq0_line_hold)
-// MCFG_CPU_VBLANK_INT_DRIVER("screen", spbactn_state, nmi_line_pulse)
+ MCFG_DEVICE_ADD("extracpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spbactnp_extra_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spbactn_state, irq0_line_hold)
+// MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spbactn_state, nmi_line_pulse)
/* video hardware */
@@ -504,7 +504,7 @@ MACHINE_CONFIG_START(spbactn_state::spbactnp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(4'000'000))
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index 585917d6ea0..f1417272ad7 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -466,25 +466,25 @@ void spc1000_exp(device_slot_interface &device)
MACHINE_CONFIG_START(spc1000_state::spc1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(spc1000_mem)
- MCFG_CPU_IO_MAP(spc1000_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spc1000_mem)
+ MCFG_DEVICE_IO_MAP(spc1000_io)
/* video hardware */
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL(3'579'545))
- MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(spc1000_state, irq_w))
- MCFG_MC6847_INPUT_CALLBACK(READ8(spc1000_state, mc6847_videoram_r))
+ MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(*this, spc1000_state, irq_w))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, spc1000_state, mc6847_videoram_r))
MCFG_MC6847_CHARROM_CALLBACK(spc1000_state, get_char_rom)
MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2)
// other lines not connected
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(4'000'000) / 1)
- MCFG_AY8910_PORT_A_READ_CB(READ8(spc1000_state, porta_r))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(4'000'000) / 1)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, spc1000_state, porta_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("cent_data_out", output_latch_device, write))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
@@ -493,7 +493,7 @@ MACHINE_CONFIG_START(spc1000_state::spc1000)
MCFG_DEVICE_SLOT_INTERFACE(spc1000_exp, nullptr, false)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(spc1000_state, centronics_busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, spc1000_state, centronics_busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index 13ffd5659c9..1c8c22c8ba6 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -874,11 +874,11 @@ READ8_MEMBER( spc1500_state::porta_r )
MACHINE_CONFIG_START(spc1500_state::spc1500)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(spc1500_mem)
- //MCFG_CPU_IO_MAP(spc1500_io)
- MCFG_CPU_IO_MAP(spc1500_double_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(spc1500_state, irq0_line_hold, 60)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(spc1500_mem)
+ //MCFG_DEVICE_IO_MAP(spc1500_io)
+ MCFG_DEVICE_IO_MAP(spc1500_double_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(spc1500_state, irq0_line_hold, 60)
/* video hardware */
@@ -898,24 +898,24 @@ MACHINE_CONFIG_START(spc1500_state::spc1500)
MCFG_VIDEO_START_OVERRIDE(spc1500_state, spc)
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTB_CB(READ8(spc1500_state, portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spc1500_state, portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spc1500_state, portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, spc1500_state, portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spc1500_state, portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spc1500_state, portc_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("1hz", spc1500_state, timer, attotime::from_hz(1))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(4'000'000) / 2)
- MCFG_AY8910_PORT_A_READ_CB(READ8(spc1500_state, psga_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(spc1500_state, psgb_w))
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(4'000'000) / 2)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, spc1500_state, psga_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, spc1500_state, psgb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(spc1500_state, centronics_busy_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, spc1500_state, centronics_busy_w))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp
index 36c28564b0c..aa12eb35181 100644
--- a/src/mame/drivers/spcforce.cpp
+++ b/src/mame/drivers/spcforce.cpp
@@ -285,22 +285,22 @@ MACHINE_CONFIG_START(spcforce_state::spcforce)
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MCFG_CPU_ADD("maincpu", I8085A, 8000000 * 2) /* 4.00 MHz??? */
- MCFG_CPU_PROGRAM_MAP(spcforce_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spcforce_state, vblank_irq)
-
- MCFG_CPU_ADD("audiocpu", I8035, 6144000) /* divisor ??? */
- MCFG_CPU_PROGRAM_MAP(spcforce_sound_map)
- MCFG_MCS48_PORT_BUS_IN_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(spcforce_state, SN76496_latch_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(spcforce_state, SN76496_select_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(spcforce_state, SN76496_select_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(spcforce_state, t0_r))
+ MCFG_DEVICE_ADD("maincpu", I8085A, 8000000 * 2) /* 4.00 MHz??? */
+ MCFG_DEVICE_PROGRAM_MAP(spcforce_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spcforce_state, vblank_irq)
+
+ MCFG_DEVICE_ADD("audiocpu", I8035, 6144000) /* divisor ??? */
+ MCFG_DEVICE_PROGRAM_MAP(spcforce_sound_map)
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, spcforce_state, SN76496_latch_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, spcforce_state, SN76496_select_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, spcforce_state, SN76496_select_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, spcforce_state, t0_r))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(spcforce_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(spcforce_state, irq_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(spcforce_state, unknown_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, spcforce_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, spcforce_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, spcforce_state, unknown_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -320,25 +320,25 @@ MACHINE_CONFIG_START(spcforce_state::spcforce)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn1", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SN76496_READY_HANDLER(WRITELINE(spcforce_state, write_sn1_ready))
+ MCFG_SN76496_READY_HANDLER(WRITELINE(*this, spcforce_state, write_sn1_ready))
- MCFG_SOUND_ADD("sn2", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn2", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SN76496_READY_HANDLER(WRITELINE(spcforce_state, write_sn2_ready))
+ MCFG_SN76496_READY_HANDLER(WRITELINE(*this, spcforce_state, write_sn2_ready))
- MCFG_SOUND_ADD("sn3", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn3", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SN76496_READY_HANDLER(WRITELINE(spcforce_state, write_sn3_ready))
+ MCFG_SN76496_READY_HANDLER(WRITELINE(*this, spcforce_state, write_sn3_ready))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(spcforce_state::meteors)
spcforce(config);
MCFG_DEVICE_MODIFY("mainlatch")
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(spcforce_state, irq_mask_w)) // ??
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(spcforce_state, flip_screen_w)) // irq mask isn't here, gets written too early causing the game to not boot, see startup code
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, spcforce_state, irq_mask_w)) // ??
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, spcforce_state, flip_screen_w)) // irq mask isn't here, gets written too early causing the game to not boot, see startup code
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp
index fceb2444935..4e52b5482d6 100644
--- a/src/mame/drivers/spdodgeb.cpp
+++ b/src/mame/drivers/spdodgeb.cpp
@@ -408,12 +408,12 @@ void spdodgeb_state::machine_reset()
MACHINE_CONFIG_START(spdodgeb_state::spdodgeb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/6) /* 2MHz ? */
- MCFG_CPU_PROGRAM_MAP(spdodgeb_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000)/6) /* 2MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(spdodgeb_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", spdodgeb_state, interrupt, "screen", 0, 1) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
- MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/2) // HD68A09P (1.5MHz internally)
- MCFG_CPU_PROGRAM_MAP(spdodgeb_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, XTAL(12'000'000)/2) // HD68A09P (1.5MHz internally)
+ MCFG_DEVICE_PROGRAM_MAP(spdodgeb_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -431,19 +431,19 @@ MACHINE_CONFIG_START(spdodgeb_state::spdodgeb)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6809_IRQ_LINE))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(12'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(spdodgeb_state, spd_adpcm_int_1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, spdodgeb_state, spd_adpcm_int_1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(spdodgeb_state, spd_adpcm_int_2)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, spdodgeb_state, spd_adpcm_int_2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp
index 9e9a28de101..0703258405e 100644
--- a/src/mame/drivers/spec128.cpp
+++ b/src/mame/drivers/spec128.cpp
@@ -295,10 +295,10 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_128)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, X1_128_SINCLAIR / 5)
- MCFG_CPU_PROGRAM_MAP(spectrum_128_mem)
- MCFG_CPU_IO_MAP(spectrum_128_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, X1_128_SINCLAIR / 5)
+ MCFG_DEVICE_PROGRAM_MAP(spectrum_128_mem)
+ MCFG_DEVICE_IO_MAP(spectrum_128_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum_128 )
@@ -311,7 +311,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_128)
MCFG_GFXDECODE_MODIFY("gfxdecode", spec128)
/* sound hardware */
- MCFG_SOUND_ADD("ay8912", AY8912, X1_128_SINCLAIR / 10)
+ MCFG_DEVICE_ADD("ay8912", AY8912, X1_128_SINCLAIR / 10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* expansion port */
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index 234423457f1..99928cb011b 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -366,8 +366,8 @@ static void specimx_floppies(device_slot_interface &device)
/* Machine driver */
MACHINE_CONFIG_START(special_state::special)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(specialist_mem)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(specialist_mem)
MCFG_MACHINE_RESET_OVERRIDE(special_state, special )
/* video hardware */
@@ -384,7 +384,7 @@ MACHINE_CONFIG_START(special_state::special)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -393,12 +393,12 @@ MACHINE_CONFIG_START(special_state::special)
/* Devices */
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(special_state, specialist_8255_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(special_state, specialist_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(special_state, specialist_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(special_state, specialist_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, special_state, specialist_8255_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, special_state, specialist_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, special_state, specialist_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, special_state, specialist_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, special_state, specialist_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, special_state, specialist_8255_portc_w))
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(rks_cassette_formats)
@@ -411,8 +411,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(special_state::specialp)
special(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(specialp_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(specialp_mem)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(special_state, screen_update_specialp)
@@ -425,18 +425,18 @@ MACHINE_CONFIG_START(special_state::specialm)
special(config);
MCFG_DEVICE_REMOVE("ppi8255")
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(special_state, specialist_8255_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(special_state, specialist_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(special_state, specimx_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(special_state, specialist_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, special_state, specialist_8255_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, special_state, specialist_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, special_state, specimx_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, special_state, specialist_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, special_state, specialist_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, special_state, specialist_8255_portc_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(special_state::specimx)
special(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(specimx_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(specimx_mem)
MCFG_MACHINE_START_OVERRIDE (special_state, specimx )
MCFG_MACHINE_RESET_OVERRIDE (special_state, specimx )
@@ -451,29 +451,29 @@ MACHINE_CONFIG_START(special_state::specimx)
MCFG_PALETTE_INIT_OWNER(special_state, specimx )
/* audio hardware */
- MCFG_SOUND_ADD("custom", SPECIMX_SND, 0)
+ MCFG_DEVICE_ADD("custom", SPECIMX_SND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* Devices */
MCFG_DEVICE_ADD( "pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(2000000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("custom", specimx_sound_device, set_input_ch0))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("custom", specimx_sound_device, set_input_ch0))
MCFG_PIT8253_CLK1(2000000)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("custom", specimx_sound_device, set_input_ch1))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("custom", specimx_sound_device, set_input_ch1))
MCFG_PIT8253_CLK2(2000000)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("custom", specimx_sound_device, set_input_ch2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("custom", specimx_sound_device, set_input_ch2))
MCFG_DEVICE_REMOVE("ppi8255")
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(special_state, specialist_8255_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(special_state, specialist_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(special_state, specimx_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(special_state, specialist_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, special_state, specialist_8255_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, special_state, specialist_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, special_state, specimx_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, special_state, specialist_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, special_state, specialist_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, special_state, specialist_8255_portc_w))
MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(special_state, fdc_drq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, special_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
MCFG_SOFTWARE_LIST_ADD("flop_list","special_flop")
@@ -486,9 +486,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(special_state::erik)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(erik_mem)
- MCFG_CPU_IO_MAP(erik_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(erik_mem)
+ MCFG_DEVICE_IO_MAP(erik_io_map)
MCFG_MACHINE_RESET_OVERRIDE(special_state, erik )
/* video hardware */
@@ -506,7 +506,7 @@ MACHINE_CONFIG_START(special_state::erik)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -520,15 +520,15 @@ MACHINE_CONFIG_START(special_state::erik)
MCFG_CASSETTE_INTERFACE("special_cass")
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(special_state, specialist_8255_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(special_state, specialist_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(special_state, specialist_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(special_state, specialist_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, special_state, specialist_8255_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, special_state, specialist_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, special_state, specialist_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, special_state, specialist_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, special_state, specialist_8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, special_state, specialist_8255_portc_w))
MCFG_FD1793_ADD("fd1793", XTAL(8'000'000) / 8)
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(special_state, fdc_drq))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, special_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
diff --git a/src/mame/drivers/specpls3.cpp b/src/mame/drivers/specpls3.cpp
index b3a7cd7e08b..e991275c500 100644
--- a/src/mame/drivers/specpls3.cpp
+++ b/src/mame/drivers/specpls3.cpp
@@ -374,9 +374,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(spectrum_state::spectrum_plus3)
spectrum_128(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spectrum_plus3_mem)
- MCFG_CPU_IO_MAP(spectrum_plus3_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spectrum_plus3_mem)
+ MCFG_DEVICE_IO_MAP(spectrum_plus3_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.01)
MCFG_GFXDECODE_MODIFY("gfxdecode", specpls3)
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index 9ad24081daf..63cd3e2cb62 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -229,14 +229,14 @@ TIMER_DEVICE_CALLBACK_MEMBER( spectra_state::outtimer)
MACHINE_CONFIG_START(spectra_state::spectra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(3'579'545)/4) // actually a M6503
- MCFG_CPU_PROGRAM_MAP(spectra_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(3'579'545)/4) // actually a M6503
+ MCFG_DEVICE_PROGRAM_MAP(spectra_map)
MCFG_DEVICE_ADD("riot", RIOT6532, XTAL(3'579'545)/4)
- MCFG_RIOT6532_IN_PA_CB(READ8(spectra_state, porta_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(spectra_state, porta_w))
- MCFG_RIOT6532_IN_PB_CB(READ8(spectra_state, portb_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(spectra_state, portb_w))
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, spectra_state, porta_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, spectra_state, porta_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8(*this, spectra_state, portb_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, spectra_state, portb_w))
MCFG_RIOT6532_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -251,7 +251,7 @@ MACHINE_CONFIG_START(spectra_state::spectra)
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_DEVICE_ADD("snsnd", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_M(1000), RES_M(1000), CAP_N(0)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(470)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_N(1), RES_K(22)) // attack_decay_cap + attack_res
diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp
index 1dcc4337880..9590862aeba 100644
--- a/src/mame/drivers/spectrum.cpp
+++ b/src/mame/drivers/spectrum.cpp
@@ -668,10 +668,10 @@ INTERRUPT_GEN_MEMBER(spectrum_state::spec_interrupt)
MACHINE_CONFIG_START(spectrum_state::spectrum_common)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, X1 / 4) /* This is verified only for the ZX Spectrum. Other clones are reported to have different clocks */
- MCFG_CPU_PROGRAM_MAP(spectrum_mem)
- MCFG_CPU_IO_MAP(spectrum_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, X1 / 4) /* This is verified only for the ZX Spectrum. Other clones are reported to have different clocks */
+ MCFG_DEVICE_PROGRAM_MAP(spectrum_mem)
+ MCFG_DEVICE_IO_MAP(spectrum_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum )
@@ -682,7 +682,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_common)
MCFG_SCREEN_RAW_PARAMS(X1 / 2, 448, 0, 352, 312, 0, 296)
MCFG_SCREEN_UPDATE_DRIVER(spectrum_state, screen_update_spectrum)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(spectrum_state, screen_vblank_spectrum))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, spectrum_state, screen_vblank_spectrum))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 16)
@@ -695,7 +695,7 @@ MACHINE_CONFIG_START(spectrum_state::spectrum_common)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* expansion port */
diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp
index d2ae9ee912f..a2c9328c141 100644
--- a/src/mame/drivers/speedatk.cpp
+++ b/src/mame/drivers/speedatk.cpp
@@ -308,10 +308,10 @@ WRITE8_MEMBER(speedatk_state::output_w)
MACHINE_CONFIG_START(speedatk_state::speedatk)
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) //divider is unknown
- MCFG_CPU_PROGRAM_MAP(speedatk_mem)
- MCFG_CPU_IO_MAP(speedatk_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", speedatk_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK/2) //divider is unknown
+ MCFG_DEVICE_PROGRAM_MAP(speedatk_mem)
+ MCFG_DEVICE_IO_MAP(speedatk_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speedatk_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8) // timing is unknown
@@ -337,9 +337,9 @@ MACHINE_CONFIG_START(speedatk_state::speedatk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/4) //divider is unknown
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/4) //divider is unknown
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(speedatk_state, output_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, speedatk_state, output_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp
index 93b81255aad..a98d54d6f6e 100644
--- a/src/mame/drivers/speedbal.cpp
+++ b/src/mame/drivers/speedbal.cpp
@@ -266,15 +266,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(speedbal_state::speedbal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(main_cpu_map)
- MCFG_CPU_IO_MAP(main_cpu_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", speedbal_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000)) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu_map)
+ MCFG_DEVICE_IO_MAP(main_cpu_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speedbal_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) // 4 MHz
- MCFG_CPU_PROGRAM_MAP(sound_cpu_map)
- MCFG_CPU_IO_MAP(sound_cpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(speedbal_state, irq0_line_hold, 1000/2) // approximate?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(4'000'000)) // 4 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu_map)
+ MCFG_DEVICE_IO_MAP(sound_cpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(speedbal_state, irq0_line_hold, 1000/2) // approximate?
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -293,7 +293,7 @@ MACHINE_CONFIG_START(speedbal_state::speedbal)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(4'000'000)) // 4 MHz(?)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(4'000'000)) // 4 MHz(?)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp
index c1a21af7df7..135b5aa4c5a 100644
--- a/src/mame/drivers/speedspn.cpp
+++ b/src/mame/drivers/speedspn.cpp
@@ -284,13 +284,13 @@ void speedspn_state::machine_start()
MACHINE_CONFIG_START(speedspn_state::speedspn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,6000000) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", speedspn_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,6000000) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speedspn_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,6000000) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,6000000) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp
index 6656f0ba033..d0756ad7df6 100644
--- a/src/mame/drivers/speglsht.cpp
+++ b/src/mame/drivers/speglsht.cpp
@@ -410,16 +410,16 @@ uint32_t speglsht_state::screen_update_speglsht(screen_device &screen, bitmap_rg
MACHINE_CONFIG_START(speglsht_state::speglsht)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",ST0016_CPU, 8000000) /* 8 MHz ? */
- MCFG_CPU_PROGRAM_MAP(st0016_mem)
- MCFG_CPU_IO_MAP(st0016_io)
+ MCFG_DEVICE_ADD("maincpu",ST0016_CPU, 8000000) /* 8 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(st0016_mem)
+ MCFG_DEVICE_IO_MAP(st0016_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", speglsht_state, irq0_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speglsht_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", R3051, 25000000)
+ MCFG_DEVICE_ADD("sub", R3051, 25000000)
MCFG_R3000_ENDIANNESS(ENDIANNESS_LITTLE)
- MCFG_CPU_PROGRAM_MAP(speglsht_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", speglsht_state, irq4_line_assert)
+ MCFG_DEVICE_PROGRAM_MAP(speglsht_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", speglsht_state, irq4_line_assert)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_MACHINE_RESET_OVERRIDE(speglsht_state,speglsht)
diff --git a/src/mame/drivers/spiders.cpp b/src/mame/drivers/spiders.cpp
index eb0b9d92e98..1c98c32d27c 100644
--- a/src/mame/drivers/spiders.cpp
+++ b/src/mame/drivers/spiders.cpp
@@ -541,12 +541,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(spiders_state::spiders)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, 2800000)
- MCFG_CPU_PROGRAM_MAP(spiders_main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(spiders_state, update_pia_1, 25)
+ MCFG_DEVICE_ADD("maincpu", MC6809, 2800000)
+ MCFG_DEVICE_PROGRAM_MAP(spiders_main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(spiders_state, update_pia_1, 25)
- MCFG_CPU_ADD("audiocpu", M6802, 3000000)
- MCFG_CPU_PROGRAM_MAP(spiders_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 3000000)
+ MCFG_DEVICE_PROGRAM_MAP(spiders_audio_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -561,32 +561,32 @@ MACHINE_CONFIG_START(spiders_state::spiders)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(spiders_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(DEVWRITELINE("ic60", ttl74123_device, a_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE("ic60", ttl74123_device, a_w))
/* 74LS123 */
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, spiders_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(spiders_state,gfx_rom_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(spiders_state,gfx_rom_intf_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(spiders_state,flipscreen_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, spiders_state,gfx_rom_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, spiders_state,gfx_rom_intf_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, spiders_state,flipscreen_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia3", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(spiders_state, spiders_audio_ctrl_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(spiders_state, spiders_audio_command_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(spiders_state,main_cpu_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, spiders_state, spiders_audio_ctrl_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, spiders_state, spiders_audio_command_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, spiders_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, spiders_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia4", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(spiders_state, spiders_audio_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(spiders_state, spiders_audio_b_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, spiders_state, spiders_audio_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, spiders_state, spiders_audio_b_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
MCFG_DEVICE_ADD("ic60", TTL74123, 0)
@@ -596,7 +596,7 @@ MACHINE_CONFIG_START(spiders_state::spiders)
MCFG_TTL74123_A_PIN_VALUE(1) /* A pin - driven by the CRTC */
MCFG_TTL74123_B_PIN_VALUE(1) /* B pin - pulled high */
MCFG_TTL74123_CLEAR_PIN_VALUE(1) /* Clear pin - pulled high */
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(spiders_state, ic60_74123_output_changed))
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, spiders_state, ic60_74123_output_changed))
/* audio hardware */
spiders_audio(config);
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp
index 99c8746cae3..8daddcc50b5 100644
--- a/src/mame/drivers/spinb.cpp
+++ b/src/mame/drivers/spinb.cpp
@@ -636,19 +636,19 @@ uint32_t spinb_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
MACHINE_CONFIG_START(spinb_state::spinb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(spinb_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(spinb_state, irq0_line_hold, 160) // NE556 adjustable (if faster, then jolypark has a stack problem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(spinb_audio_map)
- MCFG_CPU_ADD("musiccpu", Z80, XTAL(5'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(spinb_music_map)
- MCFG_CPU_ADD("dmdcpu",I8031, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(dmd_mem)
- MCFG_CPU_IO_MAP(dmd_io)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(spinb_state, p1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(spinb_state, p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(spinb_state, p3_w))
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(spinb_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(spinb_state, irq0_line_hold, 160) // NE556 adjustable (if faster, then jolypark has a stack problem)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(spinb_audio_map)
+ MCFG_DEVICE_ADD("musiccpu", Z80, XTAL(5'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(spinb_music_map)
+ MCFG_DEVICE_ADD("dmdcpu",I8031, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(dmd_mem)
+ MCFG_DEVICE_IO_MAP(dmd_io)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, spinb_state, p1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, spinb_state, p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, spinb_state, p3_w))
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -666,82 +666,82 @@ MACHINE_CONFIG_START(spinb_state::spinb)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("msmavol")
- MCFG_SOUND_ADD("msm_a", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w))
+ MCFG_DEVICE_ADD("msm_a", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE("ic5a", ttl7474_device, clock_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0)
MCFG_SPEAKER_STANDARD_MONO("msmmvol")
- MCFG_SOUND_ADD("msm_m", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCK_CALLBACK(DEVWRITELINE("ic5m", ttl7474_device, clock_w))
+ MCFG_DEVICE_ADD("msm_m", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCK_CALLBACK(WRITELINE("ic5m", ttl7474_device, clock_w))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0)
/* Devices */
MCFG_DEVICE_ADD("ppi60", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi60a_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi60a_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi60b_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi60b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, sw_r))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi60c_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi60a_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi60a_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi60b_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi60b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, sw_r))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi60c_w))
MCFG_DEVICE_ADD("ppi64", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi64a_r))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi64a_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi64b_r))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi64b_w))
- //MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppi64c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi64c_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi64a_r))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi64a_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi64b_r))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi64b_w))
+ //MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppi64c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi64c_w))
MCFG_DEVICE_ADD("ppi68", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi68a_r))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi68a_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi68b_r))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi68b_w))
- //MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppi68c_r))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi68c_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi68a_r))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi68a_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi68b_r))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi68b_w))
+ //MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppi68c_r))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi68c_w))
MCFG_DEVICE_ADD("ppi6c", I8255A, 0 )
- //MCFG_I8255_IN_PORTA_CB(READ8(spinb_state, ppi6ca_r))
- //MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppi6ca_w))
- //MCFG_I8255_IN_PORTB_CB(READ8(spinb_state, ppi6cb_r))
- //MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppi6cb_w))
- //MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppi6cc_r))
- //MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppi6cc_w))
+ //MCFG_I8255_IN_PORTA_CB(READ8(*this, spinb_state, ppi6ca_r))
+ //MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppi6ca_w))
+ //MCFG_I8255_IN_PORTB_CB(READ8(*this, spinb_state, ppi6cb_r))
+ //MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppi6cb_w))
+ //MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppi6cc_r))
+ //MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppi6cc_w))
MCFG_DEVICE_ADD("ppia", I8255A, 0 )
- MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppia_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppia_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppia_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppia_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppia_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppia_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppia_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppia_c_w))
MCFG_DEVICE_ADD("ppim", I8255A, 0 )
- MCFG_I8255_OUT_PORTA_CB(WRITE8(spinb_state, ppim_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spinb_state, ppim_b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(spinb_state, ppim_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spinb_state, ppim_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spinb_state, ppim_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spinb_state, ppim_b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, spinb_state, ppim_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spinb_state, ppim_c_w))
MCFG_DEVICE_ADD("ic5a", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(spinb_state, ic5a_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, spinb_state, ic5a_w))
MCFG_DEVICE_ADD("ic14a", HC157, 0) // actually IC15 on Jolly Park
- MCFG_74157_OUT_CB(DEVWRITE8("msm_a", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm_a", msm5205_device, data_w))
MCFG_DEVICE_ADD("ic5m", TTL7474, 0)
- MCFG_7474_COMP_OUTPUT_CB(WRITELINE(spinb_state, ic5m_w))
+ MCFG_7474_COMP_OUTPUT_CB(WRITELINE(*this, spinb_state, ic5m_w))
MCFG_DEVICE_ADD("ic14m", HC157, 0) // actually IC15 on Jolly Park
- MCFG_74157_OUT_CB(DEVWRITE8("msm_m", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm_m", msm5205_device, data_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(spinb_state::jolypark)
spinb(config);
- MCFG_SOUND_REPLACE("msm_a", MSM6585, XTAL(640'000))
- MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5a", ttl7474_device, clock_w))
+ MCFG_DEVICE_REPLACE("msm_a", MSM6585, XTAL(640'000))
+ MCFG_MSM6585_VCK_CALLBACK(WRITELINE("ic5a", ttl7474_device, clock_w))
MCFG_MSM6585_PRESCALER_SELECTOR(S40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0)
- MCFG_SOUND_REPLACE("msm_m", MSM6585, XTAL(640'000))
- MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("ic5m", ttl7474_device, clock_w))
+ MCFG_DEVICE_REPLACE("msm_m", MSM6585, XTAL(640'000))
+ MCFG_MSM6585_VCK_CALLBACK(WRITELINE("ic5m", ttl7474_device, clock_w))
MCFG_MSM6585_PRESCALER_SELECTOR(S40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0)
MACHINE_CONFIG_END
@@ -749,8 +749,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(spinb_state::vrnwrld)
jolypark(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vrnwrld_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vrnwrld_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spirit76.cpp b/src/mame/drivers/spirit76.cpp
index 642cec9f6d8..4147972c35f 100644
--- a/src/mame/drivers/spirit76.cpp
+++ b/src/mame/drivers/spirit76.cpp
@@ -121,8 +121,8 @@ void spirit76_state::machine_reset()
MACHINE_CONFIG_START(spirit76_state::spirit76)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 500000)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 500000)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", spirit76_state, irq, attotime::from_hz(120))
/* video hardware */
@@ -130,12 +130,12 @@ MACHINE_CONFIG_START(spirit76_state::spirit76)
//6821pia
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(spirit76_state, porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(spirit76_state, portb_w))
- MCFG_PIA_READPA_HANDLER(READ8(spirit76_state, porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(spirit76_state, portb_r))
-// MCFG_PIA_CA2_HANDLER(WRITELINE(spirit76_state, pia22_ca2_w))
-// MCFG_PIA_CB2_HANDLER(WRITELINE(spirit76_state, pia22_cb2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, spirit76_state, porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, spirit76_state, portb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, spirit76_state, porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, spirit76_state, portb_r))
+// MCFG_PIA_CA2_HANDLER(WRITELINE(*this, spirit76_state, pia22_ca2_w))
+// MCFG_PIA_CB2_HANDLER(WRITELINE(*this, spirit76_state, pia22_cb2_w))
// MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
// MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp
index 6a35d576719..8353e6c0b0d 100644
--- a/src/mame/drivers/splash.cpp
+++ b/src/mame/drivers/splash.cpp
@@ -488,19 +488,19 @@ MACHINE_RESET_MEMBER(splash_state,splash)
MACHINE_CONFIG_START(splash_state::splash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz (24/2) */
- MCFG_CPU_PROGRAM_MAP(splash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz (24/2) */
+ MCFG_DEVICE_PROGRAM_MAP(splash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */
- MCFG_CPU_PROGRAM_MAP(splash_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(splash_state, nmi_line_pulse, 60*64) /* needed for the msm5205 to play the samples */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */
+ MCFG_DEVICE_PROGRAM_MAP(splash_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(splash_state, nmi_line_pulse, 60*64) /* needed for the msm5205 to play the samples */
MCFG_DEVICE_ADD("outlatch", LS259, 0) // A8
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(splash_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(splash_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(splash_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(splash_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, splash_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, splash_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, splash_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, splash_state, coin2_counter_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -524,11 +524,11 @@ MACHINE_CONFIG_START(splash_state::splash)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(30'000'000)/8) /* 3.75MHz (30/8) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, splash_msm5205_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, splash_state, splash_msm5205_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */ /* Sample rate = 384kHz/48 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -550,20 +550,20 @@ INTERRUPT_GEN_MEMBER(splash_state::roldfrog_interrupt)
MACHINE_CONFIG_START(splash_state::roldfrog)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz - verified */
- MCFG_CPU_PROGRAM_MAP(roldfrog_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz - verified */
+ MCFG_DEVICE_PROGRAM_MAP(roldfrog_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", splash_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* 3 MHz - verified */
- MCFG_CPU_PROGRAM_MAP(roldfrog_sound_map)
- MCFG_CPU_IO_MAP(roldfrog_sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", splash_state, roldfrog_interrupt)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) /* 3 MHz - verified */
+ MCFG_DEVICE_PROGRAM_MAP(roldfrog_sound_map)
+ MCFG_DEVICE_IO_MAP(roldfrog_sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", splash_state, roldfrog_interrupt)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(splash_state, coin1_lockout_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(splash_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(splash_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(splash_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, splash_state, coin1_lockout_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, splash_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, splash_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, splash_state, coin2_counter_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -588,8 +588,8 @@ MACHINE_CONFIG_START(splash_state::roldfrog)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(splash_state, ym_irq))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000) / 8)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, splash_state, ym_irq))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -644,13 +644,13 @@ void funystrp_state::machine_start()
MACHINE_CONFIG_START(funystrp_state::funystrp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz (24/2) */
- MCFG_CPU_PROGRAM_MAP(funystrp_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", funystrp_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz (24/2) */
+ MCFG_DEVICE_PROGRAM_MAP(funystrp_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", funystrp_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz (24/4) */
- MCFG_CPU_PROGRAM_MAP(funystrp_sound_map)
- MCFG_CPU_IO_MAP(funystrp_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz (24/4) */
+ MCFG_DEVICE_PROGRAM_MAP(funystrp_sound_map)
+ MCFG_DEVICE_IO_MAP(funystrp_sound_io_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -673,13 +673,13 @@ MACHINE_CONFIG_START(funystrp_state::funystrp)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL(400'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(funystrp_state, adpcm_int1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(400'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, funystrp_state, adpcm_int1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 1 / 48 */ /* Sample rate = 400kHz/64 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL(400'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(funystrp_state, adpcm_int2)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, XTAL(400'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, funystrp_state, adpcm_int2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 */ /* Sample rate = 400kHz/96 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp
index 6553a1a43a1..155fcd8c94e 100644
--- a/src/mame/drivers/splus.cpp
+++ b/src/mame/drivers/splus.cpp
@@ -674,11 +674,11 @@ INPUT_PORTS_END
*************************/
MACHINE_CONFIG_START(splus_state::splus) // basic machine hardware
- MCFG_CPU_ADD("maincpu", I80C32, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(splus_map)
- MCFG_CPU_IO_MAP(splus_iomap)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(splus_state, splus_p1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(splus_state, splus_p3_r))
+ MCFG_DEVICE_ADD("maincpu", I80C32, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(splus_map)
+ MCFG_DEVICE_IO_MAP(splus_iomap)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, splus_state, splus_p1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, splus_state, splus_p3_r))
// Fill NVRAM
MCFG_NVRAM_ADD_0FILL("cmosl")
@@ -699,7 +699,7 @@ MACHINE_CONFIG_START(splus_state::splus) // basic machine hardware
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8912, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index c6111a7a032..6a0f6bdd0df 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -600,22 +600,22 @@ void spoker_state::machine_reset()
MACHINE_CONFIG_START(spoker_state::spoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 2) /* HD64180RP8, 8 MHz? */
- MCFG_CPU_PROGRAM_MAP(spoker_map)
- MCFG_CPU_IO_MAP(spoker_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spoker_state, nmi_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 2) /* HD64180RP8, 8 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(spoker_map)
+ MCFG_DEVICE_IO_MAP(spoker_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spoker_state, nmi_line_assert)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0) // Control 0x8b --> A:out; B:input; C:input.
- MCFG_I8255_OUT_PORTA_CB(WRITE8(spoker_state, nmi_and_coins_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, spoker_state, nmi_and_coins_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("SERVICE"))
MCFG_I8255_IN_PORTC_CB(IOPORT("COINS"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0) // Control 0x90 --> A:input; B:out; C:out.
MCFG_I8255_IN_PORTA_CB(IOPORT("BUTTONS1"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(spoker_state, video_and_leds_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(spoker_state, leds_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, spoker_state, video_and_leds_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, spoker_state, leds_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -632,7 +632,7 @@ MACHINE_CONFIG_START(spoker_state::spoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
MCFG_OKIM6295_ADD("oki", XTAL(12'000'000) / 12, PIN7_HIGH)
@@ -643,12 +643,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(spoker_state::_3super8)
spoker(config);
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL(24'000'000) / 4) /* z840006, 24/4 MHz? */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(spoker_map)
- MCFG_CPU_IO_MAP(_3super8_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spoker_state, nmi_line_assert)
- MCFG_CPU_PERIODIC_INT_DRIVER(spoker_state, irq0_line_hold, 120) // this signal comes from the PIC
+ MCFG_DEVICE_REPLACE("maincpu", Z80, XTAL(24'000'000) / 4) /* z840006, 24/4 MHz? */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(spoker_map)
+ MCFG_DEVICE_IO_MAP(_3super8_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spoker_state, nmi_line_assert)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(spoker_state, irq0_line_hold, 120) // this signal comes from the PIC
MCFG_DEVICE_REMOVE("ppi8255_0")
MCFG_DEVICE_REMOVE("ppi8255_1")
diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp
index 27693209015..ab40f620701 100644
--- a/src/mame/drivers/spool99.cpp
+++ b/src/mame/drivers/spool99.cpp
@@ -363,9 +363,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(spool99_state::spool99)
- MCFG_CPU_ADD("maincpu", Z80, 24000000/8)
- MCFG_CPU_PROGRAM_MAP(spool99_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spool99_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 24000000/8)
+ MCFG_DEVICE_PROGRAM_MAP(spool99_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spool99_state, irq0_line_hold)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", spool99)
@@ -392,8 +392,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(spool99_state::vcarn)
spool99(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vcarn_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vcarn_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 1*8, 31*8-1) //512x240, raw guess
diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp
index d0c969e53df..6eccdc93d74 100644
--- a/src/mame/drivers/sprcros2.cpp
+++ b/src/mame/drivers/sprcros2.cpp
@@ -454,16 +454,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(sprcros2_state::master_scanline)
MACHINE_CONFIG_START(sprcros2_state::sprcros2)
/* basic machine hardware */
- MCFG_CPU_ADD("master_cpu",Z80,MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(master_map)
- MCFG_CPU_IO_MAP(master_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sprcros2_state, master_vblank_irq)
+ MCFG_DEVICE_ADD("master_cpu",Z80,MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(master_map)
+ MCFG_DEVICE_IO_MAP(master_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sprcros2_state, master_vblank_irq)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sprcros2_state, master_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave_cpu",Z80,MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(slave_map)
- MCFG_CPU_IO_MAP(slave_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sprcros2_state, slave_vblank_irq)
+ MCFG_DEVICE_ADD("slave_cpu",Z80,MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_IO_MAP(slave_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sprcros2_state, slave_vblank_irq)
MCFG_QUANTUM_PERFECT_CPU("master_cpu")
@@ -481,13 +481,13 @@ MACHINE_CONFIG_START(sprcros2_state::sprcros2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76489, 10000000/4)
+ MCFG_DEVICE_ADD("sn1", SN76489, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489, 10000000/4)
+ MCFG_DEVICE_ADD("sn2", SN76489, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489, 10000000/4)
+ MCFG_DEVICE_ADD("sn3", SN76489, 10000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp
index e241b967377..33e5041a40f 100644
--- a/src/mame/drivers/sprint2.cpp
+++ b/src/mame/drivers/sprint2.cpp
@@ -493,9 +493,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(sprint2_state::sprint2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'096'000) / 16)
- MCFG_CPU_PROGRAM_MAP(sprint2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sprint2_state, sprint2)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'096'000) / 16)
+ MCFG_DEVICE_PROGRAM_MAP(sprint2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sprint2_state, sprint2)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -506,7 +506,7 @@ MACHINE_CONFIG_START(sprint2_state::sprint2)
MCFG_SCREEN_SIZE(512, 262)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 223)
MCFG_SCREEN_UPDATE_DRIVER(sprint2_state, screen_update_sprint2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sprint2_state, screen_vblank_sprint2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sprint2_state, screen_vblank_sprint2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprint2)
@@ -518,14 +518,14 @@ MACHINE_CONFIG_START(sprint2_state::sprint2)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_DEVICE_ADD("outlatch", F9334, 0) // at H8
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT2_ATTRACT_EN>)) // also DOMINOS_ATTRACT_EN
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT2_SKIDSND1_EN>)) // also DOMINOS_TUMBLE_EN
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT2_SKIDSND2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT2_ATTRACT_EN>)) // also DOMINOS_ATTRACT_EN
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT2_SKIDSND1_EN>)) // also DOMINOS_TUMBLE_EN
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT2_SKIDSND2_EN>))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led0")) // START LAMP1
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led1")) // START LAMP2
- //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(sprint2_state, sprint2_spare_w))
+ //MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, sprint2_state, sprint2_spare_w))
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(sprint2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -542,7 +542,7 @@ MACHINE_CONFIG_START(sprint2_state::sprint1)
MCFG_DEVICE_REMOVE("discrete")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(sprint1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -558,7 +558,7 @@ MACHINE_CONFIG_START(sprint2_state::dominos)
MCFG_DEVICE_REMOVE("discrete")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(dominos)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp
index 0d0f7158698..46675c2511d 100644
--- a/src/mame/drivers/sprint4.cpp
+++ b/src/mame/drivers/sprint4.cpp
@@ -382,8 +382,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(sprint4_state::sprint4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(sprint4_cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sprint4_cpu_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -392,7 +392,7 @@ MACHINE_CONFIG_START(sprint4_state::sprint4)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(sprint4_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sprint4_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sprint4_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprint4)
@@ -408,12 +408,12 @@ MACHINE_CONFIG_START(sprint4_state::sprint4)
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1")) // START LAMP 2
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led2")) // START LAMP 3
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led3")) // START LAMP 4
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_1>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_2>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_3>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_4>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_1>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_2>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_3>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SPRINT4_SCREECH_EN_4>))
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(sprint4)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp
index 170e2c89964..ea7edd5f8d0 100644
--- a/src/mame/drivers/sprint8.cpp
+++ b/src/mame/drivers/sprint8.cpp
@@ -458,8 +458,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(sprint8_state::sprint8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 11055000 / 11) /* ? */
- MCFG_CPU_PROGRAM_MAP(sprint8_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 11055000 / 11) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sprint8_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("input_timer", sprint8_state, input_callback, attotime::from_hz(60))
@@ -470,7 +470,7 @@ MACHINE_CONFIG_START(sprint8_state::sprint8)
MCFG_SCREEN_SIZE(512, 261)
MCFG_SCREEN_VISIBLE_AREA(0, 495, 0, 231)
MCFG_SCREEN_UPDATE_DRIVER(sprint8_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sprint8_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sprint8_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sprint8)
diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp
index 9b314558a84..2e8b220257a 100644
--- a/src/mame/drivers/spy.cpp
+++ b/src/mame/drivers/spy.cpp
@@ -497,12 +497,12 @@ void spy_state::machine_reset()
MACHINE_CONFIG_START(spy_state::spy)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(24'000'000) / 8) // 3 MHz? (divided by 051961)
- MCFG_CPU_PROGRAM_MAP(spy_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spy_state, spy_interrupt)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(24'000'000) / 8) // 3 MHz? (divided by 051961)
+ MCFG_DEVICE_PROGRAM_MAP(spy_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spy_state, spy_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(spy_sound_map) /* nmi by the sound chip */
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(spy_sound_map) /* nmi by the sound chip */
MCFG_WATCHDOG_ADD("watchdog")
@@ -533,17 +533,17 @@ MACHINE_CONFIG_START(spy_state::spy)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(spy_state, volume_callback0))
+ MCFG_DEVICE_ADD("k007232_1", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, spy_state, volume_callback0))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(spy_state, volume_callback1))
+ MCFG_DEVICE_ADD("k007232_2", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, spy_state, volume_callback1))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index 1ecf8abf7d9..d2408832c03 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -673,10 +673,10 @@ MACHINE_CONFIG_START(spyhuntertec_state::spyhuntertec)
// 2 XTALs: one 20MHz, other one near maincpu ?MHz
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000 ) // NEC D780C-2 (rated 6MHz)
- MCFG_CPU_PROGRAM_MAP(spyhuntertec_map)
- MCFG_CPU_IO_MAP(spyhuntertec_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spyhuntertec_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000 ) // NEC D780C-2 (rated 6MHz)
+ MCFG_DEVICE_PROGRAM_MAP(spyhuntertec_map)
+ MCFG_DEVICE_IO_MAP(spyhuntertec_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spyhuntertec_state, irq0_line_hold)
MCFG_TIMER_DRIVER_ADD("analog_timer", spyhuntertec_state, analog_count_callback)
/* video hardware */
@@ -695,27 +695,27 @@ MACHINE_CONFIG_START(spyhuntertec_state::spyhuntertec)
// MCFG_PALETTE_INIT_OWNER(spyhuntertec_state,spyhunt)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000 ) // SGS Z8400B1 (rated 2.5MHz?)
- MCFG_CPU_PROGRAM_MAP(spyhuntertec_sound_map)
- MCFG_CPU_IO_MAP(spyhuntertec_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(spyhuntertec_state, irq0_line_assert, 1000)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000 ) // SGS Z8400B1 (rated 2.5MHz?)
+ MCFG_DEVICE_PROGRAM_MAP(spyhuntertec_sound_map)
+ MCFG_DEVICE_IO_MAP(spyhuntertec_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(spyhuntertec_state, irq0_line_assert, 1000)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8912, 3000000/2) // AY-3-8912
+ MCFG_DEVICE_ADD("ay1", AY8912, 3000000/2) // AY-3-8912
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_AY8910_PORT_A_READ_CB(READ8(spyhuntertec_state, ay1_porta_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(spyhuntertec_state, ay1_porta_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, spyhuntertec_state, ay1_porta_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, spyhuntertec_state, ay1_porta_w))
- MCFG_SOUND_ADD("ay2", AY8912, 3000000/2) // "
+ MCFG_DEVICE_ADD("ay2", AY8912, 3000000/2) // "
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_AY8910_PORT_A_READ_CB(READ8(spyhuntertec_state, ay2_porta_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(spyhuntertec_state, ay2_porta_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, spyhuntertec_state, ay2_porta_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, spyhuntertec_state, ay2_porta_w))
- MCFG_SOUND_ADD("ay3", AY8912, 3000000/2) // "
+ MCFG_DEVICE_ADD("ay3", AY8912, 3000000/2) // "
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index 16d9d588ed8..7d28ba9d1d1 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -780,34 +780,34 @@ void squale_state::machine_reset()
MACHINE_CONFIG_START(squale_state::squale)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(squale_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(squale_mem)
/* Cartridge pia */
MCFG_DEVICE_ADD("pia_u72", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(squale_state, pia_u72_porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(squale_state, pia_u72_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(squale_state, pia_u72_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(squale_state, pia_u72_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(squale_state, pia_u72_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(squale_state, pia_u72_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, squale_state, pia_u72_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, squale_state, pia_u72_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, squale_state, pia_u72_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, squale_state, pia_u72_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, squale_state, pia_u72_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, squale_state, pia_u72_cb2_w))
/* Keyboard pia */
MCFG_DEVICE_ADD("pia_u75", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(squale_state, pia_u75_porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(squale_state, pia_u75_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(squale_state, pia_u75_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(squale_state, pia_u75_portb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(squale_state, pia_u75_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, squale_state, pia_u75_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, squale_state, pia_u75_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, squale_state, pia_u75_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, squale_state, pia_u75_portb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, squale_state, pia_u75_cb2_w))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, AY_CLOCK)
+ MCFG_DEVICE_ADD("ay8910", AY8910, AY_CLOCK)
// TODO : Add port I/O handler
- MCFG_AY8910_PORT_A_READ_CB(READ8(squale_state, ay_porta_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(squale_state, ay_portb_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(squale_state, ay_porta_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(squale_state, ay_portb_w))
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, squale_state, ay_porta_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, squale_state, ay_portb_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, squale_state, ay_porta_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, squale_state, ay_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD ("ef6850", ACIA6850, 0)
diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp
index d6a2d8bcdde..13dd5625360 100644
--- a/src/mame/drivers/srmp2.cpp
+++ b/src/mame/drivers/srmp2.cpp
@@ -1144,10 +1144,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(srmp2_state::srmp2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(srmp2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", srmp2_state, irq4_line_assert)
- MCFG_CPU_PERIODIC_INT_DRIVER(srmp2_state, irq2_line_assert, 15*60) /* Interrupt times is not understood */
+ MCFG_DEVICE_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(srmp2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp2_state, irq4_line_assert)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(srmp2_state, irq2_line_assert, 15*60) /* Interrupt times is not understood */
MCFG_MACHINE_START_OVERRIDE(srmp2_state,srmp2)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1173,13 +1173,13 @@ MACHINE_CONFIG_START(srmp2_state::srmp2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 20000000/16)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 20000000/16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(srmp2_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, srmp2_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -1189,11 +1189,11 @@ MACHINE_CONFIG_START(srmp2_state::srmp3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3500000) /* 3.50 MHz ? */
+ MCFG_DEVICE_ADD("maincpu", Z80, 3500000) /* 3.50 MHz ? */
// 4000000, /* 4.00 MHz ? */
- MCFG_CPU_PROGRAM_MAP(srmp3_map)
- MCFG_CPU_IO_MAP(srmp3_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", srmp2_state, irq0_line_assert)
+ MCFG_DEVICE_PROGRAM_MAP(srmp3_map)
+ MCFG_DEVICE_IO_MAP(srmp3_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp2_state, irq0_line_assert)
MCFG_MACHINE_START_OVERRIDE(srmp2_state,srmp3)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1220,13 +1220,13 @@ MACHINE_CONFIG_START(srmp2_state::srmp3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 16000000/16)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 16000000/16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(srmp2_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, srmp2_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -1234,9 +1234,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(srmp2_state::rmgoldyh)
srmp3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(rmgoldyh_map)
- MCFG_CPU_IO_MAP(rmgoldyh_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(rmgoldyh_map)
+ MCFG_DEVICE_IO_MAP(rmgoldyh_io_map)
MCFG_MACHINE_START_OVERRIDE(srmp2_state,rmgoldyh)
MACHINE_CONFIG_END
@@ -1244,10 +1244,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(srmp2_state::mjyuugi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
- MCFG_CPU_PROGRAM_MAP(mjyuugi_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", srmp2_state, irq4_line_assert)
- MCFG_CPU_PERIODIC_INT_DRIVER(srmp2_state, irq2_line_assert, 15*60) /* Interrupt times is not understood */
+ MCFG_DEVICE_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(mjyuugi_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp2_state, irq4_line_assert)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(srmp2_state, irq2_line_assert, 15*60) /* Interrupt times is not understood */
MCFG_MACHINE_START_OVERRIDE(srmp2_state,mjyuugi)
@@ -1273,13 +1273,13 @@ MACHINE_CONFIG_START(srmp2_state::mjyuugi)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 16000000/16)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 16000000/16)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(srmp2_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, srmp2_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp
index 5ca7aa3db9a..39949559db9 100644
--- a/src/mame/drivers/srmp5.cpp
+++ b/src/mame/drivers/srmp5.cpp
@@ -565,15 +565,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(srmp5_state::srmp5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3051, 25000000)
+ MCFG_DEVICE_ADD("maincpu", R3051, 25000000)
MCFG_R3000_ENDIANNESS(ENDIANNESS_LITTLE)
- MCFG_CPU_PROGRAM_MAP(srmp5_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", srmp5_state, irq4_line_assert)
+ MCFG_DEVICE_PROGRAM_MAP(srmp5_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp5_state, irq4_line_assert)
- MCFG_CPU_ADD("soundcpu",ST0016_CPU,8000000)
- MCFG_CPU_PROGRAM_MAP(st0016_mem)
- MCFG_CPU_IO_MAP(st0016_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", srmp5_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("soundcpu",ST0016_CPU,8000000)
+ MCFG_DEVICE_PROGRAM_MAP(st0016_mem)
+ MCFG_DEVICE_IO_MAP(st0016_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp5_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp
index 186c26db0ff..607f6dc56a7 100644
--- a/src/mame/drivers/srmp6.cpp
+++ b/src/mame/drivers/srmp6.cpp
@@ -681,9 +681,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(srmp6_state::srmp6)
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(srmp6_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", srmp6_state, irq4_line_assert) // irq3 is a timer irq, but it's never enabled
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(srmp6_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", srmp6_state, irq4_line_assert) // irq3 is a timer irq, but it's never enabled
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp
index 58717afdd1c..a6450ba63e6 100644
--- a/src/mame/drivers/srumbler.cpp
+++ b/src/mame/drivers/srumbler.cpp
@@ -248,13 +248,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(srumbler_state::srumbler)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, 6000000) /* HD68B09P at 6 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(srumbler_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809, 6000000) /* HD68B09P at 6 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(srumbler_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", srumbler_state, interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(srumbler_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(srumbler_state, irq0_line_hold, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3000000) /* 3 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(srumbler_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(srumbler_state, irq0_line_hold, 4*60)
/* video hardware */
@@ -266,7 +266,7 @@ MACHINE_CONFIG_START(srumbler_state::srumbler)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(10*8, (64-10)*8-1, 1*8, 31*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(srumbler_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram8_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", srumbler)
@@ -279,13 +279,13 @@ MACHINE_CONFIG_START(srumbler_state::srumbler)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.30)
- MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
MCFG_SOUND_ROUTE(2, "mono", 0.10)
diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp
index 8e1ee311638..750662395f4 100644
--- a/src/mame/drivers/ssem.cpp
+++ b/src/mame/drivers/ssem.cpp
@@ -630,8 +630,8 @@ void ssem_state::machine_reset()
MACHINE_CONFIG_START(ssem_state::ssem)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SSEMCPU, 700)
- MCFG_CPU_PROGRAM_MAP(ssem_map)
+ MCFG_DEVICE_ADD("maincpu", SSEMCPU, 700)
+ MCFG_DEVICE_PROGRAM_MAP(ssem_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp
index 57f7ba3529a..c63aa8b64ec 100644
--- a/src/mame/drivers/ssfindo.cpp
+++ b/src/mame/drivers/ssfindo.cpp
@@ -794,10 +794,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ssfindo_state::ssfindo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess...
- MCFG_CPU_PROGRAM_MAP(ssfindo_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 54000000) // guess...
+ MCFG_DEVICE_PROGRAM_MAP(ssfindo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ssfindo_state, interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ssfindo_state, interrupt)
MCFG_24C01_ADD("i2cmem")
@@ -816,8 +816,8 @@ MACHINE_CONFIG_START(ssfindo_state::ppcar)
ssfindo(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ppcar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ppcar_map)
MCFG_DEVICE_REMOVE("i2cmem")
MACHINE_CONFIG_END
@@ -826,8 +826,8 @@ MACHINE_CONFIG_START(ssfindo_state::tetfight)
ppcar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tetfight_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tetfight_map)
MCFG_24C02_ADD("i2cmem")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp
index 7e1e99c8aa4..d1a1dd6fede 100644
--- a/src/mame/drivers/sshangha.cpp
+++ b/src/mame/drivers/sshangha.cpp
@@ -384,12 +384,12 @@ DECO16IC_BANK_CB_MEMBER(sshangha_state::bank_callback)
MACHINE_CONFIG_START(sshangha_state::sshangha)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
- MCFG_CPU_PROGRAM_MAP(sshangha_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sshangha_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 28000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(sshangha_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sshangha_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 16000000/4)
- MCFG_CPU_PROGRAM_MAP(sshangha_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16000000/4)
+ MCFG_DEVICE_PROGRAM_MAP(sshangha_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -436,7 +436,7 @@ MACHINE_CONFIG_START(sshangha_state::sshangha)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* sure it's stereo? */
- MCFG_SOUND_ADD("ymsnd", YM2203, 16000000/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 16000000/4)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
@@ -449,8 +449,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sshangha_state::sshanghb)
sshangha(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sshanghb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sshanghb_map)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index 2836f7cd0ae..13ee0e2a813 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -343,8 +343,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(supershot_state::supershot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SCMP, XTAL(11'289'000)/4)
- MCFG_CPU_PROGRAM_MAP(supershot_map)
+ MCFG_DEVICE_ADD("maincpu", SCMP, XTAL(11'289'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(supershot_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp
index 19179ad4271..7f39706b29f 100644
--- a/src/mame/drivers/ssingles.cpp
+++ b/src/mame/drivers/ssingles.cpp
@@ -548,9 +548,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(ssingles_state::ssingles)
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(ssingles_map)
- MCFG_CPU_IO_MAP(ssingles_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ssingles_map)
+ MCFG_DEVICE_IO_MAP(ssingles_io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(4000000, 256, 0, 256, 256, 0, 256) /* temporary, CRTC will configure screen */
@@ -569,10 +569,10 @@ MACHINE_CONFIG_START(ssingles_state::ssingles)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1500000) /* ? MHz */
+ MCFG_DEVICE_ADD("ay1", AY8910, 1500000) /* ? MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("ay2", AY8910, 1500000) /* ? MHz */
+ MCFG_DEVICE_ADD("ay2", AY8910, 1500000) /* ? MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -584,9 +584,9 @@ WRITE_LINE_MEMBER(ssingles_state::atamanot_irq)
MACHINE_CONFIG_START(ssingles_state::atamanot)
ssingles(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(atamanot_map)
- MCFG_CPU_IO_MAP(atamanot_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(atamanot_map)
+ MCFG_DEVICE_IO_MAP(atamanot_io_map)
MCFG_DEVICE_REMOVE("crtc")
@@ -594,7 +594,7 @@ MACHINE_CONFIG_START(ssingles_state::atamanot)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(ssingles_state, atamanot_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(ssingles_state, atamanot_irq))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, ssingles_state, atamanot_irq))
MCFG_GFXDECODE_MODIFY("gfxdecode", atamanot)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp
index a7492a9b242..23364703929 100644
--- a/src/mame/drivers/sslam.cpp
+++ b/src/mame/drivers/sslam.cpp
@@ -694,11 +694,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(sslam_state::sslam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(sslam_program_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sslam_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sslam_program_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sslam_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", I8051, 12000000)
+ MCFG_DEVICE_ADD("audiocpu", I8051, 12000000)
MCFG_DEVICE_DISABLE() /* Internal code is not dumped - 2 boards were protected */
/* video hardware */
@@ -726,14 +726,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sslam_state::powerbls)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(powerbls_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sslam_state, irq2_line_hold)
-
- MCFG_CPU_ADD("audiocpu", I80C51, 12000000) /* 83C751 */
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(sslam_state, playmark_snd_control_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(sslam_state, playmark_snd_command_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(sslam_state, playmark_oki_w))
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(powerbls_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sslam_state, irq2_line_hold)
+
+ MCFG_DEVICE_ADD("audiocpu", I80C51, 12000000) /* 83C751 */
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, sslam_state, playmark_snd_control_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, sslam_state, playmark_snd_command_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, sslam_state, playmark_oki_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp
index 681861c2bb4..9c96c4ca0ee 100644
--- a/src/mame/drivers/ssozumo.cpp
+++ b/src/mame/drivers/ssozumo.cpp
@@ -197,13 +197,13 @@ INTERRUPT_GEN_MEMBER(ssozumo_state::sound_timer_irq)
MACHINE_CONFIG_START(ssozumo_state::ssozumo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(ssozumo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ssozumo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(ssozumo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ssozumo_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
- MCFG_CPU_PROGRAM_MAP(ssozumo_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(ssozumo_state, sound_timer_irq, 272/16*57) // guess, assume to be the same as tagteam
+ MCFG_DEVICE_ADD("audiocpu", M6502, 975000) /* 975 kHz ?? */
+ MCFG_DEVICE_PROGRAM_MAP(ssozumo_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(ssozumo_state, sound_timer_irq, 272/16*57) // guess, assume to be the same as tagteam
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -226,13 +226,13 @@ MACHINE_CONFIG_START(ssozumo_state::ssozumo)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", m6502_device::IRQ_LINE))
- MCFG_SOUND_ADD("ay1", YM2149, 1500000)
+ MCFG_DEVICE_ADD("ay1", YM2149, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("ay2", YM2149, 1500000)
+ MCFG_DEVICE_ADD("ay2", YM2149, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp
index 4db98be23c3..d8a7fb65719 100644
--- a/src/mame/drivers/sspeedr.cpp
+++ b/src/mame/drivers/sspeedr.cpp
@@ -193,10 +193,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(sspeedr_state::sspeedr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(19'968'000)/8)
- MCFG_CPU_PROGRAM_MAP(sspeedr_map)
- MCFG_CPU_IO_MAP(sspeedr_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sspeedr_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(19'968'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sspeedr_map)
+ MCFG_DEVICE_IO_MAP(sspeedr_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sspeedr_state, irq0_line_assert)
MCFG_WATCHDOG_ADD("watchdog")
@@ -207,7 +207,7 @@ MACHINE_CONFIG_START(sspeedr_state::sspeedr)
MCFG_SCREEN_SIZE(376, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 375, 0, 247)
MCFG_SCREEN_UPDATE_DRIVER(sspeedr_state, screen_update_sspeedr)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sspeedr_state, screen_vblank_sspeedr))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sspeedr_state, screen_vblank_sspeedr))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sspeedr)
diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp
index e11bce158b8..ccf224c2cb9 100644
--- a/src/mame/drivers/ssrj.cpp
+++ b/src/mame/drivers/ssrj.cpp
@@ -143,9 +143,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(ssrj_state::ssrj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2)
- MCFG_CPU_PROGRAM_MAP(ssrj_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ssrj_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(ssrj_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ssrj_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -154,7 +154,7 @@ MACHINE_CONFIG_START(ssrj_state::ssrj)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 34*8-1, 1*8, 31*8-1) // unknown res
MCFG_SCREEN_UPDATE_DRIVER(ssrj_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ssrj_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ssrj_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ssrj)
@@ -165,7 +165,7 @@ MACHINE_CONFIG_START(ssrj_state::ssrj)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 8000000/5)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 8000000/5)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp
index f638ab66d02..f09af3a3de7 100644
--- a/src/mame/drivers/sstrangr.cpp
+++ b/src/mame/drivers/sstrangr.cpp
@@ -193,10 +193,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sstrangr_state::sstrangr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */
- MCFG_CPU_PROGRAM_MAP(sstrangr_map)
- MCFG_CPU_IO_MAP(sstrangr_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(sstrangr_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */
+ MCFG_DEVICE_PROGRAM_MAP(sstrangr_map)
+ MCFG_DEVICE_IO_MAP(sstrangr_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(sstrangr_state, irq0_line_hold, 2*60)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp
index c26cc8f466d..38f8d3a70ee 100644
--- a/src/mame/drivers/ssv.cpp
+++ b/src/mame/drivers/ssv.cpp
@@ -2548,8 +2548,8 @@ DRIVER_INIT_MEMBER(ssv_state,jsk) { init(0); save_item(NAME(m_latche
MACHINE_CONFIG_START(ssv_state::ssv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V60, SSV_MASTER_CLOCK) /* Based on STA-0001 & STA-0001B System boards */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(ssv_state,irq_callback)
+ MCFG_DEVICE_ADD("maincpu", V60, SSV_MASTER_CLOCK) /* Based on STA-0001 & STA-0001B System boards */
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(ssv_state,irq_callback)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ssv_state, interrupt, "screen", 0, 1)
@@ -2566,7 +2566,7 @@ MACHINE_CONFIG_START(ssv_state::ssv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ensoniq", ES5506, SSV_MASTER_CLOCK)
+ MCFG_DEVICE_ADD("ensoniq", ES5506, SSV_MASTER_CLOCK)
MCFG_ES5506_REGION0("ensoniq.0")
MCFG_ES5506_REGION1("ensoniq.1")
MCFG_ES5506_REGION2("ensoniq.2")
@@ -2581,12 +2581,12 @@ MACHINE_CONFIG_START(ssv_state::drifto94)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(drifto94_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(drifto94_map)
- MCFG_CPU_ADD("dsp", UPD96050, 10000000) /* TODO: correct? */
- MCFG_CPU_PROGRAM_MAP(dsp_prg_map)
- MCFG_CPU_DATA_MAP(dsp_data_map)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 10000000) /* TODO: correct? */
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -2602,8 +2602,8 @@ MACHINE_CONFIG_START(ssv_state::gdfs)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gdfs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gdfs_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -2612,7 +2612,7 @@ MACHINE_CONFIG_START(ssv_state::gdfs)
MCFG_ADC0808_IN1_CB(IOPORT("GUNY1"))
MCFG_ADC0808_IN2_CB(IOPORT("GUNX2"))
MCFG_ADC0808_IN3_CB(IOPORT("GUNY2"))
- MCFG_ADC0808_EOC_CB(WRITELINE(ssv_state, gdfs_adc_int_w))
+ MCFG_ADC0808_EOC_CB(WRITELINE(*this, ssv_state, gdfs_adc_int_w))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2631,8 +2631,8 @@ MACHINE_CONFIG_START(ssv_state::hypreact)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hypreact_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hypreact_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2646,8 +2646,8 @@ MACHINE_CONFIG_START(ssv_state::hypreac2)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(hypreac2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(hypreac2_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2661,8 +2661,8 @@ MACHINE_CONFIG_START(ssv_state::janjans1)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(janjans1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(janjans1_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2674,8 +2674,8 @@ MACHINE_CONFIG_START(ssv_state::keithlcy)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(keithlcy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(keithlcy_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2687,8 +2687,8 @@ MACHINE_CONFIG_START(ssv_state::meosism)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(meosism_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(meosism_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2704,8 +2704,8 @@ MACHINE_CONFIG_START(ssv_state::mslider)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mslider_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mslider_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2717,8 +2717,8 @@ MACHINE_CONFIG_START(ssv_state::ryorioh)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ryorioh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ryorioh_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2731,8 +2731,8 @@ MACHINE_CONFIG_START(ssv_state::vasara)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ryorioh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ryorioh_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2745,8 +2745,8 @@ MACHINE_CONFIG_START(ssv_state::srmp4)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(srmp4_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(srmp4_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2760,8 +2760,8 @@ MACHINE_CONFIG_START(ssv_state::srmp7)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(srmp7_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(srmp7_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2775,12 +2775,12 @@ MACHINE_CONFIG_START(ssv_state::stmblade)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(drifto94_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(drifto94_map)
- MCFG_CPU_ADD("dsp", UPD96050, 10000000)
- MCFG_CPU_PROGRAM_MAP(dsp_prg_map)
- MCFG_CPU_DATA_MAP(dsp_data_map)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map)
/* don't need this, game just does a simple check at boot then the DSP stalls into a tight loop. */
// MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -2796,8 +2796,8 @@ MACHINE_CONFIG_START(ssv_state::survarts)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(survarts_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(survarts_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2821,8 +2821,8 @@ MACHINE_CONFIG_START(ssv_state::eaglshot)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(eaglshot_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(eaglshot_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2846,8 +2846,8 @@ MACHINE_CONFIG_START(ssv_state::sxyreact)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sxyreact_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sxyreact_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2862,8 +2862,8 @@ MACHINE_CONFIG_START(ssv_state::sxyreac2)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sxyreact_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sxyreact_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2878,8 +2878,8 @@ MACHINE_CONFIG_START(ssv_state::cairblad)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sxyreact_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sxyreact_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2894,12 +2894,12 @@ MACHINE_CONFIG_START(ssv_state::twineag2)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(twineag2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(twineag2_map)
- MCFG_CPU_ADD("dsp", UPD96050, 10000000)
- MCFG_CPU_PROGRAM_MAP(dsp_prg_map)
- MCFG_CPU_DATA_MAP(dsp_data_map)
+ MCFG_DEVICE_ADD("dsp", UPD96050, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -2915,8 +2915,8 @@ MACHINE_CONFIG_START(ssv_state::ultrax)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ultrax_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ultrax_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -2929,11 +2929,11 @@ MACHINE_CONFIG_START(ssv_state::jsk)
ssv(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jsk_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jsk_map)
- MCFG_CPU_ADD("sub", V810,25000000)
- MCFG_CPU_PROGRAM_MAP(jsk_v810_mem)
+ MCFG_DEVICE_ADD("sub", V810,25000000)
+ MCFG_DEVICE_PROGRAM_MAP(jsk_v810_mem)
MCFG_WATCHDOG_ADD("watchdog")
diff --git a/src/mame/drivers/ssystem3.cpp b/src/mame/drivers/ssystem3.cpp
index 934d30a618b..49d8ccff19d 100644
--- a/src/mame/drivers/ssystem3.cpp
+++ b/src/mame/drivers/ssystem3.cpp
@@ -285,8 +285,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ssystem3_state::ssystem3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1000000)
- MCFG_CPU_PROGRAM_MAP(ssystem3_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(ssystem3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -303,10 +303,10 @@ MACHINE_CONFIG_START(ssystem3_state::ssystem3)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 1000000)
- MCFG_VIA6522_READPA_HANDLER(READ8(ssystem3_state,ssystem3_via_read_a))
- MCFG_VIA6522_READPB_HANDLER(READ8(ssystem3_state,ssystem3_via_read_b))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(ssystem3_state,ssystem3_via_write_a))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(ssystem3_state,ssystem3_via_write_b))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, ssystem3_state,ssystem3_via_read_a))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, ssystem3_state,ssystem3_via_read_b))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, ssystem3_state,ssystem3_via_write_a))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, ssystem3_state,ssystem3_via_write_b))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp
index 043a49cc512..f70853ec3f9 100644
--- a/src/mame/drivers/st17xx.cpp
+++ b/src/mame/drivers/st17xx.cpp
@@ -90,8 +90,8 @@ void st17xx_state::machine_start()
MACHINE_CONFIG_START(st17xx_state::st17xx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM7, 50000000) /* speed unknown */
- MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_ADD("maincpu", ARM7, 50000000) /* speed unknown */
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp
index 5ab595b9bf4..71cab0e0472 100644
--- a/src/mame/drivers/st_mp100.cpp
+++ b/src/mame/drivers/st_mp100.cpp
@@ -708,8 +708,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( st_mp100_state::u11_timer )
MACHINE_CONFIG_START(st_mp100_state::st_mp100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator
- MCFG_CPU_PROGRAM_MAP(st_mp100_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator
+ MCFG_DEVICE_PROGRAM_MAP(st_mp100_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -721,22 +721,22 @@ MACHINE_CONFIG_START(st_mp100_state::st_mp100)
/* Devices */
MCFG_DEVICE_ADD("pia_u10", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(st_mp100_state, u10_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(st_mp100_state, u10_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(st_mp100_state, u10_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp100_state, u10_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp100_state, u10_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp100_state, u10_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, st_mp100_state, u10_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, st_mp100_state, u10_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, st_mp100_state, u10_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, st_mp100_state, u10_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, st_mp100_state, u10_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, st_mp100_state, u10_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x", st_mp100_state, timer_x, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(st_mp100_state, u11_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(st_mp100_state, u11_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp100_state, u11_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp100_state, u11_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp100_state, u11_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, st_mp100_state, u11_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, st_mp100_state, u11_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, st_mp100_state, u11_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, st_mp100_state, u11_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, st_mp100_state, u11_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d", st_mp100_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index 3ce08a92113..1c303e3f631 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -576,8 +576,8 @@ TIMER_DEVICE_CALLBACK_MEMBER( st_mp200_state::u11_timer )
MACHINE_CONFIG_START(st_mp200_state::st_mp200)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator
- MCFG_CPU_PROGRAM_MAP(st_mp200_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator
+ MCFG_DEVICE_PROGRAM_MAP(st_mp200_map)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -589,22 +589,22 @@ MACHINE_CONFIG_START(st_mp200_state::st_mp200)
/* Devices */
MCFG_DEVICE_ADD("pia_u10", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(st_mp200_state, u10_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(st_mp200_state, u10_a_w))
- MCFG_PIA_READPB_HANDLER(READ8(st_mp200_state, u10_b_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp200_state, u10_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp200_state, u10_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp200_state, u10_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, st_mp200_state, u10_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, st_mp200_state, u10_a_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, st_mp200_state, u10_b_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, st_mp200_state, u10_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, st_mp200_state, u10_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, st_mp200_state, u10_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_x", st_mp200_state, timer_x, attotime::from_hz(120)) // mains freq*2
MCFG_DEVICE_ADD("pia_u11", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(st_mp200_state, u11_a_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(st_mp200_state, u11_a_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(st_mp200_state, u11_b_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(st_mp200_state, u11_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(st_mp200_state, u11_cb2_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, st_mp200_state, u11_a_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, st_mp200_state, u11_a_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, st_mp200_state, u11_b_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, st_mp200_state, u11_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, st_mp200_state, u11_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_d", st_mp200_state, u11_timer, attotime::from_hz(634)) // 555 timer*2
@@ -613,7 +613,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(st_mp200_state::st_mp201)
st_mp200(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speech", S14001A, S14001_CLOCK)
+ MCFG_DEVICE_ADD("speech", S14001A, S14001_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stactics.cpp b/src/mame/drivers/stactics.cpp
index eb2aee9809b..b1bfe95d272 100644
--- a/src/mame/drivers/stactics.cpp
+++ b/src/mame/drivers/stactics.cpp
@@ -311,15 +311,15 @@ void stactics_state::machine_start()
MACHINE_CONFIG_START(stactics_state::stactics)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 1933560)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", stactics_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", I8080, 1933560)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", stactics_state, interrupt)
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 50
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(stactics_state, coin_lockout_1_w)) // COIN REJECT 1
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(stactics_state, coin_lockout_2_w)) // COIN REJECT 2
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(stactics_state, palette_bank_w)) // FLM COL 0
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(stactics_state, palette_bank_w)) // FLM COL 1
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, stactics_state, coin_lockout_1_w)) // COIN REJECT 1
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, stactics_state, coin_lockout_2_w)) // COIN REJECT 2
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, stactics_state, palette_bank_w)) // FLM COL 0
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, stactics_state, palette_bank_w)) // FLM COL 1
MCFG_DEVICE_ADD("audiolatch", LS259, 0) // 58 - TODO: implement these switches
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // MUTE
@@ -328,17 +328,17 @@ MACHINE_CONFIG_START(stactics_state::stactics)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // UFO
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // INVADER
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // EMEGENCY (sic)
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(stactics_state, motor_w)) // overlaps rocket sound
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, stactics_state, motor_w)) // overlaps rocket sound
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // SOUND ON
MCFG_DEVICE_ADD("lamplatch", LS259, 0) // 96
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(stactics_state, base_lamp_w<4>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(stactics_state, base_lamp_w<3>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(stactics_state, base_lamp_w<2>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(stactics_state, base_lamp_w<1>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(stactics_state, base_lamp_w<0>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(stactics_state, start_lamp_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(stactics_state, barrier_lamp_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, stactics_state, base_lamp_w<4>))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, stactics_state, base_lamp_w<3>))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, stactics_state, base_lamp_w<2>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, stactics_state, base_lamp_w<1>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, stactics_state, base_lamp_w<0>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, stactics_state, start_lamp_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, stactics_state, barrier_lamp_w))
/* video hardware */
stactics_video(config);
diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp
index 567228d30f0..1740611985c 100644
--- a/src/mame/drivers/stadhero.cpp
+++ b/src/mame/drivers/stadhero.cpp
@@ -204,12 +204,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(stadhero_state::stadhero)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 20_MHz_XTAL/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", stadhero_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 20_MHz_XTAL/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", stadhero_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", M6502, 24_MHz_XTAL/16)
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M6502, 24_MHz_XTAL/16)
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -238,13 +238,13 @@ MACHINE_CONFIG_START(stadhero_state::stadhero)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 24_MHz_XTAL/16)
+ MCFG_DEVICE_ADD("ym1", YM2203, 24_MHz_XTAL/16)
MCFG_SOUND_ROUTE(0, "mono", 0.95)
MCFG_SOUND_ROUTE(1, "mono", 0.95)
MCFG_SOUND_ROUTE(2, "mono", 0.95)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM3812, 24_MHz_XTAL/8)
+ MCFG_DEVICE_ADD("ym2", YM3812, 24_MHz_XTAL/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp
index 57250aecef0..91185adb531 100644
--- a/src/mame/drivers/starcrus.cpp
+++ b/src/mame/drivers/starcrus.cpp
@@ -143,10 +143,10 @@ static const char *const starcrus_sample_names[] =
MACHINE_CONFIG_START(starcrus_state::starcrus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080,9750000/9) /* 8224 chip is a divide by 9 */
- MCFG_CPU_PROGRAM_MAP(starcrus_map)
- MCFG_CPU_IO_MAP(starcrus_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", starcrus_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", I8080,9750000/9) /* 8224 chip is a divide by 9 */
+ MCFG_DEVICE_PROGRAM_MAP(starcrus_map)
+ MCFG_DEVICE_IO_MAP(starcrus_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", starcrus_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -164,7 +164,7 @@ MACHINE_CONFIG_START(starcrus_state::starcrus)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(starcrus_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp
index 2475da4d5c1..0dafb2d67a3 100644
--- a/src/mame/drivers/starfire.cpp
+++ b/src/mame/drivers/starfire.cpp
@@ -331,9 +331,9 @@ INTERRUPT_GEN_MEMBER(starfire_state::vblank_int)
MACHINE_CONFIG_START(starfire_state::fireone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", starfire_state, vblank_int)
+ MCFG_DEVICE_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", starfire_state, vblank_int)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -350,7 +350,7 @@ MACHINE_CONFIG_START(starfire_state::starfire)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(5)
MCFG_SAMPLES_NAMES(starfire_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp
index 274540a2c82..921b88c7397 100644
--- a/src/mame/drivers/stargame.cpp
+++ b/src/mame/drivers/stargame.cpp
@@ -103,14 +103,14 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(stargame_state::stargame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 15000000 / 4) // clock line marked as CK4 and derived from 15MHz crystal
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_IO_MAP(maincpu_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 15000000 / 4) // clock line marked as CK4 and derived from 15MHz crystal
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_IO_MAP(maincpu_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_ADD("audiocpu", Z80, 15000000 / 3) // ? check divider - clock line marked as CK6 and derived from 15MHz crystal
- MCFG_CPU_PROGRAM_MAP(audiocpu_map)
- MCFG_CPU_IO_MAP(audiocpu_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 15000000 / 3) // ? check divider - clock line marked as CK6 and derived from 15MHz crystal
+ MCFG_DEVICE_PROGRAM_MAP(audiocpu_map)
+ MCFG_DEVICE_IO_MAP(audiocpu_io)
MCFG_MACHINE_RESET_OVERRIDE(stargame_state, stargame)
@@ -124,10 +124,10 @@ MACHINE_CONFIG_START(stargame_state::stargame)
/* sound hardware */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("measnd")
- MCFG_SOUND_ADD("mea8000", MEA8000, 15000000 / 4)
+ MCFG_DEVICE_ADD("mea8000", MEA8000, 15000000 / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "measnd", 1.0)
MCFG_SPEAKER_STANDARD_MONO("aysnd")
- MCFG_SOUND_ADD("ay", AY8910, 15000000 / 8) // clock line marked as CK2 and derived from 15MHz crystal
+ MCFG_DEVICE_ADD("ay", AY8910, 15000000 / 8) // clock line marked as CK2 and derived from 15MHz crystal
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "aysnd", 0.25)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp
index 9951597812f..6c6c807a444 100644
--- a/src/mame/drivers/starshp1.cpp
+++ b/src/mame/drivers/starshp1.cpp
@@ -292,19 +292,19 @@ MACHINE_CONFIG_START(starshp1_state::starshp1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, STARSHP1_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(starshp1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", starshp1_state, starshp1_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, STARSHP1_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(starshp1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", starshp1_state, starshp1_interrupt)
MCFG_DEVICE_ADD("misclatch", F9334, 0) // C8
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(starshp1_state, ship_explode_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(starshp1_state, circle_mod_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(starshp1_state, circle_kill_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(starshp1_state, starfield_kill_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(starshp1_state, inverse_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, starshp1_state, ship_explode_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, starshp1_state, circle_mod_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, starshp1_state, circle_kill_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, starshp1_state, starfield_kill_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, starshp1_state, inverse_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // BLACK HOLE, not used
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(starshp1_state, mux_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(starshp1_state, led_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, starshp1_state, mux_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, starshp1_state, led_w))
/* video hardware */
@@ -312,7 +312,7 @@ MACHINE_CONFIG_START(starshp1_state::starshp1)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(STARSHP1_PIXEL_CLOCK, STARSHP1_HTOTAL, STARSHP1_HBEND, STARSHP1_HBSTART, STARSHP1_VTOTAL, STARSHP1_VBEND, STARSHP1_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(starshp1_state, screen_update_starshp1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(starshp1_state, screen_vblank_starshp1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, starshp1_state, screen_vblank_starshp1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", starshp1)
@@ -323,18 +323,18 @@ MACHINE_CONFIG_START(starshp1_state::starshp1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(starshp1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("audiolatch", F9334, 0) // D9
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(starshp1_state, attract_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(starshp1_state, phasor_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<STARSHP1_KICKER>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<STARSHP1_SL1>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<STARSHP1_SL2>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<STARSHP1_MOLVL>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<STARSHP1_NOISE_FREQ>))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, starshp1_state, attract_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, starshp1_state, phasor_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<STARSHP1_KICKER>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<STARSHP1_SL1>))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<STARSHP1_SL2>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<STARSHP1_MOLVL>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<STARSHP1_NOISE_FREQ>))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index 2aa53fd84dc..7895f40e4f1 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -303,15 +303,15 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(starwars_state::starwars)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(starwars_state, irq0_line_assert, CLOCK_3KHZ / 12)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(starwars_state, irq0_line_assert, CLOCK_3KHZ / 12)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(CLOCK_3KHZ / 128))
- MCFG_CPU_ADD("audiocpu", MC6809E, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("adc", ADC0809, MASTER_CLOCK / 16) // designated as "137243-001" on parts list and "157249-120" on schematics
MCFG_ADC0808_IN0_CB(IOPORT("STICKY")) // pitch
@@ -319,23 +319,23 @@ MACHINE_CONFIG_START(starwars_state::starwars)
MCFG_ADC0808_IN2_CB(GND) // thrust (unused)
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_CLOCK / 8)
- MCFG_RIOT6532_IN_PA_CB(READ8(starwars_state, r6532_porta_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(starwars_state, r6532_porta_w))
- MCFG_RIOT6532_IN_PB_CB(DEVREAD8("tms", tms5220_device, status_r))
- MCFG_RIOT6532_OUT_PB_CB(DEVWRITE8("tms", tms5220_device, data_w))
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, starwars_state, r6532_porta_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, starwars_state, r6532_porta_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8("tms", tms5220_device, status_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8("tms", tms5220_device, data_w))
MCFG_RIOT6532_IRQ_CB(INPUTLINE("audiocpu", M6809_IRQ_LINE))
MCFG_X2212_ADD_AUTOSAVE("x2212") /* nvram */
MCFG_DEVICE_ADD("outlatch", LS259, 0) // 9L/M
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(starwars_state, coin1_counter_w)) // Coin counter 1
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(starwars_state, coin2_counter_w)) // Coin counter 2
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, starwars_state, coin1_counter_w)) // Coin counter 1
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, starwars_state, coin2_counter_w)) // Coin counter 2
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led2")) MCFG_DEVCB_INVERT // LED 3
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // LED 2
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(MEMBANK("bank1")) // bank switch
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(starwars_state, prng_reset_w)) // reset PRNG
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, starwars_state, prng_reset_w)) // reset PRNG
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // LED 1
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(starwars_state, recall_w)) // NVRAM array recall
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, starwars_state, recall_w)) // NVRAM array recall
/* video hardware */
MCFG_VECTOR_ADD("vector")
@@ -351,35 +351,35 @@ MACHINE_CONFIG_START(starwars_state::starwars)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("pokey3", POKEY, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey3", POKEY, MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("pokey4", POKEY, MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("pokey4", POKEY, MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("tms", TMS5220, MASTER_CLOCK/2/9)
+ MCFG_DEVICE_ADD("tms", TMS5220, MASTER_CLOCK/2/9)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("riot", riot6532_device, pa7_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(starwars_state, boost_interleave_hack))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("riot", riot6532_device, pa7_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, starwars_state, boost_interleave_hack))
MCFG_GENERIC_LATCH_8_ADD("mainlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("riot", riot6532_device, pa6_w))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(starwars_state, boost_interleave_hack))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("riot", riot6532_device, pa6_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, starwars_state, boost_interleave_hack))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(starwars_state::esb)
starwars(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(esb_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(esb_main_map)
MCFG_SLAPSTIC_ADD("slapstic", 101)
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index 4c0f0ec07c9..fae4671d0b5 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -600,10 +600,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(statriv2_state::statriv2)
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MCFG_CPU_ADD("maincpu", I8085A, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(statriv2_map)
- MCFG_CPU_IO_MAP(statriv2_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", statriv2_state, statriv2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", I8085A, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(statriv2_map)
+ MCFG_DEVICE_IO_MAP(statriv2_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", statriv2_state, statriv2_interrupt)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -614,7 +614,7 @@ MACHINE_CONFIG_START(statriv2_state::statriv2)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(statriv2_state, ppi_portc_hi_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, statriv2_state, ppi_portc_hi_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -632,7 +632,7 @@ MACHINE_CONFIG_START(statriv2_state::statriv2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -653,8 +653,8 @@ MACHINE_CONFIG_START(statriv2_state::funcsino)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(MASTER_CLOCK/2) /* 3 MHz?? seems accurate */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(MASTER_CLOCK/2) /* 3 MHz?? seems accurate */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp
index a5f05579b16..64f739fb552 100644
--- a/src/mame/drivers/stellafr.cpp
+++ b/src/mame/drivers/stellafr.cpp
@@ -92,19 +92,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(stellafr_state::stellafr)
- MCFG_CPU_ADD("maincpu", M68000, 10000000 ) //?
- MCFG_CPU_PROGRAM_MAP(stellafr_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(stellafr_state, irq_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000 ) //?
+ MCFG_DEVICE_PROGRAM_MAP(stellafr_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(stellafr_state, irq_ack)
MCFG_DEVICE_ADD("duart", MC68681, 3686400)
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_2)) // ?
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(stellafr_state, duart_output_w))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, stellafr_state, duart_output_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 1000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("INPUTS"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(stellafr_state, ay8910_portb_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, stellafr_state, ay8910_portb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp
index 3e119ef5dd3..9a0e0600a4a 100644
--- a/src/mame/drivers/stfight.cpp
+++ b/src/mame/drivers/stfight.cpp
@@ -456,19 +456,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(stfight_state::stfight_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("stfight_vid:screen", stfight_state, stfight_vb_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("stfight_vid:screen", stfight_state, stfight_vb_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(stfight_state, irq0_line_hold, 120)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(stfight_state, irq0_line_hold, 120)
- MCFG_CPU_ADD("mcu", M68705P5, XTAL(12'000'000) / 4)
- MCFG_M68705_PORTB_R_CB(READ8(stfight_state, stfight_68705_port_b_r));
- MCFG_M68705_PORTA_W_CB(WRITE8(stfight_state, stfight_68705_port_a_w));
- MCFG_M68705_PORTB_W_CB(WRITE8(stfight_state, stfight_68705_port_b_w));
- MCFG_M68705_PORTC_W_CB(WRITE8(stfight_state, stfight_68705_port_c_w));
+ MCFG_DEVICE_ADD("mcu", M68705P5, XTAL(12'000'000) / 4)
+ MCFG_M68705_PORTB_R_CB(READ8(*this, stfight_state, stfight_68705_port_b_r));
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, stfight_state, stfight_68705_port_a_w));
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, stfight_state, stfight_68705_port_b_w));
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, stfight_state, stfight_68705_port_c_w));
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -479,30 +479,30 @@ MACHINE_CONFIG_START(stfight_state::stfight_base)
MCFG_SPEAKER_STANDARD_MONO("mono")
// YM2203_PITCH_HACK - These should be clocked at 1.5Mhz (see TODO list)
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(12'000'000) / 8 * 3)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(12'000'000) / 8 * 3)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(12'000'000) / 8 * 3)
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(12'000'000) / 8 * 3)
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.10)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(stfight_state, stfight_adpcm_int)) // Interrupt function
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, stfight_state, stfight_adpcm_int)) // Interrupt function
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8KHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(stfight_state::stfight)
stfight_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(stfight_cpu1_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("stfight_vid:screen", stfight_state, stfight_vb_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(stfight_cpu1_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("stfight_vid:screen", stfight_state, stfight_vb_interrupt)
MCFG_STFIGHT_VIDEO_ADD("stfight_vid")
MACHINE_CONFIG_END
@@ -510,9 +510,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(stfight_state::cshooter)
stfight_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cshooter_cpu1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("airraid_vid:screen", stfight_state, stfight_vb_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cshooter_cpu1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("airraid_vid:screen", stfight_state, stfight_vb_interrupt)
MCFG_AIRRAID_VIDEO_ADD("airraid_vid")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp
index 28e666d00ec..84b455620b2 100644
--- a/src/mame/drivers/stlforce.cpp
+++ b/src/mame/drivers/stlforce.cpp
@@ -196,9 +196,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(stlforce_state::stlforce)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 15000000)
- MCFG_CPU_PROGRAM_MAP(stlforce_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", stlforce_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 15000000)
+ MCFG_DEVICE_PROGRAM_MAP(stlforce_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", stlforce_state, irq4_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -226,8 +226,8 @@ MACHINE_CONFIG_START(stlforce_state::twinbrat)
stlforce(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(14'745'600))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(14'745'600))
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(3*8, 45*8-1, 0*8, 30*8-1)
diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp
index ca23a2f360c..4c498d44f7a 100644
--- a/src/mame/drivers/stratos.cpp
+++ b/src/mame/drivers/stratos.cpp
@@ -347,8 +347,8 @@ static INPUT_PORTS_START( stratos )
INPUT_PORTS_END
MACHINE_CONFIG_START(stratos_state::stratos)
- MCFG_CPU_ADD("maincpu", M65C02, 5670000)
- MCFG_CPU_PROGRAM_MAP(stratos_mem)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 5670000)
+ MCFG_DEVICE_PROGRAM_MAP(stratos_mem)
MCFG_SCREEN_ADD("screen", LCD)
MCFG_SCREEN_REFRESH_RATE(50)
diff --git a/src/mame/drivers/strkzn.cpp b/src/mame/drivers/strkzn.cpp
index 32967c87ca9..674f16741e2 100644
--- a/src/mame/drivers/strkzn.cpp
+++ b/src/mame/drivers/strkzn.cpp
@@ -55,13 +55,13 @@ void strkzn_state::light_io(address_map &map)
}
MACHINE_CONFIG_START(strkzn_state::strkzn)
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(main_mem)
- MCFG_CPU_IO_MAP(main_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_mem)
+ MCFG_DEVICE_IO_MAP(main_io)
- MCFG_CPU_ADD("lightcpu", I80188, 10000000)
- MCFG_CPU_PROGRAM_MAP(light_mem)
- MCFG_CPU_IO_MAP(light_io)
+ MCFG_DEVICE_ADD("lightcpu", I80188, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(light_mem)
+ MCFG_DEVICE_IO_MAP(light_io)
MACHINE_CONFIG_END
INPUT_PORTS_START( strkzn )
diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp
index 85e2a11252c..074ebef53b9 100644
--- a/src/mame/drivers/strnskil.cpp
+++ b/src/mame/drivers/strnskil.cpp
@@ -348,13 +348,13 @@ TIMER_DEVICE_CALLBACK_MEMBER(strnskil_state::strnskil_irq)
MACHINE_CONFIG_START(strnskil_state::strnskil)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
- MCFG_CPU_PROGRAM_MAP(strnskil_map1)
+ MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
+ MCFG_DEVICE_PROGRAM_MAP(strnskil_map1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", strnskil_state, strnskil_irq, "screen", 0, 1)
- MCFG_CPU_ADD("sub", Z80,8000000/2) /* 4.000MHz */
- MCFG_CPU_PROGRAM_MAP(strnskil_map2)
- MCFG_CPU_PERIODIC_INT_DRIVER(strnskil_state, irq0_line_hold, 2*60)
+ MCFG_DEVICE_ADD("sub", Z80,8000000/2) /* 4.000MHz */
+ MCFG_DEVICE_PROGRAM_MAP(strnskil_map2)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(strnskil_state, irq0_line_hold, 2*60)
// MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -376,20 +376,20 @@ MACHINE_CONFIG_START(strnskil_state::strnskil)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, 8000000/4)
+ MCFG_DEVICE_ADD("sn1", SN76496, 8000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_SOUND_ADD("sn2", SN76496, 8000000/2)
+ MCFG_DEVICE_ADD("sn2", SN76496, 8000000/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(strnskil_state::banbam)
strnskil(config);
- MCFG_CPU_ADD("mcu", MB8841, 8000000/2)
-// MCFG_MB88XX_READ_K_CB(READ8(strnskil_state, mcu_portk_r))
-// MCFG_MB88XX_READ_R0_CB(READ8(strnskil_state, mcu_portr0_r))
-// MCFG_MB88XX_WRITE_R0_CB(WRITE8(strnskil_state, mcu_portr0_w))
+ MCFG_DEVICE_ADD("mcu", MB8841, 8000000/2)
+// MCFG_MB88XX_READ_K_CB(READ8(*this, strnskil_state, mcu_portk_r))
+// MCFG_MB88XX_READ_R0_CB(READ8(*this, strnskil_state, mcu_portr0_r))
+// MCFG_MB88XX_WRITE_R0_CB(WRITE8(*this, strnskil_state, mcu_portr0_w))
MACHINE_CONFIG_END
/****************************************************************************/
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index 44c3e52292b..4d9195e6d3f 100644
--- a/src/mame/drivers/studio2.cpp
+++ b/src/mame/drivers/studio2.cpp
@@ -640,15 +640,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(studio2_state::studio2)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, 1760000) /* the real clock is derived from an oscillator circuit */
- MCFG_CPU_PROGRAM_MAP(studio2_map)
- MCFG_CPU_IO_MAP(studio2_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, 1760000) /* the real clock is derived from an oscillator circuit */
+ MCFG_DEVICE_PROGRAM_MAP(studio2_map)
+ MCFG_DEVICE_IO_MAP(studio2_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(studio2_state, clear_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(studio2_state, ef3_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(studio2_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(studio2_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(DEVWRITE8(CDP1861_TAG, cdp1861_device, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, studio2_state, clear_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, studio2_state, ef3_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, studio2_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, studio2_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(CDP1861_TAG, cdp1861_device, dma_w))
/* video hardware */
MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, 1760000)
@@ -659,7 +659,7 @@ MACHINE_CONFIG_START(studio2_state::studio2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 300)
+ MCFG_DEVICE_ADD("beeper", BEEP, 300)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
studio2_cartslot(config);
@@ -667,15 +667,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(visicom_state::visicom)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
- MCFG_CPU_PROGRAM_MAP(visicom_map)
- MCFG_CPU_IO_MAP(visicom_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(3'579'545)/2)
+ MCFG_DEVICE_PROGRAM_MAP(visicom_map)
+ MCFG_DEVICE_IO_MAP(visicom_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(visicom_state, clear_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(visicom_state, ef3_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(visicom_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(visicom_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(WRITE8(visicom_state, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, visicom_state, clear_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, visicom_state, ef3_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, visicom_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, visicom_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, visicom_state, dma_w))
/* video hardware */
MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'579'545)/2)
@@ -687,7 +687,7 @@ MACHINE_CONFIG_START(visicom_state::visicom)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 300)
+ MCFG_DEVICE_ADD("beeper", BEEP, 300)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "visicom_cart")
@@ -699,15 +699,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpt02_state::mpt02)
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1864_CLOCK)
- MCFG_CPU_PROGRAM_MAP(mpt02_map)
- MCFG_CPU_IO_MAP(mpt02_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, CDP1864_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(mpt02_map)
+ MCFG_DEVICE_IO_MAP(mpt02_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(mpt02_state, clear_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(mpt02_state, ef3_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(mpt02_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(mpt02_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(WRITE8(mpt02_state, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, mpt02_state, clear_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, mpt02_state, ef3_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, mpt02_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, mpt02_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, mpt02_state, dma_w))
/* video hardware */
MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, CDP1864_CLOCK)
@@ -715,10 +715,10 @@ MACHINE_CONFIG_START(mpt02_state::mpt02)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 300)
+ MCFG_DEVICE_ADD("beeper", BEEP, 300)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, CDP1864_CLOCK, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(mpt02_state, rdata_r), READLINE(mpt02_state, bdata_r), READLINE(mpt02_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, CDP1864_CLOCK, GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(*this, mpt02_state, rdata_r), READLINE(*this, mpt02_state, bdata_r), READLINE(*this, mpt02_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(4.7), RES_K(8.2), RES_K(4.7), RES_K(22))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 53bbdaf1fcc..df68242b443 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -516,21 +516,21 @@ void stuntair_state::machine_reset()
MACHINE_CONFIG_START(stuntair_state::stuntair)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* 3 MHz? */
- MCFG_CPU_PROGRAM_MAP(stuntair_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6) /* 3 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(stuntair_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* 3 MHz? */
- MCFG_CPU_PROGRAM_MAP(stuntair_sound_map)
- MCFG_CPU_IO_MAP(stuntair_sound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(stuntair_state, irq0_line_hold, 420) // drives music tempo, timing is approximate based on PCB audio recording.. and where is irq ack?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6) /* 3 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(stuntair_sound_map)
+ MCFG_DEVICE_IO_MAP(stuntair_sound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(stuntair_state, irq0_line_hold, 420) // drives music tempo, timing is approximate based on PCB audio recording.. and where is irq ack?
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // type and location not verified
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // set but never cleared
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(stuntair_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, stuntair_state, nmi_enable_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // cleared at start
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(stuntair_state, spritebank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, stuntair_state, spritebank1_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // cleared at start
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(stuntair_state, spritebank0_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, stuntair_state, spritebank0_w))
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // cleared at start
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // cleared at start
@@ -546,7 +546,7 @@ MACHINE_CONFIG_START(stuntair_state::stuntair)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(stuntair_state, screen_update_stuntair)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(stuntair_state, stuntair_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, stuntair_state, stuntair_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", stuntair)
MCFG_PALETTE_ADD("palette", 0x100+2)
@@ -558,12 +558,12 @@ MACHINE_CONFIG_START(stuntair_state::stuntair)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(18'432'000)/12)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(stuntair_state, ay8910_portb_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(18'432'000)/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, stuntair_state, ay8910_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index 8cfba1511d2..567f7ce0015 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -1065,18 +1065,18 @@ WRITE8_MEMBER( stv_state::pdr2_output_w )
MACHINE_CONFIG_START(stv_state::stv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MCFG_CPU_PROGRAM_MAP(stv_mem)
+ MCFG_DEVICE_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MCFG_DEVICE_PROGRAM_MAP(stv_mem)
MCFG_SH2_IS_SLAVE(0)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", stv_state, saturn_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
- MCFG_CPU_PROGRAM_MAP(stv_mem)
+ MCFG_DEVICE_ADD("slave", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MCFG_DEVICE_PROGRAM_MAP(stv_mem)
MCFG_SH2_IS_SLAVE(1)
MCFG_TIMER_DRIVER_ADD_SCANLINE("slave_scantimer", stv_state, saturn_slave_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M68000, 11289600) //11.2896 MHz
- MCFG_CPU_PROGRAM_MAP(sound_mem)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 11289600) //11.2896 MHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_mem)
MCFG_SEGA_SCU_ADD("scu")
downcast<sega_scu_device &>(*device).set_hostcpu("maincpu");
@@ -1084,18 +1084,18 @@ MACHINE_CONFIG_START(stv_state::stv)
MCFG_SMPC_HLE_ADD("smpc", XTAL(4'000'000))
MCFG_SMPC_HLE_SCREEN("screen")
downcast<smpc_hle_device &>(*device).set_region_code(0);
- MCFG_SMPC_HLE_PDR1_IN_CB(READ8(stv_state, pdr1_input_r))
- MCFG_SMPC_HLE_PDR2_IN_CB(READ8(stv_state, pdr2_input_r))
- MCFG_SMPC_HLE_PDR1_OUT_CB(WRITE8(stv_state, pdr1_output_w))
- MCFG_SMPC_HLE_PDR2_OUT_CB(WRITE8(stv_state, pdr2_output_w))
- MCFG_SMPC_HLE_MASTER_RESET_CB(WRITELINE(saturn_state, master_sh2_reset_w))
- MCFG_SMPC_HLE_MASTER_NMI_CB(WRITELINE(saturn_state, master_sh2_nmi_w))
- MCFG_SMPC_HLE_SLAVE_RESET_CB(WRITELINE(saturn_state, slave_sh2_reset_w))
-// MCFG_SMPC_HLE_SOUND_RESET_CB(WRITELINE(saturn_state, sound_68k_reset_w)) // ST-V games controls reset line via PDR2
- MCFG_SMPC_HLE_SYSTEM_RESET_CB(WRITELINE(saturn_state, system_reset_w))
- MCFG_SMPC_HLE_SYSTEM_HALT_CB(WRITELINE(saturn_state, system_halt_w))
- MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(saturn_state, dot_select_w))
- MCFG_SMPC_HLE_IRQ_HANDLER_CB(DEVWRITELINE("scu", sega_scu_device, smpc_irq_w))
+ MCFG_SMPC_HLE_PDR1_IN_CB(READ8(*this, stv_state, pdr1_input_r))
+ MCFG_SMPC_HLE_PDR2_IN_CB(READ8(*this, stv_state, pdr2_input_r))
+ MCFG_SMPC_HLE_PDR1_OUT_CB(WRITE8(*this, stv_state, pdr1_output_w))
+ MCFG_SMPC_HLE_PDR2_OUT_CB(WRITE8(*this, stv_state, pdr2_output_w))
+ MCFG_SMPC_HLE_MASTER_RESET_CB(WRITELINE(*this, saturn_state, master_sh2_reset_w))
+ MCFG_SMPC_HLE_MASTER_NMI_CB(WRITELINE(*this, saturn_state, master_sh2_nmi_w))
+ MCFG_SMPC_HLE_SLAVE_RESET_CB(WRITELINE(*this, saturn_state, slave_sh2_reset_w))
+// MCFG_SMPC_HLE_SOUND_RESET_CB(WRITELINE(*this, saturn_state, sound_68k_reset_w)) // ST-V games controls reset line via PDR2
+ MCFG_SMPC_HLE_SYSTEM_RESET_CB(WRITELINE(*this, saturn_state, system_reset_w))
+ MCFG_SMPC_HLE_SYSTEM_HALT_CB(WRITELINE(*this, saturn_state, system_halt_w))
+ MCFG_SMPC_HLE_DOT_SELECT_CB(WRITELINE(*this, saturn_state, dot_select_w))
+ MCFG_SMPC_HLE_IRQ_HANDLER_CB(WRITELINE("scu", sega_scu_device, smpc_irq_w))
MCFG_MACHINE_START_OVERRIDE(stv_state,stv)
MCFG_MACHINE_RESET_OVERRIDE(stv_state,stv)
@@ -1115,9 +1115,9 @@ MACHINE_CONFIG_START(stv_state::stv)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("scsp", SCSP, 0)
- MCFG_SCSP_IRQ_CB(WRITE8(saturn_state, scsp_irq))
- MCFG_SCSP_MAIN_IRQ_CB(DEVWRITELINE("scu", sega_scu_device, sound_req_w))
+ MCFG_DEVICE_ADD("scsp", SCSP)
+ MCFG_SCSP_IRQ_CB(WRITE8(*this, saturn_state, scsp_irq))
+ MCFG_SCSP_MAIN_IRQ_CB(WRITELINE("scu", sega_scu_device, sound_req_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1132,16 +1132,16 @@ MACHINE_CONFIG_START(stv_state::stvcd)
stv(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(stvcd_mem)
+ MCFG_DEVICE_PROGRAM_MAP(stvcd_mem)
MCFG_DEVICE_MODIFY("slave")
- MCFG_CPU_PROGRAM_MAP(stvcd_mem)
+ MCFG_DEVICE_PROGRAM_MAP(stvcd_mem)
MCFG_DEVICE_ADD("stvcd", STVCD, 0)
//MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
//MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_MODIFY("scsp")
- MCFG_SCSP_EXTS_CB(DEVREAD16("stvcd", stvcd_device, channel_volume_r))
+ MCFG_SCSP_EXTS_CB(READ16("stvcd", stvcd_device, channel_volume_r))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/su2000.cpp b/src/mame/drivers/su2000.cpp
index 1f8da514422..9781e6de97f 100644
--- a/src/mame/drivers/su2000.cpp
+++ b/src/mame/drivers/su2000.cpp
@@ -126,23 +126,23 @@ static void ide_interrupt(device_t *device, int state)
MACHINE_CONFIG_START(su2000_state::su2000)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", I486, I486_CLOCK)
- MCFG_CPU_PROGRAM_MAP(pcat_map)
- MCFG_CPU_IO_MAP(pcat_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I486, I486_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(pcat_map)
+ MCFG_DEVICE_IO_MAP(pcat_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
#if 0
- MCFG_CPU_ADD("tracker", TMS32031, TMS320C1_CLOCK)
- MCFG_CPU_PROGRAM_MAP(tracker_map)
+ MCFG_DEVICE_ADD("tracker", TMS32031, TMS320C1_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(tracker_map)
- MCFG_CPU_ADD("pix_cpu1", MC88110, MC88110_CLOCK)
- MCFG_CPU_PROGRAM_MAP(pix_cpu_a)
+ MCFG_DEVICE_ADD("pix_cpu1", MC88110, MC88110_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(pix_cpu_a)
- MCFG_CPU_ADD("pix_cpu2", MC88110, MC88110_CLOCK)
- MCFG_CPU_PROGRAM_MAP(pix_cpu_b)
+ MCFG_DEVICE_ADD("pix_cpu2", MC88110, MC88110_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(pix_cpu_b)
- MCFG_CPU_ADD("format_c", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(formatc_map)
+ MCFG_DEVICE_ADD("format_c", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(formatc_map)
#endif
/* Video hardware */
@@ -152,7 +152,7 @@ MACHINE_CONFIG_START(su2000_state::su2000)
MCFG_DEVICE_REMOVE("rtc")
MCFG_DS12885_ADD("rtc")
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp
index 697ec8febc5..59ab85ca6eb 100644
--- a/src/mame/drivers/sub.cpp
+++ b/src/mame/drivers/sub.cpp
@@ -464,17 +464,17 @@ INTERRUPT_GEN_MEMBER(sub_state::sound_irq)
MACHINE_CONFIG_START(sub_state::sub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(subm_map)
- MCFG_CPU_IO_MAP(subm_io)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK/6) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(subm_map)
+ MCFG_DEVICE_IO_MAP(subm_io)
- MCFG_CPU_ADD("soundcpu", Z80,MASTER_CLOCK/6) /* ? MHz */
- MCFG_CPU_PROGRAM_MAP(subm_sound_map)
- MCFG_CPU_IO_MAP(subm_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(sub_state, sound_irq, 120) //???
+ MCFG_DEVICE_ADD("soundcpu", Z80,MASTER_CLOCK/6) /* ? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(subm_sound_map)
+ MCFG_DEVICE_IO_MAP(subm_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(sub_state, sound_irq, 120) //???
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(sub_state, int_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, sub_state, int_mask_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP)
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // same as Q0?
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP)
@@ -489,7 +489,7 @@ MACHINE_CONFIG_START(sub_state::sub)
MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 256-16-1)
MCFG_SCREEN_UPDATE_DRIVER(sub_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(sub_state, main_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sub_state, main_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", sub)
MCFG_PALETTE_ADD("palette", 0x400)
@@ -504,10 +504,10 @@ MACHINE_CONFIG_START(sub_state::sub)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
+ MCFG_DEVICE_ADD("ay1", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
- MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
+ MCFG_DEVICE_ADD("ay2", AY8910, MASTER_CLOCK/6/2) /* ? Mhz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp
index f22d5954e3c..13ae418a920 100644
--- a/src/mame/drivers/subhuntr.cpp
+++ b/src/mame/drivers/subhuntr.cpp
@@ -144,12 +144,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(subhuntr_state::subhuntr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 14318180/4/2)
- MCFG_CPU_PROGRAM_MAP(subhuntr_map)
- MCFG_CPU_IO_MAP(subhuntr_io_map)
- MCFG_CPU_DATA_MAP(subhuntr_data_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", subhuntr_state, subhuntr_interrupt)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank))
+ MCFG_DEVICE_ADD("maincpu", S2650, 14318180/4/2)
+ MCFG_DEVICE_PROGRAM_MAP(subhuntr_map)
+ MCFG_DEVICE_IO_MAP(subhuntr_io_map)
+ MCFG_DEVICE_DATA_MAP(subhuntr_data_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", subhuntr_state, subhuntr_interrupt)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank))
// MCFG_DEVICE_ADD("s2636", S2636, 0)
// MCFG_S2636_WORKRAM_SIZE(0x100)
diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp
index fc56300cf26..031b9009dff 100644
--- a/src/mame/drivers/subs.cpp
+++ b/src/mame/drivers/subs.cpp
@@ -176,9 +176,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(subs_state::subs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(subs_state, interrupt, 4*57)
+ MCFG_DEVICE_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(subs_state, interrupt, 4*57)
/* video hardware */
@@ -209,7 +209,7 @@ MACHINE_CONFIG_START(subs_state::subs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(subs)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -217,13 +217,13 @@ MACHINE_CONFIG_START(subs_state::subs)
MCFG_DEVICE_ADD("latch", LS259, 0) // C9
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0")) MCFG_DEVCB_INVERT // START LAMP 1
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT // START LAMP 2
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SUBS_SONAR2_EN>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SUBS_SONAR1_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SUBS_SONAR2_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SUBS_SONAR1_EN>))
// Schematics show crash and explode reversed. But this is proper.
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SUBS_EXPLODE_EN>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<SUBS_CRASH_EN>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(subs_state, invert1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(subs_state, invert2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SUBS_EXPLODE_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("discrete", discrete_device, write_line<SUBS_CRASH_EN>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, subs_state, invert1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, subs_state, invert2_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index d96d3b846b7..c5710ee51ca 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -2778,14 +2778,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(subsino_state::victor21)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
- MCFG_CPU_PROGRAM_MAP(victor21_map)
- MCFG_CPU_IO_MAP(subsino_iomap)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
+ MCFG_DEVICE_PROGRAM_MAP(victor21_map)
+ MCFG_DEVICE_IO_MAP(subsino_iomap)
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(subsino_state, subsino_out_a_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, subsino_state, subsino_out_a_w))
MCFG_I8255_TRISTATE_PORTA_CB(CONSTANT(0))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(subsino_state, subsino_out_b_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, subsino_state, subsino_out_b_w))
MCFG_I8255_TRISTATE_PORTB_CB(CONSTANT(0))
MCFG_I8255_IN_PORTC_CB(IOPORT("INC"))
@@ -2810,7 +2810,7 @@ MACHINE_CONFIG_START(subsino_state::victor21)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(4'433'619) / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
@@ -2822,16 +2822,16 @@ MACHINE_CONFIG_START(subsino_state::victor5)
victor21(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(victor5_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(victor5_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::crsbingo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown CPU and clock */
- MCFG_CPU_PROGRAM_MAP(crsbingo_map)
- MCFG_CPU_IO_MAP(subsino_iomap)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown CPU and clock */
+ MCFG_DEVICE_PROGRAM_MAP(crsbingo_map)
+ MCFG_DEVICE_IO_MAP(subsino_iomap)
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
@@ -2854,16 +2854,16 @@ MACHINE_CONFIG_START(subsino_state::crsbingo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545)) /* Unknown clock */
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) /* Unknown clock */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::srider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
- MCFG_CPU_PROGRAM_MAP(srider_map)
- MCFG_CPU_IO_MAP(subsino_iomap)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
+ MCFG_DEVICE_PROGRAM_MAP(srider_map)
+ MCFG_DEVICE_IO_MAP(subsino_iomap)
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("SW1"))
@@ -2896,7 +2896,7 @@ MACHINE_CONFIG_START(subsino_state::srider)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(4'433'619) / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
@@ -2908,15 +2908,15 @@ MACHINE_CONFIG_START(subsino_state::sharkpy)
srider(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sharkpy_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sharkpy_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::tisub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown CPU and clock */
- MCFG_CPU_PROGRAM_MAP(tisub_map)
- MCFG_CPU_IO_MAP(subsino_iomap)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown CPU and clock */
+ MCFG_DEVICE_PROGRAM_MAP(tisub_map)
+ MCFG_DEVICE_IO_MAP(subsino_iomap)
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("SW1"))
@@ -2949,15 +2949,15 @@ MACHINE_CONFIG_START(subsino_state::tisub)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545)) /* Unknown clock */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(3'579'545)) /* Unknown clock */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino_state::stbsub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
- MCFG_CPU_PROGRAM_MAP(stbsub_map)
- MCFG_CPU_IO_MAP(subsino_iomap)
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
+ MCFG_DEVICE_PROGRAM_MAP(stbsub_map)
+ MCFG_DEVICE_IO_MAP(subsino_iomap)
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("SW1"))
@@ -2992,7 +2992,7 @@ MACHINE_CONFIG_START(subsino_state::stbsub)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(3'579'545))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(3'579'545))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3000,8 +3000,8 @@ MACHINE_CONFIG_START(subsino_state::mtrainnv)
stbsub(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mtrainnv_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mtrainnv_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 1e95b1046f4..c4df5d77aa9 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -2367,9 +2367,9 @@ INPUT_PORTS_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::bishjan)
- MCFG_CPU_ADD("maincpu", H83044, XTAL(44'100'000) / 3)
- MCFG_CPU_PROGRAM_MAP( bishjan_map )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", H83044, XTAL(44'100'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP( bishjan_map )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW)
@@ -2395,8 +2395,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino2_state::new2001)
bishjan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP( new2001_map )
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP( new2001_map )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE( 640, 256 )
@@ -2405,9 +2405,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino2_state::humlan)
bishjan(config);
- MCFG_CPU_REPLACE("maincpu", H83044, XTAL(48'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP( humlan_map )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", H83044, XTAL(48'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP( humlan_map )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
// sound hardware
// SS9804
@@ -2418,9 +2418,9 @@ MACHINE_CONFIG_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::mtrain)
- MCFG_CPU_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
- MCFG_CPU_PROGRAM_MAP( mtrain_map )
- MCFG_CPU_IO_MAP( mtrain_io )
+ MCFG_DEVICE_ADD("maincpu", Z180, XTAL(12'000'000) / 8) /* Unknown clock */
+ MCFG_DEVICE_PROGRAM_MAP( mtrain_map )
+ MCFG_DEVICE_IO_MAP( mtrain_io )
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2452,9 +2452,9 @@ MACHINE_CONFIG_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::saklove)
- MCFG_CPU_ADD("maincpu", I80188, XTAL(20'000'000)*2 ) // !! AMD AM188-EM !!
- MCFG_CPU_PROGRAM_MAP( saklove_map )
- MCFG_CPU_IO_MAP( saklove_io )
+ MCFG_DEVICE_ADD("maincpu", I80188, XTAL(20'000'000)*2 ) // !! AMD AM188-EM !!
+ MCFG_DEVICE_PROGRAM_MAP( saklove_map )
+ MCFG_DEVICE_IO_MAP( saklove_io )
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2480,7 +2480,7 @@ MACHINE_CONFIG_START(subsino2_state::saklove)
MCFG_OKIM6295_ADD("oki", XTAL(8'467'200) / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(12'000'000) / 4) // ? chip and clock unknown
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(12'000'000) / 4) // ? chip and clock unknown
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -2489,10 +2489,10 @@ MACHINE_CONFIG_END
***************************************************************************/
MACHINE_CONFIG_START(subsino2_state::xplan)
- MCFG_CPU_ADD("maincpu", I80188, XTAL(20'000'000)*2 ) // !! AMD AM188-EM !!
- MCFG_CPU_PROGRAM_MAP( xplan_map )
- MCFG_CPU_IO_MAP( xplan_io )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, am188em_int0_irq)
+ MCFG_DEVICE_ADD("maincpu", I80188, XTAL(20'000'000)*2 ) // !! AMD AM188-EM !!
+ MCFG_DEVICE_PROGRAM_MAP( xplan_map )
+ MCFG_DEVICE_IO_MAP( xplan_io )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", subsino2_state, am188em_int0_irq)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2521,14 +2521,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino2_state::xtrain)
xplan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(xtrain_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(xtrain_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(subsino2_state::expcard)
xplan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(expcard_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(expcard_io)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp
index 102a58bcee6..ff9c57cdd17 100644
--- a/src/mame/drivers/summit.cpp
+++ b/src/mame/drivers/summit.cpp
@@ -309,9 +309,9 @@ PALETTE_INIT_MEMBER(summit_state, summit)
MACHINE_CONFIG_START(summit_state::summit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(mainmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", summit_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(mainmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", summit_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sumt8035.cpp b/src/mame/drivers/sumt8035.cpp
index 347b513eff4..424b198a533 100644
--- a/src/mame/drivers/sumt8035.cpp
+++ b/src/mame/drivers/sumt8035.cpp
@@ -240,9 +240,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(sumt8035_state::summit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8035,5000000)
- MCFG_CPU_PROGRAM_MAP(sumt_map)
- MCFG_CPU_IO_MAP(sumt_portmap)
+ MCFG_DEVICE_ADD("maincpu",I8035,5000000)
+ MCFG_DEVICE_PROGRAM_MAP(sumt_map)
+ MCFG_DEVICE_IO_MAP(sumt_portmap)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sun1.cpp b/src/mame/drivers/sun1.cpp
index 3afc405d084..024d7fa9601 100644
--- a/src/mame/drivers/sun1.cpp
+++ b/src/mame/drivers/sun1.cpp
@@ -115,37 +115,37 @@ void sun1_state::machine_reset()
MACHINE_CONFIG_START(sun1_state::sun1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(sun1_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(sun1_mem)
MCFG_DEVICE_ADD("timer", AM9513, XTAL(16'000'000) / 4)
- MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("timer", am9513_device, gate1_w))
+ MCFG_AM9513_FOUT_CALLBACK(WRITELINE("timer", am9513_device, gate1_w))
MCFG_AM9513_OUT1_CALLBACK(NOOP) // Watchdog; generates BERR/Reset
MCFG_AM9513_OUT2_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_6)) // User timer
MCFG_AM9513_OUT3_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7)) // Refresh timer (2 ms)
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("iouart", upd7201_new_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("iouart", upd7201_new_device, txca_w))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("iouart", upd7201_new_device, rxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("iouart", upd7201_new_device, txcb_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("iouart", upd7201_new_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("iouart", upd7201_new_device, txca_w))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("iouart", upd7201_new_device, rxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("iouart", upd7201_new_device, txcb_w))
MCFG_DEVICE_ADD("iouart", UPD7201_NEW, XTAL(16'000'000) / 4)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs232b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("iouart", upd7201_new_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("iouart", upd7201_new_device, ctsa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("iouart", upd7201_new_device, dcda_w))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("iouart", upd7201_new_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("iouart", upd7201_new_device, ctsa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("iouart", upd7201_new_device, dcda_w))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("iouart", upd7201_new_device, rxb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("iouart", upd7201_new_device, ctsb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("iouart", upd7201_new_device, dcdb_w))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("iouart", upd7201_new_device, rxb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("iouart", upd7201_new_device, ctsb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("iouart", upd7201_new_device, dcdb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp
index e47dbc82237..923139ca350 100644
--- a/src/mame/drivers/sun2.cpp
+++ b/src/mame/drivers/sun2.cpp
@@ -610,8 +610,8 @@ void sun2_state::machine_reset()
MACHINE_CONFIG_START(sun2_state::sun2vme)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, XTAL(19'660'800) / 2) // or XTAL(24'000'000) / 2 by jumper setting
- MCFG_CPU_PROGRAM_MAP(sun2_mem)
+ MCFG_DEVICE_ADD("maincpu", M68010, XTAL(19'660'800) / 2) // or XTAL(24'000'000) / 2 by jumper setting
+ MCFG_DEVICE_PROGRAM_MAP(sun2_mem)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -653,37 +653,37 @@ MACHINE_CONFIG_START(sun2_state::sun2vme)
MCFG_SCREEN_REFRESH_RATE(72)
MCFG_DEVICE_ADD("timer", AM9513A, XTAL(19'660'800) / 4)
- MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("timer", am9513_device, gate1_w))
+ MCFG_AM9513_FOUT_CALLBACK(WRITELINE("timer", am9513_device, gate1_w))
MCFG_AM9513_OUT1_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7))
- MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<0>))
- MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<1>))
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<2>))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<3>))
+ MCFG_AM9513_OUT2_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<0>))
+ MCFG_AM9513_OUT3_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<1>))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<2>))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<3>))
MCFG_INPUT_MERGER_ANY_HIGH("irq5") // 74LS05 open collectors
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M68K_IRQ_5))
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(19'660'800) / 4, 0, 0, 0, 0)
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(19'660'800) / 4, 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_6))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sun2_state::sun2mbus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, XTAL(39'321'600) / 4)
- MCFG_CPU_PROGRAM_MAP(sun2_mem)
+ MCFG_DEVICE_ADD("maincpu", M68010, XTAL(39'321'600) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(sun2_mem)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("2M")
@@ -725,31 +725,31 @@ MACHINE_CONFIG_START(sun2_state::sun2mbus)
MCFG_SCREEN_REFRESH_RATE(72)
MCFG_DEVICE_ADD("timer", AM9513, XTAL(39'321'600) / 8)
- MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("timer", am9513_device, gate1_w))
+ MCFG_AM9513_FOUT_CALLBACK(WRITELINE("timer", am9513_device, gate1_w))
MCFG_AM9513_OUT1_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_7))
- MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<0>))
- MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<1>))
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<2>))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("irq5", input_merger_device, in_w<3>))
+ MCFG_AM9513_OUT2_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<0>))
+ MCFG_AM9513_OUT3_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<1>))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<2>))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("irq5", input_merger_device, in_w<3>))
MCFG_INPUT_MERGER_ANY_HIGH("irq5") // 74LS05 open collectors
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M68K_IRQ_5))
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(39'321'600) / 8, 0, 0, 0, 0)
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(39'321'600) / 8, 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
MCFG_Z80SCC_OUT_INT_CB(INPUTLINE("maincpu", M68K_IRQ_6))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index b5d0216763b..622751eaee7 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -970,8 +970,8 @@ void sun3_state::machine_reset()
// The base Sun 3004 CPU board
MACHINE_CONFIG_START(sun3_state::sun3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020, 16670000)
- MCFG_CPU_PROGRAM_MAP(sun3_mem)
+ MCFG_DEVICE_ADD("maincpu", M68020, 16670000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_mem)
MCFG_SCREEN_ADD("bwtwo", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(sun3_state, bw2_update)
@@ -1017,31 +1017,31 @@ MACHINE_CONFIG_START(sun3_state::sun3)
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", sun3_state, sun3_timer, attotime::from_hz(100))
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle")
- MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
+ MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w))
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
// Sun 3/60
MACHINE_CONFIG_START(sun3_state::sun3_60)
sun3(config);
- MCFG_CPU_REPLACE("maincpu", M68020, 20000000)
- MCFG_CPU_PROGRAM_MAP(sun3_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68020, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_mem)
MCFG_SCREEN_MODIFY("bwtwo")
MCFG_SCREEN_UPDATE_DRIVER(sun3_state, bw2_16x11_update)
@@ -1053,15 +1053,15 @@ MACHINE_CONFIG_END
// Sun 3/E
MACHINE_CONFIG_START(sun3_state::sun3e)
sun3(config);
- MCFG_CPU_REPLACE("maincpu", M68020, 20000000)
- MCFG_CPU_PROGRAM_MAP(sun3_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68020, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_mem)
MACHINE_CONFIG_END
// 3/260 and 3/280 (the Sun 3200 board)
MACHINE_CONFIG_START(sun3_state::sun3200)
sun3(config);
- MCFG_CPU_REPLACE("maincpu", M68020, 25000000)
- MCFG_CPU_PROGRAM_MAP(sun3_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68020, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_mem)
MCFG_SCREEN_MODIFY("bwtwo")
MCFG_SCREEN_UPDATE_DRIVER(sun3_state, bw2_16x11_update)
@@ -1076,8 +1076,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sun3_state::sun3_50)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68020, 15700000)
- MCFG_CPU_PROGRAM_MAP(sun3_mem)
+ MCFG_DEVICE_ADD("maincpu", M68020, 15700000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_mem)
MCFG_SCREEN_ADD("bwtwo", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(sun3_state, bw2_350_update)
@@ -1122,24 +1122,24 @@ MACHINE_CONFIG_START(sun3_state::sun3_50)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x80000000)
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle")
- MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
+ MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w))
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 8e652c7431f..5c26ab47682 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -584,30 +584,30 @@ static void sun_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(sun3x_state::sun3_80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68030, 20000000)
- MCFG_CPU_PROGRAM_MAP(sun3_80_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_80_mem)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type3hle")
- MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
+ MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w))
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
@@ -631,25 +631,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sun3x_state::sun3_460)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68030, 33000000)
- MCFG_CPU_PROGRAM_MAP(sun3_460_mem)
+ MCFG_DEVICE_ADD("maincpu", M68030, 33000000)
+ MCFG_DEVICE_PROGRAM_MAP(sun3_460_mem)
MCFG_M48T02_ADD(TIMEKEEPER_TAG)
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index 23c08fa0c99..1889b1a0ec4 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -591,7 +591,7 @@ public:
uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- static void ncr5390(device_t *device);
+ void ncr5390(device_t *device);
void sun4c(machine_config &config);
void sun4(machine_config &config);
void sun4_mem(address_map &map);
@@ -1904,13 +1904,13 @@ void sun4_state::ncr5390(device_t *device)
devcb_base *devcb;
(void)devcb;
MCFG_DEVICE_CLOCK(10000000)
- MCFG_NCR5390_IRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_irq))
- MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_drq))
+ MCFG_NCR5390_IRQ_HANDLER(WRITELINE(*this, sun4_state, scsi_irq))
+ MCFG_NCR5390_DRQ_HANDLER(WRITELINE(*this, sun4_state, scsi_drq))
}
MACHINE_CONFIG_START(sun4_state::sun4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MB86901, 16670000)
+ MCFG_DEVICE_ADD("maincpu", MB86901, 16670000)
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4_mem)
MCFG_SPARC_ADD_ASI_DESC(sun4_asi_desc)
@@ -1939,27 +1939,27 @@ MACHINE_CONFIG_START(sun4_state::sun4)
// Keyboard/mouse
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc1_int))
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, sun4_state, scc1_int))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type4hle")
- MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
+ MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w))
// RS232 serial ports
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc2_int))
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, sun4_state, scc2_int))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MCFG_NSCSI_BUS_ADD("scsibus")
MCFG_NSCSI_ADD("scsibus:0", sun_scsi_devices, "harddisk", false)
@@ -1970,12 +1970,12 @@ MACHINE_CONFIG_START(sun4_state::sun4)
MCFG_NSCSI_ADD("scsibus:5", sun_scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", sun_scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:7", sun_scsi_devices, "ncr5390", true)
- MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", ncr5390)
+ MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", [this] (device_t *device) { ncr5390(device); })
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sun4_state::sun4c)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MB86901, 16670000)
+ MCFG_DEVICE_ADD("maincpu", MB86901, 16670000)
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4c_mem)
MCFG_SPARC_ADD_ASI_DESC(sun4c_asi_desc)
@@ -2004,27 +2004,27 @@ MACHINE_CONFIG_START(sun4_state::sun4c)
// Keyboard/mouse
MCFG_SCC8530_ADD(SCC1_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc1_int))
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, sun4_state, scc1_int))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
MCFG_SUNKBD_PORT_ADD(KEYBOARD_TAG, default_sun_keyboard_devices, "type5hle")
- MCFG_SUNKBD_RXD_HANDLER(DEVWRITELINE(SCC1_TAG, z80scc_device, rxa_w))
+ MCFG_SUNKBD_RXD_HANDLER(WRITELINE(SCC1_TAG, z80scc_device, rxa_w))
// RS232 serial ports
MCFG_SCC8530_ADD(SCC2_TAG, XTAL(4'915'200), 0, 0, 0, 0)
- MCFG_Z80SCC_OUT_INT_CB(WRITELINE(sun4_state, scc2_int))
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, sun4_state, scc2_int))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MCFG_NSCSI_BUS_ADD("scsibus")
MCFG_NSCSI_ADD("scsibus:0", sun_scsi_devices, "harddisk", false)
@@ -2035,7 +2035,7 @@ MACHINE_CONFIG_START(sun4_state::sun4c)
MCFG_NSCSI_ADD("scsibus:5", sun_scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:6", sun_scsi_devices, nullptr, false)
MCFG_NSCSI_ADD("scsibus:7", sun_scsi_devices, "ncr5390", true)
- MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", ncr5390)
+ MCFG_SLOT_OPTION_MACHINE_CONFIG("ncr5390", [this] (device_t *device) { ncr5390(device); })
MCFG_SCREEN_ADD("bwtwo", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(sun4_state, bw2_update)
diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp
index 33dad960941..cd249f5aca4 100644
--- a/src/mame/drivers/suna16.cpp
+++ b/src/mame/drivers/suna16.cpp
@@ -815,20 +815,20 @@ TIMER_DEVICE_CALLBACK_MEMBER(suna16_state::bssoccer_interrupt)
MACHINE_CONFIG_START(suna16_state::bssoccer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/4) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(bssoccer_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/4) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bssoccer_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna16_state, bssoccer_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(bssoccer_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bssoccer_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
- MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
- MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
+ MCFG_DEVICE_ADD("pcm1", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bssoccer_pcm_1_map)
+ MCFG_DEVICE_IO_MAP(bssoccer_pcm_1_io_map)
- MCFG_CPU_ADD("pcm2", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
- MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_2_map)
- MCFG_CPU_IO_MAP(bssoccer_pcm_2_io_map)
+ MCFG_DEVICE_ADD("pcm2", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bssoccer_pcm_2_map)
+ MCFG_DEVICE_IO_MAP(bssoccer_pcm_2_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -858,10 +858,10 @@ MACHINE_CONFIG_START(suna16_state::bssoccer)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.2)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.2)
- MCFG_SOUND_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("ldac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("rdac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("ldac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("rdac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -878,16 +878,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna16_state::uballoon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/4) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(uballoon_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/4) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(uballoon_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(uballoon_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(uballoon_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
- MCFG_CPU_PROGRAM_MAP(uballoon_pcm_1_map)
- MCFG_CPU_IO_MAP(uballoon_pcm_1_io_map)
+ MCFG_DEVICE_ADD("pcm1", Z80, XTAL(32'000'000)/6) /* Z80B at 5.333MHz */
+ MCFG_DEVICE_PROGRAM_MAP(uballoon_pcm_1_map)
+ MCFG_DEVICE_IO_MAP(uballoon_pcm_1_io_map)
/* 2nd PCM Z80 missing */
@@ -919,8 +919,8 @@ MACHINE_CONFIG_START(suna16_state::uballoon)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -933,16 +933,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna16_state::sunaq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 6MHz */
- MCFG_CPU_PROGRAM_MAP(sunaq_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sunaq_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suna16_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
- MCFG_CPU_PROGRAM_MAP(sunaq_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) /* Z80B at 3.579545MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sunaq_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL(24'000'000)/4) /* Z80B at 6MHz */
- MCFG_CPU_PROGRAM_MAP(bssoccer_pcm_1_map)
- MCFG_CPU_IO_MAP(bssoccer_pcm_1_io_map)
+ MCFG_DEVICE_ADD("pcm1", Z80, XTAL(24'000'000)/4) /* Z80B at 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bssoccer_pcm_1_map)
+ MCFG_DEVICE_IO_MAP(bssoccer_pcm_1_io_map)
/* 2nd PCM Z80 missing */
@@ -975,8 +975,8 @@ MACHINE_CONFIG_START(suna16_state::sunaq)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -994,16 +994,16 @@ WRITE8_MEMBER(suna16_state::bestbest_ay8910_port_a_w)
MACHINE_CONFIG_START(suna16_state::bestbest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 6MHz */
- MCFG_CPU_PROGRAM_MAP(bestbest_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bestbest_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna16_state, bssoccer_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
- MCFG_CPU_PROGRAM_MAP(bestbest_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bestbest_sound_map)
- MCFG_CPU_ADD("pcm1", Z80, XTAL(24'000'000)/4) /* 6MHz */
- MCFG_CPU_PROGRAM_MAP(bestbest_pcm_1_map)
- MCFG_CPU_IO_MAP(bestbest_pcm_1_iomap)
+ MCFG_DEVICE_ADD("pcm1", Z80, XTAL(24'000'000)/4) /* 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(bestbest_pcm_1_map)
+ MCFG_DEVICE_IO_MAP(bestbest_pcm_1_iomap)
/* 2nd PCM Z80 missing */
@@ -1030,20 +1030,20 @@ MACHINE_CONFIG_START(suna16_state::bestbest)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/16) /* 1.5MHz */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna16_state, bestbest_ay8910_port_a_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(24'000'000)/16) /* 1.5MHz */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, suna16_state, bestbest_ay8910_port_a_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(24'000'000)/8) /* 3MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(24'000'000)/8) /* 3MHz */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_IRQ0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_SOUND_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("ldac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
- MCFG_SOUND_ADD("rdac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("ldac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) // unknown DAC
+ MCFG_DEVICE_ADD("rdac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index 8681c1c6fd8..9842599f290 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -1887,16 +1887,16 @@ GFXDECODE_END
MACHINE_CONFIG_START(suna8_state::hardhead)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(hardhead_map)
- MCFG_CPU_IO_MAP(hardhead_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) /* No NMI */
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(hardhead_map)
+ MCFG_DEVICE_IO_MAP(hardhead_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) /* No NMI */
- MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(hardhead_sound_map)
- MCFG_CPU_IO_MAP(hardhead_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* No NMI */
+ MCFG_DEVICE_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(hardhead_sound_map)
+ MCFG_DEVICE_IO_MAP(hardhead_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* No NMI */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1920,15 +1920,15 @@ MACHINE_CONFIG_START(suna8_state::hardhead)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, suna8_state, suna8_play_samples_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(suna8_state, sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
@@ -1945,15 +1945,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna8_state::rranger)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MCFG_CPU_PROGRAM_MAP(rranger_map)
- MCFG_CPU_IO_MAP(rranger_io_map)
-// MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) /* IRQ & NMI ! */
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(rranger_map)
+ MCFG_DEVICE_IO_MAP(rranger_io_map)
+// MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) /* IRQ & NMI ! */
- MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rranger_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* NMI = retn */
+ MCFG_DEVICE_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rranger_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* NMI = retn */
MCFG_WATCHDOG_ADD("watchdog")
@@ -1979,15 +1979,15 @@ MACHINE_CONFIG_START(suna8_state::rranger)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, rranger_play_samples_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
+ MCFG_DEVICE_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, suna8_state, rranger_play_samples_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9)
- MCFG_SOUND_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 16) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.9)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(suna8_state, sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
@@ -2013,16 +2013,16 @@ MACHINE_RESET_MEMBER(suna8_state,brickzn)
MACHINE_CONFIG_START(suna8_state::brickzn11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */
- MCFG_CPU_PROGRAM_MAP(brickzn11_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) // nmi breaks ramtest but is needed!
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */
+ MCFG_DEVICE_PROGRAM_MAP(brickzn11_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suna8_state, irq0_line_hold) // nmi breaks ramtest but is needed!
- MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC - 6MHz (measured) */
- MCFG_CPU_PROGRAM_MAP(brickzn_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC - 6MHz (measured) */
+ MCFG_DEVICE_PROGRAM_MAP(brickzn_sound_map)
- MCFG_CPU_ADD("pcm", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC - 6MHz (measured) */
- MCFG_CPU_PROGRAM_MAP(brickzn_pcm_map)
- MCFG_CPU_IO_MAP(brickzn_pcm_io_map)
+ MCFG_DEVICE_ADD("pcm", Z80, SUNA8_MASTER_CLOCK / 4) /* Z0840006PSC - 6MHz (measured) */
+ MCFG_DEVICE_PROGRAM_MAP(brickzn_pcm_map)
+ MCFG_DEVICE_IO_MAP(brickzn_pcm_io_map)
MCFG_MACHINE_RESET_OVERRIDE(suna8_state, brickzn )
@@ -2048,17 +2048,17 @@ MACHINE_CONFIG_START(suna8_state::brickzn11)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) // 3MHz (measured)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8) // 3MHz (measured)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) // 1.5MHz (measured)
+ MCFG_DEVICE_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16) // 1.5MHz (measured)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.33)
- MCFG_SOUND_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
- MCFG_SOUND_ADD("ldac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
- MCFG_SOUND_ADD("rdac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
+ MCFG_DEVICE_ADD("ldac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
+ MCFG_DEVICE_ADD("rdac2", DAC_4BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.17) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -2068,10 +2068,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna8_state::brickzn)
brickzn11(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(brickzn_map)
- MCFG_CPU_IO_MAP(brickzn_io_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(brickzn_map)
+ MCFG_DEVICE_IO_MAP(brickzn_io_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
@@ -2101,9 +2101,9 @@ MACHINE_CONFIG_START(suna8_state::hardhea2)
brickzn(config);
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA T568009 */
- MCFG_CPU_PROGRAM_MAP(hardhea2_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA T568009 */
+ MCFG_DEVICE_PROGRAM_MAP(hardhea2_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna8_state, hardhea2_interrupt, "screen", 0, 1)
MCFG_MACHINE_RESET_OVERRIDE(suna8_state,hardhea2)
@@ -2117,8 +2117,8 @@ MACHINE_CONFIG_START(suna8_state::hardhea2b)
hardhea2(config);
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) //bootleg clock not verified (?)
- MCFG_CPU_PROGRAM_MAP(hardhea2_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) //bootleg clock not verified (?)
+ MCFG_DEVICE_PROGRAM_MAP(hardhea2_map)
MACHINE_CONFIG_END
@@ -2129,16 +2129,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna8_state::starfigh)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MCFG_CPU_PROGRAM_MAP(starfigh_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(starfigh_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna8_state, hardhea2_interrupt, "screen", 0, 1)
/* The sound section is identical to that of hardhead */
- MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MCFG_CPU_PROGRAM_MAP(hardhead_sound_map)
- MCFG_CPU_IO_MAP(hardhead_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* No NMI */
+ MCFG_DEVICE_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(hardhead_sound_map)
+ MCFG_DEVICE_IO_MAP(hardhead_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* No NMI */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2162,15 +2162,15 @@ MACHINE_CONFIG_START(suna8_state::starfigh)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, suna8_state, suna8_play_samples_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(suna8_state, sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
@@ -2184,15 +2184,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(suna8_state::sparkman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MCFG_CPU_PROGRAM_MAP(sparkman_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sparkman_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", suna8_state, hardhea2_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
- MCFG_CPU_PROGRAM_MAP(hardhead_sound_map)
- MCFG_CPU_IO_MAP(hardhead_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* No NMI */
+ MCFG_DEVICE_ADD("audiocpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(hardhead_sound_map)
+ MCFG_DEVICE_IO_MAP(hardhead_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(suna8_state, irq0_line_hold, 4*60) /* No NMI */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2216,15 +2216,15 @@ MACHINE_CONFIG_START(suna8_state::sparkman)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suna8_state, suna8_play_samples_w)) // two sample roms
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suna8_state, suna8_samples_number_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SUNA8_MASTER_CLOCK / 16)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, suna8_state, suna8_play_samples_w)) // two sample roms
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, suna8_state, suna8_samples_number_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(suna8_state, sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp
index f80b715df58..706b772e8fc 100644
--- a/src/mame/drivers/supbtime.cpp
+++ b/src/mame/drivers/supbtime.cpp
@@ -441,16 +441,16 @@ GFXDECODE_END
//**************************************************************************
MACHINE_CONFIG_START(supbtime_state::supbtime)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(supbtime_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(supbtime_map)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(32'220'000) / 8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 442, 0, 320, 274, 8, 248)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(supbtime_state, vblank_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, supbtime_state, vblank_w))
MCFG_SCREEN_UPDATE_DRIVER(supbtime_state, screen_update_supbtime)
MCFG_SCREEN_PALETTE("palette")
@@ -493,14 +493,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(supbtime_state::chinatwn)
supbtime(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(chinatwn_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(chinatwn_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(supbtime_state::tumblep)
supbtime(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tumblep_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tumblep_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(supbtime_state, screen_update_tumblep)
diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp
index bd2d7458c61..2b18bf9eb61 100644
--- a/src/mame/drivers/supdrapo.cpp
+++ b/src/mame/drivers/supdrapo.cpp
@@ -454,9 +454,9 @@ WRITE8_MEMBER(supdrapo_state::ay8910_outputb_w)
MACHINE_CONFIG_START(supdrapo_state::supdrapo)
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
- MCFG_CPU_PROGRAM_MAP(sdpoker_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", supdrapo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(sdpoker_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", supdrapo_state, irq0_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
@@ -477,9 +477,9 @@ MACHINE_CONFIG_START(supdrapo_state::supdrapo)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, SND_CLOCK) /* guess */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(supdrapo_state, ay8910_outputa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(supdrapo_state, ay8910_outputb_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, SND_CLOCK) /* guess */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, supdrapo_state, ay8910_outputa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, supdrapo_state, ay8910_outputb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index e416315a1d3..5261ce3ffdc 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -443,12 +443,12 @@ void supduck_state::machine_reset()
MACHINE_CONFIG_START(supduck_state::supduck)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) /* Verified on PCB */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", supduck_state, irq2_line_hold) // 2 & 4?
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000)) /* Verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", supduck_state, irq2_line_hold) // 2 & 4?
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/4) /* 2MHz - verified on PCB */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/4) /* 2MHz - verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(supduck_state::supduck)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp
index 6b790a64be7..c92460a2ed5 100644
--- a/src/mame/drivers/super6.cpp
+++ b/src/mame/drivers/super6.cpp
@@ -480,9 +480,9 @@ void super6_state::machine_reset()
MACHINE_CONFIG_START(super6_state::super6)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(24'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(super6_mem)
- MCFG_CPU_IO_MAP(super6_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(24'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(super6_mem)
+ MCFG_DEVICE_IO_MAP(super6_io)
MCFG_Z80_DAISY_CHAIN(super6_daisy_chain)
// devices
@@ -493,43 +493,43 @@ MACHINE_CONFIG_START(super6_state::super6)
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(24'000'000)/6)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
- MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg2))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(super6_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(super6_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(super6_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super6_state, io_write_byte))
+ MCFG_Z80DMA_OUT_INT_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg2))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, super6_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, super6_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, super6_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, super6_state, io_write_byte))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(24'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_WD2793_ADD(WD2793_TAG, 1000000)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(super6_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(super6_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, super6_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, super6_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", super6_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", super6_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(24'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
MCFG_DEVICE_ADD(BR1945_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_TAG, z80dart_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index a10638dd482..f869c6e5761 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -707,16 +707,16 @@ static const char *const relay_sample_names[] =
MACHINE_CONFIG_START(super80_state::super80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(super80_map)
- MCFG_CPU_IO_MAP(super80_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(super80_map)
+ MCFG_DEVICE_IO_MAP(super80_io)
MCFG_Z80_DAISY_CHAIN(super80_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(super80_state, super80)
MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(super80_state, pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(super80_state,pio_port_b_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, super80_state, pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, super80_state,pio_port_b_r))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(48.8)
@@ -735,16 +735,16 @@ MACHINE_CONFIG_START(super80_state::super80)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(relay_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -775,8 +775,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80e)
super80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(super80e_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(super80e_io)
MCFG_GFXDECODE_MODIFY("gfxdecode", super80e)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80e)
@@ -784,35 +784,35 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80m)
super80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(super80m_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(super80m_map)
MCFG_GFXDECODE_MODIFY("gfxdecode", super80m)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80m)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(super80_state, screen_vblank_super80m))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, super80_state, screen_vblank_super80m))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80v)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(super80v_map)
- MCFG_CPU_IO_MAP(super80v_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(super80v_map)
+ MCFG_DEVICE_IO_MAP(super80v_io)
MCFG_Z80_DAISY_CHAIN(super80_daisy_chain)
MCFG_MACHINE_RESET_OVERRIDE(super80_state, super80r)
MCFG_DEVICE_ADD("z80pio", Z80PIO, MASTER_CLOCK/6)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(super80_state, pio_port_a_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(super80_state,pio_port_b_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, super80_state, pio_port_a_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, super80_state,pio_port_b_r))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_SIZE(SUPER80V_SCREEN_WIDTH, SUPER80V_SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, SUPER80V_SCREEN_WIDTH-1, 0, SUPER80V_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(super80_state, screen_update_super80v)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(super80_state, screen_vblank_super80m))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, super80_state, screen_vblank_super80m))
MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(super80_state,super80m)
@@ -829,16 +829,16 @@ MACHINE_CONFIG_START(super80_state::super80v)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_NAMES(relay_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* printer */
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -857,20 +857,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(super80_state::super80r)
super80v(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(super80r_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(super80r_io)
MCFG_DEVICE_ADD("dma", Z80DMA, MASTER_CLOCK/6)
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(super80_state, busreq_w))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, super80_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
//ba0 - not connected
- MCFG_Z80DMA_IN_MREQ_CB(READ8(super80_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(super80_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(super80_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super80_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, super80_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, super80_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, super80_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, super80_state, io_write_byte))
MCFG_WD2793_ADD("fdc", XTAL(2'000'000))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("dma", z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", super80_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", super80_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp
index b983993d555..1cc2aae1747 100644
--- a/src/mame/drivers/superchs.cpp
+++ b/src/mame/drivers/superchs.cpp
@@ -226,13 +226,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(superchs_state::superchs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20MHz - verified */
- MCFG_CPU_PROGRAM_MAP(superchs_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", superchs_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20MHz - verified */
+ MCFG_DEVICE_PROGRAM_MAP(superchs_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", superchs_state, irq2_line_hold)
- MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2) /* 16MHz - verified */
- MCFG_CPU_PROGRAM_MAP(superchs_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", superchs_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(32'000'000)/2) /* 16MHz - verified */
+ MCFG_DEVICE_PROGRAM_MAP(superchs_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", superchs_state, irq4_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(480)) /* Need to interleave CPU 1 & 3 */
@@ -242,16 +242,16 @@ MACHINE_CONFIG_START(superchs_state::superchs)
MCFG_ADC0808_EOC_FF_CB(INPUTLINE("maincpu", 3))
MCFG_ADC0808_IN0_CB(IOPORT("WHEEL"))
MCFG_ADC0808_IN1_CB(IOPORT("ACCEL"))
- MCFG_ADC0808_IN2_CB(READ8(superchs_state, volume_r))
+ MCFG_ADC0808_IN2_CB(READ8(*this, superchs_state, volume_r))
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_1_CB(IOPORT("COINS"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("SWITCHES"))
- MCFG_TC0510NIO_READ_3_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
- MCFG_TC0510NIO_WRITE_3_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(superchs_state, coin_word_w))
+ MCFG_TC0510NIO_READ_3_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_TC0510NIO_WRITE_3_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, superchs_state, coin_word_w))
// there are 'vibration' control bits somewhere!
/* video hardware */
@@ -281,9 +281,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(superchs_state::chase3)
superchs(config);
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(chase3_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", superchs_state, irq4_line_hold)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(chase3_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", superchs_state, irq4_line_hold)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index 7ece5415fed..a3010fca83c 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -417,8 +417,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(supercrd_state::supercrd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 2MHz, guess */
- MCFG_CPU_PROGRAM_MAP(supercrd_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_DEVICE_PROGRAM_MAP(supercrd_map)
// MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp
index a5a1b1228b0..5a4431b313b 100644
--- a/src/mame/drivers/superdq.cpp
+++ b/src/mame/drivers/superdq.cpp
@@ -333,10 +333,10 @@ void superdq_state::machine_start()
MACHINE_CONFIG_START(superdq_state::superdq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(superdq_map)
- MCFG_CPU_IO_MAP(superdq_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", superdq_state, superdq_vblank)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(superdq_map)
+ MCFG_DEVICE_IO_MAP(superdq_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", superdq_state, superdq_vblank)
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
@@ -353,10 +353,10 @@ MACHINE_CONFIG_START(superdq_state::superdq)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/8)
+ MCFG_DEVICE_ADD("snsnd", SN76496, MASTER_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8)
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp
index 9e4634545b9..43fc0009241 100644
--- a/src/mame/drivers/superqix.cpp
+++ b/src/mame/drivers/superqix.cpp
@@ -1352,14 +1352,14 @@ INTERRUPT_GEN_MEMBER(superqix_state::sqix_timer_irq)
MACHINE_CONFIG_START(hotsmash_state::pbillian)
- MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* 6 MHz, ROHM Z80B */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(pbillian_port_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* 6 MHz, ROHM Z80B */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(pbillian_port_map)
- MCFG_CPU_ADD("mcu", M68705P5, XTAL(12'000'000)/4) /* 3mhz???? */
- MCFG_M68705_PORTA_R_CB(READ8(hotsmash_state, hotsmash_68705_portA_r))
- MCFG_M68705_PORTB_W_CB(WRITE8(hotsmash_state, hotsmash_68705_portB_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(hotsmash_state, hotsmash_68705_portC_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, XTAL(12'000'000)/4) /* 3mhz???? */
+ MCFG_M68705_PORTA_R_CB(READ8(*this, hotsmash_state, hotsmash_68705_portA_r))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, hotsmash_state, hotsmash_68705_portB_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, hotsmash_state, hotsmash_68705_portC_w))
//MCFG_QUANTUM_PERFECT_CPU("maincpu")
MCFG_MACHINE_START_OVERRIDE(hotsmash_state, pbillian)
@@ -1372,7 +1372,7 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(hotsmash_state, screen_update_pbillian)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(hotsmash_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, hotsmash_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pbillian)
MCFG_PALETTE_ADD("palette", 512)
@@ -1382,12 +1382,12 @@ MACHINE_CONFIG_START(hotsmash_state::pbillian)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) // AY-3-8910A
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) // AY-3-8910A
MCFG_AY8910_PORT_A_READ_CB(IOPORT("BUTTONS"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("SYSTEM"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(hotsmash_state, pbillian_sh_start)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1396,17 +1396,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(superqix_state::sqix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Z80B, 12 MHz / 2 (6 MHz), verified from pcb tracing */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(sqix_port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(superqix_state, sqix_timer_irq, 4*60) /* ??? */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* Z80B, 12 MHz / 2 (6 MHz), verified from pcb tracing */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(sqix_port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(superqix_state, sqix_timer_irq, 4*60) /* ??? */
- MCFG_CPU_ADD("mcu", I8751, XTAL(12'000'000)/2) /* i8751-88, 12 MHz / 2 (6 MHz), verified from pcb tracing */
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(12'000'000)/2) /* i8751-88, 12 MHz / 2 (6 MHz), verified from pcb tracing */
MCFG_MCS51_PORT_P0_IN_CB(IOPORT("SYSTEM"))
MCFG_MCS51_PORT_P1_IN_CB(IOPORT("DSW1"))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(superqix_state, mcu_port2_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(superqix_state, mcu_port3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(superqix_state, mcu_port3_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, superqix_state, mcu_port2_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, superqix_state, mcu_port3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, superqix_state, mcu_port3_w))
MCFG_MACHINE_START_OVERRIDE(superqix_state,superqix)
@@ -1428,38 +1428,38 @@ MACHINE_CONFIG_START(superqix_state::sqix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) // AY-3-8910A @3P, analog outputs directly tied together
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) // AY-3-8910A @3P, analog outputs directly tied together
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2")) /* port Bread */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) // AY-3-8910A @3M, analog outputs directly tied together
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8) // AY-3-8910A @3M, analog outputs directly tied together
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
- MCFG_AY8910_PORT_B_READ_CB(READ8(superqix_state, z80_ay2_iob_r)) /* port Bread */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(superqix_state, z80_ay2_iob_w)) /* port Bwrite */
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, superqix_state, z80_ay2_iob_r)) /* port Bread */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, superqix_state, z80_ay2_iob_w)) /* port Bwrite */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(superqix_state::sqix_8031)
sqix(config);
- MCFG_CPU_REPLACE("mcu", I8031, XTAL(12'000'000)/2) /* p8031ah, clock not verified */
- MCFG_CPU_PROGRAM_MAP(sqix_8031_map)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(superqix_state, bootleg_mcu_port1_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(superqix_state, bootleg_mcu_port3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(superqix_state, bootleg_mcu_port3_w))
+ MCFG_DEVICE_REPLACE("mcu", I8031, XTAL(12'000'000)/2) /* p8031ah, clock not verified */
+ MCFG_DEVICE_PROGRAM_MAP(sqix_8031_map)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, superqix_state, bootleg_mcu_port1_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, superqix_state, bootleg_mcu_port3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, superqix_state, bootleg_mcu_port3_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(superqix_state::sqix_nomcu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(sqix_port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(superqix_state, sqix_timer_irq, 4*60) /* ??? */
+ MCFG_DEVICE_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(sqix_port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(superqix_state, sqix_timer_irq, 4*60) /* ??? */
MCFG_MACHINE_START_OVERRIDE(superqix_state,superqix)
@@ -1481,16 +1481,16 @@ MACHINE_CONFIG_START(superqix_state::sqix_nomcu)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 12000000/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, 12000000/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) // ?
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 12000000/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, 12000000/8)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT) // ?
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
- MCFG_AY8910_PORT_B_READ_CB(READ8(superqix_state, bootleg_in0_r)) /* port Bread */
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, superqix_state, bootleg_in0_r)) /* port Bread */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp
index ab624bec04b..669bac553d7 100644
--- a/src/mame/drivers/superslave.cpp
+++ b/src/mame/drivers/superslave.cpp
@@ -381,9 +381,9 @@ void superslave_state::machine_reset()
MACHINE_CONFIG_START(superslave_state::superslave)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(superslave_mem)
- MCFG_CPU_IO_MAP(superslave_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(superslave_mem)
+ MCFG_DEVICE_IO_MAP(superslave_io)
MCFG_Z80_DAISY_CHAIN(superslave_daisy_chain)
// devices
@@ -394,51 +394,51 @@ MACHINE_CONFIG_START(superslave_state::superslave)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80DART_0_TAG, Z80DART, XTAL(8'000'000)/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, ctsa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, ctsb_w))
MCFG_DEVICE_ADD(Z80DART_1_TAG, Z80DART, XTAL(8'000'000)/2)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_C_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_D_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_C_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_C_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_C_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_D_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_D_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_D_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, ctsa_w))
+ MCFG_DEVICE_ADD(RS232_C_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_1_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_1_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_1_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_PORT_ADD(RS232_D_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, ctsb_w))
+ MCFG_DEVICE_ADD(RS232_D_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_1_TAG, z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(Z80DART_1_TAG, z80dart_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(Z80DART_1_TAG, z80dart_device, ctsb_w))
MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxca_w))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80DART_0_TAG, z80dart_device, rxtxcb_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(Z80DART_1_TAG, z80dart_device, rxtxcb_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_0_TAG, z80dart_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_1_TAG, z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_1_TAG, z80dart_device, rxca_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(Z80DART_0_TAG, z80dart_device, rxtxcb_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(Z80DART_1_TAG, z80dart_device, rxtxcb_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp
index 5914ab7c3f4..0e2e8655800 100644
--- a/src/mame/drivers/supertnk.cpp
+++ b/src/mame/drivers/supertnk.cpp
@@ -437,7 +437,7 @@ MACHINE_CONFIG_START(supertnk_state::supertnk)
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2598750, supertnk_map, supertnk_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", supertnk_state, supertnk_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", supertnk_state, supertnk_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
@@ -453,7 +453,7 @@ MACHINE_CONFIG_START(supertnk_state::supertnk)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index 3c7957be802..4d79a071316 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -478,13 +478,13 @@ void superwng_state::machine_reset()
MACHINE_CONFIG_START(superwng_state::superwng)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(superwng_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", superwng_state, superwng_nmi_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(superwng_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", superwng_state, superwng_nmi_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(superwng_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(superwng_state, superwng_sound_nmi_assert, 4*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(superwng_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(superwng_state, superwng_sound_nmi_assert, 4*60)
/* video hardware */
@@ -503,11 +503,11 @@ MACHINE_CONFIG_START(superwng_state::superwng)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/12)
- MCFG_AY8910_PORT_A_READ_CB(READ8(superwng_state, superwng_sound_byte_r))
+ MCFG_DEVICE_ADD("ay1", AY8910, MASTER_CLOCK/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, superwng_state, superwng_sound_byte_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/12)
+ MCFG_DEVICE_ADD("ay2", AY8910, MASTER_CLOCK/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index e92cf7f03b7..b8c25df7498 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -1885,13 +1885,13 @@ INTERRUPT_GEN_MEMBER(supracan_state::supracan_sound_irq)
MACHINE_CONFIG_START(supracan_state::supracan)
- MCFG_CPU_ADD( "maincpu", M68000, XTAL(10'738'635) ) /* Correct frequency unknown */
- MCFG_CPU_PROGRAM_MAP( supracan_mem )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", supracan_state, supracan_irq)
+ MCFG_DEVICE_ADD( "maincpu", M68000, XTAL(10'738'635) ) /* Correct frequency unknown */
+ MCFG_DEVICE_PROGRAM_MAP( supracan_mem )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", supracan_state, supracan_irq)
- MCFG_CPU_ADD( "soundcpu", M6502, XTAL(3'579'545) ) /* TODO: Verify actual clock */
- MCFG_CPU_PROGRAM_MAP( supracan_sound_mem )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", supracan_state, supracan_sound_irq)
+ MCFG_DEVICE_ADD( "soundcpu", M6502, XTAL(3'579'545) ) /* TODO: Verify actual clock */
+ MCFG_DEVICE_PROGRAM_MAP( supracan_sound_mem )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", supracan_state, supracan_sound_irq)
#if !(SOUNDCPU_BOOT_HACK)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index 12fa91aab6b..80ff260ef57 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -494,22 +494,22 @@ void suprgolf_state::machine_reset()
MACHINE_CONFIG_START(suprgolf_state::suprgolf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) /* guess */
- MCFG_CPU_PROGRAM_MAP(suprgolf_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suprgolf_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,MASTER_CLOCK/2) /* guess */
+ MCFG_DEVICE_PROGRAM_MAP(suprgolf_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suprgolf_state, irq0_line_hold)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(suprgolf_state, p1_r))
- MCFG_I8255_IN_PORTB_CB(READ8(suprgolf_state, p2_r))
- MCFG_I8255_IN_PORTC_CB(READ8(suprgolf_state, pedal_extra_bits_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, suprgolf_state, p1_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, suprgolf_state, p2_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, suprgolf_state, pedal_extra_bits_r))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("SYSTEM"))
- MCFG_I8255_IN_PORTB_CB(READ8(suprgolf_state, rom_bank_select_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(suprgolf_state, rom_bank_select_w))
- MCFG_I8255_IN_PORTC_CB(READ8(suprgolf_state, vregs_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(suprgolf_state, vregs_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, suprgolf_state, rom_bank_select_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, suprgolf_state, rom_bank_select_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, suprgolf_state, vregs_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, suprgolf_state, vregs_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -526,16 +526,16 @@ MACHINE_CONFIG_START(suprgolf_state::suprgolf)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, MASTER_CLOCK/4) /* guess */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, MASTER_CLOCK/4) /* guess */
//MCFG_YM2203_IRQ_HANDLER(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(suprgolf_state, writeA))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(suprgolf_state, writeB))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, suprgolf_state, writeA))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, suprgolf_state, writeB))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) /* guess */
- MCFG_MSM5205_VCLK_CB(WRITELINE(suprgolf_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000)) /* guess */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, suprgolf_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp
index 53166ee386b..5a7e13552f3 100644
--- a/src/mame/drivers/suprloco.cpp
+++ b/src/mame/drivers/suprloco.cpp
@@ -173,18 +173,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(suprloco_state::suprloco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", SEGA_315_5015, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suprloco_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", SEGA_315_5015, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suprloco_state, irq0_line_hold)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(suprloco_state, irq0_line_hold, 4*60) /* NMIs are caused by the main CPU */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(suprloco_state, irq0_line_hold, 4*60) /* NMIs are caused by the main CPU */
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTB_CB(WRITE8(suprloco_state, control_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, suprloco_state, control_w))
MCFG_I8255_TRISTATE_PORTB_CB(CONSTANT(0))
MCFG_I8255_OUT_PORTC_CB(OUTPUT("lamp0")) MCFG_DEVCB_BIT(0) MCFG_DEVCB_INVERT // set by 8255 bit mode when no credits inserted
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_DEVCB_BIT(7) MCFG_DEVCB_INVERT
@@ -205,10 +205,10 @@ MACHINE_CONFIG_START(suprloco_state::suprloco)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, 4000000)
+ MCFG_DEVICE_ADD("sn1", SN76496, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76496, 2000000)
+ MCFG_DEVICE_ADD("sn2", SN76496, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp
index c3dab32714e..91bb24d1f71 100644
--- a/src/mame/drivers/suprnova.cpp
+++ b/src/mame/drivers/suprnova.cpp
@@ -788,8 +788,8 @@ GFXDECODE_END
/***** MACHINE DRIVER *****/
MACHINE_CONFIG_START(skns_state::skns)
- MCFG_CPU_ADD("maincpu", SH2,28638000)
- MCFG_CPU_PROGRAM_MAP(skns_map)
+ MCFG_DEVICE_ADD("maincpu", SH2,28638000)
+ MCFG_DEVICE_PROGRAM_MAP(skns_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", skns_state, irq, "screen", 0, 1)
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
@@ -820,7 +820,7 @@ MACHINE_CONFIG_START(skns_state::skns)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 33333333 / 2)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 33333333 / 2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp
index dcda7af79e0..e509e512b09 100644
--- a/src/mame/drivers/suprridr.cpp
+++ b/src/mame/drivers/suprridr.cpp
@@ -324,14 +324,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(suprridr_state::suprridr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(49'152'000)/16) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_portmap)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suprridr_state, main_nmi_gen)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(49'152'000)/16) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_portmap)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suprridr_state, main_nmi_gen)
- MCFG_CPU_ADD("audiocpu", Z80, 10000000/4) /* 2.5 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_portmap)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 10000000/4) /* 2.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_portmap)
MCFG_WATCHDOG_ADD("watchdog")
@@ -351,11 +351,11 @@ MACHINE_CONFIG_START(suprridr_state::suprridr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(49'152'000)/32)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(49'152'000)/32)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(49'152'000)/32)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(49'152'000)/32)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp
index ca20b2d783a..5ea34186a20 100644
--- a/src/mame/drivers/suprslam.cpp
+++ b/src/mame/drivers/suprslam.cpp
@@ -270,13 +270,13 @@ void suprslam_state::machine_reset()
MACHINE_CONFIG_START(suprslam_state::suprslam)
- MCFG_CPU_ADD("maincpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(suprslam_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", suprslam_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(suprslam_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", suprslam_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
MCFG_DEVICE_ADD("io", VS9209, 0)
MCFG_VS9209_IN_PORTA_CB(IOPORT("P1"))
@@ -284,7 +284,7 @@ MACHINE_CONFIG_START(suprslam_state::suprslam)
MCFG_VS9209_IN_PORTC_CB(IOPORT("SYSTEM"))
MCFG_VS9209_IN_PORTD_CB(IOPORT("DSW1"))
MCFG_VS9209_IN_PORTE_CB(IOPORT("DSW2"))
- MCFG_VS9209_OUT_PORTG_CB(WRITE8(suprslam_state, spr_ctrl_w))
+ MCFG_VS9209_OUT_PORTG_CB(WRITE8(*this, suprslam_state, spr_ctrl_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", suprslam)
@@ -315,7 +315,7 @@ MACHINE_CONFIG_START(suprslam_state::suprslam)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/supstarf.cpp b/src/mame/drivers/supstarf.cpp
index c9384e1fbc0..15d74ddae24 100644
--- a/src/mame/drivers/supstarf.cpp
+++ b/src/mame/drivers/supstarf.cpp
@@ -173,18 +173,18 @@ void supstarf_state::machine_start()
}
MACHINE_CONFIG_START(supstarf_state::supstarf)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(5'068'800))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_I8085A_SID(READLINE(supstarf_state, contacts_r))
- MCFG_I8085A_SOD(WRITELINE(supstarf_state, displays_w))
-
- MCFG_CPU_ADD("soundcpu", I8035, XTAL(5'068'800) / 2) // from 8085 pin 37 (CLK OUT)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(supstarf_state, port1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(supstarf_state, port2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(supstarf_state, phase_detect_r))
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(5'068'800))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_I8085A_SID(READLINE(*this, supstarf_state, contacts_r))
+ MCFG_I8085A_SOD(WRITELINE(*this, supstarf_state, displays_w))
+
+ MCFG_DEVICE_ADD("soundcpu", I8035, XTAL(5'068'800) / 2) // from 8085 pin 37 (CLK OUT)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, supstarf_state, port1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, supstarf_state, port2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, supstarf_state, phase_detect_r))
MCFG_DEVICE_ADD("soundlatch1", I8212, 0)
MCFG_I8212_MD_CALLBACK(GND)
@@ -197,12 +197,12 @@ MACHINE_CONFIG_START(supstarf_state::supstarf)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("psg1", AY8910, XTAL(5'068'800) / 6) // from 8035 pin 1 (T0)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(supstarf_state, lights_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(supstarf_state, lights_b_w))
+ MCFG_DEVICE_ADD("psg1", AY8910, XTAL(5'068'800) / 6) // from 8035 pin 1 (T0)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, supstarf_state, lights_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, supstarf_state, lights_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("psg2", AY8910, XTAL(5'068'800) / 6) // from 8035 pin 1 (T0)
+ MCFG_DEVICE_ADD("psg2", AY8910, XTAL(5'068'800) / 6) // from 8035 pin 1 (T0)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JO"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("I1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp
index d4cbdd897c9..b41c19efd4a 100644
--- a/src/mame/drivers/surpratk.cpp
+++ b/src/mame/drivers/surpratk.cpp
@@ -171,10 +171,10 @@ WRITE8_MEMBER( surpratk_state::banking_callback )
MACHINE_CONFIG_START(surpratk_state::surpratk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
- MCFG_CPU_PROGRAM_MAP(surpratk_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", surpratk_state, surpratk_interrupt)
- MCFG_KONAMICPU_LINE_CB(WRITE8(surpratk_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
+ MCFG_DEVICE_PROGRAM_MAP(surpratk_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", surpratk_state, surpratk_interrupt)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, surpratk_state, banking_callback))
MCFG_DEVICE_ADD("bank0000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank0000_map)
diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp
index aeaa8614df3..1494648dcde 100644
--- a/src/mame/drivers/sv8000.cpp
+++ b/src/mame/drivers/sv8000.cpp
@@ -377,33 +377,33 @@ READ8_MEMBER( sv8000_state::mc6847_videoram_r )
MACHINE_CONFIG_START(sv8000_state::sv8000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(10'738'635)/3) /* Not verified */
- MCFG_CPU_PROGRAM_MAP(sv8000_mem)
- MCFG_CPU_IO_MAP(sv8000_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", sv8000_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(10'738'635)/3) /* Not verified */
+ MCFG_DEVICE_PROGRAM_MAP(sv8000_mem)
+ MCFG_DEVICE_IO_MAP(sv8000_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", sv8000_state, irq0_line_hold)
MCFG_DEVICE_ADD("i8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(sv8000_state, i8255_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(sv8000_state, i8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(sv8000_state, i8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(sv8000_state, i8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(sv8000_state, i8255_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(sv8000_state, i8255_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, sv8000_state, i8255_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, sv8000_state, i8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, sv8000_state, i8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, sv8000_state, i8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, sv8000_state, i8255_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, sv8000_state, i8255_portc_w))
/* video hardware */
// S68047P - Unknown whether the internal or an external character rom is used
MCFG_DEVICE_ADD("s68047p", S68047, XTAL(10'738'635)/3 ) // Clock not verified
- MCFG_MC6847_INPUT_CALLBACK(READ8(sv8000_state, mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, sv8000_state, mc6847_videoram_r))
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "s68047p")
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) /* Exact model and clock not verified */
- MCFG_AY8910_PORT_A_READ_CB(READ8(sv8000_state, ay_port_a_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(sv8000_state, ay_port_b_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(sv8000_state, ay_port_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(sv8000_state, ay_port_b_w))
+ MCFG_DEVICE_ADD("ay8910", AY8910, XTAL(10'738'635)/3/2) /* Exact model and clock not verified */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, sv8000_state, ay_port_a_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, sv8000_state, ay_port_b_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, sv8000_state, ay_port_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, sv8000_state, ay_port_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* cartridge */
diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index fabdb21f088..6634437a437 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -530,9 +530,9 @@ DEVICE_IMAGE_LOAD_MEMBER( svi3x8_state, cartridge )
MACHINE_CONFIG_START(svi3x8_state::svi318)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'738'635) / 3)
- MCFG_CPU_PROGRAM_MAP(svi3x8_mem)
- MCFG_CPU_IO_MAP(svi3x8_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'738'635) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(svi3x8_mem)
+ MCFG_DEVICE_IO_MAP(svi3x8_io)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("16K")
@@ -544,26 +544,26 @@ MACHINE_CONFIG_START(svi3x8_state::svi318)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x100)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(svi3x8_state, ppi_port_a_r))
- MCFG_I8255_IN_PORTB_CB(READ8(svi3x8_state, ppi_port_b_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(svi3x8_state, ppi_port_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, svi3x8_state, ppi_port_a_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, svi3x8_state, ppi_port_b_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, svi3x8_state, ppi_port_c_w))
// video hardware
MCFG_DEVICE_ADD("vdp", TMS9929A, XTAL(10'738'635) / 2)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi3x8_state, intvdp_w))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, svi3x8_state, intvdp_w))
MCFG_TMS9928A_SCREEN_ADD_PAL("screen")
MCFG_SCREEN_UPDATE_DEVICE("vdp", tms9929a_device, screen_update)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("psg", AY8910, XTAL(10'738'635) / 6)
+ MCFG_DEVICE_ADD("psg", AY8910, XTAL(10'738'635) / 6)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("JOY"))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(svi3x8_state, bank_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, svi3x8_state, bank_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
// cassette
@@ -581,12 +581,12 @@ MACHINE_CONFIG_START(svi3x8_state::svi318)
// expander bus
MCFG_SVI_EXPANDER_BUS_ADD("exp")
- MCFG_SVI_EXPANDER_INT_HANDLER(WRITELINE(svi3x8_state, intexp_w))
- MCFG_SVI_EXPANDER_ROMDIS_HANDLER(WRITELINE(svi3x8_state, romdis_w))
- MCFG_SVI_EXPANDER_RAMDIS_HANDLER(WRITELINE(svi3x8_state, ramdis_w))
- MCFG_SVI_EXPANDER_CTRL1_HANDLER(WRITELINE(svi3x8_state, ctrl1_w))
- MCFG_SVI_EXPANDER_EXCSR_HANDLER(READ8(svi3x8_state, excs_r))
- MCFG_SVI_EXPANDER_EXCSW_HANDLER(WRITE8(svi3x8_state, excs_w))
+ MCFG_SVI_EXPANDER_INT_HANDLER(WRITELINE(*this, svi3x8_state, intexp_w))
+ MCFG_SVI_EXPANDER_ROMDIS_HANDLER(WRITELINE(*this, svi3x8_state, romdis_w))
+ MCFG_SVI_EXPANDER_RAMDIS_HANDLER(WRITELINE(*this, svi3x8_state, ramdis_w))
+ MCFG_SVI_EXPANDER_CTRL1_HANDLER(WRITELINE(*this, svi3x8_state, ctrl1_w))
+ MCFG_SVI_EXPANDER_EXCSR_HANDLER(READ8(*this, svi3x8_state, excs_r))
+ MCFG_SVI_EXPANDER_EXCSW_HANDLER(WRITE8(*this, svi3x8_state, excs_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(svi3x8_state::svi318n)
@@ -595,7 +595,7 @@ MACHINE_CONFIG_START(svi3x8_state::svi318n)
MCFG_DEVICE_REMOVE("screen")
MCFG_DEVICE_ADD("vdp", TMS9928A, XTAL(10'738'635) / 2)
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(svi3x8_state, intvdp_w))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, svi3x8_state, intvdp_w))
MCFG_TMS9928A_SCREEN_ADD_NTSC("screen")
MCFG_SCREEN_UPDATE_DEVICE("vdp", tms9928a_device, screen_update)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp
index 7b84b8d96e6..af7c3897e19 100644
--- a/src/mame/drivers/svision.cpp
+++ b/src/mame/drivers/svision.cpp
@@ -516,9 +516,9 @@ MACHINE_RESET_MEMBER(svision_state,tvlink)
MACHINE_CONFIG_START(svision_state::svision)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M65C02, 4000000) /* ? stz used! speed? */
- MCFG_CPU_PROGRAM_MAP(svision_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", svision_state, svision_frame_int)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 4000000) /* ? stz used! speed? */
+ MCFG_DEVICE_PROGRAM_MAP(svision_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", svision_state, svision_frame_int)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -535,7 +535,7 @@ MACHINE_CONFIG_START(svision_state::svision)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", SVISION_SND, 0)
+ MCFG_DEVICE_ADD("custom", SVISION_SND, 0)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
SVISION_SND_IRQ_CB(svision_state, svision_irq)
@@ -557,8 +557,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(svision_state::svisionp)
svision(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(4430000)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(4430000)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_PALETTE_MODIFY("palette")
@@ -567,8 +567,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(svision_state::svisionn)
svision(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(3560000/*?*/)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(3560000/*?*/)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_PALETTE_MODIFY("palette")
@@ -577,8 +577,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(svision_state::tvlinkp)
svisionp(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tvlink_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tvlink_mem)
MCFG_MACHINE_RESET_OVERRIDE(svision_state, tvlink)
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index c5bc7402c06..129992b73c4 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -307,13 +307,13 @@ QUICKLOAD_LOAD_MEMBER( svmu_state, svmu )
MACHINE_CONFIG_START(svmu_state::svmu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", LC8670, XTAL(32'768))
- MCFG_CPU_PROGRAM_MAP(svmu_mem)
- MCFG_CPU_IO_MAP(svmu_io_mem)
+ MCFG_DEVICE_ADD("maincpu", LC8670, XTAL(32'768))
+ MCFG_DEVICE_PROGRAM_MAP(svmu_mem)
+ MCFG_DEVICE_IO_MAP(svmu_io_mem)
/* specific LC8670 configurations */
MCFG_LC8670_SET_CLOCK_SOURCES(XTAL(32'768), 600000, XTAL(6'000'000)) // tolerance range of the RC oscillator is 600kHz to 1200kHz
- MCFG_LC8670_BANKSWITCH_CB(WRITE8(svmu_state, page_w))
+ MCFG_LC8670_BANKSWITCH_CB(WRITE8(*this, svmu_state, page_w))
MCFG_LC8670_LCD_UPDATE_CB(svmu_lcd_update)
/* video hardware */
@@ -331,7 +331,7 @@ MACHINE_CONFIG_START(svmu_state::svmu)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
diff --git a/src/mame/drivers/swtpc.cpp b/src/mame/drivers/swtpc.cpp
index 529280062f4..f70648cf55e 100644
--- a/src/mame/drivers/swtpc.cpp
+++ b/src/mame/drivers/swtpc.cpp
@@ -97,75 +97,75 @@ void swtpc_state::machine_start()
MACHINE_CONFIG_START(swtpc_state::swtpc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, XTAL(1'843'200) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(1'843'200) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_DEVICE_ADD("brg", MC14411, XTAL(1'843'200))
- MCFG_MC14411_F7_CB(DEVWRITELINE("io0", ss50_interface_port_device, f600_1200_w)) // 1200b
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io1", ss50_interface_port_device, f600_1200_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io2", ss50_interface_port_device, f600_1200_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io3", ss50_interface_port_device, f600_1200_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io4", ss50_interface_port_device, f600_1200_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io5", ss50_interface_port_device, f600_1200_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io6", ss50_interface_port_device, f600_1200_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io7", ss50_interface_port_device, f600_1200_w))
- MCFG_MC14411_F8_CB(DEVWRITELINE("io0", ss50_interface_port_device, f600_4800_w)) // 600b
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io1", ss50_interface_port_device, f600_4800_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io2", ss50_interface_port_device, f600_4800_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io3", ss50_interface_port_device, f600_4800_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io4", ss50_interface_port_device, f600_4800_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io5", ss50_interface_port_device, f600_4800_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io6", ss50_interface_port_device, f600_4800_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io7", ss50_interface_port_device, f600_4800_w))
- MCFG_MC14411_F9_CB(DEVWRITELINE("io0", ss50_interface_port_device, f300_w)) // 300b
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io1", ss50_interface_port_device, f300_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io2", ss50_interface_port_device, f300_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io3", ss50_interface_port_device, f300_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io4", ss50_interface_port_device, f300_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io5", ss50_interface_port_device, f300_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io6", ss50_interface_port_device, f300_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io7", ss50_interface_port_device, f300_w))
- MCFG_MC14411_F11_CB(DEVWRITELINE("io0", ss50_interface_port_device, f150_9600_w)) // 150b
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io1", ss50_interface_port_device, f150_9600_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io2", ss50_interface_port_device, f150_9600_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io3", ss50_interface_port_device, f150_9600_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io4", ss50_interface_port_device, f150_9600_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io5", ss50_interface_port_device, f150_9600_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io6", ss50_interface_port_device, f150_9600_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io7", ss50_interface_port_device, f150_9600_w))
- MCFG_MC14411_F13_CB(DEVWRITELINE("io0", ss50_interface_port_device, f110_w)) // 110b
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io1", ss50_interface_port_device, f110_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io2", ss50_interface_port_device, f110_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io3", ss50_interface_port_device, f110_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io4", ss50_interface_port_device, f110_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io5", ss50_interface_port_device, f110_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io6", ss50_interface_port_device, f110_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("io7", ss50_interface_port_device, f110_w))
+ MCFG_MC14411_F7_CB(WRITELINE("io0", ss50_interface_port_device, f600_1200_w)) // 1200b
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io1", ss50_interface_port_device, f600_1200_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io2", ss50_interface_port_device, f600_1200_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io3", ss50_interface_port_device, f600_1200_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io4", ss50_interface_port_device, f600_1200_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io5", ss50_interface_port_device, f600_1200_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io6", ss50_interface_port_device, f600_1200_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io7", ss50_interface_port_device, f600_1200_w))
+ MCFG_MC14411_F8_CB(WRITELINE("io0", ss50_interface_port_device, f600_4800_w)) // 600b
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io1", ss50_interface_port_device, f600_4800_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io2", ss50_interface_port_device, f600_4800_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io3", ss50_interface_port_device, f600_4800_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io4", ss50_interface_port_device, f600_4800_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io5", ss50_interface_port_device, f600_4800_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io6", ss50_interface_port_device, f600_4800_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io7", ss50_interface_port_device, f600_4800_w))
+ MCFG_MC14411_F9_CB(WRITELINE("io0", ss50_interface_port_device, f300_w)) // 300b
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io1", ss50_interface_port_device, f300_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io2", ss50_interface_port_device, f300_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io3", ss50_interface_port_device, f300_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io4", ss50_interface_port_device, f300_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io5", ss50_interface_port_device, f300_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io6", ss50_interface_port_device, f300_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io7", ss50_interface_port_device, f300_w))
+ MCFG_MC14411_F11_CB(WRITELINE("io0", ss50_interface_port_device, f150_9600_w)) // 150b
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io1", ss50_interface_port_device, f150_9600_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io2", ss50_interface_port_device, f150_9600_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io3", ss50_interface_port_device, f150_9600_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io4", ss50_interface_port_device, f150_9600_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io5", ss50_interface_port_device, f150_9600_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io6", ss50_interface_port_device, f150_9600_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io7", ss50_interface_port_device, f150_9600_w))
+ MCFG_MC14411_F13_CB(WRITELINE("io0", ss50_interface_port_device, f110_w)) // 110b
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io1", ss50_interface_port_device, f110_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io2", ss50_interface_port_device, f110_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io3", ss50_interface_port_device, f110_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io4", ss50_interface_port_device, f110_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io5", ss50_interface_port_device, f110_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io6", ss50_interface_port_device, f110_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("io7", ss50_interface_port_device, f110_w))
MCFG_SS50_INTERFACE_PORT_ADD("io0", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<0>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<0>))
MCFG_SS50_INTERFACE_PORT_ADD("io1", default_2rs_devices, "mps")
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<1>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<1>))
MCFG_SS50_INTERFACE_PORT_ADD("io2", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<2>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<2>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<2>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<2>))
MCFG_SS50_INTERFACE_PORT_ADD("io3", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<3>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<3>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<3>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<3>))
MCFG_SS50_INTERFACE_PORT_ADD("io4", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<4>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<4>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<4>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<4>))
MCFG_SS50_INTERFACE_PORT_ADD("io5", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<5>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<5>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<5>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<5>))
MCFG_SS50_INTERFACE_PORT_ADD("io6", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<6>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<6>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<6>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<6>))
MCFG_SS50_INTERFACE_PORT_ADD("io7", default_2rs_devices, nullptr)
- MCFG_SS50_INTERFACE_IRQ_CALLBACK(DEVWRITELINE("mainirq", input_merger_device, in_w<7>))
- MCFG_SS50_INTERFACE_FIRQ_CALLBACK(DEVWRITELINE("mainnmi", input_merger_device, in_w<7>))
+ MCFG_SS50_INTERFACE_IRQ_CALLBACK(WRITELINE("mainirq", input_merger_device, in_w<7>))
+ MCFG_SS50_INTERFACE_FIRQ_CALLBACK(WRITELINE("mainnmi", input_merger_device, in_w<7>))
MCFG_INPUT_MERGER_ANY_HIGH("mainirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
@@ -179,8 +179,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(swtpc_state::swtpcm)
swtpc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(1'797'100) / 2)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(1'797'100) / 2)
MCFG_DEVICE_MODIFY("brg")
MCFG_DEVICE_CLOCK(XTAL(1'797'100))
diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp
index 2c8062a3892..d7adda033b6 100644
--- a/src/mame/drivers/swtpc09.cpp
+++ b/src/mame/drivers/swtpc09.cpp
@@ -167,8 +167,8 @@ static void swtpc09_floppies(device_slot_interface &device)
/* MPU09, MPID, MPS2 DMF2 */
MACHINE_CONFIG_START(swtpc09_state::swtpc09_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mp09_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mp09_mem)
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_BIG)
@@ -177,28 +177,28 @@ MACHINE_CONFIG_START(swtpc09_state::swtpc09_base)
MCFG_DEVICE_PROGRAM_MAP(flex_dmf2_mem)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_a_r))
- MCFG_PIA_READPA_HANDLER(READ8(swtpc09_state, pia0_ca1_r))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(swtpc09_state, pia0_irq_a))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, swtpc09_state, pia0_a_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, swtpc09_state, pia0_ca1_r))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, swtpc09_state, pia0_irq_a))
MCFG_DEVICE_ADD("ptm", PTM6840, 2000000)
MCFG_PTM6840_EXTERNAL_CLOCKS(50, 0, 50)
- MCFG_PTM6840_O1_CB(WRITELINE(swtpc09_state, ptm_o1_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(swtpc09_state, ptm_o3_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(swtpc09_state, ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, swtpc09_state, ptm_o1_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, swtpc09_state, ptm_o3_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, swtpc09_state, ptm_irq))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(swtpc09_state, acia_interrupt))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, swtpc09_state, acia_interrupt))
MCFG_DEVICE_ADD("brg", MC14411, XTAL(1'843'200))
- MCFG_MC14411_F1_CB(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_MC14411_F1_CB(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
MCFG_FD1793_ADD("fdc", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", swtpc09_floppies, "dd", swtpc09_state::floppy_formats)
@@ -210,8 +210,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(swtpc09_state::swtpc09)
swtpc09_base(config);
MCFG_DEVICE_MODIFY("fdc")
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, swtpc09_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, swtpc09_state, fdc_drq_w))
MACHINE_CONFIG_END
/* MPU09, MPID, MPS2 DC4 PIAIDE*/
@@ -241,8 +241,8 @@ MACHINE_CONFIG_END
/* MPU09, MPID, MPS2 DMF3 */
MACHINE_CONFIG_START(swtpc09_state::swtpc09d3)
swtpc09_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(XTAL(8'000'000))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(XTAL(8'000'000))
MCFG_DEVICE_MODIFY("pia")
MCFG_DEVICE_CLOCK(2000000)
@@ -255,11 +255,11 @@ MACHINE_CONFIG_START(swtpc09_state::swtpc09d3)
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("via", VIA6522, XTAL(4'000'000) / 4)
- MCFG_VIA6522_READPA_HANDLER(READ8(swtpc09_state, dmf3_via_read_porta))
- MCFG_VIA6522_READPB_HANDLER(READ8(swtpc09_state, dmf3_via_read_portb))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swtpc09_state, dmf3_via_write_porta))
- //MCFG_VIA6522_CA1_HANDLER(WRITELINE(swtpc09_state, dmf3_via_write_ca1))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(swtpc09_state, dmf3_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, swtpc09_state, dmf3_via_read_porta))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, swtpc09_state, dmf3_via_read_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, swtpc09_state, dmf3_via_write_porta))
+ //MCFG_VIA6522_CA1_HANDLER(WRITELINE(*this, swtpc09_state, dmf3_via_write_ca1))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, swtpc09_state, dmf3_via_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp
index 8b083ff6b13..401f28f9fa5 100644
--- a/src/mame/drivers/swyft.cpp
+++ b/src/mame/drivers/swyft.cpp
@@ -765,8 +765,8 @@ WRITE_LINE_MEMBER( swyft_state::write_acia_clock )
MACHINE_CONFIG_START(swyft_state::swyft)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68008, XTAL(15'897'600)/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2
- MCFG_CPU_PROGRAM_MAP(swyft_mem)
+ MCFG_DEVICE_ADD("maincpu",M68008, XTAL(15'897'600)/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2
+ MCFG_DEVICE_PROGRAM_MAP(swyft_mem)
MCFG_MACHINE_START_OVERRIDE(swyft_state,swyft)
MCFG_MACHINE_RESET_OVERRIDE(swyft_state,swyft)
@@ -787,27 +787,27 @@ MACHINE_CONFIG_START(swyft_state::swyft)
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
// acia rx and tx clocks come from one of the VIA pins and are tied together, fix this below? acia e clock comes from 68008
MCFG_DEVICE_ADD("acia_clock", CLOCK, (XTAL(15'897'600)/2)/5) // out e clock from 68008, ~ 10in clocks per out clock
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swyft_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, swyft_state, write_acia_clock))
MCFG_DEVICE_ADD("via6522_0", VIA6522, (XTAL(15'897'600)/2)/5) // out e clock from 68008
- MCFG_VIA6522_READPA_HANDLER(READ8(swyft_state, via0_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(swyft_state, via0_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swyft_state, via0_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(swyft_state, via0_pb_w))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(swyft_state, via0_cb1_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(swyft_state, via0_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(swyft_state, via0_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(swyft_state, via0_int_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, swyft_state, via0_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, swyft_state, via0_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, swyft_state, via0_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, swyft_state, via0_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, swyft_state, via0_cb1_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, swyft_state, via0_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, swyft_state, via0_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, swyft_state, via0_int_w))
MCFG_DEVICE_ADD("via6522_1", VIA6522, (XTAL(15'897'600)/2)/5) // out e clock from 68008
- MCFG_VIA6522_READPA_HANDLER(READ8(swyft_state, via1_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(swyft_state, via1_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(swyft_state, via1_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(swyft_state, via1_pb_w))
- MCFG_VIA6522_CB1_HANDLER(WRITELINE(swyft_state, via1_cb1_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(swyft_state, via1_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(swyft_state, via1_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(swyft_state, via1_int_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, swyft_state, via1_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, swyft_state, via1_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, swyft_state, via1_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, swyft_state, via1_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(*this, swyft_state, via1_cb1_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, swyft_state, via1_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, swyft_state, via1_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, swyft_state, via1_int_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index 64c06a5ca98..d3a7defbcb7 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -326,48 +326,48 @@ void sym1_state::sym1_map(address_map &map)
MACHINE_CONFIG_START(sym1_state::sym1)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M6502, SYM1_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sym1_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, SYM1_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sym1_map)
MCFG_DEFAULT_LAYOUT(layout_sym1)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
MCFG_DEVICE_ADD("riot", MOS6532_NEW, SYM1_CLOCK)
- MCFG_MOS6530n_IN_PA_CB(READ8(sym1_state, riot_a_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(sym1_state, riot_a_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(sym1_state, riot_b_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(sym1_state, riot_b_w))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, sym1_state, riot_a_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, sym1_state, riot_a_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, sym1_state, riot_b_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, sym1_state, riot_b_w))
MCFG_DEVICE_ADD("ttl74145", TTL74145, 0)
- MCFG_TTL74145_OUTPUT_LINE_0_CB(WRITELINE(sym1_state, sym1_74145_output_0_w))
- MCFG_TTL74145_OUTPUT_LINE_1_CB(WRITELINE(sym1_state, sym1_74145_output_1_w))
- MCFG_TTL74145_OUTPUT_LINE_2_CB(WRITELINE(sym1_state, sym1_74145_output_2_w))
- MCFG_TTL74145_OUTPUT_LINE_3_CB(WRITELINE(sym1_state, sym1_74145_output_3_w))
- MCFG_TTL74145_OUTPUT_LINE_4_CB(WRITELINE(sym1_state, sym1_74145_output_4_w))
- MCFG_TTL74145_OUTPUT_LINE_5_CB(WRITELINE(sym1_state, sym1_74145_output_5_w))
- MCFG_TTL74145_OUTPUT_LINE_6_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_TTL74145_OUTPUT_LINE_0_CB(WRITELINE(*this, sym1_state, sym1_74145_output_0_w))
+ MCFG_TTL74145_OUTPUT_LINE_1_CB(WRITELINE(*this, sym1_state, sym1_74145_output_1_w))
+ MCFG_TTL74145_OUTPUT_LINE_2_CB(WRITELINE(*this, sym1_state, sym1_74145_output_2_w))
+ MCFG_TTL74145_OUTPUT_LINE_3_CB(WRITELINE(*this, sym1_state, sym1_74145_output_3_w))
+ MCFG_TTL74145_OUTPUT_LINE_4_CB(WRITELINE(*this, sym1_state, sym1_74145_output_4_w))
+ MCFG_TTL74145_OUTPUT_LINE_5_CB(WRITELINE(*this, sym1_state, sym1_74145_output_5_w))
+ MCFG_TTL74145_OUTPUT_LINE_6_CB(WRITELINE("speaker", speaker_sound_device, level_w))
// lines 7-9 not connected
MCFG_DEVICE_ADD("via1", VIA6522, SYM1_CLOCK)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("via2", VIA6522, SYM1_CLOCK)
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("via3", VIA6522, SYM1_CLOCK)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(sym1_state, via3_a_w))
- MCFG_VIA6522_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<2>))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, sym1_state, via3_a_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<2>))
MCFG_INPUT_MERGER_ANY_HIGH("mainirq") // wire-or connection
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
- MCFG_RS232_PORT_ADD("crt", default_rs232_devices, nullptr)
- MCFG_RS232_PORT_ADD("tty", default_rs232_devices, nullptr) // actually a 20 mA current loop; 110 bps assumed
+ MCFG_DEVICE_ADD("crt", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("tty", RS232_PORT, default_rs232_devices, nullptr) // actually a 20 mA current loop; 110 bps assumed
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp
index 63432c0903a..9cc08a7f545 100644
--- a/src/mame/drivers/symbolics.cpp
+++ b/src/mame/drivers/symbolics.cpp
@@ -321,8 +321,8 @@ MACHINE_CONFIG_START(symbolics_state::symbolics)
//XTALS: 16MHz @H11 (68k CPU clock)
// 4.9152MHz @J5 (driving the two MPSCs serial clocks)
// 66.67MHz @J10 (main lispcpu/system clock)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* MC68000L8 @A27; clock is derived from the 16Mhz xtal @ H11, verified from patent */
- MCFG_CPU_PROGRAM_MAP(m68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* MC68000L8 @A27; clock is derived from the 16Mhz xtal @ H11, verified from patent */
+ MCFG_DEVICE_PROGRAM_MAP(m68k_mem)
//ADD ME:
// Framebuffer
diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp
index cb18a3d8f7c..a04bc1f4e13 100644
--- a/src/mame/drivers/sys2900.cpp
+++ b/src/mame/drivers/sys2900.cpp
@@ -140,9 +140,9 @@ uint32_t sys2900_state::screen_update_sys2900(screen_device &screen, bitmap_ind1
MACHINE_CONFIG_START(sys2900_state::sys2900)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/sys9002.cpp b/src/mame/drivers/sys9002.cpp
index 9feca342338..97cd48e8cac 100644
--- a/src/mame/drivers/sys9002.cpp
+++ b/src/mame/drivers/sys9002.cpp
@@ -122,9 +122,9 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(sys9002_state::sys9002)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(2'000'000)) // XTAL not visible on images
- MCFG_CPU_PROGRAM_MAP(sys9002_mem)
- MCFG_CPU_IO_MAP(sys9002_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(2'000'000)) // XTAL not visible on images
+ MCFG_DEVICE_PROGRAM_MAP(sys9002_mem)
+ MCFG_DEVICE_IO_MAP(sys9002_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -143,31 +143,31 @@ MACHINE_CONFIG_START(sys9002_state::sys9002)
MCFG_MC6845_UPDATE_ROW_CB(sys9002_state, crtc_update_row)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 614400)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", uart1)
MCFG_DEVICE_ADD("uart2", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", uart2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/systec.cpp b/src/mame/drivers/systec.cpp
index c27ba6c8ae3..a3bb277a44a 100644
--- a/src/mame/drivers/systec.cpp
+++ b/src/mame/drivers/systec.cpp
@@ -84,24 +84,24 @@ void systec_state::machine_reset()
MACHINE_CONFIG_START(systec_state::systec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(systec_mem)
- MCFG_CPU_IO_MAP(systec_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(systec_mem)
+ MCFG_DEVICE_IO_MAP(systec_io)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxca_w))
/* Devices */
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(4'000'000))
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // no evidence of a daisy chain because IM2 is not set
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index d25b72b165f..afd2a6cb95f 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -2164,21 +2164,21 @@ GFXDECODE_END
MACHINE_CONFIG_START(system1_state::sys1ppi)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */
- MCFG_CPU_PROGRAM_MAP(system1_map)
- MCFG_CPU_IO_MAP(system1_ppi_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */
+ MCFG_DEVICE_PROGRAM_MAP(system1_map)
+ MCFG_DEVICE_IO_MAP(system1_ppi_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, SOUND_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, SOUND_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("soundirq", system1_state, soundirq_gen, "screen", 32, 64)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(system1_state, soundport_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(system1_state, videomode_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(system1_state, sound_control_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, system1_state, soundport_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, system1_state, videomode_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, system1_state, sound_control_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2196,10 +2196,10 @@ MACHINE_CONFIG_START(system1_state::sys1ppi)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76489A, SOUND_CLOCK/4)
+ MCFG_DEVICE_ADD("sn1", SN76489A, SOUND_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489A, SOUND_CLOCK/2) /* selectable via jumper */
+ MCFG_DEVICE_ADD("sn2", SN76489A, SOUND_CLOCK/2) /* selectable via jumper */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -2224,79 +2224,79 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1pio)
sys1ppi(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(system1_pio_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(system1_pio_io_map)
MCFG_DEVICE_REMOVE("ppi8255")
MCFG_DEVICE_ADD("pio", Z80PIO, MASTER_CLOCK)
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(system1_state, soundport_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, system1_state, soundport_w))
MCFG_Z80PIO_OUT_ARDY_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(system1_state, videomode_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, system1_state, videomode_w))
MACHINE_CONFIG_END
#define ENCRYPTED_SYS1PPI_MAPS \
- MCFG_CPU_PROGRAM_MAP(system1_map) \
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map) \
- MCFG_CPU_IO_MAP(system1_ppi_io_map) \
- MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(system1_map) \
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) \
+ MCFG_DEVICE_IO_MAP(system1_ppi_io_map) \
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
#define ENCRYPTED_SYS1PIO_MAPS \
- MCFG_CPU_PROGRAM_MAP(system1_map) \
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map) \
- MCFG_CPU_IO_MAP(system1_pio_io_map) \
- MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(system1_map) \
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) \
+ MCFG_DEVICE_IO_MAP(system1_pio_io_map) \
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
#define ENCRYPTED_SYS2_MC8123_MAPS \
- MCFG_CPU_PROGRAM_MAP(system1_map) \
- MCFG_CPU_OPCODES_MAP(banked_decrypted_opcodes_map) \
- MCFG_CPU_IO_MAP(system1_ppi_io_map) \
- MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(system1_map) \
+ MCFG_DEVICE_OPCODES_MAP(banked_decrypted_opcodes_map) \
+ MCFG_DEVICE_IO_MAP(system1_ppi_io_map) \
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", system1_state, irq0_line_hold)
MACHINE_CONFIG_START(system1_state::sys1pioxb)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", MC8123, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5178)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5178, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5178, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5179)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5179, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5179, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5051)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5048)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5048, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5048, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5033)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5033, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5033, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5065)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2304,77 +2304,77 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppix_315_5098)
sys1ppi(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5177)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5162)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5162, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5162, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_317_0006)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5135)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5135, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5135, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5132)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5132, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5132, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5155)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5155, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5155, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5110)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5110, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5110, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5051)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5051, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5098)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5102)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5102, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5102, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2382,7 +2382,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5133)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5133, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5133, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2390,14 +2390,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5093)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5093, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5093, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piox_315_5065)
sys1pio(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2413,14 +2413,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piosx_315_5099)
sys1pios(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5065, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1piosx_315_spat)
sys1pios(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_SPAT, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_SPAT, MASTER_CLOCK)
ENCRYPTED_SYS1PIO_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2428,14 +2428,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppisx_315_5064)
sys1ppis(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5064, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5064, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys1ppisx_315_5041)
sys1ppis(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5041, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5041, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2449,13 +2449,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::mcu)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_REMOVE()
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_REMOVE()
- MCFG_CPU_ADD("mcu", I8751, SOUND_CLOCK)
- MCFG_CPU_IO_MAP(mcu_io_map)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(system1_state, mcu_control_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", system1_state, mcu_irq_assert)
+ MCFG_DEVICE_ADD("mcu", I8751, SOUND_CLOCK)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, system1_state, mcu_control_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", system1_state, mcu_irq_assert)
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcu_t0", system1_state, mcu_t0_callback, attotime::from_usec(2500))
MACHINE_CONFIG_END
@@ -2467,19 +2467,19 @@ MACHINE_CONFIG_START(system1_state::nob)
sys1ppi(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nobo_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nobo_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::nobm)
nob(config);
/* basic machine hardware */
- MCFG_CPU_ADD("mcu", I8751, SOUND_CLOCK)
- MCFG_MCS51_PORT_P0_IN_CB(READ8(system1_state, nob_mcu_latch_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(system1_state, nob_mcu_latch_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(system1_state, nob_mcu_status_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(system1_state, nob_mcu_control_p2_w))
+ MCFG_DEVICE_ADD("mcu", I8751, SOUND_CLOCK)
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, system1_state, nob_mcu_latch_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, system1_state, nob_mcu_latch_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, system1_state, nob_mcu_status_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, system1_state, nob_mcu_control_p2_w))
MACHINE_CONFIG_END
@@ -2499,33 +2499,33 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2x)
sys2(config);
MCFG_DEVICE_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2_315_5177)
sys2(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5177, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2_315_5176)
sys2(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5176, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5176, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2_317_0006)
sys2(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_317_0006, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2_317_0007)
sys2(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_317_0007, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_317_0007, MASTER_CLOCK)
ENCRYPTED_SYS1PPI_MAPS
MCFG_SEGAZ80_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
@@ -2533,14 +2533,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2xb)
sys2(config);
- MCFG_CPU_REPLACE("maincpu", MC8123, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, MASTER_CLOCK)
ENCRYPTED_SYS2_MC8123_MAPS
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2xboot)
sys2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(banked_decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(banked_decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2m)
@@ -2559,14 +2559,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2rowxb)
sys2row(config);
- MCFG_CPU_REPLACE("maincpu", MC8123, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("maincpu", MC8123, MASTER_CLOCK)
ENCRYPTED_SYS2_MC8123_MAPS
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2rowxboot)
sys2row(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(banked_decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(banked_decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(system1_state::sys2rowm)
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 0013bc2aa1c..cf926e6038e 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -2080,9 +2080,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -2100,9 +2100,9 @@ WRITE_LINE_MEMBER(segas1x_bootleg_state::sound_cause_nmi)
MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151_upd7759)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(sound_7759_map)
- MCFG_CPU_IO_MAP(sound_7759_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_7759_map)
+ MCFG_DEVICE_IO_MAP(sound_7759_io_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -2111,8 +2111,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::z80_ym2151_upd7759)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.32)
- MCFG_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
- MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(segas1x_bootleg_state,sound_cause_nmi))
+ MCFG_DEVICE_ADD("7759", UPD7759)
+ MCFG_UPD7759_DRQ_CALLBACK(WRITELINE(*this, segas1x_bootleg_state,sound_cause_nmi))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.48)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48)
MACHINE_CONFIG_END
@@ -2123,9 +2123,9 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::datsu_ym2151_msm5205)
- speaker is likely to be mono for the bootlegs, not stereo.
- check msm5205 frequency.
*/
- MCFG_CPU_ADD("soundcpu",Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(tturfbl_sound_map)
- MCFG_CPU_IO_MAP(tturfbl_sound_io_map)
+ MCFG_DEVICE_ADD("soundcpu",Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(tturfbl_sound_map)
+ MCFG_DEVICE_IO_MAP(tturfbl_sound_io_map)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -2133,38 +2133,38 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::datsu_ym2151_msm5205)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.32)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.32)
- MCFG_SOUND_ADD("5205", MSM5205, 220000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, tturfbl_msm5205_callback))
+ MCFG_DEVICE_ADD("5205", MSM5205, 220000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, segas1x_bootleg_state, tturfbl_msm5205_callback))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::datsu_2x_ym2203_msm5205)
- MCFG_CPU_ADD("soundcpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(shinobi_datsu_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(shinobi_datsu_sound_map)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
// 2x YM2203C, one at U57, one at U56
- MCFG_SOUND_ADD("ym1", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_SOUND_ADD("ym2", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 4000000)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("5205", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("5205", msm5205_device, data_w))
- MCFG_SOUND_ADD("5205", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, datsu_msm5205_callback))
+ MCFG_DEVICE_ADD("5205", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, segas1x_bootleg_state, datsu_msm5205_callback))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -2180,8 +2180,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::system16_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2204,8 +2204,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::shinobi_datsu)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(shinobib_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(shinobib_map)
MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117)
@@ -2222,8 +2222,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::passshtb)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(passshtb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(passshtb_map)
MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117)
@@ -2241,8 +2241,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::passsht4b)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(passht4b_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(passht4b_map)
// wrong
MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites")
@@ -2262,8 +2262,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::wb3bb)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wb3bbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wb3bbl_map)
MCFG_BOOTLEG_SYS16A_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16A_SPRITES_XORIGIN(189-117)
@@ -2281,10 +2281,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::goldnaxeb_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_PROGRAM_MAP(goldnaxeb1_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_PROGRAM_MAP(goldnaxeb1_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
/* video hardware */
@@ -2318,8 +2318,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::goldnaxeb2)
goldnaxeb_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(goldnaxeb2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(goldnaxeb2_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES)
datsu_2x_ym2203_msm5205(config);
@@ -2330,16 +2330,16 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::bayrouteb1)
goldnaxeb1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bayrouteb1_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bayrouteb1_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::bayrouteb2)
goldnaxeb_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bayrouteb2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bayrouteb2_map)
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES)
datsu_ym2151_msm5205(config);
@@ -2353,8 +2353,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::tturfbl)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tturfbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tturfbl_map)
datsu_ym2151_msm5205(config);
@@ -2366,8 +2366,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::dduxbl)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dduxbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dduxbl_map)
MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
@@ -2379,8 +2379,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::eswatbl)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(eswatbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(eswatbl_map)
MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-124)
@@ -2392,8 +2392,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::eswatbl2)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(eswatbl2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(eswatbl2_map)
MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-121)
@@ -2405,8 +2405,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::tetrisbl)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tetrisbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tetrisbl_map)
MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
@@ -2417,8 +2417,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::altbeastbl)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tetrisbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tetrisbl_map)
MCFG_BOOTLEG_SYS16B_SPRITES_ADD("sprites")
MCFG_BOOTLEG_SYS16B_SPRITES_XORIGIN(189-112)
@@ -2432,8 +2432,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::beautyb)
system16_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(beautyb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(beautyb_map)
// no sprites
@@ -2445,12 +2445,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::system18)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(sound_18_map)
- MCFG_CPU_IO_MAP(sound_18_io_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_18_map)
+ MCFG_DEVICE_IO_MAP(sound_18_io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2474,13 +2474,13 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::system18)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("3438.0", YM3438, 8000000)
+ MCFG_DEVICE_ADD("3438.0", YM3438, 8000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(3, "rspeaker", 0.40)
- MCFG_SOUND_ADD("3438.1", YM3438, 8000000)
+ MCFG_DEVICE_ADD("3438.1", YM3438, 8000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
MCFG_SOUND_ROUTE(2, "lspeaker", 0.40)
@@ -2496,19 +2496,19 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::astormbl)
system18(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(astormbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(astormbl_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(segas1x_bootleg_state::astormb2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
- MCFG_CPU_PROGRAM_MAP(astormbl_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(astormbl_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(8'000'000)/2) /* 4MHz */
- MCFG_CPU_PROGRAM_MAP(sys18bl_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(8'000'000)/2) /* 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sys18bl_sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2542,8 +2542,8 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::mwalkbl)
astormb2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mwalkbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mwalkbl_map)
MACHINE_CONFIG_END
@@ -2551,16 +2551,16 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::shdancbl)
system18(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(shdancbl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(shdancbl_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(shdancbl_sound_map)
- MCFG_CPU_IO_MAP(shdancbl_sound_io_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(shdancbl_sound_map)
+ MCFG_DEVICE_IO_MAP(shdancbl_sound_io_map)
MCFG_DEVICE_REMOVE("5c68")
- MCFG_SOUND_ADD("5205", MSM5205, 200000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, shdancbl_msm5205_callback))
+ MCFG_DEVICE_ADD("5205", MSM5205, 200000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, segas1x_bootleg_state, shdancbl_msm5205_callback))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
@@ -2570,16 +2570,16 @@ MACHINE_CONFIG_START(segas1x_bootleg_state::shdancbla)
system18(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(shdancbla_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(shdancbla_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(shdancbla_sound_map)
- MCFG_CPU_IO_MAP(shdancbl_sound_io_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(shdancbla_sound_map)
+ MCFG_DEVICE_IO_MAP(shdancbl_sound_io_map)
MCFG_DEVICE_REMOVE("5c68")
- MCFG_SOUND_ADD("5205", MSM5205, 200000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, shdancbl_msm5205_callback))
+ MCFG_DEVICE_ADD("5205", MSM5205, 200000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, segas1x_bootleg_state, shdancbl_msm5205_callback))
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
@@ -2601,9 +2601,9 @@ MACHINE_RESET_MEMBER(segas1x_bootleg_state,ddcrewbl)
MACHINE_CONFIG_START(segas1x_bootleg_state::ddcrewbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
- MCFG_CPU_PROGRAM_MAP(ddcrewbl_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", segas1x_bootleg_state, irq4_line_hold)
+ MCFG_DEVICE_PROGRAM_MAP(ddcrewbl_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp
index ca0b6614bdf..64f02cb1eca 100644
--- a/src/mame/drivers/tagteam.cpp
+++ b/src/mame/drivers/tagteam.cpp
@@ -212,13 +212,13 @@ INTERRUPT_GEN_MEMBER(tagteam_state::sound_timer_irq)
MACHINE_CONFIG_START(tagteam_state::tagteam)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, XTAL(12'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tagteam_state, irq0_line_assert, 272/16*57) // connected to bit 4 of vcount (basically once every 16 scanlines)
+ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(12'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tagteam_state, irq0_line_assert, 272/16*57) // connected to bit 4 of vcount (basically once every 16 scanlines)
- MCFG_CPU_ADD("audiocpu", M6502, XTAL(12'000'000)/2/6) // daughterboard gets 12mhz/2 from mainboard, but how it's divided further is a guess
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tagteam_state, sound_timer_irq, 272/16*57) // same source as maincpu irq
+ MCFG_DEVICE_ADD("audiocpu", M6502, XTAL(12'000'000)/2/6) // daughterboard gets 12mhz/2 from mainboard, but how it's divided further is a guess
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tagteam_state, sound_timer_irq, 272/16*57) // same source as maincpu irq
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -239,13 +239,13 @@ MACHINE_CONFIG_START(tagteam_state::tagteam)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6502_IRQ_LINE))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp
index 9762fe9559c..2570a797d57 100644
--- a/src/mame/drivers/tail2nos.cpp
+++ b/src/mame/drivers/tail2nos.cpp
@@ -235,19 +235,19 @@ void tail2nos_state::machine_reset()
MACHINE_CONFIG_START(tail2nos_state::tail2nos)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tail2nos_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tail2nos_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(20'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_port_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(20'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2608 */
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
MCFG_ACIA6850_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_3))
- //MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("link", rs232_port_device, write_txd))
- //MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("link", rs232_port_device, write_rts))
+ //MCFG_ACIA6850_TXD_HANDLER(WRITELINE("link", rs232_port_device, write_txd))
+ //MCFG_ACIA6850_RTS_HANDLER(WRITELINE("link", rs232_port_device, write_rts))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -278,9 +278,9 @@ MACHINE_CONFIG_START(tail2nos_state::tail2nos)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2608, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2608, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tail2nos_state, sound_bankswitch_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tail2nos_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 2ba90a15ec8..d51f7ca14d2 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -349,11 +349,11 @@ TIMER_DEVICE_CALLBACK_MEMBER( taito_state::timer_a )
MACHINE_CONFIG_START(taito_state::taito)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 19000000/9)
- MCFG_CPU_PROGRAM_MAP(taito_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, 19000000/9)
+ MCFG_DEVICE_PROGRAM_MAP(taito_map)
- MCFG_CPU_ADD("audiocpu", M6802, 1000000) // cpu & clock are a guess
- MCFG_CPU_PROGRAM_MAP(taito_sub_map)
+ MCFG_DEVICE_ADD("audiocpu", M6802, 1000000) // cpu & clock are a guess
+ MCFG_DEVICE_PROGRAM_MAP(taito_sub_map)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_taito)
@@ -362,17 +362,17 @@ MACHINE_CONFIG_START(taito_state::taito)
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.475) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.475) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- //MCFG_PIA_READPA_HANDLER(READ8(taito_state, pia_pa_r))
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_READPB_HANDLER(READ8(taito_state, pia_pb_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(taito_state, pia_pb_w))
- //MCFG_PIA_CA2_HANDLER(WRITELINE(taito_state, pia_ca2_w))
- //MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w))
+ //MCFG_PIA_READPA_HANDLER(READ8(*this, taito_state, pia_pa_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, taito_state, pia_pb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, taito_state, pia_pb_w))
+ //MCFG_PIA_CA2_HANDLER(WRITELINE(*this, taito_state, pia_ca2_w))
+ //MCFG_PIA_CB2_HANDLER(WRITELINE(*this, taito_state, pia_cb2_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("audiocpu", M6802_IRQ_LINE))
@@ -381,16 +381,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taito_state::shock)
taito(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(shock_map)
- MCFG_CPU_MODIFY( "audiocpu" )
- MCFG_CPU_PROGRAM_MAP(shock_sub_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(shock_map)
+ MCFG_DEVICE_MODIFY( "audiocpu" )
+ MCFG_DEVICE_PROGRAM_MAP(shock_sub_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taito_state::taito2)
taito(config);
- MCFG_CPU_MODIFY( "audiocpu" )
- MCFG_CPU_PROGRAM_MAP(taito_sub_map2)
+ MCFG_DEVICE_MODIFY( "audiocpu" )
+ MCFG_DEVICE_PROGRAM_MAP(taito_sub_map2)
MACHINE_CONFIG_END
// add vox
@@ -398,21 +398,21 @@ MACHINE_CONFIG_START(taito_state::taito4)
taito(config);
MCFG_SPEAKER_STANDARD_MONO("voxsnd")
MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000) // guess
- MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(taito_state, votrax_request))
+ MCFG_VOTRAX_SC01_REQUEST_CB(WRITELINE(*this, taito_state, votrax_request))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "voxsnd", 0.15) // todo: fix - it makes noise continuously
MCFG_DEVICE_MODIFY("pia")
- MCFG_PIA_CB2_HANDLER(WRITELINE(taito_state, pia_cb2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, taito_state, pia_cb2_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taito_state::taito_ay_audio)
- MCFG_CPU_MODIFY( "audiocpu" )
- MCFG_CPU_PROGRAM_MAP(taito_sub_map5)
+ MCFG_DEVICE_MODIFY( "audiocpu" )
+ MCFG_DEVICE_PROGRAM_MAP(taito_sub_map5)
MCFG_SPEAKER_STANDARD_MONO("aysnd")
- MCFG_SOUND_ADD("aysnd_0", AY8910, XTAL(3'579'545)/2) /* guess */
+ MCFG_DEVICE_ADD("aysnd_0", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "aysnd", 0.8)
- MCFG_SOUND_ADD("aysnd_1", AY8910, XTAL(3'579'545)/2) /* guess */
+ MCFG_DEVICE_ADD("aysnd_1", AY8910, XTAL(3'579'545)/2) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "aysnd", 0.8)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp
index 243907c5db0..4b6f499c177 100644
--- a/src/mame/drivers/taito_b.cpp
+++ b/src/mame/drivers/taito_b.cpp
@@ -1947,12 +1947,12 @@ void taitob_state::machine_reset()
MACHINE_CONFIG_START(taitob_state::rastsag2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(rastsag2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rastsag2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -1961,7 +1961,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -1971,7 +1971,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -1989,7 +1989,7 @@ MACHINE_CONFIG_START(taitob_state::rastsag2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2004,12 +2004,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::masterw)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(masterw_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, masterw_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(masterw_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, masterw_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */
- MCFG_CPU_PROGRAM_MAP(masterw_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */
+ MCFG_DEVICE_PROGRAM_MAP(masterw_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2018,7 +2018,7 @@ MACHINE_CONFIG_START(taitob_state::masterw)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2028,7 +2028,7 @@ MACHINE_CONFIG_START(taitob_state::masterw)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2046,9 +2046,9 @@ MACHINE_CONFIG_START(taitob_state::masterw)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
@@ -2063,8 +2063,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::tetrist) /* Nastar conversion kit with slightly different memory map */
rastsag2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tetrist_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tetrist_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBRGBx)
@@ -2074,20 +2074,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::tetrista) /* Master of Weapon conversion kit with slightly different memory map */
masterw(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tetrista_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tetrista_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::ashura)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(rastsag2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rastsag2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rastansaga2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2096,7 +2096,7 @@ MACHINE_CONFIG_START(taitob_state::ashura)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2106,7 +2106,7 @@ MACHINE_CONFIG_START(taitob_state::ashura)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2124,7 +2124,7 @@ MACHINE_CONFIG_START(taitob_state::ashura)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2139,12 +2139,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::crimec)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(crimec_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, crimec_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(crimec_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, crimec_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2153,7 +2153,7 @@ MACHINE_CONFIG_START(taitob_state::crimec)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2163,7 +2163,7 @@ MACHINE_CONFIG_START(taitob_state::crimec)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2181,7 +2181,7 @@ MACHINE_CONFIG_START(taitob_state::crimec)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2197,12 +2197,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::hitice)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(hitice_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, hitice_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(hitice_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, hitice_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */
- MCFG_CPU_PROGRAM_MAP(viofight_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz Z80B */
+ MCFG_DEVICE_PROGRAM_MAP(viofight_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2211,7 +2211,7 @@ MACHINE_CONFIG_START(taitob_state::hitice)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2221,7 +2221,7 @@ MACHINE_CONFIG_START(taitob_state::hitice)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2240,9 +2240,9 @@ MACHINE_CONFIG_START(taitob_state::hitice)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
@@ -2260,12 +2260,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::rambo3p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rambo3_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rambo3_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2274,7 +2274,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2284,7 +2284,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", rambo3)
@@ -2302,7 +2302,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3p)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
@@ -2318,12 +2318,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::rambo3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rambo3_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12MHz verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rambo3_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, rambo3_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2332,7 +2332,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2342,7 +2342,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2360,7 +2360,7 @@ MACHINE_CONFIG_START(taitob_state::rambo3)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2375,12 +2375,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::pbobble)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(pbobble_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pbobble_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2392,11 +2392,11 @@ MACHINE_CONFIG_START(taitob_state::pbobble)
MCFG_TC0640FIO_READ_1_CB(IOPORT("COIN"))
MCFG_TC0640FIO_READ_2_CB(IOPORT("START"))
MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A"))
- MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B"))
MCFG_DEVICE_ADD("mb87078", MB87078, 0)
- MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed))
+ MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taitob_state, mb87078_gain_changed))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2405,7 +2405,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2423,7 +2423,7 @@ MACHINE_CONFIG_START(taitob_state::pbobble)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2438,12 +2438,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::spacedx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(spacedx_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(spacedx_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2455,11 +2455,11 @@ MACHINE_CONFIG_START(taitob_state::spacedx)
MCFG_TC0640FIO_READ_1_CB(IOPORT("COIN"))
MCFG_TC0640FIO_READ_2_CB(IOPORT("START"))
MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A"))
- MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B"))
MCFG_DEVICE_ADD("mb87078", MB87078, 0)
- MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed))
+ MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taitob_state, mb87078_gain_changed))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2468,7 +2468,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2486,7 +2486,7 @@ MACHINE_CONFIG_START(taitob_state::spacedx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2501,12 +2501,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::spacedxo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(spacedxo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(spacedxo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2515,7 +2515,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2525,7 +2525,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2543,7 +2543,7 @@ MACHINE_CONFIG_START(taitob_state::spacedxo)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2558,12 +2558,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::qzshowby)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/
- MCFG_CPU_PROGRAM_MAP(qzshowby_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/
+ MCFG_DEVICE_PROGRAM_MAP(qzshowby_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, pbobble_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2575,11 +2575,11 @@ MACHINE_CONFIG_START(taitob_state::qzshowby)
MCFG_TC0640FIO_READ_1_CB(IOPORT("COIN"))
MCFG_TC0640FIO_READ_2_CB(IOPORT("START"))
MCFG_TC0640FIO_READ_3_CB(IOPORT("P1_P2_A"))
- MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0640FIO_READ_7_CB(IOPORT("P1_P2_B"))
MCFG_DEVICE_ADD("mb87078", MB87078, 0)
- MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(taitob_state, mb87078_gain_changed))
+ MCFG_MB87078_GAIN_CHANGED_CB(WRITE8(*this, taitob_state, mb87078_gain_changed))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -2588,7 +2588,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2606,7 +2606,7 @@ MACHINE_CONFIG_START(taitob_state::qzshowby)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2621,12 +2621,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::viofight)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(viofight_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, viofight_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(viofight_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, viofight_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz verified */
- MCFG_CPU_PROGRAM_MAP(viofight_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/4) /* 6 MHz verified */
+ MCFG_DEVICE_PROGRAM_MAP(viofight_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2635,7 +2635,7 @@ MACHINE_CONFIG_START(taitob_state::viofight)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2645,7 +2645,7 @@ MACHINE_CONFIG_START(taitob_state::viofight)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2663,9 +2663,9 @@ MACHINE_CONFIG_START(taitob_state::viofight)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(24'000'000)/8) /* 3 MHz */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitob_state, bankswitch_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitob_state, bankswitch_w))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
@@ -2683,12 +2683,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::silentd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(silentd_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, silentd_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(silentd_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, silentd_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2697,7 +2697,7 @@ MACHINE_CONFIG_START(taitob_state::silentd)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2707,7 +2707,7 @@ MACHINE_CONFIG_START(taitob_state::silentd)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2725,7 +2725,7 @@ MACHINE_CONFIG_START(taitob_state::silentd)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2740,12 +2740,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_state::selfeena)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(selfeena_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(selfeena_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2754,7 +2754,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2764,7 +2764,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2782,7 +2782,7 @@ MACHINE_CONFIG_START(taitob_state::selfeena)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2806,12 +2806,12 @@ void taitob_state::ryujin_patch(void)
MACHINE_CONFIG_START(taitob_state::ryujin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(selfeena_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(selfeena_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, selfeena_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2820,7 +2820,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2830,7 +2830,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2848,7 +2848,7 @@ MACHINE_CONFIG_START(taitob_state::ryujin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* 8 MHz */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2870,12 +2870,12 @@ void taitob_state::sbm_patch(void)
MACHINE_CONFIG_START(taitob_state::sbm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(sbm_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, sbm_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sbm_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, sbm_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2884,7 +2884,7 @@ MACHINE_CONFIG_START(taitob_state::sbm)
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("JOY"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("START"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("PHOTOSENSOR"))
/* video hardware */
@@ -2894,7 +2894,7 @@ MACHINE_CONFIG_START(taitob_state::sbm)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_taitob)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
@@ -2912,7 +2912,7 @@ MACHINE_CONFIG_START(taitob_state::sbm)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -2926,12 +2926,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitob_c_state::realpunc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(realpunc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitob_state, realpunc_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(realpunc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitob_state, realpunc_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 6000000)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2940,7 +2940,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc)
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitob_state, player_12_coin_ctrl_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitob_state, player_12_coin_ctrl_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -2950,7 +2950,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitob_state, screen_update_realpunc)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitob_state, screen_vblank_taitob))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitob_state, screen_vblank_taitob))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_b)
MCFG_PALETTE_ADD("palette", 4096)
@@ -2970,7 +2970,7 @@ MACHINE_CONFIG_START(taitob_c_state::realpunc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp
index f5f9138c0ca..e270c825884 100644
--- a/src/mame/drivers/taito_f2.cpp
+++ b/src/mame/drivers/taito_f2.cpp
@@ -2852,11 +2852,11 @@ MACHINE_START_MEMBER(taitof2_state,f2)
MACHINE_CONFIG_START(taitof2_state::taito_f2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 24000000/6) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 24000000/6) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(taitof2_state,f2)
@@ -2869,7 +2869,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_no_buffer))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_no_buffer))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taitof2)
@@ -2881,7 +2881,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -2903,7 +2903,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2_tc0220ioc )
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitof2_state, coin_nibble_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitof2_state, coin_nibble_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
MACHINE_CONFIG_END
@@ -2917,7 +2917,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2_tc0510nio )
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitof2_state, coin_nibble_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitof2_state, coin_nibble_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB)
@@ -2929,7 +2929,7 @@ MACHINE_CONFIG_START(taitof2_state::taito_f2_te7750 )
MCFG_TE7750_IN_PORT1_CB(IOPORT("DSWA"))
MCFG_TE7750_IN_PORT2_CB(IOPORT("DSWB"))
MCFG_TE7750_IN_PORT3_CB(IOPORT("IN2"))
- MCFG_TE7750_OUT_PORT4_CB(WRITE8(taitof2_state, taitof2_4p_coin_word_w))
+ MCFG_TE7750_OUT_PORT4_CB(WRITE8(*this, taitof2_state, taitof2_4p_coin_word_w))
MCFG_TE7750_IN_PORT6_CB(IOPORT("IN0"))
MCFG_TE7750_IN_PORT7_CB(IOPORT("IN1"))
MCFG_TE7750_IN_PORT8_CB(IOPORT("IN3"))
@@ -2941,14 +2941,14 @@ MACHINE_CONFIG_START(taitof2_state::finalb)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(finalb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(finalb_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", finalb)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_finalb)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -2966,14 +2966,14 @@ MACHINE_CONFIG_START(taitof2_state::dondokod)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dondokod_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dondokod_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz)
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
@@ -2995,9 +2995,9 @@ MACHINE_CONFIG_START(taitof2_state::megab)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(megab_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitof2_state, megab_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(megab_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitof2_state, megab_interrupt)
MCFG_TAITO_CCHIP_ADD("cchip", XTAL(24'000'000)/2) /* 12MHz */
// the ports don't appear to hook up to anything
@@ -3024,15 +3024,15 @@ MACHINE_CONFIG_START(taitof2_state::thundfox)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(thundfox_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(thundfox_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", thundfox)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_thundfox)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_thundfox)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed_thundfox))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_thundfox))
MCFG_DEVICE_ADD("tc0100scn_1", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3062,8 +3062,8 @@ MACHINE_CONFIG_START(taitof2_state::cameltry)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cameltry_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cameltry_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
@@ -3090,13 +3090,13 @@ MACHINE_CONFIG_START(taitof2_state::qtorimon)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qtorimon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qtorimon_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3113,14 +3113,14 @@ MACHINE_CONFIG_START(taitof2_state::liquidk)
taito_f2_tc0220ioc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(liquidk_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(liquidk_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_megab)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3137,13 +3137,13 @@ MACHINE_CONFIG_START(taitof2_state::quizhq)
taito_f2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(quizhq_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(quizhq_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3160,8 +3160,8 @@ MACHINE_CONFIG_START(taitof2_state::ssi)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ssi_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ssi_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
@@ -3170,7 +3170,7 @@ MACHINE_CONFIG_START(taitof2_state::ssi)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_ssi)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_ssi)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed_thundfox))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_thundfox))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3185,8 +3185,8 @@ MACHINE_CONFIG_START(taitof2_state::gunfront)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(gunfront_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(gunfront_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
@@ -3195,7 +3195,7 @@ MACHINE_CONFIG_START(taitof2_state::gunfront)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_gunfront)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3212,8 +3212,8 @@ MACHINE_CONFIG_START(taitof2_state::growl)
taito_f2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(growl_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(growl_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_growl)
@@ -3238,8 +3238,8 @@ MACHINE_CONFIG_START(taitof2_state::mjnquest)
taito_f2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(mjnquest_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(mjnquest_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_mjnquest)
@@ -3259,15 +3259,15 @@ MACHINE_CONFIG_START(taitof2_state::footchmp)
taito_f2_te7750(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(footchmp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(footchmp_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_footchmp)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_full_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_full_buffer_delayed))
MCFG_DEVICE_ADD("tc0480scp", TC0480SCP, 0)
MCFG_TC0480SCP_GFX_REGION(1)
@@ -3292,15 +3292,15 @@ MACHINE_CONFIG_START(taitof2_state::hthero)
taito_f2_te7750(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(footchmp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(footchmp_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_hthero)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_full_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_full_buffer_delayed))
MCFG_TC0360PRI_ADD("tc0360pri")
@@ -3318,8 +3318,8 @@ MACHINE_CONFIG_START(taitof2_state::koshien)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(koshien_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(koshien_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_koshien)
@@ -3345,8 +3345,8 @@ MACHINE_CONFIG_START(taitof2_state::yuyugogo)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(yuyugogo_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(yuyugogo_map)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
@@ -3370,8 +3370,8 @@ MACHINE_CONFIG_START(taitof2_state::ninjak)
taito_f2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ninjak_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ninjak_map)
MCFG_DEVICE_ADD("te7750", TE7750, 0)
MCFG_TE7750_IN_PORT1_CB(IOPORT("DSWA"))
@@ -3381,7 +3381,7 @@ MACHINE_CONFIG_START(taitof2_state::ninjak)
MCFG_TE7750_IN_PORT5_CB(IOPORT("IN3"))
MCFG_TE7750_IN_PORT6_CB(IOPORT("IN4"))
MCFG_TE7750_IN_PORT7_CB(IOPORT("IN2"))
- MCFG_TE7750_OUT_PORT8_CB(WRITE8(taitof2_state, taitof2_4p_coin_word_w))
+ MCFG_TE7750_OUT_PORT8_CB(WRITE8(*this, taitof2_state, taitof2_4p_coin_word_w))
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_ninjak)
@@ -3403,8 +3403,8 @@ MACHINE_CONFIG_START(taitof2_state::solfigtr)
taito_f2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(solfigtr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(solfigtr_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_solfigtr)
@@ -3428,12 +3428,12 @@ MACHINE_CONFIG_START(taitof2_state::qzquest)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qzquest_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qzquest_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3447,8 +3447,8 @@ MACHINE_CONFIG_START(taitof2_state::pulirula)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pulirula_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pulirula_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
@@ -3475,8 +3475,8 @@ MACHINE_CONFIG_START(taitof2_state::metalb)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(metalb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(metalb_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
@@ -3505,13 +3505,13 @@ MACHINE_CONFIG_START(taitof2_state::qzchikyu)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qzchikyu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qzchikyu_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_qzchikyu)
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_partial_buffer_delayed_qzchikyu))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_qzchikyu))
MCFG_DEVICE_ADD("tc0100scn", TC0100SCN, 0)
MCFG_TC0100SCN_GFX_REGION(1)
@@ -3528,8 +3528,8 @@ MACHINE_CONFIG_START(taitof2_state::yesnoj)
taito_f2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(yesnoj_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(yesnoj_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo)
@@ -3555,8 +3555,8 @@ MACHINE_CONFIG_START(taitof2_state::deadconx)
taito_f2_te7750(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(deadconx_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(deadconx_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
@@ -3583,8 +3583,8 @@ MACHINE_CONFIG_START(taitof2_state::deadconxj)
taito_f2_te7750(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(deadconx_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(deadconx_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
@@ -3608,8 +3608,8 @@ MACHINE_CONFIG_START(taitof2_state::dinorex)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dinorex_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dinorex_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dinorex)
@@ -3634,8 +3634,8 @@ MACHINE_CONFIG_START(taitof2_state::qjinsei)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qjinsei_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qjinsei_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz)
@@ -3660,8 +3660,8 @@ MACHINE_CONFIG_START(taitof2_state::qcrayon)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qcrayon_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qcrayon_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz)
@@ -3686,8 +3686,8 @@ MACHINE_CONFIG_START(taitof2_state::qcrayon2)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(qcrayon2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(qcrayon2_map)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_quiz)
@@ -3712,8 +3712,8 @@ MACHINE_CONFIG_START(taitof2_state::driftout)
taito_f2_tc0510nio(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(driftout_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(driftout_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
@@ -3740,12 +3740,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitof2_state::cameltrya)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cameltrya_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000,24000000/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cameltrya_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */
- MCFG_CPU_PROGRAM_MAP(cameltrya_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,24000000/4) /* verifed on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cameltrya_sound_map)
MCFG_MACHINE_START_OVERRIDE(taitof2_state,common)
@@ -3754,7 +3754,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitof2_state, coin_nibble_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitof2_state, coin_nibble_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3764,7 +3764,7 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_no_buffer))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_no_buffer))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pivot)
@@ -3789,9 +3789,9 @@ MACHINE_CONFIG_START(taitof2_state::cameltrya)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 24000000/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 24000000/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitof2_state, cameltrya_porta_w)) /* portA write - not implemented */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitof2_state, cameltrya_porta_w)) /* portA write - not implemented */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -3809,12 +3809,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitof2_state::driveout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(driveout_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(driveout_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitof2_state, taitof2_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(driveout_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,24000000/6) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(driveout_sound_map)
MCFG_MACHINE_START_OVERRIDE(taitof2_state,common)
@@ -3823,7 +3823,7 @@ MACHINE_CONFIG_START(taitof2_state::driveout)
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitof2_state, coin_nibble_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitof2_state, coin_nibble_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3833,7 +3833,7 @@ MACHINE_CONFIG_START(taitof2_state::driveout)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitof2_state, screen_vblank_no_buffer))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_no_buffer))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pivot)
diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp
index baa956ff2d5..d1008148dba 100644
--- a/src/mame/drivers/taito_f3.cpp
+++ b/src/mame/drivers/taito_f3.cpp
@@ -460,9 +460,9 @@ MACHINE_RESET_MEMBER(taito_f3_state,f3)
MACHINE_CONFIG_START(taito_f3_state::f3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(f3_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(f3_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
MCFG_MACHINE_RESET_OVERRIDE(taito_f3_state,f3)
@@ -477,7 +477,7 @@ MACHINE_CONFIG_START(taito_f3_state::f3)
MCFG_SCREEN_SIZE(40*8+48*2, 32*8)
MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 24, 24+232-1)
MCFG_SCREEN_UPDATE_DRIVER(taito_f3_state, screen_update_f3)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taito_f3_state, screen_vblank_f3))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taito_f3_state, screen_vblank_f3))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_f3)
MCFG_PALETTE_ADD("palette", 0x2000)
@@ -560,9 +560,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(taito_f3_state::bubsympb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(bubsympb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(bubsympb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taito_f3_state, f3_interrupt2)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -575,7 +575,7 @@ MACHINE_CONFIG_START(taito_f3_state::bubsympb)
MCFG_SCREEN_SIZE(40*8+48*2, 32*8)
MCFG_SCREEN_VISIBLE_AREA(46, 40*8-1 + 46, 31, 31+224-1)
MCFG_SCREEN_UPDATE_DRIVER(taito_f3_state, screen_update_f3)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taito_f3_state, screen_vblank_f3))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taito_f3_state, screen_vblank_f3))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", bubsympb)
MCFG_PALETTE_ADD("palette", 8192)
diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp
index a917251b1c6..7e0dd6b73e1 100644
--- a/src/mame/drivers/taito_h.cpp
+++ b/src/mame/drivers/taito_h.cpp
@@ -647,12 +647,12 @@ void taitoh_state::machine_start()
MACHINE_CONFIG_START(taitoh_state::syvalion)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(syvalion_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoh_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(syvalion_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoh_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -662,7 +662,7 @@ MACHINE_CONFIG_START(taitoh_state::syvalion)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitoh_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitoh_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -688,7 +688,7 @@ MACHINE_CONFIG_START(taitoh_state::syvalion)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -703,12 +703,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoh_state::recordbr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(recordbr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoh_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(recordbr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoh_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -718,7 +718,7 @@ MACHINE_CONFIG_START(taitoh_state::recordbr)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitoh_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitoh_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -744,7 +744,7 @@ MACHINE_CONFIG_START(taitoh_state::recordbr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -760,20 +760,20 @@ MACHINE_CONFIG_START(taitoh_state::tetristh)
recordbr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tetristh_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tetristh_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoh_state::dleague)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(dleague_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoh_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(dleague_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoh_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000) / 2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -783,7 +783,7 @@ MACHINE_CONFIG_START(taitoh_state::dleague)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitoh_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitoh_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -809,7 +809,7 @@ MACHINE_CONFIG_START(taitoh_state::dleague)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(8'000'000))
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp
index 11d1022c85a..f777001c1cf 100644
--- a/src/mame/drivers/taito_l.cpp
+++ b/src/mame/drivers/taito_l.cpp
@@ -1472,7 +1472,7 @@ MACHINE_CONFIG_START(taitol_state::l_system_video)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taitol_state, screen_update_taitol)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taitol_state, screen_vblank_taitol))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitol_state, screen_vblank_taitol))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", taito_l)
@@ -1488,16 +1488,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fhawk_state::fhawk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
- MCFG_CPU_PROGRAM_MAP(fhawk_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_DEVICE_PROGRAM_MAP(fhawk_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(fhawk_3_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(fhawk_3_map)
- MCFG_CPU_ADD("slave", Z80, 12_MHz_XTAL/3) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(fhawk_2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("slave", Z80, 12_MHz_XTAL/3) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(fhawk_2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1506,7 +1506,7 @@ MACHINE_CONFIG_START(fhawk_state::fhawk)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitol_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l)
@@ -1518,9 +1518,9 @@ MACHINE_CONFIG_START(fhawk_state::fhawk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fhawk_state, portA_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, fhawk_state, portA_w))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -1536,23 +1536,23 @@ MACHINE_CONFIG_START(champwr_state::champwr)
fhawk(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(champwr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(champwr_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(champwr_3_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(champwr_3_map)
- MCFG_CPU_MODIFY("slave")
- MCFG_CPU_PROGRAM_MAP(champwr_2_map)
+ MCFG_DEVICE_MODIFY("slave")
+ MCFG_DEVICE_PROGRAM_MAP(champwr_2_map)
/* sound hardware */
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(champwr_state, portA_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(champwr_state, msm5205_volume_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, champwr_state, portA_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, champwr_state, msm5205_volume_w))
- MCFG_SOUND_ADD("msm", MSM5205, 384_kHz_XTAL)
- MCFG_MSM5205_VCLK_CB(WRITELINE(champwr_state, msm5205_vck)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384_kHz_XTAL)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, champwr_state, msm5205_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1561,16 +1561,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_2cpu_state::raimais)
- MCFG_CPU_ADD("maincpu", Z80, 13330560/2) // needs verification from pin122 of TC0090LVC
- MCFG_CPU_PROGRAM_MAP(raimais_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, 13330560/2) // needs verification from pin122 of TC0090LVC
+ MCFG_DEVICE_PROGRAM_MAP(raimais_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, 12000000/3) // not verified
- MCFG_CPU_PROGRAM_MAP(raimais_3_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000/3) // not verified
+ MCFG_DEVICE_PROGRAM_MAP(raimais_3_map)
- MCFG_CPU_ADD("slave", Z80, 12000000/3) // not verified
- MCFG_CPU_PROGRAM_MAP(raimais_2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("slave", Z80, 12000000/3) // not verified
+ MCFG_DEVICE_PROGRAM_MAP(raimais_2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -1579,7 +1579,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitol_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("dpram", MB8421, 0)
@@ -1593,7 +1593,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8_MHz_XTAL) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8_MHz_XTAL) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
@@ -1608,13 +1608,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_2cpu_state::kurikint)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
- MCFG_CPU_PROGRAM_MAP(kurikint_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_DEVICE_PROGRAM_MAP(kurikint_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(kurikint_2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(kurikint_2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1625,7 +1625,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitol_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l)
@@ -1637,7 +1637,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* verified on pcb */
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -1648,9 +1648,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_1cpu_state::plotting)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
- MCFG_CPU_PROGRAM_MAP(plotting_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MCFG_DEVICE_PROGRAM_MAP(plotting_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
MCFG_MACHINE_START_OVERRIDE(taitol_state, taito_l)
MCFG_MACHINE_RESET_OVERRIDE(taitol_state, taito_l)
@@ -1661,9 +1661,9 @@ MACHINE_CONFIG_START(taitol_1cpu_state::plotting)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(13'330'560)/4) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("dswmux", ls157_x2_device, output_r))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("inmux", ls157_x2_device, output_r))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(13'330'560)/4) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8("dswmux", ls157_x2_device, output_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8("inmux", ls157_x2_device, output_r))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MCFG_SOUND_ROUTE(2, "mono", 0.20)
@@ -1683,8 +1683,8 @@ MACHINE_CONFIG_START(taitol_1cpu_state::puzznic)
plotting(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(puzznic_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(puzznic_map)
MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, 3_MHz_XTAL)
MACHINE_CONFIG_END
@@ -1693,8 +1693,8 @@ MACHINE_CONFIG_START(taitol_1cpu_state::puzznici)
plotting(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(puzznici_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(puzznici_map)
MACHINE_CONFIG_END
@@ -1702,8 +1702,8 @@ MACHINE_CONFIG_START(horshoes_state::horshoes)
plotting(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(horshoes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(horshoes_map)
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0)
MCFG_UPD4701_PORTX("AN0")
@@ -1715,15 +1715,15 @@ MACHINE_CONFIG_START(taitol_1cpu_state::palamed)
plotting(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(palamed_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(palamed_map)
MCFG_DEVICE_ADD("ppi", I8255, 0) // Toshiba TMP8255AP-5
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
@@ -1736,15 +1736,15 @@ MACHINE_CONFIG_START(taitol_1cpu_state::cachat)
plotting(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cachat_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cachat_map)
MCFG_DEVICE_ADD("ppi", I8255, 0) // NEC D70155C
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_SOUND_MODIFY("ymsnd")
+ MCFG_DEVICE_MODIFY("ymsnd")
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
@@ -1755,13 +1755,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitol_2cpu_state::evilston)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* not verified */
- MCFG_CPU_PROGRAM_MAP(evilston_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(13'330'560)/2) /* not verified */
+ MCFG_DEVICE_PROGRAM_MAP(evilston_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback)
- MCFG_CPU_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* not verified */
- MCFG_CPU_PROGRAM_MAP(evilston_2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12_MHz_XTAL/3) /* not verified */
+ MCFG_DEVICE_PROGRAM_MAP(evilston_2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1770,7 +1770,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston)
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitol_state, coin_control_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitol_state, coin_control_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("dpram", MB8421, 0)
@@ -1785,7 +1785,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* not verified */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 12_MHz_XTAL/4) /* not verified */
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.25)
MCFG_SOUND_ROUTE(2, "mono", 0.25)
diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp
index a58ed8abb80..f3a3252cbe8 100644
--- a/src/mame/drivers/taito_o.cpp
+++ b/src/mame/drivers/taito_o.cpp
@@ -235,8 +235,8 @@ void taitoo_state::machine_start()
MACHINE_CONFIG_START(taitoo_state::parentj)
- MCFG_CPU_ADD("maincpu", M68000,12000000 ) /*?? MHz */
- MCFG_CPU_PROGRAM_MAP(parentj_map)
+ MCFG_DEVICE_ADD("maincpu", M68000,12000000 ) /*?? MHz */
+ MCFG_DEVICE_PROGRAM_MAP(parentj_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", taitoo_state, parentj_interrupt, "screen", 0, 1)
MCFG_WATCHDOG_ADD("watchdog")
@@ -262,7 +262,7 @@ MACHINE_CONFIG_START(taitoo_state::parentj)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 2000000) /*?? MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 2000000) /*?? MHz */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp
index 6fcd9cfed55..07b07a7a61f 100644
--- a/src/mame/drivers/taito_x.cpp
+++ b/src/mame/drivers/taito_x.cpp
@@ -824,18 +824,18 @@ TIMER_DEVICE_CALLBACK_MEMBER(taitox_state::cchip_irq_clear_cb)
MACHINE_CONFIG_START(taitox_state::superman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(superman_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(superman_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_TAITO_CCHIP_ADD("cchip", XTAL(16'000'000)/2) /* 8MHz measured on pin 20 */
MCFG_CCHIP_IN_PORTA_CB(IOPORT("IN0"))
MCFG_CCHIP_IN_PORTB_CB(IOPORT("IN1"))
MCFG_CCHIP_IN_PORTAD_CB(IOPORT("IN2"))
- MCFG_CCHIP_OUT_PORTC_CB(WRITE8(taitox_state, superman_counters_w))
+ MCFG_CCHIP_OUT_PORTC_CB(WRITE8(*this, taitox_state, superman_counters_w))
MCFG_TIMER_DRIVER_ADD("cchip_irq_clear", taitox_state, cchip_irq_clear_cb)
@@ -864,7 +864,7 @@ MACHINE_CONFIG_START(taitox_state::superman)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000)/2) /* verified on pcb */
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -879,12 +879,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitox_state::daisenpu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(daisenpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(daisenpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(daisenpu_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(daisenpu_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -924,12 +924,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitox_state::gigandes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
- MCFG_CPU_PROGRAM_MAP(gigandes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(gigandes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -956,7 +956,7 @@ MACHINE_CONFIG_START(taitox_state::gigandes)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -971,12 +971,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitox_state::ballbros)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
- MCFG_CPU_PROGRAM_MAP(ballbros_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(ballbros_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitox_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
@@ -1003,7 +1003,7 @@ MACHINE_CONFIG_START(taitox_state::ballbros)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index bbd10ecdb3f..3a0d17bed97 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -3178,16 +3178,16 @@ MACHINE_RESET_MEMBER(taitoz_state,taitoz)
MACHINE_CONFIG_START(taitoz_state::contcirc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(contcirc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(contcirc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(contcirc_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(contcirc_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3197,7 +3197,7 @@ MACHINE_CONFIG_START(taitoz_state::contcirc)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3231,7 +3231,7 @@ MACHINE_CONFIG_START(taitoz_state::contcirc)
MCFG_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "subwoofer", 0.20)
MCFG_SOUND_ROUTE(1, "2610.1.l", 2.0)
@@ -3257,16 +3257,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::chasehq)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(chasehq_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(chasehq_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(chq_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(chq_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3276,7 +3276,7 @@ MACHINE_CONFIG_START(taitoz_state::chasehq)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3310,7 +3310,7 @@ MACHINE_CONFIG_START(taitoz_state::chasehq)
MCFG_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "subwoofer", 0.20)
MCFG_SOUND_ROUTE(1, "2610.1.l", 1.0)
@@ -3336,16 +3336,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::enforce)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(enforce_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(enforce_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(enforce_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(enforce_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq6_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3357,7 +3357,7 @@ MACHINE_CONFIG_START(taitoz_state::enforce)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3389,7 +3389,7 @@ MACHINE_CONFIG_START(taitoz_state::enforce)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3416,13 +3416,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::bshark)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(bshark_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(bshark_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(bshark_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(bshark_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3441,7 +3441,7 @@ MACHINE_CONFIG_START(taitoz_state::bshark)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3470,7 +3470,7 @@ MACHINE_CONFIG_START(taitoz_state::bshark)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
//MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) // DG: this is probably specific to Z80 and wrong?
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3494,8 +3494,8 @@ MACHINE_CONFIG_START(taitoz_state::bsharkjjs)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bsharkjjs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bsharkjjs_map)
MCFG_DEVICE_REMOVE("adc")
MACHINE_CONFIG_END
@@ -3504,16 +3504,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::sci)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sci_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sci_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sci_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sci_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3525,7 +3525,7 @@ MACHINE_CONFIG_START(taitoz_state::sci)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3554,7 +3554,7 @@ MACHINE_CONFIG_START(taitoz_state::sci)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3581,16 +3581,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::nightstr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(nightstr_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(nightstr_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(nightstr_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(nightstr_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3609,7 +3609,7 @@ MACHINE_CONFIG_START(taitoz_state::nightstr)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3643,7 +3643,7 @@ MACHINE_CONFIG_START(taitoz_state::nightstr)
MCFG_SPEAKER_ADD("rear", 0.0, 0.0, 1.3)
MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "subwoofer", 0.20)
MCFG_SOUND_ROUTE(1, "2610.1.l", 2.0)
@@ -3669,16 +3669,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::aquajack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(aquajack_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(aquajack_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(aquajack_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(aquajack_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3690,7 +3690,7 @@ MACHINE_CONFIG_START(taitoz_state::aquajack)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3722,7 +3722,7 @@ MACHINE_CONFIG_START(taitoz_state::aquajack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3749,13 +3749,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::spacegun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(spacegun_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(spacegun_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(spacegun_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 16000000) /* 16 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(spacegun_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,bshark)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3774,9 +3774,9 @@ MACHINE_CONFIG_START(taitoz_state::spacegun)
MCFG_TC0510NIO_READ_0_CB(IOPORT("DSWA"))
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
- MCFG_TC0510NIO_READ_3_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
- MCFG_TC0510NIO_WRITE_3_CB(WRITE8(taitoz_state, spacegun_eeprom_w))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0510NIO_READ_3_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_TC0510NIO_WRITE_3_CB(WRITE8(*this, taitoz_state, spacegun_eeprom_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3805,7 +3805,7 @@ MACHINE_CONFIG_START(taitoz_state::spacegun)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
//MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) // DG: this is probably specific to Z80 and wrong?
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3828,16 +3828,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::dblaxle)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(dblaxle_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(dblaxle_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(dblaxle_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(dblaxle_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3850,7 +3850,7 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle)
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3879,7 +3879,7 @@ MACHINE_CONFIG_START(taitoz_state::dblaxle)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(32'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(32'000'000)/4)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -3906,16 +3906,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitoz_state::racingb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(racingb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(racingb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, sci_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(racingb_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(racingb_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoz_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(taitoz_state,taitoz)
MCFG_MACHINE_RESET_OVERRIDE(taitoz_state,taitoz)
@@ -3927,7 +3927,7 @@ MACHINE_CONFIG_START(taitoz_state::racingb)
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(taitoz_state, coin_control_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, taitoz_state, coin_control_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -3955,7 +3955,7 @@ MACHINE_CONFIG_START(taitoz_state::racingb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(32'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(32'000'000)/4)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp
index 4405b4ea2b1..eba6a6b40f0 100644
--- a/src/mame/drivers/taitoair.cpp
+++ b/src/mame/drivers/taitoair.cpp
@@ -705,18 +705,18 @@ void taitoair_state::machine_reset()
MACHINE_CONFIG_START(taitoair_state::airsys)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)) // MC68000P12
- MCFG_CPU_PROGRAM_MAP(airsys_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitoair_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000)) // MC68000P12
+ MCFG_DEVICE_PROGRAM_MAP(airsys_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitoair_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4) // Z8400AB1
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000) / 4) // Z8400AB1
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
- MCFG_CPU_ADD("dsp", TMS32025, XTAL(36'000'000)) // Unverified
- MCFG_CPU_PROGRAM_MAP(DSP_map_program)
- MCFG_CPU_DATA_MAP(DSP_map_data)
- MCFG_TMS32025_HOLD_IN_CB(READ16(taitoair_state, dsp_HOLD_signal_r))
- MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(taitoair_state, dsp_HOLDA_signal_w))
+ MCFG_DEVICE_ADD("dsp", TMS32025, XTAL(36'000'000)) // Unverified
+ MCFG_DEVICE_PROGRAM_MAP(DSP_map_program)
+ MCFG_DEVICE_DATA_MAP(DSP_map_data)
+ MCFG_TMS32025_HOLD_IN_CB(READ16(*this, taitoair_state, dsp_HOLD_signal_r))
+ MCFG_TMS32025_HOLD_ACK_OUT_CB(WRITE16(*this, taitoair_state, dsp_HOLDA_signal_w))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -725,7 +725,7 @@ MACHINE_CONFIG_START(taitoair_state::airsys)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(taitoair_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, taitoair_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
MCFG_TAITOIO_YOKE_ADD("yokectrl")
@@ -755,7 +755,7 @@ MACHINE_CONFIG_START(taitoair_state::airsys)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, XTAL(16'000'000) / 2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.30)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp
index 92a3d1c70c1..6a2a9baf9aa 100644
--- a/src/mame/drivers/taitogn.cpp
+++ b/src/mame/drivers/taitogn.cpp
@@ -697,32 +697,32 @@ void slot_ataflash(device_slot_interface &device)
MACHINE_CONFIG_START(taitogn_state::coh3002t)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL(100'000'000) )
- MCFG_CPU_PROGRAM_MAP(taitogn_map)
+ MCFG_DEVICE_ADD( "maincpu", CXD8661R, XTAL(100'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(taitogn_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_DEVICE_MODIFY("maincpu:sio0")
- MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(taitogn_state, sio0_sck))
- MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(taitogn_state, sio0_txd))
+ MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(*this, taitogn_state, sio0_sck))
+ MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(*this, taitogn_state, sio0_txd))
MCFG_DEVICE_ADD("cat702_1", CAT702, 0)
- MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(taitogn_state, cat702_1_dataout))
+ MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, taitogn_state, cat702_1_dataout))
MCFG_DEVICE_ADD("cat702_2", CAT702, 0)
- MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(taitogn_state, cat702_2_dataout))
+ MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, taitogn_state, cat702_2_dataout))
MCFG_DEVICE_ADD("znmcu", ZNMCU, 0)
- MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(taitogn_state, znmcu_dataout))
- MCFG_ZNMCU_DSR_HANDLER(DEVWRITELINE("maincpu:sio0", psxsio0_device, write_dsr))
- MCFG_ZNMCU_DSW_HANDLER(IOPORT(":DSW"))
- MCFG_ZNMCU_ANALOG1_HANDLER(IOPORT(":ANALOG1"))
- MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT(":ANALOG2"))
+ MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(*this, taitogn_state, znmcu_dataout))
+ MCFG_ZNMCU_DSR_HANDLER(WRITELINE("maincpu:sio0", psxsio0_device, write_dsr))
+ MCFG_ZNMCU_DSW_HANDLER(IOPORT("DSW"))
+ MCFG_ZNMCU_ANALOG1_HANDLER(IOPORT("ANALOG1"))
+ MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT("ANALOG2"))
MCFG_DEVICE_ADD("at28c16", AT28C16, 0)
MCFG_DEVICE_ADD("rf5c296", RF5C296, 0)
- MCFG_RF5C296_SLOT(":pccard")
+ MCFG_RF5C296_SLOT("pccard")
MCFG_DEVICE_ADD("pccard", PCCARD_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(slot_ataflash, nullptr, false)
@@ -758,7 +758,7 @@ MACHINE_CONFIG_START(taitogn_state::coh3002t)
MCFG_TAITO_ZOOM_USE_FLASH
MCFG_DEVICE_MODIFY("taito_zoom:zsg2")
- MCFG_ZSG2_EXT_READ_HANDLER(READ32(taitogn_state, zsg2_ext_r))
+ MCFG_ZSG2_EXT_READ_HANDLER(READ32(*this, taitogn_state, zsg2_ext_r))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitogn_state::coh3002t_t1)
@@ -777,16 +777,16 @@ MACHINE_CONFIG_START(taitogn_state::coh3002t_t1_mp)
coh3002t_t1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(taitogn_mp_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(taitogn_mp_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitogn_state::coh3002t_t2_mp)
coh3002t_t2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP(taitogn_mp_map)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP(taitogn_mp_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitogn_state::coh3002t_cf)
diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp
index e9f8c5af2a4..b54e6d950d9 100644
--- a/src/mame/drivers/taitojc.cpp
+++ b/src/mame/drivers/taitojc.cpp
@@ -1080,18 +1080,18 @@ void taitojc_state::machine_start()
MACHINE_CONFIG_START(taitojc_state::taitojc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68040, XTAL(10'000'000)*2) // 20MHz, clock source = CY7C991
- MCFG_CPU_PROGRAM_MAP(taitojc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitojc_state, taitojc_vblank)
+ MCFG_DEVICE_ADD("maincpu", M68040, XTAL(10'000'000)*2) // 20MHz, clock source = CY7C991
+ MCFG_DEVICE_PROGRAM_MAP(taitojc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitojc_state, taitojc_vblank)
- MCFG_CPU_ADD("sub", MC68HC11, XTAL(16'000'000)/2) // 8MHz, MC68HC11M0
- MCFG_CPU_PROGRAM_MAP(hc11_pgm_map)
- MCFG_CPU_IO_MAP(hc11_io_map)
+ MCFG_DEVICE_ADD("sub", MC68HC11, XTAL(16'000'000)/2) // 8MHz, MC68HC11M0
+ MCFG_DEVICE_PROGRAM_MAP(hc11_pgm_map)
+ MCFG_DEVICE_IO_MAP(hc11_io_map)
MCFG_MC68HC11_CONFIG( 1, 1280, 0x00 )
- MCFG_CPU_ADD("dsp", TMS32051, XTAL(10'000'000)*4) // 40MHz, clock source = CY7C991
- MCFG_CPU_PROGRAM_MAP(tms_program_map)
- MCFG_CPU_DATA_MAP(tms_data_map)
+ MCFG_DEVICE_ADD("dsp", TMS32051, XTAL(10'000'000)*4) // 40MHz, clock source = CY7C991
+ MCFG_DEVICE_PROGRAM_MAP(tms_program_map)
+ MCFG_DEVICE_DATA_MAP(tms_data_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1102,7 +1102,7 @@ MACHINE_CONFIG_START(taitojc_state::taitojc)
MCFG_TC0640FIO_READ_1_CB(IOPORT("COINS"))
MCFG_TC0640FIO_READ_2_CB(IOPORT("START"))
MCFG_TC0640FIO_READ_3_CB(IOPORT("UNUSED"))
- MCFG_TC0640FIO_WRITE_4_CB(WRITE8(taitojc_state, coin_control_w))
+ MCFG_TC0640FIO_WRITE_4_CB(WRITE8(*this, taitojc_state, coin_control_w))
MCFG_TC0640FIO_READ_7_CB(IOPORT("BUTTONS"))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", empty)
@@ -1125,8 +1125,8 @@ MACHINE_CONFIG_START(taitojc_state::dendego)
taitojc(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dendego_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dendego_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index ffdd0b7c9c6..9263eb072bb 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -766,12 +766,12 @@ INTERRUPT_GEN_MEMBER(taitopjc_state::taitopjc_vbi)
MACHINE_CONFIG_START(taitopjc_state::taitopjc)
- MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603E, 100000000)
MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
- MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
+ MCFG_DEVICE_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
- MCFG_CPU_ADD("iocpu", TMP95C063, 25000000)
+ MCFG_DEVICE_ADD("iocpu", TMP95C063, 25000000)
MCFG_TMP95C063_PORT5_READ(IOPORT("INPUTS1"))
MCFG_TMP95C063_PORTD_READ(IOPORT("INPUTS2"))
MCFG_TMP95C063_PORTE_READ(IOPORT("INPUTS3"))
@@ -779,17 +779,17 @@ MACHINE_CONFIG_START(taitopjc_state::taitopjc)
MCFG_TMP95C063_AN1_READ(IOPORT("ANALOG2"))
MCFG_TMP95C063_AN2_READ(IOPORT("ANALOG3"))
MCFG_TMP95C063_AN3_READ(IOPORT("ANALOG4"))
- MCFG_CPU_PROGRAM_MAP(tlcs900h_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitopjc_state, taitopjc_vbi)
+ MCFG_DEVICE_PROGRAM_MAP(tlcs900h_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitopjc_state, taitopjc_vbi)
/* TMS320C53 DSP */
- MCFG_CPU_ADD("dsp", TMS32053, 40000000)
- MCFG_CPU_PROGRAM_MAP(tms_program_map)
- MCFG_CPU_DATA_MAP(tms_data_map)
- MCFG_CPU_IO_MAP(tms_io_map)
+ MCFG_DEVICE_ADD("dsp", TMS32053, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(tms_program_map)
+ MCFG_DEVICE_DATA_MAP(tms_data_map)
+ MCFG_DEVICE_IO_MAP(tms_io_map)
- MCFG_CPU_ADD("mn10200", MN1020012A, 10000000) /* MN1020819DA sound CPU - NOTE: May have 64kB internal ROM */
- MCFG_CPU_PROGRAM_MAP(mn10200_map)
+ MCFG_DEVICE_ADD("mn10200", MN1020012A, 10000000) /* MN1020819DA sound CPU - NOTE: May have 64kB internal ROM */
+ MCFG_DEVICE_PROGRAM_MAP(mn10200_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index 8cf6f50c14c..29c068110eb 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -1759,17 +1759,17 @@ WRITE8_MEMBER(taitosj_state::taitosj_dacvol_w)
MACHINE_CONFIG_START(taitosj_state::nomcu)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,XTAL(8'000'000)/2) /* 8 MHz / 2, on CPU board */
- MCFG_CPU_PROGRAM_MAP(taitosj_main_nomcu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitosj_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z80,XTAL(8'000'000)/2) /* 8 MHz / 2, on CPU board */
+ MCFG_DEVICE_PROGRAM_MAP(taitosj_main_nomcu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitosj_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(6'000'000)/2) /* 6 MHz / 2, on GAME board */
- MCFG_CPU_PROGRAM_MAP(taitosj_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(6'000'000)/2) /* 6 MHz / 2, on GAME board */
+ MCFG_DEVICE_PROGRAM_MAP(taitosj_audio_map)
/* interrupts: */
/* - no interrupts synced with vblank */
/* - NMI triggered by the main CPU */
/* - periodic IRQ, with frequency 6000000/(4*16*16*10*16) = 36.621 Hz, */
- MCFG_CPU_PERIODIC_INT_DRIVER(taitosj_state, irq0_line_hold, XTAL(6'000'000)/(4*16*16*10*16))
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(taitosj_state, irq0_line_hold, XTAL(6'000'000)/(4*16*16*10*16))
/* video hardware */
@@ -1789,28 +1789,28 @@ MACHINE_CONFIG_START(taitosj_state::nomcu)
MCFG_SPEAKER_STANDARD_MONO("speaker")
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(DEVWRITELINE("soundnmi2", input_merger_device, in_w<0>))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("soundnmi2", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ANY_HIGH("soundnmi2")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC53 (this is the only AY which uses proper mixing resistors, the 3 below have outputs tied together)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC53 (this is the only AY which uses proper mixing resistors, the 3 below have outputs tied together)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC51
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC51
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(taitosj_state, taitosj_dacvol_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, taitosj_state, taitosj_dacvol_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay3", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC49
+ MCFG_DEVICE_ADD("ay3", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC49
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(taitosj_state, input_port_4_f0_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, taitosj_state, input_port_4_f0_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("ay4", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC50
+ MCFG_DEVICE_ADD("ay4", AY8910, XTAL(6'000'000)/4) // 6mhz/4 on GAME board, AY-3-8910 @ IC50
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
/* TODO: Implement ay4 Port A bits 0 and 1 which connect to a 7416 open
collector inverter, to selectively tie none, either or both of two
@@ -1818,14 +1818,14 @@ MACHINE_CONFIG_START(taitosj_state::nomcu)
audio output signal and high-z (i.e. do nothing).
Bio Attack uses this?
*/
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(taitosj_state, taitosj_sndnmi_msk_w)) /* port Bwrite */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, taitosj_state, taitosj_sndnmi_msk_w)) /* port Bwrite */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 128); // 74LS393 on CPU board, counts 128 vblanks before firing watchdog
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // 30k r-2r network
- MCFG_SOUND_ADD("dacvol", DISCRETE, 0) MCFG_DISCRETE_INTF(taitosj_dacvol)
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // 30k r-2r network
+ MCFG_DEVICE_ADD("dacvol", DISCRETE) MCFG_DISCRETE_INTF(taitosj_dacvol)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1835,15 +1835,15 @@ MACHINE_CONFIG_START(taitosj_state::mcu)
nomcu(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(taitosj_main_mcu_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(taitosj_main_mcu_map)
- MCFG_CPU_ADD("bmcu", TAITO_SJ_SECURITY_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */
+ MCFG_DEVICE_ADD("bmcu", TAITO_SJ_SECURITY_MCU, XTAL(3'000'000)) /* xtal is 3MHz, divided by 4 internally */
MCFG_TAITO_SJ_SECURITY_MCU_INT_MODE(LATCH)
- MCFG_TAITO_SJ_SECURITY_MCU_68READ_CB(READ8(taitosj_state, mcu_mem_r))
- MCFG_TAITO_SJ_SECURITY_MCU_68WRITE_CB(WRITE8(taitosj_state, mcu_mem_w))
- MCFG_TAITO_SJ_SECURITY_MCU_68INTRQ_CB(WRITELINE(taitosj_state, mcu_intrq_w))
- MCFG_TAITO_SJ_SECURITY_MCU_BUSRQ_CB(WRITELINE(taitosj_state, mcu_busrq_w))
+ MCFG_TAITO_SJ_SECURITY_MCU_68READ_CB(READ8(*this, taitosj_state, mcu_mem_r))
+ MCFG_TAITO_SJ_SECURITY_MCU_68WRITE_CB(WRITE8(*this, taitosj_state, mcu_mem_w))
+ MCFG_TAITO_SJ_SECURITY_MCU_68INTRQ_CB(WRITELINE(*this, taitosj_state, mcu_intrq_w))
+ MCFG_TAITO_SJ_SECURITY_MCU_BUSRQ_CB(WRITELINE(*this, taitosj_state, mcu_busrq_w))
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MACHINE_CONFIG_END
@@ -1853,8 +1853,8 @@ MACHINE_CONFIG_START(taitosj_state::kikstart)
mcu(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kikstart_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kikstart_main_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(taitosj_state, screen_update_kikstart)
diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp
index 3ddfb66b0dc..f21a1dbeff7 100644
--- a/src/mame/drivers/taitotx.cpp
+++ b/src/mame/drivers/taitotx.cpp
@@ -172,8 +172,8 @@ void taito_type_x_state::machine_reset()
MACHINE_CONFIG_START(taito_type_x_state::taito_type_x)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333) /* Wrong, much newer processors, much faster. */
- MCFG_CPU_PROGRAM_MAP(taito_type_x_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 733333333) /* Wrong, much newer processors, much faster. */
+ MCFG_DEVICE_PROGRAM_MAP(taito_type_x_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 3bcc40a18e1..079b7ed5ccf 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -2567,12 +2567,12 @@ WRITE_LINE_MEMBER(taitotz_state::ide_interrupt)
MACHINE_CONFIG_START(taitotz_state::taitotz)
/* IBM EMPPC603eBG-100 */
- MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
+ MCFG_DEVICE_ADD("maincpu", PPC603E, 100000000)
MCFG_PPC_BUS_FREQUENCY(XTAL(66'666'700)) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
- MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
+ MCFG_DEVICE_PROGRAM_MAP(ppc603e_mem)
/* TMP95C063F I/O CPU */
- MCFG_CPU_ADD("iocpu", TMP95C063, 25000000)
+ MCFG_DEVICE_ADD("iocpu", TMP95C063, 25000000)
MCFG_TMP95C063_PORT9_READ(IOPORT("INPUTS1"))
MCFG_TMP95C063_PORTB_READ(IOPORT("INPUTS2"))
MCFG_TMP95C063_PORTD_READ(IOPORT("INPUTS3"))
@@ -2586,15 +2586,15 @@ MACHINE_CONFIG_START(taitotz_state::taitotz)
MCFG_TMP95C063_AN6_READ(IOPORT("ANALOG7"))
MCFG_TMP95C063_AN7_READ(IOPORT("ANALOG8"))
- MCFG_CPU_PROGRAM_MAP(tlcs900h_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taitotz_state, taitotz_vbi)
+ MCFG_DEVICE_PROGRAM_MAP(tlcs900h_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taitotz_state, taitotz_vbi)
/* MN1020819DA sound CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(120))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(taitotz_state, ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, taitotz_state, ide_interrupt))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2609,8 +2609,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(taitotz_state::landhigh)
taitotz(config);
- MCFG_CPU_MODIFY("iocpu")
- MCFG_CPU_PROGRAM_MAP(landhigh_tlcs900h_mem)
+ MCFG_DEVICE_MODIFY("iocpu")
+ MCFG_DEVICE_PROGRAM_MAP(landhigh_tlcs900h_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp
index e8775976818..8dff006e27b 100644
--- a/src/mame/drivers/taitowlf.cpp
+++ b/src/mame/drivers/taitowlf.cpp
@@ -378,10 +378,10 @@ PALETTE_INIT_MEMBER(taitowlf_state, taitowlf)
MACHINE_CONFIG_START(taitowlf_state::taitowlf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM, 200000000)
- MCFG_CPU_PROGRAM_MAP(taitowlf_map)
- MCFG_CPU_IO_MAP(taitowlf_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM, 200000000)
+ MCFG_DEVICE_PROGRAM_MAP(taitowlf_map)
+ MCFG_DEVICE_IO_MAP(taitowlf_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp
index 65eb6c80e35..96b257613c1 100644
--- a/src/mame/drivers/tamag1.cpp
+++ b/src/mame/drivers/tamag1.cpp
@@ -137,9 +137,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tamag1_state::tama)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", E0C6S46, 32.768_kHz_XTAL)
+ MCFG_DEVICE_ADD("maincpu", E0C6S46, 32.768_kHz_XTAL)
MCFG_E0C6S46_PIXEL_UPDATE_CB(tamag1_state, pixel_update)
- MCFG_E0C6S46_WRITE_R_CB(4, WRITE8(tamag1_state, speaker_w))
+ MCFG_E0C6S46_WRITE_R_CB(4, WRITE8(*this, tamag1_state, speaker_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -156,7 +156,7 @@ MACHINE_CONFIG_START(tamag1_state::tama)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 8ab4b6efbc5..44bde5ca41e 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -656,16 +656,16 @@ MACHINE_CONFIG_START(tandy1000_state::tandy1000_common)
MCFG_GFXDECODE_ADD("gfxdecode", "pcvideo_t1000:palette", t1000)
/* sound hardware */
- MCFG_SOUND_ADD("sn76496", NCR7496, XTAL(14'318'181)/4)
+ MCFG_DEVICE_ADD("sn76496", NCR7496, XTAL(14'318'181)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mb:mono", 0.80)
MCFG_NVRAM_ADD_0FILL("nvram");
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa_fdc", pc_isa8_cards, "fdc_xt", true)
+ MCFG_DEVICE_ADD("isa_fdc", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", true) // FIXME: determine ISA bus clock
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_fdc_35)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa_lpt", pc_isa8_cards, "lpt", true)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa_com", pc_isa8_cards, "com", true)
+ MCFG_DEVICE_ADD("isa_lpt", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", true)
+ MCFG_DEVICE_ADD("isa_com", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", true)
MCFG_PC_JOY_ADD("pc_joy")
@@ -678,25 +678,25 @@ MACHINE_CONFIG_START(tandy1000_state::tandy1000_common)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::tandy1000_90key)
- MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE("mb:pic8259", pic8259_device, ir1_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::tandy1000_101key)
- MCFG_AT_KEYB_ADD("pc_keyboard", 1, DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w))
+ MCFG_AT_KEYB_ADD("pc_keyboard", 1, WRITELINE("mb:pic8259", pic8259_device, ir1_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000hx)
- MCFG_CPU_ADD("maincpu", I8088, 8000000)
- MCFG_CPU_PROGRAM_MAP(tandy1000_map)
- MCFG_CPU_IO_MAP(tandy1000_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(tandy1000_map)
+ MCFG_DEVICE_IO_MAP(tandy1000_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
tandy1000_common(config);
tandy1000_90key(config);
// plus cards are isa with a nonstandard conntector
- MCFG_ISA8_SLOT_ADD("mb:isa", "plus1", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("plus1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // FIXME: determine ISA bus clock
MCFG_DEVICE_MODIFY(RAM_TAG)
MCFG_RAM_EXTRA_OPTIONS("256K, 384K")
MACHINE_CONFIG_END
@@ -706,10 +706,10 @@ MACHINE_CONFIG_START(tandy1000_state::t1000sx)
MCFG_DEVICE_MODIFY("isa_fdc")
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_fdc_525)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
/* software lists */
MCFG_DEVICE_MODIFY(RAM_TAG)
@@ -717,10 +717,10 @@ MACHINE_CONFIG_START(tandy1000_state::t1000sx)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000rl)
- MCFG_CPU_ADD("maincpu", I8086, XTAL(28'636'363) / 3)
- MCFG_CPU_PROGRAM_MAP(tandy1000_bank_map)
- MCFG_CPU_IO_MAP(tandy1000_bank_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, XTAL(28'636'363) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(tandy1000_bank_map)
+ MCFG_DEVICE_IO_MAP(tandy1000_bank_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
tandy1000_common(config);
@@ -740,36 +740,36 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000sl2)
t1000rl(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_CLOCK( XTAL(24'000'000) / 3 )
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_CLOCK( XTAL(24'000'000) / 3 )
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000tl)
- MCFG_CPU_ADD("maincpu", I80286, XTAL(28'636'363) / 2)
- MCFG_CPU_PROGRAM_MAP(tandy1000_286_map)
- MCFG_CPU_IO_MAP(tandy1000_16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I80286, XTAL(28'636'363) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tandy1000_286_map)
+ MCFG_DEVICE_IO_MAP(tandy1000_16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
tandy1000_common(config);
tandy1000_101key(config);
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy1000_state::t1000tx)
t1000tl(config);
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_IO_MAP(tandy1000tx_io)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_IO_MAP(tandy1000tx_io)
MCFG_DEVICE_REMOVE("pc_keyboard")
tandy1000_90key(config);
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index db789a65e8b..99227b391c8 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -771,10 +771,10 @@ void tandy2k_state::device_reset_after_children()
MACHINE_CONFIG_START(tandy2k_state::tandy2k)
// basic machine hardware
- MCFG_CPU_ADD(I80186_TAG, I80186, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(tandy2k_mem)
- MCFG_CPU_IO_MAP(tandy2k_io)
- MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, tandy2k_state, irq_callback))
+ MCFG_DEVICE_ADD(I80186_TAG, I80186, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tandy2k_mem)
+ MCFG_DEVICE_IO_MAP(tandy2k_io)
+ MCFG_80186_IRQ_SLAVE_ACK(READ8(DEVICE_SELF, tandy2k_state, irq_callback))
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
@@ -790,24 +790,24 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k)
MCFG_DEVICE_ADD(CRT9007_TAG, CRT9007, XTAL(16'000'000)*28/20/8)
MCFG_DEVICE_ADDRESS_MAP(0, vpac_mem)
MCFG_CRT9007_CHARACTER_WIDTH(8)
- MCFG_CRT9007_INT_CALLBACK(DEVWRITELINE(I8259A_1_TAG, pic8259_device, ir1_w))
- MCFG_CRT9007_VS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_device, vsync_w))
- MCFG_CRT9007_VLT_CALLBACK(WRITELINE(tandy2k_state, vpac_vlt_w))
- MCFG_CRT9007_CURS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_device, cursor_w))
- MCFG_CRT9007_DRB_CALLBACK(WRITELINE(tandy2k_state, vpac_drb_w))
- MCFG_CRT9007_WBEN_CALLBACK(WRITELINE(tandy2k_state, vpac_wben_w))
- MCFG_CRT9007_CBLANK_CALLBACK(WRITELINE(tandy2k_state, vpac_cblank_w))
- MCFG_CRT9007_SLG_CALLBACK(WRITELINE(tandy2k_state, vpac_slg_w))
- MCFG_CRT9007_SLD_CALLBACK(WRITELINE(tandy2k_state, vpac_sld_w))
+ MCFG_CRT9007_INT_CALLBACK(WRITELINE(I8259A_1_TAG, pic8259_device, ir1_w))
+ MCFG_CRT9007_VS_CALLBACK(WRITELINE(CRT9021B_TAG, crt9021_device, vsync_w))
+ MCFG_CRT9007_VLT_CALLBACK(WRITELINE(*this, tandy2k_state, vpac_vlt_w))
+ MCFG_CRT9007_CURS_CALLBACK(WRITELINE(CRT9021B_TAG, crt9021_device, cursor_w))
+ MCFG_CRT9007_DRB_CALLBACK(WRITELINE(*this, tandy2k_state, vpac_drb_w))
+ MCFG_CRT9007_WBEN_CALLBACK(WRITELINE(*this, tandy2k_state, vpac_wben_w))
+ MCFG_CRT9007_CBLANK_CALLBACK(WRITELINE(*this, tandy2k_state, vpac_cblank_w))
+ MCFG_CRT9007_SLG_CALLBACK(WRITELINE(*this, tandy2k_state, vpac_slg_w))
+ MCFG_CRT9007_SLD_CALLBACK(WRITELINE(*this, tandy2k_state, vpac_sld_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADD(CRT9212_0_TAG, CRT9212, 0)
MCFG_CRT9212_WEN2_VCC()
- MCFG_CRT9212_DOUT_CALLBACK(WRITE8(tandy2k_state, vidla_w))
+ MCFG_CRT9212_DOUT_CALLBACK(WRITE8(*this, tandy2k_state, vidla_w))
MCFG_DEVICE_ADD(CRT9212_1_TAG, CRT9212, 0)
MCFG_CRT9212_WEN2_VCC()
- MCFG_CRT9212_DOUT_CALLBACK(WRITE8(tandy2k_state, drb_attr_w))
+ MCFG_CRT9212_DOUT_CALLBACK(WRITE8(*this, tandy2k_state, drb_attr_w))
MCFG_DEVICE_ADD(CRT9021B_TAG, CRT9021, XTAL(16'000'000)*28/20)
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
@@ -816,65 +816,65 @@ MACHINE_CONFIG_START(tandy2k_state::tandy2k)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTB_CB(READ8(tandy2k_state, ppi_pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tandy2k_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, tandy2k_state, ppi_pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tandy2k_state, ppi_pc_w))
MCFG_DEVICE_ADD(I8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(tandy2k_state, rxrdy_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(tandy2k_state, txrdy_w))
-
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_dsr))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, tandy2k_state, rxrdy_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, tandy2k_state, txrdy_w))
+
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251A_TAG, i8251_device, write_dsr))
// TODO pin 15 external transmit clock
// TODO pin 17 external receiver clock
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(16'000'000)/16)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(tandy2k_state, outspkr_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, tandy2k_state, outspkr_w))
MCFG_PIT8253_CLK1(XTAL(16'000'000)/8)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(tandy2k_state, intbrclk_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, tandy2k_state, intbrclk_w))
//MCFG_PIT8253_CLK2(XTAL(16'000'000)/8)
- //MCFG_PIT8253_OUT2_HANDLER(WRITELINE(tandy2k_state, rfrqpulse_w))
+ //MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, tandy2k_state, rfrqpulse_w))
MCFG_DEVICE_ADD(I8259A_0_TAG, PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(I80186_TAG, i80186_cpu_device, int0_w))
MCFG_DEVICE_ADD(I8259A_1_TAG, PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int1_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(I80186_TAG, i80186_cpu_device, int1_w))
MCFG_I8272A_ADD(I8272A_TAG, true)
downcast<i8272a_device *>(device)->set_select_lines_connected(true);
- MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE(I8259A_0_TAG, pic8259_device, ir4_w))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(tandy2k_state, fdc_drq_w))
- MCFG_UPD765_HDL_CALLBACK(WRITELINE(tandy2k_state, fdc_hdl_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(I8259A_0_TAG, pic8259_device, ir4_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, tandy2k_state, fdc_drq_w))
+ MCFG_UPD765_HDL_CALLBACK(WRITELINE(*this, tandy2k_state, fdc_hdl_w))
MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":0", tandy2k_floppies, "525qd", tandy2k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(I8272A_TAG ":1", tandy2k_floppies, "525qd", tandy2k_state::floppy_formats)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(tandy2k_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tandy2k_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(tandy2k_state, write_centronics_perror))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(tandy2k_state, write_centronics_select))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(tandy2k_state, write_centronics_fault))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_perror))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_select))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, tandy2k_state, write_centronics_fault))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD(TANDY2K_KEYBOARD_TAG, TANDY2K_KEYBOARD, 0)
- MCFG_TANDY2000_KEYBOARD_CLOCK_CALLBACK(WRITELINE(tandy2k_state, kbdclk_w))
- MCFG_TANDY2000_KEYBOARD_DATA_CALLBACK(WRITELINE(tandy2k_state, kbddat_w))
+ MCFG_TANDY2000_KEYBOARD_CLOCK_CALLBACK(WRITELINE(*this, tandy2k_state, kbdclk_w))
+ MCFG_TANDY2000_KEYBOARD_DATA_CALLBACK(WRITELINE(*this, tandy2k_state, kbddat_w))
// temporary until the tandy keyboard has a rom dump
- MCFG_PC_KEYB_ADD("pc_keyboard", DEVWRITELINE(I8259A_1_TAG, pic8259_device, ir0_w))
+ MCFG_PC_KEYB_ADD("pc_keyboard", WRITELINE(I8259A_1_TAG, pic8259_device, ir0_w))
// software lists
@@ -889,8 +889,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tandy2k_state::tandy2k_hd)
tandy2k(config);
// basic machine hardware
- MCFG_CPU_MODIFY(I80186_TAG)
- MCFG_CPU_IO_MAP(tandy2k_hd_io)
+ MCFG_DEVICE_MODIFY(I80186_TAG)
+ MCFG_DEVICE_IO_MAP(tandy2k_hd_io)
// Tandon TM502 hard disk
MCFG_HARDDISK_ADD("harddisk0")
diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp
index 8672031c5db..34246dd8dcd 100644
--- a/src/mame/drivers/tank8.cpp
+++ b/src/mame/drivers/tank8.cpp
@@ -330,8 +330,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(tank8_state::tank8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 11055000 / 10) /* ? */
- MCFG_CPU_PROGRAM_MAP(tank8_cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, 11055000 / 10) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(tank8_cpu_map)
/* video hardware */
@@ -342,7 +342,7 @@ MACHINE_CONFIG_START(tank8_state::tank8)
MCFG_SCREEN_SIZE(512, 524)
MCFG_SCREEN_VISIBLE_AREA(16, 495, 0, 463)
MCFG_SCREEN_UPDATE_DRIVER(tank8_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tank8_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tank8_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tank8)
@@ -353,7 +353,7 @@ MACHINE_CONFIG_START(tank8_state::tank8)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(tank8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp
index 50687d0ff45..7958dbd0e1c 100644
--- a/src/mame/drivers/tankbatt.cpp
+++ b/src/mame/drivers/tankbatt.cpp
@@ -272,24 +272,24 @@ static const char *const tankbatt_sample_names[] =
MACHINE_CONFIG_START(tankbatt_state::tankbatt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tankbatt_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tankbatt_state, interrupt)
MCFG_DEVICE_ADD("mainlatch", CD4099, 0) // latches at 4H and 5H (are the empty 4J and 5J locations for LS259 substitution?)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) //coin counter mirror?
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tankbatt_state, interrupt_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tankbatt_state, sh_engine_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(tankbatt_state, sh_fire_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(tankbatt_state, sh_expl_w)) // bit 7 also set by ASL instruction
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tankbatt_state, interrupt_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tankbatt_state, sh_engine_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, tankbatt_state, sh_fire_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, tankbatt_state, sh_expl_w)) // bit 7 also set by ASL instruction
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // bit 7 also set by ASL instruction
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(tankbatt_state, demo_interrupt_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, tankbatt_state, demo_interrupt_enable_w))
MCFG_DEVICE_ADD("outlatch", CD4099, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0"))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1"))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tankbatt_state, coincounter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tankbatt_state, coinlockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tankbatt_state, coincounter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tankbatt_state, coinlockout_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -308,7 +308,7 @@ MACHINE_CONFIG_START(tankbatt_state::tankbatt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(3)
MCFG_SAMPLES_NAMES(tankbatt_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp
index 0556ece64f7..f663cd09c7d 100644
--- a/src/mame/drivers/tankbust.cpp
+++ b/src/mame/drivers/tankbust.cpp
@@ -336,14 +336,14 @@ INTERRUPT_GEN_MEMBER(tankbust_state::vblank_irq)
MACHINE_CONFIG_START(tankbust_state::tankbust)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(14'318'181)/2) /* Verified on PCB */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tankbust_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(14'318'181)/2) /* Verified on PCB */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tankbust_state, vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL(14'318'181)/4) /* Verified on PCB */
-// MCFG_CPU_ADD("sub", Z80, XTAL(14'318'181)/3) /* Accurate to audio recording, but apparently incorrect clock */
- MCFG_CPU_PROGRAM_MAP(map_cpu2)
- MCFG_CPU_IO_MAP(port_map_cpu2)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(14'318'181)/4) /* Verified on PCB */
+// MCFG_DEVICE_ADD("sub", Z80, XTAL(14'318'181)/3) /* Accurate to audio recording, but apparently incorrect clock */
+ MCFG_DEVICE_PROGRAM_MAP(map_cpu2)
+ MCFG_DEVICE_IO_MAP(port_map_cpu2)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -366,12 +366,12 @@ MACHINE_CONFIG_START(tankbust_state::tankbust)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(14'318'181)/16) /* Verified on PCB */
- MCFG_AY8910_PORT_A_READ_CB(READ8(tankbust_state, soundlatch_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(tankbust_state, soundtimer_r))
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(14'318'181)/16) /* Verified on PCB */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, tankbust_state, soundlatch_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, tankbust_state, soundtimer_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(14'318'181)/16) /* Verified on PCB */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(14'318'181)/16) /* Verified on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp
index 82c4a436742..a6eebb7d9a0 100644
--- a/src/mame/drivers/taotaido.cpp
+++ b/src/mame/drivers/taotaido.cpp
@@ -348,13 +348,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(taotaido_state::taotaido)
- MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taotaido_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taotaido_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,20000000/4) // ??
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_port_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,20000000/4) // ??
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2610 */
MCFG_DEVICE_ADD("io1", VS9209, 0)
@@ -364,7 +364,7 @@ MACHINE_CONFIG_START(taotaido_state::taotaido)
MCFG_VS9209_IN_PORTD_CB(IOPORT("DSW1"))
MCFG_VS9209_IN_PORTE_CB(IOPORT("DSW2"))
MCFG_VS9209_IN_PORTF_CB(IOPORT("DSW3"))
- MCFG_VS9209_OUT_PORTG_CB(WRITE8(taotaido_state, unknown_output_w))
+ MCFG_VS9209_OUT_PORTG_CB(WRITE8(*this, taotaido_state, unknown_output_w))
MCFG_VS9209_IN_PORTH_CB(IOPORT("JP"))
MCFG_DEVICE_ADD("io2", VS9209, 0)
@@ -381,7 +381,7 @@ MACHINE_CONFIG_START(taotaido_state::taotaido)
MCFG_SCREEN_SIZE(40*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(taotaido_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(taotaido_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taotaido_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 0x800)
@@ -399,7 +399,7 @@ MACHINE_CONFIG_START(taotaido_state::taotaido)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp
index ea2653d58fc..725dd37266e 100644
--- a/src/mame/drivers/tapatune.cpp
+++ b/src/mame/drivers/tapatune.cpp
@@ -519,10 +519,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tapatune_state::tapatune_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_IO_MAP(maincpu_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tapatune_state, irq0_line_assert, XTAL(24'000'000) / 4 / 4 / 4096)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_IO_MAP(maincpu_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tapatune_state, irq0_line_assert, XTAL(24'000'000) / 4 / 4 / 4096)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -531,15 +531,15 @@ MACHINE_CONFIG_START(tapatune_state::tapatune_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("bsmt", BSMT2000, XTAL(24'000'000))
+ MCFG_DEVICE_ADD("bsmt", BSMT2000, XTAL(24'000'000))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tapatune_state::tapatune)
tapatune_base(config);
- MCFG_CPU_ADD("videocpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(video_map)
+ MCFG_DEVICE_ADD("videocpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(video_map)
MCFG_QUANTUM_PERFECT_CPU("videocpu")
@@ -548,7 +548,7 @@ MACHINE_CONFIG_START(tapatune_state::tapatune)
MCFG_MC6845_CHAR_WIDTH(5)
MCFG_MC6845_BEGIN_UPDATE_CB(tapatune_state, crtc_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(tapatune_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(tapatune_state, crtc_vsync))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, tapatune_state, crtc_vsync))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp
index 8c4da39b3ee..d52e00b5fa2 100644
--- a/src/mame/drivers/targeth.cpp
+++ b/src/mame/drivers/targeth.cpp
@@ -274,16 +274,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(targeth_state::targeth)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", targeth_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", targeth_state, irq2_line_hold)
MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2)
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(targeth_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(targeth_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, targeth_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, targeth_state, coin2_counter_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index ca7ec8c80dd..7903db4bdc2 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -640,18 +640,18 @@ TIMER_DEVICE_CALLBACK_MEMBER(kongambl_state::kongambl_vblank)
}
MACHINE_CONFIG_START(kongambl_state::kongambl)
- MCFG_CPU_ADD("maincpu", M68EC020, 25000000)
- MCFG_CPU_PROGRAM_MAP(kongambl_map)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(kongambl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kongambl_state, kongambl_vblank, "screen", 0, 1)
- MCFG_CPU_ADD("sndcpu", M68000, 16000000)
- MCFG_CPU_PROGRAM_MAP(kongamaud_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(kongambl_state, irq2_line_hold, 480)
+ MCFG_DEVICE_ADD("sndcpu", M68000, 16000000)
+ MCFG_DEVICE_PROGRAM_MAP(kongamaud_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(kongambl_state, irq2_line_hold, 480)
MCFG_DEVICE_ADD("k053252", K053252, 25000000)
MCFG_K053252_OFFSETS(0, 16) // TBD
- MCFG_K053252_INT1_ACK_CB(WRITELINE(kongambl_state, vblank_irq_ack_w))
- MCFG_K053252_INT2_ACK_CB(WRITELINE(kongambl_state, hblank_irq_ack_w))
+ MCFG_K053252_INT1_ACK_CB(WRITELINE(*this, kongambl_state, vblank_irq_ack_w))
+ MCFG_K053252_INT2_ACK_CB(WRITELINE(*this, kongambl_state, hblank_irq_ack_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp
index ef387f51640..897d757d4e5 100644
--- a/src/mame/drivers/tatsumi.cpp
+++ b/src/mame/drivers/tatsumi.cpp
@@ -848,20 +848,20 @@ MACHINE_RESET_MEMBER(apache3_state,apache3)
MACHINE_CONFIG_START(apache3_state::apache3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
- MCFG_CPU_PROGRAM_MAP(apache3_v30_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tatsumi_state, v30_interrupt)
+ MCFG_DEVICE_ADD("maincpu", V30, CLOCK_1 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(apache3_v30_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tatsumi_state, v30_interrupt)
- MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MCFG_CPU_PROGRAM_MAP(apache3_68000_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", apache3_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(apache3_68000_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", apache3_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", V20, CLOCK_1 / 2)
- MCFG_CPU_PROGRAM_MAP(apache3_v20_map)
+ MCFG_DEVICE_ADD("audiocpu", V20, CLOCK_1 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(apache3_v20_map)
- MCFG_CPU_ADD("sub2", Z80, CLOCK_2 / 8)
- MCFG_CPU_PROGRAM_MAP(apache3_z80_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", apache3_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub2", Z80, CLOCK_2 / 8)
+ MCFG_DEVICE_PROGRAM_MAP(apache3_z80_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", apache3_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -871,7 +871,7 @@ MACHINE_CONFIG_START(apache3_state::apache3)
MCFG_ADC0808_IN0_CB(IOPORT("STICK_X"))
MCFG_ADC0808_IN1_CB(IOPORT("STICK_Y"))
MCFG_ADC0808_IN2_CB(GND) // VSP1
- MCFG_ADC0808_IN4_CB(READ8(apache3_state, apache3_vr1_r))
+ MCFG_ADC0808_IN4_CB(READ8(*this, apache3_state, apache3_vr1_r))
MCFG_ADC0808_IN5_CB(IOPORT("THROTTLE"))
MCFG_ADC0808_IN6_CB(GND) // RPSNC
MCFG_ADC0808_IN7_CB(GND) // LPSNC
@@ -913,15 +913,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(roundup5_state::roundup5)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
- MCFG_CPU_PROGRAM_MAP(roundup5_v30_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tatsumi_state, v30_interrupt)
+ MCFG_DEVICE_ADD("maincpu", V30, CLOCK_1 / 2)
+ MCFG_DEVICE_PROGRAM_MAP(roundup5_v30_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tatsumi_state, v30_interrupt)
- MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MCFG_CPU_PROGRAM_MAP(roundup5_68000_map)
+ MCFG_DEVICE_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(roundup5_68000_map)
- MCFG_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MCFG_CPU_PROGRAM_MAP(roundup5_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, CLOCK_1 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(roundup5_z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -961,16 +961,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cyclwarr_state::cyclwarr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
- MCFG_CPU_PROGRAM_MAP(cyclwarr_68000a_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, CLOCK_2 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(cyclwarr_68000a_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
- MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MCFG_CPU_PROGRAM_MAP(cyclwarr_68000b_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(cyclwarr_68000b_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MCFG_CPU_PROGRAM_MAP(cyclwarr_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, CLOCK_1 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(cyclwarr_z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -985,7 +985,7 @@ MACHINE_CONFIG_START(cyclwarr_state::cyclwarr)
MCFG_CXD1095_IN_PORTB_CB(IOPORT("DSW2"))
MCFG_CXD1095_IN_PORTC_CB(IOPORT("P3"))
MCFG_CXD1095_IN_PORTD_CB(IOPORT("P4"))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(cyclwarr_state, cyclwarr_control_w))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, cyclwarr_state, cyclwarr_control_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1019,16 +1019,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(cyclwarr_state::bigfight)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
- MCFG_CPU_PROGRAM_MAP(bigfight_68000a_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, CLOCK_2 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(bigfight_68000a_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
- MCFG_CPU_ADD("sub", M68000, CLOCK_2 / 4)
- MCFG_CPU_PROGRAM_MAP(bigfight_68000b_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, CLOCK_2 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(bigfight_68000b_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", cyclwarr_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, CLOCK_1 / 4)
- MCFG_CPU_PROGRAM_MAP(cyclwarr_z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, CLOCK_1 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(cyclwarr_z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(12000))
@@ -1043,7 +1043,7 @@ MACHINE_CONFIG_START(cyclwarr_state::bigfight)
MCFG_CXD1095_IN_PORTB_CB(IOPORT("DSW2"))
MCFG_CXD1095_IN_PORTC_CB(IOPORT("P3"))
MCFG_CXD1095_IN_PORTD_CB(IOPORT("P4"))
- MCFG_CXD1095_OUT_PORTE_CB(WRITE8(cyclwarr_state, cyclwarr_control_w))
+ MCFG_CXD1095_OUT_PORTE_CB(WRITE8(*this, cyclwarr_state, cyclwarr_control_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp
index f355eb75e30..9e7afd96042 100644
--- a/src/mame/drivers/tattack.cpp
+++ b/src/mame/drivers/tattack.cpp
@@ -403,9 +403,9 @@ static const char *const tattack_sample_names[] =
MACHINE_CONFIG_START(tattack_state::tattack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(tattack_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tattack_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(tattack_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tattack_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -422,13 +422,13 @@ MACHINE_CONFIG_START(tattack_state::tattack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(4)
MCFG_SAMPLES_NAMES(tattack_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
/* Discrete ???? */
-// MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+// MCFG_DEVICE_ADD("discrete", DISCRETE)
// MCFG_DISCRETE_INTF(tattack)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index e3db604a5f0..45af28ab8fe 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -295,8 +295,8 @@ void tavernie_state::kbd_put(u8 data)
MACHINE_CONFIG_START(tavernie_state::cpu09)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(cpu09_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(cpu09_mem)
MCFG_MACHINE_RESET_OVERRIDE(tavernie_state, cpu09)
/* sound hardware */
@@ -308,10 +308,10 @@ MACHINE_CONFIG_START(tavernie_state::cpu09)
MCFG_CASSETTE_ADD( "cassette" )
MCFG_DEVICE_ADD("pia", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(tavernie_state, pa_r))
- MCFG_PIA_READCA1_HANDLER(READLINE(tavernie_state, ca1_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tavernie_state, pb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, tavernie_state, pa_r))
+ MCFG_PIA_READCA1_HANDLER(READLINE(*this, tavernie_state, ca1_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tavernie_state, pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tavernie_state, pb_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -322,23 +322,23 @@ MACHINE_CONFIG_START(tavernie_state::cpu09)
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tavernie_state::ivg09)
cpu09(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ivg09_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ivg09_mem)
MCFG_MACHINE_RESET_OVERRIDE(tavernie_state, ivg09)
/* video hardware */
@@ -352,7 +352,7 @@ MACHINE_CONFIG_START(tavernie_state::ivg09)
MCFG_DEFAULT_LAYOUT(layout_tavernie)
/* sound hardware */
- MCFG_SOUND_ADD("beeper", BEEP, 950) // guess
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -365,9 +365,9 @@ MACHINE_CONFIG_START(tavernie_state::ivg09)
MCFG_MC6845_UPDATE_ROW_CB(tavernie_state, crtc_update_row)
MCFG_DEVICE_ADD("pia_ivg", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(tavernie_state, pb_ivg_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_ivg_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("beeper", beep_device, set_state))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, tavernie_state, pb_ivg_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tavernie_state, pa_ivg_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("beeper", beep_device, set_state))
MCFG_FD1795_ADD("fdc", XTAL(8'000'000) / 8)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ifd09_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp
index cdaed919d08..5092a90e7cf 100644
--- a/src/mame/drivers/taxidriv.cpp
+++ b/src/mame/drivers/taxidriv.cpp
@@ -337,48 +337,48 @@ PALETTE_INIT_MEMBER(taxidriv_state, taxidriv)
MACHINE_CONFIG_START(taxidriv_state::taxidriv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taxidriv_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taxidriv_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taxidriv_state, irq0_line_hold) /* ??? */
+ MCFG_DEVICE_ADD("sub", Z80,4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taxidriv_state, irq0_line_hold) /* ??? */
- MCFG_CPU_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(cpu3_map)
- MCFG_CPU_IO_MAP(cpu3_port_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", taxidriv_state, irq0_line_hold) /* ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80,4000000) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu3_map)
+ MCFG_DEVICE_IO_MAP(cpu3_port_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", taxidriv_state, irq0_line_hold) /* ??? */
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(taxidriv_state, p0a_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(taxidriv_state, p0b_w))
- MCFG_I8255_IN_PORTC_CB(READ8(taxidriv_state, p0c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(taxidriv_state, p0c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, taxidriv_state, p0a_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, taxidriv_state, p0b_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, taxidriv_state, p0c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, taxidriv_state, p0c_w))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(taxidriv_state, p1a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(taxidriv_state, p1b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(taxidriv_state, p1c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(taxidriv_state, p1c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, taxidriv_state, p1a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, taxidriv_state, p1b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, taxidriv_state, p1c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, taxidriv_state, p1c_w))
MCFG_DEVICE_ADD("ppi8255_2", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(taxidriv_state, p2a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(taxidriv_state, p2b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(taxidriv_state, p2c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, taxidriv_state, p2a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, taxidriv_state, p2b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, taxidriv_state, p2c_w))
MCFG_DEVICE_ADD("ppi8255_3", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(taxidriv_state, p3a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(taxidriv_state, p3b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(taxidriv_state, p3c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, taxidriv_state, p3a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, taxidriv_state, p3b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, taxidriv_state, p3c_w))
MCFG_DEVICE_ADD("ppi8255_4", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(taxidriv_state, p4a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(taxidriv_state, p4b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(taxidriv_state, p4c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, taxidriv_state, p4a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, taxidriv_state, p4b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, taxidriv_state, p4c_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -396,13 +396,13 @@ MACHINE_CONFIG_START(taxidriv_state::taxidriv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 1250000)
- MCFG_AY8910_PORT_A_READ_CB(READ8(taxidriv_state, p8910_0a_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(taxidriv_state, p8910_0b_w))
+ MCFG_DEVICE_ADD("ay1", AY8910, 1250000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, taxidriv_state, p8910_0a_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, taxidriv_state, p8910_0b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 1250000)
- MCFG_AY8910_PORT_A_READ_CB(READ8(taxidriv_state, p8910_1a_r))
+ MCFG_DEVICE_ADD("ay2", AY8910, 1250000)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, taxidriv_state, p8910_1a_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp
index 9fe622af24f..33346ae8398 100644
--- a/src/mame/drivers/tb303.cpp
+++ b/src/mame/drivers/tb303.cpp
@@ -250,17 +250,17 @@ void tb303_state::machine_start()
MACHINE_CONFIG_START(tb303_state::tb303)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D650, TP2_HZ)
- MCFG_UCOM4_READ_A_CB(READ8(tb303_state, input_r))
- MCFG_UCOM4_READ_B_CB(READ8(tb303_state, input_r))
- MCFG_UCOM4_READ_C_CB(READ8(tb303_state, ram_r))
- MCFG_UCOM4_WRITE_C_CB(WRITE8(tb303_state, ram_w))
- MCFG_UCOM4_WRITE_D_CB(WRITE8(tb303_state, ram_w))
- MCFG_UCOM4_WRITE_E_CB(WRITE8(tb303_state, ram_w))
- MCFG_UCOM4_WRITE_F_CB(WRITE8(tb303_state, ram_w))
- MCFG_UCOM4_WRITE_G_CB(WRITE8(tb303_state, switch_w))
- MCFG_UCOM4_WRITE_H_CB(WRITE8(tb303_state, switch_w))
- MCFG_UCOM4_WRITE_I_CB(WRITE8(tb303_state, strobe_w))
+ MCFG_DEVICE_ADD("maincpu", NEC_D650, TP2_HZ)
+ MCFG_UCOM4_READ_A_CB(READ8(*this, tb303_state, input_r))
+ MCFG_UCOM4_READ_B_CB(READ8(*this, tb303_state, input_r))
+ MCFG_UCOM4_READ_C_CB(READ8(*this, tb303_state, ram_r))
+ MCFG_UCOM4_WRITE_C_CB(WRITE8(*this, tb303_state, ram_w))
+ MCFG_UCOM4_WRITE_D_CB(WRITE8(*this, tb303_state, ram_w))
+ MCFG_UCOM4_WRITE_E_CB(WRITE8(*this, tb303_state, ram_w))
+ MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, tb303_state, ram_w))
+ MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tb303_state, switch_w))
+ MCFG_UCOM4_WRITE_H_CB(WRITE8(*this, tb303_state, switch_w))
+ MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, tb303_state, strobe_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("tp3_clock", tb303_state, tp3_clock, TP3_PERIOD)
MCFG_TIMER_START_DELAY(TP3_PERIOD - TP3_LOW)
diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp
index f0441cfdd7b..2b14ef6ca44 100644
--- a/src/mame/drivers/tbowl.cpp
+++ b/src/mame/drivers/tbowl.cpp
@@ -433,18 +433,18 @@ void tbowl_state::machine_reset()
MACHINE_CONFIG_START(tbowl_state::tbowl)
/* CPU on Board '6206B' */
- MCFG_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
- MCFG_CPU_PROGRAM_MAP(_6206B_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", tbowl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
+ MCFG_DEVICE_PROGRAM_MAP(_6206B_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", tbowl_state, irq0_line_hold)
/* CPU on Board '6206C' */
- MCFG_CPU_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
- MCFG_CPU_PROGRAM_MAP(_6206C_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", tbowl_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
+ MCFG_DEVICE_PROGRAM_MAP(_6206C_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", tbowl_state, irq0_line_hold)
/* CPU on Board '6206A' */
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* Actual Z80 */
- MCFG_CPU_PROGRAM_MAP(_6206A_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* Actual Z80 */
+ MCFG_DEVICE_PROGRAM_MAP(_6206A_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -481,21 +481,21 @@ MACHINE_CONFIG_START(tbowl_state::tbowl)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ym1", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ym1", YM3812, 4000000)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_SOUND_ADD("ym2", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ym2", YM3812, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* something for the samples? */
- MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(tbowl_state, adpcm_int_1)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm1", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, tbowl_state, adpcm_int_1)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(tbowl_state, adpcm_int_2)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm2", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, tbowl_state, adpcm_int_2)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp
index 60e5c4fc512..6eb954f761b 100644
--- a/src/mame/drivers/tceptor.cpp
+++ b/src/mame/drivers/tceptor.cpp
@@ -325,21 +325,21 @@ void tceptor_state::machine_reset()
MACHINE_CONFIG_START(tceptor_state::tceptor)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, XTAL(49'152'000)/32)
- MCFG_CPU_PROGRAM_MAP(m6809_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, XTAL(49'152'000)/32)
+ MCFG_DEVICE_PROGRAM_MAP(m6809_map)
- MCFG_CPU_ADD("audiocpu", M65C02, XTAL(49'152'000)/24)
- MCFG_CPU_PROGRAM_MAP(m6502_a_map)
+ MCFG_DEVICE_ADD("audiocpu", M65C02, XTAL(49'152'000)/24)
+ MCFG_DEVICE_PROGRAM_MAP(m6502_a_map)
- MCFG_CPU_ADD("audio2", M65C02, XTAL(49'152'000)/24)
- MCFG_CPU_PROGRAM_MAP(m6502_b_map)
+ MCFG_DEVICE_ADD("audio2", M65C02, XTAL(49'152'000)/24)
+ MCFG_DEVICE_PROGRAM_MAP(m6502_b_map)
- MCFG_CPU_ADD("sub", M68000, XTAL(49'152'000)/4)
- MCFG_CPU_PROGRAM_MAP(m68k_map)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(49'152'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(m68k_map)
- MCFG_CPU_ADD("mcu", HD63701, XTAL(49'152'000)/8) // or compatible 6808 with extra instructions
- MCFG_CPU_PROGRAM_MAP(mcu_map)
- MCFG_CPU_IO_MAP(mcu_io_map)
+ MCFG_DEVICE_ADD("mcu", HD63701, XTAL(49'152'000)/8) // or compatible 6808 with extra instructions
+ MCFG_DEVICE_PROGRAM_MAP(mcu_map)
+ MCFG_DEVICE_IO_MAP(mcu_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -366,7 +366,7 @@ MACHINE_CONFIG_START(tceptor_state::tceptor)
MCFG_SCREEN_SIZE(38*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(2*8, 34*8-1 + 2*8, 0*8, 28*8-1 + 0)
MCFG_SCREEN_UPDATE_DRIVER(tceptor_state, screen_update_tceptor)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tceptor_state, screen_vblank_tceptor))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tceptor_state, screen_vblank_tceptor))
MCFG_SCREEN_PALETTE("palette")
/* sound hardware */
@@ -376,13 +376,13 @@ MACHINE_CONFIG_START(tceptor_state::tceptor)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
+ MCFG_DEVICE_ADD("namco", NAMCO_CUS30, XTAL(49'152'000)/2048)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_NAMCO_AUDIO_STEREO(1)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp
index af802f173cf..96c37968b65 100644
--- a/src/mame/drivers/tdv2324.cpp
+++ b/src/mame/drivers/tdv2324.cpp
@@ -265,16 +265,16 @@ static void tdv2324_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(tdv2324_state::tdv2324)
// basic system hardware
- MCFG_CPU_ADD(P8085AH_0_TAG, I8085A, 8700000/2) // ???
- MCFG_CPU_PROGRAM_MAP(tdv2324_mem)
- MCFG_CPU_IO_MAP(tdv2324_io)
+ MCFG_DEVICE_ADD(P8085AH_0_TAG, I8085A, 8700000/2) // ???
+ MCFG_DEVICE_PROGRAM_MAP(tdv2324_mem)
+ MCFG_DEVICE_IO_MAP(tdv2324_io)
- MCFG_CPU_ADD(P8085AH_1_TAG, I8085A, 8000000/2) // ???
- MCFG_CPU_PROGRAM_MAP(tdv2324_sub_mem)
- MCFG_CPU_IO_MAP(tdv2324_sub_io)
+ MCFG_DEVICE_ADD(P8085AH_1_TAG, I8085A, 8000000/2) // ???
+ MCFG_DEVICE_PROGRAM_MAP(tdv2324_sub_mem)
+ MCFG_DEVICE_IO_MAP(tdv2324_sub_io)
- MCFG_CPU_ADD(MC68B02P_TAG, M6802, 8000000/2) // ???
- MCFG_CPU_PROGRAM_MAP(tdv2324_fdc_mem)
+ MCFG_DEVICE_ADD(MC68B02P_TAG, M6802, 8000000/2) // ???
+ MCFG_DEVICE_PROGRAM_MAP(tdv2324_fdc_mem)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp
index 14510574b6e..e109a26474c 100644
--- a/src/mame/drivers/tec1.cpp
+++ b/src/mame/drivers/tec1.cpp
@@ -417,31 +417,31 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tec1_state::tec1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 1000000) /* speed can be varied between 250kHz and 2MHz */
- MCFG_CPU_PROGRAM_MAP(tec1_map)
- MCFG_CPU_IO_MAP(tec1_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 1000000) /* speed can be varied between 250kHz and 2MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tec1_map)
+ MCFG_DEVICE_IO_MAP(tec1_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_tec1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tec1_state::tecjmon)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545) / 2)
- MCFG_CPU_PROGRAM_MAP(tecjmon_map)
- MCFG_CPU_IO_MAP(tecjmon_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tecjmon_map)
+ MCFG_DEVICE_IO_MAP(tecjmon_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_tec1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp
index e00440241d9..4690cf10bae 100644
--- a/src/mame/drivers/techno.cpp
+++ b/src/mame/drivers/techno.cpp
@@ -289,12 +289,12 @@ void techno_state::machine_reset()
MACHINE_CONFIG_START(techno_state::techno)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(techno_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(techno_map)
MCFG_NVRAM_ADD_0FILL("nvram")
- //MCFG_CPU_ADD("cpu2", TMS7000, XTAL(4'000'000))
- //MCFG_CPU_PROGRAM_MAP(techno_sub_map)
+ //MCFG_DEVICE_ADD("cpu2", TMS7000, XTAL(4'000'000))
+ //MCFG_DEVICE_PROGRAM_MAP(techno_sub_map)
/* Video */
MCFG_DEFAULT_LAYOUT(layout_techno)
diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp
index aefbf6a1372..6182dd9afb2 100644
--- a/src/mame/drivers/tecmo.cpp
+++ b/src/mame/drivers/tecmo.cpp
@@ -717,12 +717,12 @@ void tecmo_state::machine_reset()
MACHINE_CONFIG_START(tecmo_state::rygar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rygar_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rygar_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tecmo_state, irq0_line_hold)
- MCFG_CPU_ADD("soundcpu", Z80, XTAL(4'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(rygar_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", Z80, XTAL(4'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(rygar_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -746,12 +746,12 @@ MACHINE_CONFIG_START(tecmo_state::rygar)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(4'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(4'000'000)) /* verified on pcb */
MCFG_YM3526_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb, even if schematics shows a 384khz resonator */
- MCFG_MSM5205_VCLK_CB(WRITELINE(tecmo_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb, even if schematics shows a 384khz resonator */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, tecmo_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -761,15 +761,15 @@ MACHINE_CONFIG_START(tecmo_state::gemini)
rygar(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
// xtal found on bootleg, to be confirmed on a real board
- MCFG_CPU_CLOCK(XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(gemini_map)
+ MCFG_DEVICE_CLOCK(XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(gemini_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(tecmo_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(tecmo_sound_map)
- MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL(4'000'000))
+ MCFG_DEVICE_REPLACE("ymsnd", YM3812, XTAL(4'000'000))
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -785,9 +785,9 @@ MACHINE_CONFIG_START(tecmo_state::silkworm)
gemini(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000)
- MCFG_CPU_PROGRAM_MAP(silkworm_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000)
+ MCFG_DEVICE_PROGRAM_MAP(silkworm_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tecmo_state::backfirt)
@@ -802,8 +802,8 @@ MACHINE_CONFIG_START(tecmo_state::silkwormp)
/* bootleg pcb doesn't have the MSM5205 populated */
MCFG_DEVICE_REMOVE("msm")
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(silkwormp_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(silkwormp_sound_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp
index ce5f1b12354..e7b4bfcb27a 100644
--- a/src/mame/drivers/tecmo16.cpp
+++ b/src/mame/drivers/tecmo16.cpp
@@ -365,12 +365,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(tecmo16_state::fstarfrc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,MASTER_CLOCK/2) /* 12MHz */
- MCFG_CPU_PROGRAM_MAP(fstarfrc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmo16_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,MASTER_CLOCK/2) /* 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fstarfrc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tecmo16_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,MASTER_CLOCK/6) /* 4MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,MASTER_CLOCK/6) /* 4MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -416,8 +416,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tecmo16_state::ginkun)
fstarfrc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ginkun_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ginkun_map)
MCFG_VIDEO_START_OVERRIDE(tecmo16_state,ginkun)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp
index 6e8f44e60e4..18af8db14bc 100644
--- a/src/mame/drivers/tecmosys.cpp
+++ b/src/mame/drivers/tecmosys.cpp
@@ -455,16 +455,16 @@ void tecmosys_state::machine_start()
}
MACHINE_CONFIG_START(tecmosys_state::tecmosys)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmosys_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tecmosys_state, irq1_line_hold)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 400) // guess
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2 )
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2 )
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tecmosys)
@@ -486,12 +486,12 @@ MACHINE_CONFIG_START(tecmosys_state::tecmosys)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundnmi", input_merger_device, in_w<0>))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundnmi", input_merger_device, in_w<0>))
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymf", YMF262, XTAL(14'318'181))
+ MCFG_DEVICE_ADD("ymf", YMF262, XTAL(14'318'181))
MCFG_YMF262_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
@@ -503,7 +503,7 @@ MACHINE_CONFIG_START(tecmosys_state::tecmosys)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp
index 0e33d5298db..4c70a8b5842 100644
--- a/src/mame/drivers/tecnbras.cpp
+++ b/src/mame/drivers/tecnbras.cpp
@@ -114,9 +114,9 @@ void tecnbras_state::machine_reset()
MACHINE_CONFIG_START(tecnbras_state::tecnbras)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, 12_MHz_XTAL) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(i80c31_prg)
- MCFG_CPU_IO_MAP(i80c31_io)
+ MCFG_DEVICE_ADD("maincpu", I80C31, 12_MHz_XTAL) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_prg)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
MCFG_MCS51_PORT_P1_OUT_CB(NOOP) // buzzer ?
/* TODO: Add an I2C RTC (Phillips PCF8583P)
diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp
index 336a4f32b09..e4938852812 100644
--- a/src/mame/drivers/tehkanwc.cpp
+++ b/src/mame/drivers/tehkanwc.cpp
@@ -668,18 +668,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(tehkanwc_state::tehkanwc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */
- MCFG_CPU_PROGRAM_MAP(main_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tehkanwc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */
+ MCFG_DEVICE_PROGRAM_MAP(main_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tehkanwc_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, 18432000/4)
- MCFG_CPU_PROGRAM_MAP(sub_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tehkanwc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, 18432000/4)
+ MCFG_DEVICE_PROGRAM_MAP(sub_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tehkanwc_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 18432000/4)
- MCFG_CPU_PROGRAM_MAP(sound_mem)
- MCFG_CPU_IO_MAP(sound_port)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tehkanwc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 18432000/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_mem)
+ MCFG_DEVICE_IO_MAP(sound_port)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tehkanwc_state, irq0_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - seems enough to keep the CPUs in sync */
@@ -705,32 +705,32 @@ MACHINE_CONFIG_START(tehkanwc_state::tehkanwc)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ay1", YM2149, 18432000/12)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tehkanwc_state, portA_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tehkanwc_state, portB_w))
+ MCFG_DEVICE_ADD("ay1", YM2149, 18432000/12)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tehkanwc_state, portA_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tehkanwc_state, portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", YM2149, 18432000/12)
- MCFG_AY8910_PORT_A_READ_CB(READ8(tehkanwc_state, portA_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(tehkanwc_state, portB_r))
+ MCFG_DEVICE_ADD("ay2", YM2149, 18432000/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, tehkanwc_state, portA_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, tehkanwc_state, portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(tehkanwc_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, tehkanwc_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tehkanwc_state::tehkanwcb)
tehkanwc(config);
- MCFG_SOUND_REPLACE("ay1", AY8910, 18432000/12)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tehkanwc_state, portA_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tehkanwc_state, portB_w))
+ MCFG_DEVICE_REPLACE("ay1", AY8910, 18432000/12)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tehkanwc_state, portA_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tehkanwc_state, portB_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_REPLACE("ay2", AY8910, 18432000/12)
- MCFG_AY8910_PORT_A_READ_CB(READ8(tehkanwc_state, portA_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(tehkanwc_state, portB_r))
+ MCFG_DEVICE_REPLACE("ay2", AY8910, 18432000/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, tehkanwc_state, portA_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, tehkanwc_state, portB_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp
index ab1861617b9..d2f21df7d91 100644
--- a/src/mame/drivers/tek405x.cpp
+++ b/src/mame/drivers/tek405x.cpp
@@ -1000,8 +1000,8 @@ void tek4052_state::machine_start()
MACHINE_CONFIG_START(tek4051_state::tek4051)
// basic machine hardware
- MCFG_CPU_ADD(MC6800_TAG, M6800, XTAL(12'500'000)/15)
- MCFG_CPU_PROGRAM_MAP(tek4051_mem)
+ MCFG_DEVICE_ADD(MC6800_TAG, M6800, XTAL(12'500'000)/15)
+ MCFG_DEVICE_PROGRAM_MAP(tek4051_mem)
// video hardware
MCFG_VECTOR_ADD("vector")
@@ -1016,79 +1016,79 @@ MACHINE_CONFIG_START(tek4051_state::tek4051)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", tek4051_state, keyboard_tick, attotime::from_hz(XTAL(12'500'000)/15/4))
MCFG_DEVICE_ADD(MC6820_X_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, x_pia_pa_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, tek4051_state, x_pia_pa_r))
// CB1 viewcause
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, x_pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, x_pia_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(tek4051_state, adot_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(tek4051_state, bufclk_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, x_pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, x_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tek4051_state, x_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tek4051_state, x_pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, tek4051_state, adot_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, tek4051_state, bufclk_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, tek4051_state, x_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, tek4051_state, x_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_Y_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, sa_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, tek4051_state, sa_r))
// CA1 rdbyte
// CB1 mdata
// CB2 fmark
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, y_pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, sb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(tek4051_state, sot_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, y_pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, y_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tek4051_state, y_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tek4051_state, sb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, tek4051_state, sot_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, tek4051_state, y_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, tek4051_state, y_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_KB_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, kb_pia_pa_r))
- MCFG_PIA_READPB_HANDLER(READ8(tek4051_state, kb_pia_pb_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, tek4051_state, kb_pia_pa_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, tek4051_state, kb_pia_pb_r))
// CA1 key
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, kb_pia_pb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(tek4051_state, kb_halt_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, kb_pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, kb_pia_irqb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tek4051_state, kb_pia_pb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, tek4051_state, kb_halt_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, tek4051_state, kb_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, tek4051_state, kb_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_TAPE_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(tek4051_state, tape_pia_pa_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, tek4051_state, tape_pia_pa_r))
// CA1 rmark
// CB1 lohole
// CA2 filfnd
// CB2 uphole
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, tape_pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, tape_pia_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, tape_pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, tape_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tek4051_state, tape_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tek4051_state, tape_pia_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, tek4051_state, tape_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, tek4051_state, tape_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_GPIB_TAG, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_PIA_READPB_HANDLER(READ8(tek4051_state, gpib_pia_pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, dio_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, gpib_pia_pb_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(tek4051_state, talk_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, gpib_pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, gpib_pia_irqb_w))
+ MCFG_PIA_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, tek4051_state, gpib_pia_pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tek4051_state, dio_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tek4051_state, gpib_pia_pb_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, tek4051_state, talk_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, tek4051_state, gpib_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, tek4051_state, gpib_pia_irqb_w))
MCFG_DEVICE_ADD(MC6820_COM_TAG, PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(tek4051_state, com_pia_pb_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, tek4051_state, com_pia_pb_r))
//CA1 - SRX (RS-232 pin 12)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(tek4051_state, com_pia_pa_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tek4051_state, com_pia_pb_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(tek4051_state, com_pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(tek4051_state, com_pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, tek4051_state, com_pia_pa_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tek4051_state, com_pia_pb_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, tek4051_state, com_pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, tek4051_state, com_pia_irqb_w))
MCFG_DEVICE_ADD(MC6850_TAG, ACIA6850, 0)
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(tek4051_state, acia_irq_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, tek4051_state, acia_irq_w))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 38400)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(tek4051_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, tek4051_state, write_acia_clock))
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE(MC6820_GPIB_TAG, pia6821_device, ca1_w))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(MC6820_GPIB_TAG, pia6821_device, cb1_w))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE(MC6820_GPIB_TAG, pia6821_device, ca1_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(MC6820_GPIB_TAG, pia6821_device, cb1_w))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -1107,8 +1107,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tek4052_state::tek4052)
// basic machine hardware
- MCFG_CPU_ADD(AM2901A_TAG, M6800, 1000000) // should be 4x AM2901A + AM2911
- MCFG_CPU_PROGRAM_MAP(tek4052_mem)
+ MCFG_DEVICE_ADD(AM2901A_TAG, M6800, 1000000) // should be 4x AM2901A + AM2911
+ MCFG_DEVICE_PROGRAM_MAP(tek4052_mem)
// video hardware
MCFG_VECTOR_ADD("vector")
@@ -1123,7 +1123,7 @@ MACHINE_CONFIG_START(tek4052_state::tek4052)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// internal ram
diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp
index 25c454502d9..a40085c0575 100644
--- a/src/mame/drivers/tek410x.cpp
+++ b/src/mame/drivers/tek410x.cpp
@@ -94,9 +94,9 @@ void tek4107a_state::machine_start()
MACHINE_CONFIG_START(tek4107a_state::tek4107a)
/* basic machine hardware */
- MCFG_CPU_ADD(I80188_TAG, I80188, 21000000)
- MCFG_CPU_PROGRAM_MAP(tek4107a_mem)
- MCFG_CPU_IO_MAP(tek4107a_io)
+ MCFG_DEVICE_ADD(I80188_TAG, I80188, 21000000)
+ MCFG_DEVICE_PROGRAM_MAP(tek4107a_mem)
+ MCFG_DEVICE_IO_MAP(tek4107a_io)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp
index 7d4648eaee9..566901089ea 100644
--- a/src/mame/drivers/tek440x.cpp
+++ b/src/mame/drivers/tek440x.cpp
@@ -193,11 +193,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tek440x_state::tek4404)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, XTAL(40'000'000) / 4) // MC68010L10
- MCFG_CPU_PROGRAM_MAP(maincpu_map)
+ MCFG_DEVICE_ADD("maincpu", M68010, XTAL(40'000'000) / 4) // MC68010L10
+ MCFG_DEVICE_PROGRAM_MAP(maincpu_map)
- MCFG_CPU_ADD("fdccpu", M6502, 1000000)
- MCFG_CPU_PROGRAM_MAP(fdccpu_map)
+ MCFG_DEVICE_ADD("fdccpu", M6502, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(fdccpu_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -212,19 +212,19 @@ MACHINE_CONFIG_START(tek440x_state::tek4404)
MCFG_DEVICE_ADD("aica", MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_DEVICE_ADD("timer", AM9513, XTAL(40'000'000) / 4 / 10) // from CPU E output
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("aica", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("aica", mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("aica", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("aica", mos6551_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("aica", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("aica", mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("aica", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("aica", mos6551_device, write_cts))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("snsnd", SN76496, VIDEO_CLOCK / 8)
+ MCFG_DEVICE_ADD("snsnd", SN76496, VIDEO_CLOCK / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp
index 0ec4ad04210..e3db0caf99d 100644
--- a/src/mame/drivers/tekxp33x.cpp
+++ b/src/mame/drivers/tekxp33x.cpp
@@ -96,12 +96,12 @@ void tekxp330_state::machine_start()
MACHINE_CONFIG_START(tekxp330_state::tekxp330)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3052, XTAL(20'000'000)) /* IDT 79R3052E, clock unknown */
+ MCFG_DEVICE_ADD("maincpu", R3052, XTAL(20'000'000)) /* IDT 79R3052E, clock unknown */
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_CPU_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
- MCFG_CPU_ADD("tms", TMS34010, XTAL(40'000'000)) /* clock unknown */
- MCFG_CPU_PROGRAM_MAP(tms_map)
+ MCFG_DEVICE_ADD("tms", TMS34010, XTAL(40'000'000)) /* clock unknown */
+ MCFG_DEVICE_PROGRAM_MAP(tms_map)
/* video hardware */
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index 8ef79ce5bef..4aeb0387791 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -599,9 +599,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tempest_state::tempest)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tempest_state, irq0_line_assert, CLOCK_3KHZ / 12)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tempest_state, irq0_line_assert, CLOCK_3KHZ / 12)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(CLOCK_3KHZ / 256))
@@ -625,28 +625,28 @@ MACHINE_CONFIG_START(tempest_state::tempest)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
- MCFG_POKEY_POT0_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT1_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT2_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT3_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT4_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT5_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT6_R_CB(READ8(tempest_state, input_port_1_bit_r))
- MCFG_POKEY_POT7_R_CB(READ8(tempest_state, input_port_1_bit_r))
+ MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK / 8)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, tempest_state, input_port_1_bit_r))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
- MCFG_POKEY_POT0_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT1_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT2_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT3_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT4_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT5_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT6_R_CB(READ8(tempest_state, input_port_2_bit_r))
- MCFG_POKEY_POT7_R_CB(READ8(tempest_state, input_port_2_bit_r))
+ MCFG_DEVICE_ADD("pokey2", POKEY, MASTER_CLOCK / 8)
+ MCFG_POKEY_POT0_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT1_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
+ MCFG_POKEY_POT7_R_CB(READ8(*this, tempest_state, input_port_2_bit_r))
MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp
index edf8710c5f6..a0b6885fe04 100644
--- a/src/mame/drivers/terak.cpp
+++ b/src/mame/drivers/terak.cpp
@@ -101,9 +101,9 @@ uint32_t terak_state::screen_update_terak(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(terak_state::terak)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, XTAL(4'000'000))
+ MCFG_DEVICE_ADD("maincpu",T11, XTAL(4'000'000))
MCFG_T11_INITIAL_MODE(6 << 13)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/terco.cpp b/src/mame/drivers/terco.cpp
index 30fd7ed0d9f..58f910e0879 100644
--- a/src/mame/drivers/terco.cpp
+++ b/src/mame/drivers/terco.cpp
@@ -294,8 +294,8 @@ static INPUT_PORTS_START( t4490 )
INPUT_PORTS_END
MACHINE_CONFIG_START(t4490_state::t4490)
- MCFG_CPU_ADD("maincpu", M6800, XTAL(8'000'000)/4) // divided by a MC6875
- MCFG_CPU_PROGRAM_MAP(t4490_map)
+ MCFG_DEVICE_ADD("maincpu", M6800, XTAL(8'000'000)/4) // divided by a MC6875
+ MCFG_DEVICE_PROGRAM_MAP(t4490_map)
/* devices */
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp
index 00fadbe6622..a8f0a9a8421 100644
--- a/src/mame/drivers/terracre.cpp
+++ b/src/mame/drivers/terracre.cpp
@@ -455,14 +455,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(terracre_state::ym3526)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
- MCFG_CPU_PROGRAM_MAP(terracre_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", terracre_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)/2) // 8mhz
+ MCFG_DEVICE_PROGRAM_MAP(terracre_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", terracre_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) // 4.0mhz when compared to sound recordings, should be derived from XTAL(22'000'000)? how?
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_3526_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(terracre_state, irq0_line_hold, XTAL(16'000'000)/4/512) // ?
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) // 4.0mhz when compared to sound recordings, should be derived from XTAL(22'000'000)? how?
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_3526_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(terracre_state, irq0_line_hold, XTAL(16'000'000)/4/512) // ?
MCFG_BUFFERED_SPRITERAM16_ADD("spriteram")
@@ -472,7 +472,7 @@ MACHINE_CONFIG_START(terracre_state::ym3526)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(terracre_state, screen_update_amazon)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", terracre)
@@ -484,11 +484,11 @@ MACHINE_CONFIG_START(terracre_state::ym3526)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3526, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3526, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", 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)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -496,12 +496,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(terracre_state::ym2203)
ym3526(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_IO_MAP(sound_2203_io_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_IO_MAP(sound_2203_io_map)
MCFG_DEVICE_REMOVE("ymsnd")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(0, "speaker", 0.2)
MCFG_SOUND_ROUTE(1, "speaker", 0.2)
MCFG_SOUND_ROUTE(2, "speaker", 0.2)
@@ -510,14 +510,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(terracre_state::amazon_base)
ym3526(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(amazon_base_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(amazon_base_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(amazon_state::amazon_1412m2)
amazon_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(amazon_1412m2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(amazon_1412m2_map)
MCFG_DEVICE_ADD("prot_chip", NB1412M2, XTAL(16'000'000)) // divided by 4 maybe
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/test_t400.cpp b/src/mame/drivers/test_t400.cpp
index d0fac258f5f..e8108af03b3 100644
--- a/src/mame/drivers/test_t400.cpp
+++ b/src/mame/drivers/test_t400.cpp
@@ -30,15 +30,15 @@ WRITE8_MEMBER( t400_test_suite_state::port_l_w )
}
MACHINE_CONFIG_START(t400_test_suite_state::test_t410)
- MCFG_CPU_ADD("maincpu", COP410, 1000000)
+ MCFG_DEVICE_ADD("maincpu", COP410, 1000000)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
- MCFG_COP400_WRITE_L_CB(WRITE8(t400_test_suite_state, port_l_w))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, t400_test_suite_state, port_l_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(t400_test_suite_state::test_t420)
- MCFG_CPU_ADD("maincpu", COP420, 1000000)
+ MCFG_DEVICE_ADD("maincpu", COP420, 1000000)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true )
- MCFG_COP400_WRITE_L_CB(WRITE8(t400_test_suite_state, port_l_w))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, t400_test_suite_state, port_l_w))
MACHINE_CONFIG_END
ROM_START( test410 )
diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp
index abe38b77177..d80ac63cdd3 100644
--- a/src/mame/drivers/testconsole.cpp
+++ b/src/mame/drivers/testconsole.cpp
@@ -177,25 +177,25 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(whouse_testcons_state::whousetc)
- MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, 6.144_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("i8155", I8155, 6.144_MHz_XTAL)
MCFG_DEVICE_ADD("i8255", I8255, 0)
MCFG_DEVICE_ADD("dsp0", DL1416B, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(whouse_testcons_state, update_dsp<0>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, whouse_testcons_state, update_dsp<0>))
MCFG_DEVICE_ADD("dsp1", DL1416B, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(whouse_testcons_state, update_dsp<1>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, whouse_testcons_state, update_dsp<1>))
MCFG_DEVICE_ADD("dsp2", DL1416B, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(whouse_testcons_state, update_dsp<2>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, whouse_testcons_state, update_dsp<2>))
MCFG_DEVICE_ADD("dsp3", DL1416B, u32(0))
- MCFG_DL1416_UPDATE_HANDLER(WRITE16(whouse_testcons_state, update_dsp<3>))
+ MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, whouse_testcons_state, update_dsp<3>))
MCFG_DEFAULT_LAYOUT(layout_whousetc)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index 95ddca21fb9..7abdba8f557 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -1695,9 +1695,9 @@ DRIVER_INIT_MEMBER(stepstag_state,stepstag)
MACHINE_CONFIG_START(tetrisp2_state::tetrisp2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(tetrisp2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(tetrisp2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1721,7 +1721,7 @@ MACHINE_CONFIG_START(tetrisp2_state::tetrisp2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1730,9 +1730,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tetrisp2_state::nndmseal)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(nndmseal_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(nndmseal_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1763,9 +1763,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tetrisp2_state::rockn)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(rockn1_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(rockn1_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1788,7 +1788,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1797,9 +1797,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tetrisp2_state::rockn2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(rockn2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(rockn2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1822,7 +1822,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rockn2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1831,13 +1831,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tetrisp2_state::rocknms)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(rocknms_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", tetrisp2_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(rocknms_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", tetrisp2_state, irq2_line_hold)
- MCFG_CPU_ADD("sub", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(rocknms_sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", tetrisp2_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(rocknms_sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", tetrisp2_state, irq2_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1872,20 +1872,20 @@ MACHINE_CONFIG_START(tetrisp2_state::rocknms)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(stepstag_state::stepstag)
- MCFG_CPU_ADD("maincpu", M68000, 12000000 )
- MCFG_CPU_PROGRAM_MAP(stepstag_map)
- MCFG_CPU_VBLANK_INT_DRIVER("mscreen", tetrisp2_state, irq2_line_hold) // lev 4 triggered by system timer
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000 )
+ MCFG_DEVICE_PROGRAM_MAP(stepstag_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("mscreen", tetrisp2_state, irq2_line_hold) // lev 4 triggered by system timer
- MCFG_CPU_ADD("sub", M68000, 16000000 ) //??
- MCFG_CPU_PROGRAM_MAP(stepstag_sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", tetrisp2_state, irq4_line_hold) // lev 6 triggered by main CPU
+ MCFG_DEVICE_ADD("sub", M68000, 16000000 ) //??
+ MCFG_DEVICE_PROGRAM_MAP(stepstag_sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", tetrisp2_state, irq4_line_hold) // lev 6 triggered by main CPU
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1937,19 +1937,19 @@ MACHINE_CONFIG_START(stepstag_state::stepstag)
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(stepstag_state::vjdash) // 4 Screens
- MCFG_CPU_ADD("maincpu", M68000, 12000000 )
- MCFG_CPU_PROGRAM_MAP(vjdash_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold) // lev 4 triggered by system timer
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000 )
+ MCFG_DEVICE_PROGRAM_MAP(vjdash_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold) // lev 4 triggered by system timer
- MCFG_CPU_ADD("sub", M68000, 16000000 ) //??
- MCFG_CPU_PROGRAM_MAP(stepstag_sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("mscreen", tetrisp2_state, irq4_line_hold) // lev 6 triggered by main CPU
+ MCFG_DEVICE_ADD("sub", M68000, 16000000 ) //??
+ MCFG_DEVICE_PROGRAM_MAP(stepstag_sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("mscreen", tetrisp2_state, irq4_line_hold) // lev 6 triggered by main CPU
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2009,7 +2009,7 @@ MACHINE_CONFIG_START(stepstag_state::vjdash) // 4 Screens
MCFG_GENERIC_LATCH_16_ADD("soundlatch")
- MCFG_SOUND_ADD("ymz", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz", YMZ280B, 16934400)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tg100.cpp b/src/mame/drivers/tg100.cpp
index 56818379047..16b818f9eb5 100644
--- a/src/mame/drivers/tg100.cpp
+++ b/src/mame/drivers/tg100.cpp
@@ -73,13 +73,13 @@ void tg100_state::ymw258_map(address_map &map)
MACHINE_CONFIG_START(tg100_state::tg100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type (H8/520) */
- MCFG_CPU_PROGRAM_MAP( tg100_map )
- MCFG_CPU_IO_MAP( tg100_io_map )
+ MCFG_DEVICE_ADD("maincpu", H83002, XTAL(20'000'000)) /* TODO: correct CPU type (H8/520) */
+ MCFG_DEVICE_PROGRAM_MAP( tg100_map )
+ MCFG_DEVICE_IO_MAP( tg100_io_map )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymw258", MULTIPCM, 9400000)
+ MCFG_DEVICE_ADD("ymw258", MULTIPCM, 9400000)
MCFG_DEVICE_ADDRESS_MAP(0, ymw258_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp
index 6696e755814..6edb9dcdf2b 100644
--- a/src/mame/drivers/tgtpanic.cpp
+++ b/src/mame/drivers/tgtpanic.cpp
@@ -154,10 +154,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tgtpanic_state::tgtpanic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tgtpanic_state, irq0_line_hold, 20) /* Unverified */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tgtpanic_state, irq0_line_hold, 20) /* Unverified */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp
index 21aec9a1c0d..eb0fe6d3732 100644
--- a/src/mame/drivers/thayers.cpp
+++ b/src/mame/drivers/thayers.cpp
@@ -797,19 +797,19 @@ void thayers_state::machine_reset()
MACHINE_CONFIG_START(thayers_state::thayers)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(thayers_map)
- MCFG_CPU_IO_MAP(thayers_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(thayers_map)
+ MCFG_DEVICE_IO_MAP(thayers_io_map)
- MCFG_CPU_ADD("mcu", COP421, XTAL(4'000'000)/2) // COP421L-PCA/N
+ MCFG_DEVICE_ADD("mcu", COP421, XTAL(4'000'000)/2) // COP421L-PCA/N
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
- MCFG_COP400_READ_L_CB(READ8(thayers_state, cop_l_r))
- MCFG_COP400_WRITE_L_CB(WRITE8(thayers_state, cop_l_w))
- MCFG_COP400_READ_G_CB(READ8(thayers_state, cop_g_r))
- MCFG_COP400_WRITE_G_CB(WRITE8(thayers_state, cop_g_w))
- MCFG_COP400_WRITE_D_CB(WRITE8(thayers_state, cop_d_w))
- MCFG_COP400_READ_SI_CB(READLINE(thayers_state, kbdata_r))
- MCFG_COP400_WRITE_SO_CB(WRITELINE(thayers_state, kbclk_w))
+ MCFG_COP400_READ_L_CB(READ8(*this, thayers_state, cop_l_r))
+ MCFG_COP400_WRITE_L_CB(WRITE8(*this, thayers_state, cop_l_w))
+ MCFG_COP400_READ_G_CB(READ8(*this, thayers_state, cop_g_r))
+ MCFG_COP400_WRITE_G_CB(WRITE8(*this, thayers_state, cop_g_w))
+ MCFG_COP400_WRITE_D_CB(WRITE8(*this, thayers_state, cop_d_w))
+ MCFG_COP400_READ_SI_CB(READLINE(*this, thayers_state, kbdata_r))
+ MCFG_COP400_WRITE_SO_CB(WRITELINE(*this, thayers_state, kbclk_w))
MCFG_LASERDISC_PR7820_ADD("laserdisc")
@@ -822,7 +822,7 @@ MACHINE_CONFIG_START(thayers_state::thayers)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
// SSI 263 @ 2MHz
- MCFG_SOUND_MODIFY("laserdisc")
+ MCFG_DEVICE_MODIFY("laserdisc")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index d0c9e5f05d8..e54c1e32470 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -532,12 +532,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(thedealr_state::thedealr_interrupt)
MACHINE_CONFIG_START(thedealr_state::thedealr)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", R65C02, XTAL(16'000'000)/8) // 2 MHz?
- MCFG_CPU_PROGRAM_MAP(thedealr)
+ MCFG_DEVICE_ADD("maincpu", R65C02, XTAL(16'000'000)/8) // 2 MHz?
+ MCFG_DEVICE_PROGRAM_MAP(thedealr)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", thedealr_state, thedealr_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("subcpu", R65C02, XTAL(16'000'000)/8) // 2 MHz?
- MCFG_CPU_PROGRAM_MAP(thedealr_sub)
+ MCFG_DEVICE_ADD("subcpu", R65C02, XTAL(16'000'000)/8) // 2 MHz?
+ MCFG_DEVICE_PROGRAM_MAP(thedealr_sub)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -556,7 +556,7 @@ MACHINE_CONFIG_START(thedealr_state::thedealr)
MCFG_SCREEN_SIZE(512, 256)
MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0+30, 256-1)
MCFG_SCREEN_UPDATE_DRIVER(thedealr_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(thedealr_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, thedealr_state, screen_vblank))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("subcpu", INPUT_LINE_NMI))
MCFG_SCREEN_PALETTE("palette")
@@ -566,7 +566,7 @@ MACHINE_CONFIG_START(thedealr_state::thedealr)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, XTAL(16'000'000)/8) // 2 MHz?
+ MCFG_DEVICE_ADD("aysnd", YM2149, XTAL(16'000'000)/8) // 2 MHz?
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp
index 75395e710f4..26ee9f31945 100644
--- a/src/mame/drivers/thedeep.cpp
+++ b/src/mame/drivers/thedeep.cpp
@@ -404,22 +404,22 @@ INTERRUPT_GEN_MEMBER(thedeep_state::mcu_irq)
MACHINE_CONFIG_START(thedeep_state::thedeep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", thedeep_state, interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", M65C02, XTAL(12'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", M65C02, XTAL(12'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
/* IRQ by YM2203, NMI by when sound latch written by main cpu */
/* MCU is a i8751 running at 8Mhz (8mhz xtal)*/
- MCFG_CPU_ADD("mcu", I8751, XTAL(8'000'000))
- MCFG_MCS51_PORT_P0_IN_CB(READ8(thedeep_state, p0_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(thedeep_state, p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(thedeep_state, from_main_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(thedeep_state, to_main_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(thedeep_state, p3_w))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", thedeep_state, mcu_irq) // unknown source, but presumably vblank
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(8'000'000))
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, thedeep_state, p0_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, thedeep_state, p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, thedeep_state, from_main_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, thedeep_state, to_main_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, thedeep_state, p3_w))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", thedeep_state, mcu_irq) // unknown source, but presumably vblank
MCFG_DEVICE_DISABLE()
@@ -447,7 +447,7 @@ MACHINE_CONFIG_START(thedeep_state::thedeep)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp
index 93b9794c79f..6e63803a35f 100644
--- a/src/mame/drivers/thepit.cpp
+++ b/src/mame/drivers/thepit.cpp
@@ -719,21 +719,21 @@ INTERRUPT_GEN_MEMBER(thepit_state::vblank_irq)
MACHINE_CONFIG_START(thepit_state::thepit)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(thepit_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", thepit_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(thepit_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", thepit_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 2.5 MHz */
- MCFG_CPU_PROGRAM_MAP(audio_map)
- MCFG_CPU_IO_MAP(audio_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", thepit_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4) /* 2.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_IO_MAP(audio_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", thepit_state, irq0_line_hold)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC42
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(thepit_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, thepit_state, nmi_mask_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // marked "LOCK OUT" on Centuri schematic but never written
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(thepit_state, sound_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(thepit_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(thepit_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, thepit_state, sound_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, thepit_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, thepit_state, flip_screen_y_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -752,26 +752,26 @@ MACHINE_CONFIG_START(thepit_state::thepit)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, PIXEL_CLOCK/4)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay1", AY8910, PIXEL_CLOCK/4)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, PIXEL_CLOCK/4)
+ MCFG_DEVICE_ADD("ay2", AY8910, PIXEL_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(thepit_state::fitter)
thepit(config);
MCFG_DEVICE_MODIFY("mainlatch") // IC42
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(thepit_state, coin_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, thepit_state, coin_lockout_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(thepit_state::desertdn)
fitter(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(desertdan_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(desertdan_main_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -784,11 +784,11 @@ MACHINE_CONFIG_START(thepit_state::intrepid)
fitter(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(intrepid_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(intrepid_main_map)
MCFG_DEVICE_MODIFY("mainlatch") // 2F on Funny Mouse main board; IC46 on Port Man main board
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(thepit_state, intrepid_graphics_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, thepit_state, intrepid_graphics_bank_w))
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", intrepid)
diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp
index 63f3c55cb99..6fd03c82e2b 100644
--- a/src/mame/drivers/thief.cpp
+++ b/src/mame/drivers/thief.cpp
@@ -394,15 +394,15 @@ static const char *const natodef_sample_names[] =
MACHINE_CONFIG_START(thief_state::thief)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(thief_main_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(thief_state, iack)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(thief_main_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(thief_state, iack)
MCFG_DEVICE_ADD("ppi", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(thief_state, thief_input_select_w))
- MCFG_I8255_IN_PORTB_CB(READ8(thief_state, thief_io_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(thief_state, tape_control_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, thief_state, thief_input_select_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, thief_state, thief_io_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, thief_state, tape_control_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -418,13 +418,13 @@ MACHINE_CONFIG_START(thief_state::thief)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(8'000'000)/2/4)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(8'000'000)/2/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(8'000'000)/2/4)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(8'000'000)/2/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(thief_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -432,8 +432,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(thief_state::sharkatt)
thief(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sharkatt_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sharkatt_main_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp
index 4a04e06136b..9284160a92a 100644
--- a/src/mame/drivers/thomson.cpp
+++ b/src/mame/drivers/thomson.cpp
@@ -625,8 +625,8 @@ MACHINE_CONFIG_START(thomson_state::to7)
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to7 )
/* cpu */
- MCFG_CPU_ADD("maincpu", MC6809E, 1000000)
- MCFG_CPU_PROGRAM_MAP(to7)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(to7)
MCFG_INPUT_MERGER_ANY_HIGH("mainirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -641,7 +641,7 @@ MACHINE_CONFIG_START(thomson_state::to7)
MCFG_SCREEN_VISIBLE_AREA ( 0, THOM_TOTAL_WIDTH * 2 - 1,
0, THOM_TOTAL_HEIGHT - 1 )
MCFG_SCREEN_UPDATE_DRIVER( thomson_state, screen_update_thom )
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(thomson_state, thom_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, thomson_state, thom_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD ( "palette", 4097 ) /* 12-bit color + transparency */
@@ -650,14 +650,14 @@ MACHINE_CONFIG_START(thomson_state::to7)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("buzzer", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
- MCFG_SOUND_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC (6-bit game extension DAC)
+ MCFG_DEVICE_ADD("buzzer", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
+ MCFG_DEVICE_ADD("dac", DAC_6BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC (6-bit game extension DAC)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "buzzer", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
/* speech synthesis */
- MCFG_SOUND_ADD("mea8000", MEA8000, 3840000)
+ MCFG_DEVICE_ADD("mea8000", MEA8000, 3840000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
/* cassette */
@@ -668,27 +668,27 @@ MACHINE_CONFIG_START(thomson_state::to7)
/* timer */
MCFG_DEVICE_ADD("mc6846", MC6846, 0)
- MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to7_timer_port_out))
- MCFG_MC6846_OUT_CP2_CB(DEVWRITELINE("buzzer", dac_bit_interface, write))
- MCFG_MC6846_IN_PORT_CB(READ8(thomson_state, to7_timer_port_in))
- MCFG_MC6846_OUT_CTO_CB(WRITELINE(thomson_state, to7_set_cassette))
- MCFG_MC6846_IRQ_CB(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_MC6846_OUT_PORT_CB(WRITE8(*this, thomson_state, to7_timer_port_out))
+ MCFG_MC6846_OUT_CP2_CB(WRITELINE("buzzer", dac_bit_interface, write))
+ MCFG_MC6846_IN_PORT_CB(READ8(*this, thomson_state, to7_timer_port_in))
+ MCFG_MC6846_OUT_CTO_CB(WRITELINE(*this, thomson_state, to7_set_cassette))
+ MCFG_MC6846_IRQ_CB(WRITELINE("mainirq", input_merger_device, in_w<0>))
/* floppy */
MCFG_DEVICE_ADD("mc6843", MC6843, 0)
MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0)
MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface)
- MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_0_w))
+ MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, thomson_state, fdc_index_0_w))
MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0)
MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface)
- MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_1_w))
+ MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, thomson_state, fdc_index_1_w))
MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0)
MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface)
- MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_2_w))
+ MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, thomson_state, fdc_index_2_w))
MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0)
MCFG_LEGACY_FLOPPY_CONFIG(thomson_floppy_interface)
- MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(thomson_state, fdc_index_3_w))
+ MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(*this, thomson_state, fdc_index_3_w))
MCFG_WD2793_ADD("wd2793", XTAL(1'000'000))
MCFG_FLOPPY_DRIVE_ADD("wd2793:0", cd90_640_floppies, "dd", thomson_state::cd90_640_formats)
@@ -702,33 +702,33 @@ MACHINE_CONFIG_START(thomson_state::to7)
/* pia */
MCFG_DEVICE_ADD(THOM_PIA_SYS, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to7_sys_porta_in))
- MCFG_PIA_READPB_HANDLER(READ8(thomson_state, to7_sys_portb_in))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to7_sys_portb_out))
- MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, to7_set_cassette_motor))
- MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to7_sys_cb2_out))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("mainfirq", input_merger_device, in_w<1>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainfirq", input_merger_device, in_w<1>))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to7_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, to7_sys_portb_in))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to7_sys_portb_out))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, to7_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, to7_sys_cb2_out))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("mainfirq", input_merger_device, in_w<1>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainfirq", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD(THOM_PIA_GAME, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to7_game_porta_in))
- MCFG_PIA_READPB_HANDLER(READ8(thomson_state, to7_game_portb_in))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to7_game_portb_out))
- MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to7_game_cb2_out))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to7_game_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, to7_game_portb_in))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to7_game_portb_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, to7_game_cb2_out))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
/* TODO: CONVERT THIS TO A SLOT DEVICE (RF 57-932) */
MCFG_DEVICE_ADD("acia", MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
/// 2400 7N2
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dcd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("acia", mos6551_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", mos6551_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("acia", mos6551_device, write_dcd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("acia", mos6551_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", mos6551_device, write_cts))
/* TODO: CONVERT THIS TO A SLOT DEVICE (CC 90-232) */
@@ -739,11 +739,11 @@ MACHINE_CONFIG_START(thomson_state::to7)
MCFG_DEVICE_ADD(THOM_PIA_MODEM, PIA6821, 0)
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(WRITELINE(thomson_state, to7_modem_tx_w))
- MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(thomson_state, to7_modem_cb))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE(*this, thomson_state, to7_modem_tx_w))
+ MCFG_ACIA6850_IRQ_HANDLER(WRITELINE(*this, thomson_state, to7_modem_cb))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 1200) /* 1200 bauds, might be divided by 16 */
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(thomson_state, write_acia_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, thomson_state, write_acia_clock))
/* cartridge */
@@ -932,17 +932,17 @@ MACHINE_CONFIG_START(thomson_state::to770)
MCFG_MACHINE_START_OVERRIDE( thomson_state, to770 )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to770 )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( to770)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( to770)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to770_sys_porta_in))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to770_sys_porta_in))
MCFG_PIA_READPB_HANDLER(NOOP)
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to770_sys_portb_out))
- MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, to770_sys_cb2_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to770_sys_portb_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, to770_sys_cb2_out))
MCFG_DEVICE_MODIFY("mc6846")
- MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to770_timer_port_out))
+ MCFG_MC6846_OUT_PORT_CB(WRITE8(*this, thomson_state, to770_timer_port_out))
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -1125,8 +1125,8 @@ MACHINE_CONFIG_START(thomson_state::mo5)
MCFG_MACHINE_START_OVERRIDE( thomson_state, mo5 )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo5 )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( mo5)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( mo5)
MCFG_CASSETTE_MODIFY( "cassette" )
MCFG_CASSETTE_FORMATS(mo5_cassette_formats)
@@ -1138,13 +1138,13 @@ MACHINE_CONFIG_START(thomson_state::mo5)
MCFG_PALETTE_INIT_OWNER(thomson_state, mo5)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, mo5_sys_porta_in))
- MCFG_PIA_READPB_HANDLER(READ8(thomson_state, mo5_sys_portb_in))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo5_sys_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("buzzer", dac_bit_interface, write))
- MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, mo5_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, mo5_sys_portb_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo5_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, mo5_set_cassette_motor))
MCFG_PIA_CB2_HANDLER(NOOP)
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>)) // WARNING: differs from TO7 !
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>)) // WARNING: differs from TO7 !
MCFG_DEVICE_REMOVE("cartslot")
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "mo_cart")
@@ -1488,22 +1488,22 @@ MACHINE_CONFIG_START(thomson_state::to9)
MCFG_MACHINE_START_OVERRIDE( thomson_state, to9 )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to9 )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( to9)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( to9)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to9_sys_porta_in))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to9_sys_porta_in))
MCFG_PIA_READPB_HANDLER(NOOP)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to9_sys_portb_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, to9_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to9_sys_portb_out))
MCFG_PIA_CB2_HANDLER(NOOP)
MCFG_PIA_IRQA_HANDLER(NOOP)
MCFG_DEVICE_MODIFY("mc6846")
- MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to9_timer_port_out))
+ MCFG_MC6846_OUT_PORT_CB(WRITE8(*this, thomson_state, to9_timer_port_out))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy))
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -1712,24 +1712,24 @@ MACHINE_CONFIG_START(thomson_state::to8)
MCFG_MACHINE_START_OVERRIDE( thomson_state, to8 )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to8 )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( to8)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( to8)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to8_sys_porta_in))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to8_sys_porta_in))
MCFG_PIA_READPB_HANDLER(NOOP)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to8_sys_portb_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, to9_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to8_sys_portb_out))
MCFG_PIA_CB2_HANDLER(NOOP)
MCFG_PIA_IRQA_HANDLER(NOOP)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy))
MCFG_DEVICE_MODIFY("mc6846")
- MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to8_timer_port_out))
- MCFG_MC6846_OUT_CP2_CB(WRITELINE(thomson_state, to8_timer_cp2_out))
- MCFG_MC6846_IN_PORT_CB(READ8(thomson_state, to8_timer_port_in))
+ MCFG_MC6846_OUT_PORT_CB(WRITE8(*this, thomson_state, to8_timer_port_out))
+ MCFG_MC6846_OUT_CP2_CB(WRITELINE(*this, thomson_state, to8_timer_cp2_out))
+ MCFG_MC6846_IN_PORT_CB(READ8(*this, thomson_state, to8_timer_port_in))
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -1878,25 +1878,25 @@ MACHINE_CONFIG_START(thomson_state::to9p)
MCFG_MACHINE_START_OVERRIDE( thomson_state, to9p )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to9p )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( to9p)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( to9p)
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, to9_sys_porta_in))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, to9_sys_porta_in))
MCFG_PIA_READPB_HANDLER(NOOP)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, to9_sys_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(thomson_state, to8_sys_portb_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, to9_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, thomson_state, to8_sys_portb_out))
MCFG_PIA_CB2_HANDLER(NOOP)
MCFG_PIA_IRQA_HANDLER(NOOP)
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainfirq", input_merger_device, in_w<1>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainfirq", input_merger_device, in_w<1>))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy))
MCFG_DEVICE_MODIFY("mc6846")
- MCFG_MC6846_OUT_PORT_CB(WRITE8(thomson_state, to9p_timer_port_out))
- MCFG_MC6846_OUT_CP2_CB(WRITELINE(thomson_state, to8_timer_cp2_out))
- MCFG_MC6846_IN_PORT_CB(READ8(thomson_state, to9p_timer_port_in))
+ MCFG_MC6846_OUT_PORT_CB(WRITE8(*this, thomson_state, to9p_timer_port_out))
+ MCFG_MC6846_OUT_CP2_CB(WRITELINE(*this, thomson_state, to8_timer_cp2_out))
+ MCFG_MC6846_IN_PORT_CB(READ8(*this, thomson_state, to9p_timer_port_in))
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -2227,8 +2227,8 @@ MACHINE_CONFIG_START(thomson_state::mo6)
MCFG_MACHINE_START_OVERRIDE( thomson_state, mo6 )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo6 )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( mo6)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( mo6)
MCFG_CASSETTE_MODIFY( "cassette" )
MCFG_CASSETTE_FORMATS(mo5_cassette_formats)
@@ -2237,20 +2237,20 @@ MACHINE_CONFIG_START(thomson_state::mo6)
MCFG_DEVICE_REMOVE( "mc6846" )
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, mo6_sys_porta_in))
- MCFG_PIA_READPB_HANDLER(READ8(thomson_state, mo6_sys_portb_in))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_sys_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("buzzer", dac_bit_interface, write))
- MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
- MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_sys_cb2_out))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>)) // differs from TO
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, mo6_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, mo6_sys_portb_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo6_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, mo5_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, mo6_sys_cb2_out))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>)) // differs from TO
MCFG_DEVICE_MODIFY(THOM_PIA_GAME)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out))
- MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_game_cb2_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo6_game_porta_out))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, mo6_game_cb2_out))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -2497,8 +2497,8 @@ MACHINE_CONFIG_START(thomson_state::mo5nr)
MCFG_MACHINE_START_OVERRIDE( thomson_state, mo5nr )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, mo5nr )
- MCFG_CPU_MODIFY( "maincpu" )
- MCFG_CPU_PROGRAM_MAP ( mo5nr)
+ MCFG_DEVICE_MODIFY( "maincpu" )
+ MCFG_DEVICE_PROGRAM_MAP ( mo5nr)
MCFG_CASSETTE_MODIFY( "cassette" )
MCFG_CASSETTE_FORMATS(mo5_cassette_formats)
@@ -2507,20 +2507,20 @@ MACHINE_CONFIG_START(thomson_state::mo5nr)
MCFG_DEVICE_REMOVE( "mc6846" )
MCFG_DEVICE_MODIFY(THOM_PIA_SYS)
- MCFG_PIA_READPA_HANDLER(READ8(thomson_state, mo6_sys_porta_in))
- MCFG_PIA_READPB_HANDLER(READ8(thomson_state, mo5nr_sys_portb_in))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo5nr_sys_porta_out))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("buzzer", dac_bit_interface, write))
- MCFG_PIA_CA2_HANDLER(WRITELINE(thomson_state, mo5_set_cassette_motor))
- MCFG_PIA_CB2_HANDLER(WRITELINE(thomson_state, mo6_sys_cb2_out))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>)) // differs from TO
+ MCFG_PIA_READPA_HANDLER(READ8(*this, thomson_state, mo6_sys_porta_in))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, thomson_state, mo5nr_sys_portb_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo5nr_sys_porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("buzzer", dac_bit_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, thomson_state, mo5_set_cassette_motor))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, thomson_state, mo6_sys_cb2_out))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>)) // differs from TO
MCFG_DEVICE_MODIFY(THOM_PIA_GAME)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(thomson_state, mo6_game_porta_out))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, thomson_state, mo6_game_porta_out))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(thomson_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, thomson_state, write_centronics_busy))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp
index eb02555da59..a3e367cbca2 100644
--- a/src/mame/drivers/thoop2.cpp
+++ b/src/mame/drivers/thoop2.cpp
@@ -268,18 +268,18 @@ GFXDECODE_END
MACHINE_CONFIG_START(thoop2_state::thoop2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(24'000'000) / 2) // 12MHz verified
- MCFG_CPU_PROGRAM_MAP(thoop2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", thoop2_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(24'000'000) / 2) // 12MHz verified
+ MCFG_DEVICE_PROGRAM_MAP(thoop2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", thoop2_state, irq6_line_hold)
MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) // 12MHz verified
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(thoop2_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(thoop2_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(thoop2_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(thoop2_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, thoop2_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, thoop2_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, thoop2_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, thoop2_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // unknown. Sound related?
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // unknown
diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp
index ecc2591d2fc..63d635cc9c4 100644
--- a/src/mame/drivers/thunderj.cpp
+++ b/src/mame/drivers/thunderj.cpp
@@ -243,11 +243,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(thunderj_state::thunderj)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(extra_map)
+ MCFG_DEVICE_ADD("extra", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(extra_map)
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -262,7 +262,7 @@ MACHINE_CONFIG_START(thunderj_state::thunderj)
MCFG_PALETTE_ADD("palette", 2048)
MCFG_PALETTE_FORMAT(IRRRRRGGGGGBBBBB)
- MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(thunderj_state, scanline_int_write_line))
+ MCFG_ATARI_VAD_ADD("vad", "screen", WRITELINE(*this, thunderj_state, scanline_int_write_line))
MCFG_ATARI_VAD_PLAYFIELD(thunderj_state, "gfxdecode", get_playfield_tile_info)
MCFG_ATARI_VAD_PLAYFIELD2(thunderj_state, "gfxdecode", get_playfield2_tile_info)
MCFG_ATARI_VAD_ALPHA(thunderj_state, "gfxdecode", get_alpha_tile_info)
diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp
index 69376da792d..629c448ebe7 100644
--- a/src/mame/drivers/thunderx.cpp
+++ b/src/mame/drivers/thunderx.cpp
@@ -641,12 +641,12 @@ void thunderx_state::machine_reset()
MACHINE_CONFIG_START(thunderx_state::scontra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(scontra_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", thunderx_state, vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/2/4) /* 052001 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(scontra_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", thunderx_state, vblank_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(scontra_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(scontra_sound_map)
MCFG_DEVICE_ADD("bank5800", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(scontra_bank5800_map)
@@ -688,8 +688,8 @@ MACHINE_CONFIG_START(thunderx_state::scontra)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(thunderx_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, thunderx_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
@@ -706,11 +706,11 @@ MACHINE_CONFIG_START(thunderx_state::thunderx)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("maincpu") /* 052001 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(thunderx_map)
- MCFG_KONAMICPU_LINE_CB(WRITE8(thunderx_state, banking_callback))
+ MCFG_DEVICE_PROGRAM_MAP(thunderx_map)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, thunderx_state, banking_callback))
MCFG_DEVICE_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(thunderx_sound_map)
+ MCFG_DEVICE_PROGRAM_MAP(thunderx_sound_map)
MCFG_DEVICE_MODIFY("bank5800")
MCFG_DEVICE_PROGRAM_MAP(thunderx_bank5800_map)
@@ -724,8 +724,8 @@ MACHINE_CONFIG_START(thunderx_state::gbusters)
/* basic machine hardware */
MCFG_DEVICE_MODIFY("maincpu") /* 052526 */
- MCFG_CPU_PROGRAM_MAP(gbusters_map)
- MCFG_KONAMICPU_LINE_CB(WRITE8(thunderx_state, banking_callback))
+ MCFG_DEVICE_PROGRAM_MAP(gbusters_map)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, thunderx_state, banking_callback))
MCFG_DEVICE_MODIFY("k052109")
MCFG_K052109_CB(thunderx_state, gbusters_tile_callback)
diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp
index 282f29a49e9..5bad9cc3560 100644
--- a/src/mame/drivers/ti630.cpp
+++ b/src/mame/drivers/ti630.cpp
@@ -136,12 +136,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(ti630_state::ti630)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(i80c31_prg)
- MCFG_CPU_IO_MAP(i80c31_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(ti630_state, i80c31_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(ti630_state, i80c31_p1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(ti630_state, i80c31_p3_w))
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(i80c31_prg)
+ MCFG_DEVICE_IO_MAP(i80c31_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, ti630_state, i80c31_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, ti630_state, i80c31_p1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, ti630_state, i80c31_p3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp
index 49c52b93a52..31a57f87d5c 100644
--- a/src/mame/drivers/ti74.cpp
+++ b/src/mame/drivers/ti74.cpp
@@ -510,11 +510,11 @@ void ti74_state::machine_start()
MACHINE_CONFIG_START(ti74_state::ti74)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS70C46, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_TMS7000_IN_PORTA_CB(READ8(ti74_state, keyboard_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(ti74_state, bankswitch_w))
- MCFG_TMS7000_OUT_PORTE_CB(WRITE8(ti74_state, keyboard_w))
+ MCFG_DEVICE_ADD("maincpu", TMS70C46, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, ti74_state, keyboard_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, ti74_state, bankswitch_w))
+ MCFG_TMS7000_OUT_PORTE_CB(WRITE8(*this, ti74_state, keyboard_w))
MCFG_NVRAM_ADD_0FILL("sysram.ic3")
@@ -546,11 +546,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti74_state::ti95)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS70C46, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_TMS7000_IN_PORTA_CB(READ8(ti74_state, keyboard_r))
- MCFG_TMS7000_OUT_PORTB_CB(WRITE8(ti74_state, bankswitch_w))
- MCFG_TMS7000_OUT_PORTE_CB(WRITE8(ti74_state, keyboard_w))
+ MCFG_DEVICE_ADD("maincpu", TMS70C46, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_TMS7000_IN_PORTA_CB(READ8(*this, ti74_state, keyboard_r))
+ MCFG_TMS7000_OUT_PORTB_CB(WRITE8(*this, ti74_state, bankswitch_w))
+ MCFG_TMS7000_OUT_PORTE_CB(WRITE8(*this, ti74_state, keyboard_w))
MCFG_NVRAM_ADD_0FILL("sysram.ic3")
diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp
index f7a8f769b05..332b0931854 100644
--- a/src/mame/drivers/ti85.cpp
+++ b/src/mame/drivers/ti85.cpp
@@ -580,9 +580,9 @@ INPUT_PORTS_END
/* machine definition */
MACHINE_CONFIG_START(ti85_state::ti81)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz */
- MCFG_CPU_PROGRAM_MAP(ti81_mem)
- MCFG_CPU_IO_MAP(ti81_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 2000000) /* 2 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ti81_mem)
+ MCFG_DEVICE_IO_MAP(ti81_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -603,9 +603,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti85)
ti81(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) /* 6 MHz */
- MCFG_CPU_IO_MAP(ti85_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000) /* 6 MHz */
+ MCFG_DEVICE_IO_MAP(ti85_io)
MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 )
@@ -626,9 +626,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti82)
ti81(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) /* 6 MHz */
- MCFG_CPU_IO_MAP(ti82_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000) /* 6 MHz */
+ MCFG_DEVICE_IO_MAP(ti82_io)
MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 )
@@ -647,17 +647,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti81v2)
ti82(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(ti81v2_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(ti81v2_io)
MCFG_DEVICE_REMOVE("linkport")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti83)
ti81(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) /* 6 MHz */
- MCFG_CPU_IO_MAP(ti83_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000) /* 6 MHz */
+ MCFG_DEVICE_IO_MAP(ti83_io)
MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 )
@@ -674,9 +674,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti86)
ti85(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ti86_mem)
- MCFG_CPU_IO_MAP(ti86_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ti86_mem)
+ MCFG_DEVICE_IO_MAP(ti86_io)
MCFG_MACHINE_START_OVERRIDE(ti85_state, ti86 )
MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti85 )
@@ -686,10 +686,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti83p)
ti81(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(6000000) /* 8 MHz running at 6 MHz */
- MCFG_CPU_PROGRAM_MAP(ti83p_asic_mem)
- MCFG_CPU_IO_MAP(ti83p_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(6000000) /* 8 MHz running at 6 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ti83p_asic_mem)
+ MCFG_DEVICE_IO_MAP(ti83p_io)
MCFG_MACHINE_START_OVERRIDE(ti85_state, ti83p )
MCFG_MACHINE_RESET_OVERRIDE(ti85_state, ti83p )
@@ -735,9 +735,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti85_state::ti83pse)
ti83p(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK( 15000000)
- MCFG_CPU_IO_MAP(ti83pse_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK( 15000000)
+ MCFG_DEVICE_IO_MAP(ti83pse_io)
MCFG_DEVICE_MODIFY("membank1")
MCFG_DEVICE_PROGRAM_MAP(ti83pse_banked_mem)
diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp
index a98327eb8ff..503c8c65d75 100644
--- a/src/mame/drivers/ti89.cpp
+++ b/src/mame/drivers/ti89.cpp
@@ -522,8 +522,8 @@ PALETTE_INIT_MEMBER(ti68k_state, ti68k)
MACHINE_CONFIG_START(ti68k_state::ti89)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(ti89_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ti89_mem)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -548,8 +548,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti68k_state::ti92)
ti89(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ti92_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ti92_mem)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -559,22 +559,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti68k_state::ti92p)
ti92(config);
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(ti92p_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ti92p_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti68k_state::v200)
ti92(config);
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(v200_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(v200_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(ti68k_state::ti89t)
ti89(config);
- MCFG_CPU_REPLACE("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(ti89t_mem)
+ MCFG_DEVICE_REPLACE("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ti89t_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ti990_10.cpp b/src/mame/drivers/ti990_10.cpp
index 9cef52ba5f4..d32463c1d84 100644
--- a/src/mame/drivers/ti990_10.cpp
+++ b/src/mame/drivers/ti990_10.cpp
@@ -323,16 +323,16 @@ MACHINE_CONFIG_START(ti990_10_state::ti990_10)
// VDT 911 terminal
MCFG_DEVICE_ADD("vdt911", VDT911, 0)
- MCFG_VDT911_KEYINT_HANDLER(WRITELINE(ti990_10_state, key_interrupt))
- MCFG_VDT911_LINEINT_HANDLER(WRITELINE(ti990_10_state, line_interrupt))
+ MCFG_VDT911_KEYINT_HANDLER(WRITELINE(*this, ti990_10_state, key_interrupt))
+ MCFG_VDT911_LINEINT_HANDLER(WRITELINE(*this, ti990_10_state, line_interrupt))
// Hard disk
MCFG_DEVICE_ADD("hdc", TI990_HDC, 0)
- MCFG_TI990_HDC_INT_CALLBACK(WRITELINE(ti990_10_state, ti990_set_int13))
+ MCFG_TI990_HDC_INT_CALLBACK(WRITELINE(*this, ti990_10_state, ti990_set_int13))
// Tape controller
MCFG_DEVICE_ADD("tpc", TI990_TAPE_CTRL, 0)
- MCFG_TI990_TAPE_INT_HANDLER(WRITELINE(ti990_10_state, tape_interrupt))
+ MCFG_TI990_TAPE_INT_HANDLER(WRITELINE(*this, ti990_10_state, tape_interrupt))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp
index a4c70d175ea..faab4c35d81 100644
--- a/src/mame/drivers/ti990_4.cpp
+++ b/src/mame/drivers/ti990_4.cpp
@@ -293,19 +293,19 @@ MACHINE_CONFIG_START(ti990_4_state::ti990_4)
/* basic machine hardware */
/* TMS9900 CPU @ 3.0(???) MHz */
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti990_4_state, external_operation) )
- MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti990_4_state, interrupt_level) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti990_4_state, external_operation) )
+ MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti990_4_state, interrupt_level) )
MCFG_MACHINE_RESET_OVERRIDE(ti990_4_state, ti990_4 )
// Terminal
MCFG_DEVICE_ADD("asr733", ASR733, 0)
- MCFG_ASR733_KEYINT_HANDLER(WRITELINE(ti990_4_state, asrkey_interrupt))
- MCFG_ASR733_LINEINT_HANDLER(WRITELINE(ti990_4_state, line_interrupt))
+ MCFG_ASR733_KEYINT_HANDLER(WRITELINE(*this, ti990_4_state, asrkey_interrupt))
+ MCFG_ASR733_LINEINT_HANDLER(WRITELINE(*this, ti990_4_state, line_interrupt))
// Floppy controller
MCFG_DEVICE_ADD("fd800", TI99X_FD800, 0)
- MCFG_FD800_INT_HANDLER(WRITELINE(ti990_4_state, fd_interrupt))
+ MCFG_FD800_INT_HANDLER(WRITELINE(*this, ti990_4_state, fd_interrupt))
// MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)
MACHINE_CONFIG_END
@@ -314,18 +314,18 @@ MACHINE_CONFIG_START(ti990_4_state::ti990_4v)
/* basic machine hardware */
/* TMS9900 CPU @ 3.0(???) MHz */
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map_v)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti990_4_state, external_operation) )
- MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti990_4_state, interrupt_level) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti990_4_state, external_operation) )
+ MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti990_4_state, interrupt_level) )
MCFG_MACHINE_RESET_OVERRIDE(ti990_4_state, ti990_4 )
// Terminal
MCFG_DEVICE_ADD("vdt911", VDT911, 0)
- MCFG_VDT911_KEYINT_HANDLER(WRITELINE(ti990_4_state, vdtkey_interrupt))
- MCFG_VDT911_LINEINT_HANDLER(WRITELINE(ti990_4_state, line_interrupt))
+ MCFG_VDT911_KEYINT_HANDLER(WRITELINE(*this, ti990_4_state, vdtkey_interrupt))
+ MCFG_VDT911_LINEINT_HANDLER(WRITELINE(*this, ti990_4_state, line_interrupt))
// Floppy controller
MCFG_DEVICE_ADD("fd800", TI99X_FD800, 0)
- MCFG_FD800_INT_HANDLER(WRITELINE(ti990_4_state, fd_interrupt))
+ MCFG_FD800_INT_HANDLER(WRITELINE(*this, ti990_4_state, fd_interrupt))
// MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp
index 9a43dd681de..e252d6f2f1e 100644
--- a/src/mame/drivers/ti99_2.cpp
+++ b/src/mame/drivers/ti99_2.cpp
@@ -383,7 +383,7 @@ MACHINE_CONFIG_START(ti99_2_state::ti99_2)
// We have no lines connected yet
MCFG_TMS99xx_ADD("maincpu", TMS9995, 10700000, ti99_2_memmap, ti99_2_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ti99_2_state, ti99_2_vblank_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ti99_2_state, ti99_2_vblank_interrupt)
/* video hardware */
/*MCFG_TMS9928A( &tms9918_interface )*/
diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp
index 97875ca843a..9599b0a4074 100644
--- a/src/mame/drivers/ti99_4p.cpp
+++ b/src/mame/drivers/ti99_4p.cpp
@@ -998,31 +998,31 @@ MACHINE_CONFIG_START(ti99_4p_state::ti99_4p_60hz)
/* basic machine hardware */
/* TMS9900 CPU @ 3.0 MHz */
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4p_state, external_operation) )
- MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti99_4p_state, interrupt_level) )
- MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(ti99_4p_state, clock_out) )
- MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(ti99_4p_state, dbin_line) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti99_4p_state, external_operation) )
+ MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti99_4p_state, interrupt_level) )
+ MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4p_state, clock_out) )
+ MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4p_state, dbin_line) )
// tms9901
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_4p_state, read_by_9901) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( ti99_4p_state, keyC0) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( ti99_4p_state, keyC1) )
- MCFG_TMS9901_P4_HANDLER( WRITELINE( ti99_4p_state, keyC2) )
- MCFG_TMS9901_P5_HANDLER( WRITELINE( ti99_4p_state, alphaW) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( ti99_4p_state, cs_motor) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( ti99_4p_state, audio_gate) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4p_state, cassette_output) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4p_state, tms9901_interrupt) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, ti99_4p_state, read_by_9901) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, ti99_4p_state, keyC0) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, ti99_4p_state, keyC1) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( *this, ti99_4p_state, keyC2) )
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( *this, ti99_4p_state, alphaW) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, ti99_4p_state, cs_motor) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, ti99_4p_state, audio_gate) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, ti99_4p_state, cassette_output) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, ti99_4p_state, tms9901_interrupt) )
// Peripheral expansion box (SGCPU composition)
MCFG_DEVICE_ADD( TI_PERIBOX_TAG, TI99_PERIBOX_SG, 0)
- MCFG_PERIBOX_INTA_HANDLER( WRITELINE(ti99_4p_state, extint) )
- MCFG_PERIBOX_INTB_HANDLER( WRITELINE(ti99_4p_state, notconnected) )
- MCFG_PERIBOX_READY_HANDLER( WRITELINE(ti99_4p_state, ready_line) )
+ MCFG_PERIBOX_INTA_HANDLER( WRITELINE(*this, ti99_4p_state, extint) )
+ MCFG_PERIBOX_INTB_HANDLER( WRITELINE(*this, ti99_4p_state, notconnected) )
+ MCFG_PERIBOX_READY_HANDLER( WRITELINE(*this, ti99_4p_state, ready_line) )
// The SGCPU actually makes use of this pin which was unused before
- MCFG_PERIBOX_LCP_HANDLER( WRITELINE(ti99_4p_state, video_interrupt_in) )
+ MCFG_PERIBOX_LCP_HANDLER( WRITELINE(*this, ti99_4p_state, video_interrupt_in) )
// Scratch pad RAM 1024 bytes (4 times the size of the TI-99/4A)
MCFG_RAM_ADD(TI99_PADRAM_TAG)
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index d2f4156605a..403103a8039 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -843,33 +843,33 @@ MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4)
MACHINE_CONFIG_START(ti99_4x_state::ti99_4)
// CPU
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) )
- MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti99_4x_state, interrupt_level) )
- MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(ti99_4x_state, clock_out) )
- MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(ti99_4x_state, dbin_line) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti99_4x_state, external_operation) )
+ MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti99_4x_state, interrupt_level) )
+ MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4x_state, clock_out) )
+ MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4x_state, dbin_line) )
MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4 )
MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4 )
// Main board
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_4x_state, read_by_9901) )
- MCFG_TMS9901_P0_HANDLER( WRITELINE( ti99_4x_state, handset_ack) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( ti99_4x_state, keyC0) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( ti99_4x_state, keyC1) )
- MCFG_TMS9901_P4_HANDLER( WRITELINE( ti99_4x_state, keyC2) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( ti99_4x_state, cs1_motor) )
- MCFG_TMS9901_P7_HANDLER( WRITELINE( ti99_4x_state, cs2_motor) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( ti99_4x_state, audio_gate) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4x_state, cassette_output) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4x_state, tms9901_interrupt) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, ti99_4x_state, read_by_9901) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, ti99_4x_state, handset_ack) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, ti99_4x_state, keyC0) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, ti99_4x_state, keyC1) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( *this, ti99_4x_state, keyC2) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, ti99_4x_state, cs1_motor) )
+ MCFG_TMS9901_P7_HANDLER( WRITELINE( *this, ti99_4x_state, cs2_motor) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, ti99_4x_state, audio_gate) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, ti99_4x_state, cassette_output) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, ti99_4x_state, tms9901_interrupt) )
MCFG_DEVICE_ADD( TI99_DATAMUX_TAG, TI99_DATAMUX, 0)
- MCFG_DMUX_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_dmux) )
+ MCFG_DMUX_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_dmux) )
MCFG_GROMPORT4_ADD( TI99_GROMPORT_TAG )
- MCFG_GROMPORT_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_cart) )
- MCFG_GROMPORT_RESET_HANDLER( WRITELINE(ti99_4x_state, console_reset) )
+ MCFG_GROMPORT_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_cart) )
+ MCFG_GROMPORT_RESET_HANDLER( WRITELINE(*this, ti99_4x_state, console_reset) )
// Scratch pad RAM 256 bytes
MCFG_RAM_ADD(TI99_PADRAM_TAG)
@@ -886,14 +886,14 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4)
// Input/output port
MCFG_IOPORT_ADD( TI99_IOPORT_TAG )
- MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_4x_state, extint) )
- MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(TI99_DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) )
+ MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(*this, ti99_4x_state, extint) )
+ MCFG_IOPORT_READY_HANDLER( WRITELINE(TI99_DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) )
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("sound_out")
- MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
- MCFG_SN76496_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_sound) )
+ MCFG_SN76496_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_sound) )
// Cassette drives
MCFG_SPEAKER_STANDARD_MONO("cass_out")
@@ -904,13 +904,13 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "cass_out", 0.25)
// GROM devices
- MCFG_GROM_ADD( TI99_GROM0_TAG, 0, TI99_CONSOLEGROM, 0x0000, WRITELINE(ti99_4x_state, console_ready_grom))
- MCFG_GROM_ADD( TI99_GROM1_TAG, 1, TI99_CONSOLEGROM, 0x2000, WRITELINE(ti99_4x_state, console_ready_grom))
- MCFG_GROM_ADD( TI99_GROM2_TAG, 2, TI99_CONSOLEGROM, 0x4000, WRITELINE(ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM0_TAG, 0, TI99_CONSOLEGROM, 0x0000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM1_TAG, 1, TI99_CONSOLEGROM, 0x2000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM2_TAG, 2, TI99_CONSOLEGROM, 0x4000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
// Joystick port
MCFG_TI_JOYPORT4_ADD( TI_JOYPORT_TAG )
- MCFG_JOYPORT_INT_HANDLER( WRITELINE(ti99_4x_state, handset_interrupt_in) )
+ MCFG_JOYPORT_INT_HANDLER( WRITELINE(*this, ti99_4x_state, handset_interrupt_in) )
MACHINE_CONFIG_END
/*
@@ -920,8 +920,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4_60hz)
ti99_4(config);
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))
- MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_4x_state, video_interrupt_in))
+ MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(*this, ti99_4x_state, gromclk_in))
MCFG_TMS9928A_SCREEN_ADD_NTSC( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -933,8 +933,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4_50hz)
ti99_4(config);
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))
- MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_4x_state, video_interrupt_in))
+ MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(*this, ti99_4x_state, gromclk_in))
MCFG_TMS9928A_SCREEN_ADD_PAL( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -962,33 +962,33 @@ MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4a)
MACHINE_CONFIG_START(ti99_4x_state::ti99_4a)
// CPU
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) )
- MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti99_4x_state, interrupt_level) )
- MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(ti99_4x_state, clock_out) )
- MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(ti99_4x_state, dbin_line) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti99_4x_state, external_operation) )
+ MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti99_4x_state, interrupt_level) )
+ MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4x_state, clock_out) )
+ MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4x_state, dbin_line) )
MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4a )
MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4a )
// Main board
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_4x_state, read_by_9901) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( ti99_4x_state, keyC0) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( ti99_4x_state, keyC1) )
- MCFG_TMS9901_P4_HANDLER( WRITELINE( ti99_4x_state, keyC2) )
- MCFG_TMS9901_P5_HANDLER( WRITELINE( ti99_4x_state, alphaW) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( ti99_4x_state, cs1_motor) )
- MCFG_TMS9901_P7_HANDLER( WRITELINE( ti99_4x_state, cs2_motor) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( ti99_4x_state, audio_gate) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4x_state, cassette_output) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4x_state, tms9901_interrupt) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, ti99_4x_state, read_by_9901) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, ti99_4x_state, keyC0) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, ti99_4x_state, keyC1) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( *this, ti99_4x_state, keyC2) )
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( *this, ti99_4x_state, alphaW) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, ti99_4x_state, cs1_motor) )
+ MCFG_TMS9901_P7_HANDLER( WRITELINE( *this, ti99_4x_state, cs2_motor) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, ti99_4x_state, audio_gate) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, ti99_4x_state, cassette_output) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, ti99_4x_state, tms9901_interrupt) )
MCFG_DEVICE_ADD( TI99_DATAMUX_TAG, TI99_DATAMUX, 0)
- MCFG_DMUX_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_dmux) )
+ MCFG_DMUX_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_dmux) )
MCFG_GROMPORT4_ADD( TI99_GROMPORT_TAG )
- MCFG_GROMPORT_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_cart) )
- MCFG_GROMPORT_RESET_HANDLER( WRITELINE(ti99_4x_state, console_reset) )
+ MCFG_GROMPORT_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_cart) )
+ MCFG_GROMPORT_RESET_HANDLER( WRITELINE(*this, ti99_4x_state, console_reset) )
// Scratch pad RAM 256 bytes
MCFG_RAM_ADD(TI99_PADRAM_TAG)
@@ -1005,14 +1005,14 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4a)
// Input/output port
MCFG_IOPORT_ADD( TI99_IOPORT_TAG )
- MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_4x_state, extint) )
- MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(TI99_DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) )
+ MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(*this, ti99_4x_state, extint) )
+ MCFG_IOPORT_READY_HANDLER( WRITELINE(TI99_DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) )
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("sound_out")
- MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
- MCFG_SN76496_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_sound) )
+ MCFG_SN76496_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_sound) )
// Cassette drives
MCFG_SPEAKER_STANDARD_MONO("cass_out")
@@ -1023,9 +1023,9 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4a)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "cass_out", 0.25)
// GROM devices
- MCFG_GROM_ADD( TI99_GROM0_TAG, 0, TI99_CONSOLEGROM, 0x0000, WRITELINE(ti99_4x_state, console_ready_grom))
- MCFG_GROM_ADD( TI99_GROM1_TAG, 1, TI99_CONSOLEGROM, 0x2000, WRITELINE(ti99_4x_state, console_ready_grom))
- MCFG_GROM_ADD( TI99_GROM2_TAG, 2, TI99_CONSOLEGROM, 0x4000, WRITELINE(ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM0_TAG, 0, TI99_CONSOLEGROM, 0x0000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM1_TAG, 1, TI99_CONSOLEGROM, 0x2000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM2_TAG, 2, TI99_CONSOLEGROM, 0x4000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
// Joystick port
MCFG_TI_JOYPORT4A_ADD( TI_JOYPORT_TAG )
@@ -1038,8 +1038,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4a_60hz)
ti99_4a(config);
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))
- MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_4x_state, video_interrupt_in))
+ MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(*this, ti99_4x_state, gromclk_in))
MCFG_TMS9928A_SCREEN_ADD_NTSC( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -1051,8 +1051,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4a_50hz)
ti99_4a(config);
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9929A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))
- MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_4x_state, video_interrupt_in))
+ MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(*this, ti99_4x_state, gromclk_in))
MCFG_TMS9928A_SCREEN_ADD_PAL( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -1086,8 +1086,8 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4qi_60hz)
ti99_4qi(config);
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9918A, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_4x_state, video_interrupt_in))
- MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(ti99_4x_state, gromclk_in))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_4x_state, video_interrupt_in))
+ MCFG_TMS9928A_OUT_GROMCLK_CB(WRITELINE(*this, ti99_4x_state, gromclk_in))
MCFG_TMS9928A_SCREEN_ADD_NTSC( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -1123,32 +1123,32 @@ MACHINE_RESET_MEMBER(ti99_4x_state, ti99_4ev)
MACHINE_CONFIG_START(ti99_4x_state::ti99_4ev_60hz)
// CPU
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) )
- MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(ti99_4x_state, interrupt_level) )
- MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(ti99_4x_state, clock_out) )
- MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(ti99_4x_state, dbin_line) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, ti99_4x_state, external_operation) )
+ MCFG_TMS99xx_INTLEVEL_HANDLER( READ8(*this, ti99_4x_state, interrupt_level) )
+ MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(*this, ti99_4x_state, clock_out) )
+ MCFG_TMS99xx_DBIN_HANDLER( WRITELINE(*this, ti99_4x_state, dbin_line) )
MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4ev )
MCFG_MACHINE_RESET_OVERRIDE(ti99_4x_state, ti99_4ev )
// Main board
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, 3000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_4x_state, read_by_9901) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( ti99_4x_state, keyC0) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( ti99_4x_state, keyC1) )
- MCFG_TMS9901_P4_HANDLER( WRITELINE( ti99_4x_state, keyC2) )
- MCFG_TMS9901_P5_HANDLER( WRITELINE( ti99_4x_state, alphaW) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( ti99_4x_state, cs1_motor) )
- MCFG_TMS9901_P7_HANDLER( WRITELINE( ti99_4x_state, cs2_motor) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( ti99_4x_state, audio_gate) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4x_state, cassette_output) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4x_state, tms9901_interrupt) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, ti99_4x_state, read_by_9901) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, ti99_4x_state, keyC0) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, ti99_4x_state, keyC1) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( *this, ti99_4x_state, keyC2) )
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( *this, ti99_4x_state, alphaW) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, ti99_4x_state, cs1_motor) )
+ MCFG_TMS9901_P7_HANDLER( WRITELINE( *this, ti99_4x_state, cs2_motor) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, ti99_4x_state, audio_gate) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, ti99_4x_state, cassette_output) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, ti99_4x_state, tms9901_interrupt) )
MCFG_DEVICE_ADD( TI99_DATAMUX_TAG, TI99_DATAMUX, 0)
- MCFG_DMUX_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_dmux) )
+ MCFG_DMUX_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_dmux) )
MCFG_GROMPORT4_ADD( TI99_GROMPORT_TAG )
- MCFG_GROMPORT_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_cart) )
- MCFG_GROMPORT_RESET_HANDLER( WRITELINE(ti99_4x_state, console_reset) )
+ MCFG_GROMPORT_READY_HANDLER( WRITELINE(*this, ti99_4x_state, console_ready_cart) )
+ MCFG_GROMPORT_RESET_HANDLER( WRITELINE(*this, ti99_4x_state, console_reset) )
// Scratch pad RAM 256 bytes
MCFG_RAM_ADD(TI99_PADRAM_TAG)
@@ -1161,15 +1161,15 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4ev_60hz)
MCFG_RAM_DEFAULT_VALUE(0)
// EVPC connector
- MCFG_ADD_EVPC_CONNECTOR( TI99_EVPC_CONN_TAG, WRITELINE( ti99_4x_state, video_interrupt_evpc_in ) )
+ MCFG_ADD_EVPC_CONNECTOR( TI99_EVPC_CONN_TAG, WRITELINE( *this, ti99_4x_state, video_interrupt_evpc_in ) )
// Software list
MCFG_SOFTWARE_LIST_ADD("cart_list_ti99", "ti99_cart")
// Input/output port
MCFG_IOPORT_ADD_WITH_PEB( TI99_IOPORT_TAG )
- MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_4x_state, extint) )
- MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(TI99_DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) )
+ MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(*this, ti99_4x_state, extint) )
+ MCFG_IOPORT_READY_HANDLER( WRITELINE(TI99_DATAMUX_TAG, bus::ti99::internal::datamux_device, ready_line) )
// Cassette drives
MCFG_SPEAKER_STANDARD_MONO("cass_out")
@@ -1180,9 +1180,9 @@ MACHINE_CONFIG_START(ti99_4x_state::ti99_4ev_60hz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "cass_out", 0.25)
// GROM devices
- MCFG_GROM_ADD( TI99_GROM0_TAG, 0, TI99_CONSOLEGROM, 0x0000, WRITELINE(ti99_4x_state, console_ready_grom))
- MCFG_GROM_ADD( TI99_GROM1_TAG, 1, TI99_CONSOLEGROM, 0x2000, WRITELINE(ti99_4x_state, console_ready_grom))
- MCFG_GROM_ADD( TI99_GROM2_TAG, 2, TI99_CONSOLEGROM, 0x4000, WRITELINE(ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM0_TAG, 0, TI99_CONSOLEGROM, 0x0000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM1_TAG, 1, TI99_CONSOLEGROM, 0x2000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
+ MCFG_GROM_ADD( TI99_GROM2_TAG, 2, TI99_CONSOLEGROM, 0x4000, WRITELINE(*this, ti99_4x_state, console_ready_grom))
// Joystick port
MCFG_TI_JOYPORT4A_ADD( TI_JOYPORT_TAG )
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index cc515c5ae1a..741d4a37e03 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -725,37 +725,37 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8)
// TMS9995-MP9537 CPU @ 10.7 MHz
// MP9537 mask: This variant of the TMS9995 does not contain on-chip RAM
MCFG_TMS99xx_ADD("maincpu", TMS9995_MP9537, XTAL(10'738'635), memmap, crumap)
- MCFG_TMS9995_EXTOP_HANDLER( WRITE8(ti99_8_state, external_operation) )
- MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(ti99_8_state, clock_out) )
- MCFG_TMS9995_DBIN_HANDLER( WRITELINE(ti99_8_state, dbin_line) )
- MCFG_TMS9995_HOLDA_HANDLER( DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, holda_line) )
+ MCFG_TMS9995_EXTOP_HANDLER( WRITE8(*this, ti99_8_state, external_operation) )
+ MCFG_TMS9995_CLKOUT_HANDLER( WRITELINE(*this, ti99_8_state, clock_out) )
+ MCFG_TMS9995_DBIN_HANDLER( WRITELINE(*this, ti99_8_state, dbin_line) )
+ MCFG_TMS9995_HOLDA_HANDLER( WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, holda_line) )
MCFG_MACHINE_START_OVERRIDE(ti99_8_state, ti99_8 )
MCFG_MACHINE_RESET_OVERRIDE(ti99_8_state, ti99_8 )
// 9901 configuration
MCFG_DEVICE_ADD(TI_TMS9901_TAG, TMS9901, XTAL(10'738'635)/4.0)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(ti99_8_state, read_by_9901) )
- MCFG_TMS9901_P0_HANDLER( WRITELINE( ti99_8_state, keyC0) )
- MCFG_TMS9901_P1_HANDLER( WRITELINE( ti99_8_state, keyC1) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( ti99_8_state, keyC2) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( ti99_8_state, keyC3) )
- MCFG_TMS9901_P4_HANDLER( DEVWRITELINE( TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, crus_in) )
- MCFG_TMS9901_P5_HANDLER( DEVWRITELINE( TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptgen_in) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( ti99_8_state, cassette_motor) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( ti99_8_state, audio_gate) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_8_state, cassette_output) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_8_state, tms9901_interrupt) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, ti99_8_state, read_by_9901) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, ti99_8_state, keyC0) )
+ MCFG_TMS9901_P1_HANDLER( WRITELINE( *this, ti99_8_state, keyC1) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, ti99_8_state, keyC2) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, ti99_8_state, keyC3) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, crus_in) )
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptgen_in) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, ti99_8_state, cassette_motor) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, ti99_8_state, audio_gate) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, ti99_8_state, cassette_output) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, ti99_8_state, tms9901_interrupt) )
// Mainboard with custom chips
MCFG_DEVICE_ADD(TI998_MAINBOARD_TAG, TI99_MAINBOARD8, 0)
- MCFG_MAINBOARD8_READY_CALLBACK(WRITELINE(ti99_8_state, console_ready))
- MCFG_MAINBOARD8_RESET_CALLBACK(WRITELINE(ti99_8_state, console_reset))
- MCFG_MAINBOARD8_HOLD_CALLBACK(WRITELINE(ti99_8_state, cpu_hold))
+ MCFG_MAINBOARD8_READY_CALLBACK(WRITELINE(*this, ti99_8_state, console_ready))
+ MCFG_MAINBOARD8_RESET_CALLBACK(WRITELINE(*this, ti99_8_state, console_reset))
+ MCFG_MAINBOARD8_HOLD_CALLBACK(WRITELINE(*this, ti99_8_state, cpu_hold))
MCFG_GROMPORT8_ADD( TI99_GROMPORT_TAG )
- MCFG_GROMPORT_READY_HANDLER( DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready) )
- MCFG_GROMPORT_RESET_HANDLER( WRITELINE(ti99_8_state, console_reset) )
+ MCFG_GROMPORT_READY_HANDLER( WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready) )
+ MCFG_GROMPORT_RESET_HANDLER( WRITELINE(*this, ti99_8_state, console_reset) )
// RAM
MCFG_RAM_ADD(TI998_SRAM_TAG)
@@ -770,24 +770,24 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8)
// I/O port
MCFG_IOPORT_ADD( TI99_IOPORT_TAG )
- MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(ti99_8_state, extint) )
- MCFG_IOPORT_READY_HANDLER( DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, pbox_ready) )
+ MCFG_IOPORT_EXTINT_HANDLER( WRITELINE(*this, ti99_8_state, extint) )
+ MCFG_IOPORT_READY_HANDLER( WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, pbox_ready) )
// Hexbus
MCFG_HEXBUS_ADD( TI_HEXBUS_TAG )
// Sound hardware
MCFG_SPEAKER_STANDARD_MONO("sound_out")
- MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN76496, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD(TI_SOUNDCHIP_TAG, SN76496, 3579545) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
- MCFG_SN76496_READY_HANDLER(DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, sound_ready))
+ MCFG_SN76496_READY_HANDLER(WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, sound_ready))
// Speech hardware
// Note: SPEECHROM uses its tag for referencing the region
MCFG_DEVICE_ADD(TI998_SPEECHROM_REG, SPEECHROM, 0)
MCFG_SPEAKER_STANDARD_MONO("speech_out")
- MCFG_SOUND_ADD(TI998_SPEECHSYN_TAG, CD2501ECD, 640000L)
- MCFG_TMS52XX_READYQ_HANDLER(DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, speech_ready))
+ MCFG_DEVICE_ADD(TI998_SPEECHSYN_TAG, CD2501ECD, 640000L)
+ MCFG_TMS52XX_READYQ_HANDLER(WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, speech_ready))
MCFG_TMS52XX_SPEECHROM(TI998_SPEECHROM_REG)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speech_out", 0.50)
@@ -798,31 +798,31 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "cass_out", 0.25)
// GROM library
- MCFG_GROM_ADD( TI998_SYSGROM0_TAG, 0, TI998_SYSGROM_REG, 0x0000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready))
- MCFG_GROM_ADD( TI998_SYSGROM1_TAG, 1, TI998_SYSGROM_REG, 0x2000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready))
- MCFG_GROM_ADD( TI998_SYSGROM2_TAG, 2, TI998_SYSGROM_REG, 0x4000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready))
-
- MCFG_GROM_ADD( TI998_GLIB10_TAG, 0, TI998_GROMLIB1_REG, 0x0000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB11_TAG, 1, TI998_GROMLIB1_REG, 0x2000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB12_TAG, 2, TI998_GROMLIB1_REG, 0x4000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB13_TAG, 3, TI998_GROMLIB1_REG, 0x6000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB14_TAG, 4, TI998_GROMLIB1_REG, 0x8000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB15_TAG, 5, TI998_GROMLIB1_REG, 0xa000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB16_TAG, 6, TI998_GROMLIB1_REG, 0xc000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB17_TAG, 7, TI998_GROMLIB1_REG, 0xe000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
-
- MCFG_GROM_ADD( TI998_GLIB20_TAG, 0, TI998_GROMLIB2_REG, 0x0000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB21_TAG, 1, TI998_GROMLIB2_REG, 0x2000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB22_TAG, 2, TI998_GROMLIB2_REG, 0x4000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB23_TAG, 3, TI998_GROMLIB2_REG, 0x6000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB24_TAG, 4, TI998_GROMLIB2_REG, 0x8000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB25_TAG, 5, TI998_GROMLIB2_REG, 0xa000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB26_TAG, 6, TI998_GROMLIB2_REG, 0xc000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB27_TAG, 7, TI998_GROMLIB2_REG, 0xe000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
-
- MCFG_GROM_ADD( TI998_GLIB30_TAG, 0, TI998_GROMLIB3_REG, 0x0000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p3_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB31_TAG, 1, TI998_GROMLIB3_REG, 0x2000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p3_grom_ready))
- MCFG_GROM_ADD( TI998_GLIB32_TAG, 2, TI998_GROMLIB3_REG, 0x4000, DEVWRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p3_grom_ready))
+ MCFG_GROM_ADD( TI998_SYSGROM0_TAG, 0, TI998_SYSGROM_REG, 0x0000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready))
+ MCFG_GROM_ADD( TI998_SYSGROM1_TAG, 1, TI998_SYSGROM_REG, 0x2000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready))
+ MCFG_GROM_ADD( TI998_SYSGROM2_TAG, 2, TI998_SYSGROM_REG, 0x4000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, system_grom_ready))
+
+ MCFG_GROM_ADD( TI998_GLIB10_TAG, 0, TI998_GROMLIB1_REG, 0x0000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB11_TAG, 1, TI998_GROMLIB1_REG, 0x2000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB12_TAG, 2, TI998_GROMLIB1_REG, 0x4000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB13_TAG, 3, TI998_GROMLIB1_REG, 0x6000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB14_TAG, 4, TI998_GROMLIB1_REG, 0x8000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB15_TAG, 5, TI998_GROMLIB1_REG, 0xa000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB16_TAG, 6, TI998_GROMLIB1_REG, 0xc000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB17_TAG, 7, TI998_GROMLIB1_REG, 0xe000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, ptts_grom_ready))
+
+ MCFG_GROM_ADD( TI998_GLIB20_TAG, 0, TI998_GROMLIB2_REG, 0x0000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB21_TAG, 1, TI998_GROMLIB2_REG, 0x2000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB22_TAG, 2, TI998_GROMLIB2_REG, 0x4000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB23_TAG, 3, TI998_GROMLIB2_REG, 0x6000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB24_TAG, 4, TI998_GROMLIB2_REG, 0x8000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB25_TAG, 5, TI998_GROMLIB2_REG, 0xa000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB26_TAG, 6, TI998_GROMLIB2_REG, 0xc000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB27_TAG, 7, TI998_GROMLIB2_REG, 0xe000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p8_grom_ready))
+
+ MCFG_GROM_ADD( TI998_GLIB30_TAG, 0, TI998_GROMLIB3_REG, 0x0000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p3_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB31_TAG, 1, TI998_GROMLIB3_REG, 0x2000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p3_grom_ready))
+ MCFG_GROM_ADD( TI998_GLIB32_TAG, 2, TI998_GROMLIB3_REG, 0x4000, WRITELINE(TI998_MAINBOARD_TAG, bus::ti99::internal::mainboard8_device, p3_grom_ready))
// Joystick port
MCFG_TI_JOYPORT4A_ADD( TI_JOYPORT_TAG )
@@ -836,7 +836,7 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8_60hz)
// Video hardware
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9118, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_8_state, video_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_8_state, video_interrupt))
MCFG_TMS9928A_SCREEN_ADD_NTSC( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
@@ -849,7 +849,7 @@ MACHINE_CONFIG_START(ti99_8_state::ti99_8_50hz)
// Video hardware
MCFG_DEVICE_ADD( TI_VDP_TAG, TMS9129, XTAL(10'738'635) / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
- MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(ti99_8_state,video_interrupt))
+ MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(*this, ti99_8_state,video_interrupt))
MCFG_TMS9928A_SCREEN_ADD_PAL( TI_SCREEN_TAG )
MCFG_SCREEN_UPDATE_DEVICE( TI_VDP_TAG, tms9928a_device, screen_update )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp
index 54d0412ccfd..95c55a8595e 100644
--- a/src/mame/drivers/tiamc1.cpp
+++ b/src/mame/drivers/tiamc1.cpp
@@ -329,15 +329,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(tiamc1_state::tiamc1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(tiamc1_map)
- MCFG_CPU_IO_MAP(tiamc1_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(tiamc1_map)
+ MCFG_DEVICE_IO_MAP(tiamc1_io_map)
MCFG_DEVICE_ADD("kr580vv55a", I8255A, 0) /* soviet clone of i8255 */
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN1"))
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tiamc1_state, tiamc1_control_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tiamc1_state, tiamc1_control_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -352,15 +352,15 @@ MACHINE_CONFIG_START(tiamc1_state::tiamc1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("2x8253", TIAMC1, SND_CLOCK)
+ MCFG_DEVICE_ADD("2x8253", TIAMC1, SND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tiamc1_state::kot)
tiamc1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kotrybolov_map)
- MCFG_CPU_IO_MAP(kotrybolov_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kotrybolov_map)
+ MCFG_DEVICE_IO_MAP(kotrybolov_io_map)
MCFG_SCREEN_MODIFY("screen")
MCFG_VIDEO_START_OVERRIDE(tiamc1_state, kot)
@@ -369,13 +369,13 @@ MACHINE_CONFIG_START(tiamc1_state::kot)
MCFG_GFXDECODE_MODIFY("gfxdecode", kot)
MCFG_DEVICE_REMOVE("2x8253")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(PIXEL_CLOCK / 4)
MCFG_PIT8253_CLK2(SND_CLOCK) // guess
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(tiamc1_state, pit8253_2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, tiamc1_state, pit8253_2_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp
index fe8b21493bf..0d748712f01 100644
--- a/src/mame/drivers/ticalc1x.cpp
+++ b/src/mame/drivers/ticalc1x.cpp
@@ -188,10 +188,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cmulti8_state::cmulti8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1070, 250000) // approximation - RC osc. R=56K, C=68pf
- MCFG_TMS1XXX_READ_K_CB(READ8(cmulti8_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(cmulti8_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(cmulti8_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1070, 250000) // approximation - RC osc. R=56K, C=68pf
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, cmulti8_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cmulti8_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cmulti8_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_cmulti8)
@@ -405,10 +405,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tisr16_state::tisr16)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=68pf (note: tisr16ii MCU RC osc. is different: R=30K, C=100pf, same freq)
- MCFG_TMS1XXX_READ_K_CB(READ8(tisr16_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tisr16_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tisr16_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=68pf (note: tisr16ii MCU RC osc. is different: R=30K, C=100pf, same freq)
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tisr16_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tisr16_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tisr16_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tisr16)
@@ -545,10 +545,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ti1250_state::ti1250)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0950, 200000) // approximation - RC osc. R=68K, C=68pf
- MCFG_TMS1XXX_READ_K_CB(READ8(ti1250_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ti1250_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ti1250_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS0950, 200000) // approximation - RC osc. R=68K, C=68pf
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ti1250_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ti1250_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti1250_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ti1250)
@@ -560,10 +560,10 @@ MACHINE_CONFIG_START(ti1250_state::ti1270)
ti1250(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", TMS0970, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(ti1250_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ti1250_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ti1250_state, write_r))
+ MCFG_DEVICE_REPLACE("maincpu", TMS0970, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ti1250_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ti1250_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti1250_state, write_r))
MCFG_DEFAULT_LAYOUT(layout_ti1270)
MACHINE_CONFIG_END
@@ -673,10 +673,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ti25503_state::ti25503)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1000, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(ti25503_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ti25503_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ti25503_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1000, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ti25503_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ti25503_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti25503_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ti25503)
@@ -774,10 +774,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ti1000_state::ti1000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1990, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(ti1000_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ti1000_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ti1000_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1990, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ti1000_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ti1000_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti1000_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ti1270)
@@ -875,10 +875,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wizatron_state::wizatron)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(wizatron_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(wizatron_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(wizatron_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS0970, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, wizatron_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, wizatron_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, wizatron_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_wizatron)
@@ -950,10 +950,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(lilprof_state::lilprof)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(lilprof_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(lilprof_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(wizatron_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS0970, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, lilprof_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, lilprof_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, wizatron_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_wizatron)
@@ -1061,10 +1061,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(lilprof78_state::lilprof78)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1990, 250000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(lilprof78_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(lilprof78_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(lilprof78_state, write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1990, 250000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, lilprof78_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, lilprof78_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, lilprof78_state, write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_wizatron)
@@ -1174,11 +1174,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(dataman_state::dataman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1980, 300000) // patent says 300kHz
- MCFG_TMS1XXX_READ_K_CB(READ8(dataman_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(dataman_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(dataman_state, write_r))
- MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(hh_tms1k_state, auto_power_off))
+ MCFG_DEVICE_ADD("maincpu", TMS1980, 300000) // patent says 300kHz
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, dataman_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, dataman_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, dataman_state, write_r))
+ MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_dataman)
@@ -1242,18 +1242,18 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(mathmarv_state::mathmarv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1980, 300000) // assume same as dataman
- MCFG_TMS1XXX_READ_K_CB(READ8(dataman_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(dataman_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(mathmarv_state, write_r))
- MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(hh_tms1k_state, auto_power_off))
+ MCFG_DEVICE_ADD("maincpu", TMS1980, 300000) // assume same as dataman
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, dataman_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, dataman_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, mathmarv_state, write_r))
+ MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_mathmarv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1503,11 +1503,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(ti30_state::ti30)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0980, 400000) // guessed
- MCFG_TMS1XXX_READ_K_CB(READ8(ti30_state, read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(ti30_state, write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(ti30_state, write_r))
- MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(hh_tms1k_state, auto_power_off))
+ MCFG_DEVICE_ADD("maincpu", TMS0980, 400000) // guessed
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, ti30_state, read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ti30_state, write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti30_state, write_r))
+ MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_ti30)
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index 08a1372a3f1..6f59852e638 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -759,8 +759,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tickee_state::tickee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(tickee_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tickee_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -784,12 +784,12 @@ MACHINE_CONFIG_START(tickee_state::tickee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2149, VIDEO_CLOCK/8)
+ MCFG_DEVICE_ADD("ym1", YM2149, VIDEO_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("ym2", YM2149, VIDEO_CLOCK/8)
+ MCFG_DEVICE_ADD("ym2", YM2149, VIDEO_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -800,16 +800,16 @@ MACHINE_CONFIG_START(tickee_state::ghoshunt)
tickee(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ghoshunt_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ghoshunt_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tickee_state::rapidfir)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL(50'000'000))
- MCFG_CPU_PROGRAM_MAP(rapidfir_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, XTAL(50'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(rapidfir_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -842,8 +842,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tickee_state::mouseatk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(mouseatk_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mouseatk_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(VIDEO_CLOCK/2) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
@@ -865,7 +865,7 @@ MACHINE_CONFIG_START(tickee_state::mouseatk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM2149, OKI_CLOCK)
+ MCFG_DEVICE_ADD("ym", YM2149, OKI_CLOCK)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp
index 467f41f78c2..7f6176b7970 100644
--- a/src/mame/drivers/tigeroad.cpp
+++ b/src/mame/drivers/tigeroad.cpp
@@ -651,13 +651,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(tigeroad_state::tigeroad)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tigeroad_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tigeroad_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_port_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_port_map)
/* IRQs are triggered by the YM2203 */
@@ -670,7 +670,7 @@ MACHINE_CONFIG_START(tigeroad_state::tigeroad)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(tigeroad_state, screen_update_tigeroad)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tigeroad)
@@ -686,11 +686,11 @@ MACHINE_CONFIG_START(tigeroad_state::tigeroad)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ym2", YM2203, XTAL(3'579'545)) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -698,13 +698,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(f1dream_state::f1dream)
tigeroad(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(f1dream_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(f1dream_map)
- MCFG_CPU_ADD("mcu", I8751, XTAL(10'000'000)) /* ??? */
- MCFG_CPU_IO_MAP(f1dream_mcu_io)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(f1dream_state, out1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(f1dream_state, out3_w))
+ MCFG_DEVICE_ADD("mcu", I8751, XTAL(10'000'000)) /* ??? */
+ MCFG_DEVICE_IO_MAP(f1dream_mcu_io)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, f1dream_state, out1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, f1dream_state, out3_w))
MACHINE_CONFIG_END
/* same as above but with additional Z80 for samples playback */
@@ -713,13 +713,13 @@ MACHINE_CONFIG_START(tigeroad_state::toramich)
/* basic machine hardware */
- MCFG_CPU_ADD("sample", Z80, 3579545) /* ? */
- MCFG_CPU_PROGRAM_MAP(sample_map)
- MCFG_CPU_IO_MAP(sample_port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tigeroad_state, irq0_line_hold, 4000) /* ? */
+ MCFG_DEVICE_ADD("sample", Z80, 3579545) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sample_map)
+ MCFG_DEVICE_IO_MAP(sample_port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tigeroad_state, irq0_line_hold, 4000) /* ? */
/* sound hardware */
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 4KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -728,13 +728,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tigeroad_state::f1dream_comad)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tigeroad_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tigeroad_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(comad_sound_map)
- MCFG_CPU_IO_MAP(comad_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(comad_sound_map)
+ MCFG_DEVICE_IO_MAP(comad_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(3600))
@@ -747,7 +747,7 @@ MACHINE_CONFIG_START(tigeroad_state::f1dream_comad)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(tigeroad_state, screen_update_tigeroad)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
@@ -763,11 +763,11 @@ MACHINE_CONFIG_START(tigeroad_state::f1dream_comad)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ym1", YM2203, 2000000)
+ MCFG_DEVICE_ADD("ym1", YM2203, 2000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, 2000000)
+ MCFG_DEVICE_ADD("ym2", YM2203, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -784,20 +784,20 @@ void pushman_state::machine_start()
MACHINE_CONFIG_START(pushman_state::pushman)
f1dream_comad(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pushman_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pushman_map)
- MCFG_CPU_ADD("mcu", M68705R3, 4000000) /* No idea */
- MCFG_M68705_PORTA_W_CB(WRITE8(pushman_state, mcu_pa_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(pushman_state, mcu_pb_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(pushman_state, mcu_pc_w))
+ MCFG_DEVICE_ADD("mcu", M68705R3, 4000000) /* No idea */
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, pushman_state, mcu_pa_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, pushman_state, mcu_pb_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, pushman_state, mcu_pc_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pushman_state::bballs)
pushman(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bballs_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bballs_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index e56e1935862..8a0ba7a87ac 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -700,9 +700,9 @@ void tiki100_state::machine_reset()
MACHINE_CONFIG_START(tiki100_state::tiki100)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(tiki100_mem)
- MCFG_CPU_IO_MAP(tiki100_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(tiki100_mem)
+ MCFG_DEVICE_IO_MAP(tiki100_io)
MCFG_Z80_DAISY_CHAIN(tiki100_daisy_chain)
/* video hardware */
@@ -714,35 +714,35 @@ MACHINE_CONFIG_START(tiki100_state::tiki100)
MCFG_TIKI100_BUS_ADD()
MCFG_TIKI100_BUS_IRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_TIKI100_BUS_NMI_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_NMI))
- MCFG_TIKI100_BUS_BUSRQ_CALLBACK(WRITELINE(tiki100_state, busrq_w))
- MCFG_TIKI100_BUS_IN_MREQ_CALLBACK(READ8(tiki100_state, mrq_r))
- MCFG_TIKI100_BUS_OUT_MREQ_CALLBACK(WRITE8(tiki100_state, mrq_w))
+ MCFG_TIKI100_BUS_BUSRQ_CALLBACK(WRITELINE(*this, tiki100_state, busrq_w))
+ MCFG_TIKI100_BUS_IN_MREQ_CALLBACK(READ8(*this, tiki100_state, mrq_r))
+ MCFG_TIKI100_BUS_OUT_MREQ_CALLBACK(WRITE8(*this, tiki100_state, mrq_w))
MCFG_TIKI100_BUS_SLOT_ADD("slot1", "8088")
MCFG_TIKI100_BUS_SLOT_ADD("slot2", "hdc")
MCFG_TIKI100_BUS_SLOT_ADD("slot3", nullptr)
/* devices */
MCFG_DEVICE_ADD(Z80DART_TAG, Z80DART, XTAL(8'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(DEVREAD8("cent_data_in", input_buffer_device, read))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_IN_PB_CB(READ8(tiki100_state, pio_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(tiki100_state, pio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8("cent_data_in", input_buffer_device, read))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, tiki100_state, pio_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, tiki100_state, pio_pb_w))
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(tiki100_state, bar0_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(tiki100_state, bar2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, tiki100_state, bar0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80DART_TAG, z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, tiki100_state, bar2_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/4))
@@ -750,17 +750,17 @@ MACHINE_CONFIG_START(tiki100_state::tiki100)
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525qd", tiki100_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525qd", tiki100_state::floppy_formats)
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80DART_TAG, z80dart_device, rxb_w))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(tiki100_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tiki100_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(tiki100_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, tiki100_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tiki100_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, tiki100_state, write_centronics_perror))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
@@ -772,9 +772,9 @@ MACHINE_CONFIG_START(tiki100_state::tiki100)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(AY8912_TAG, AY8912, XTAL(8'000'000)/4)
+ MCFG_DEVICE_ADD(AY8912_TAG, AY8912, XTAL(8'000'000)/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tiki100_state, video_scroll_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tiki100_state, video_scroll_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* internal ram */
diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp
index dc64f1b40ef..75cbd4f6133 100644
--- a/src/mame/drivers/tim011.cpp
+++ b/src/mame/drivers/tim011.cpp
@@ -129,12 +129,12 @@ static const floppy_format_type tim011_floppy_formats[] = {
MACHINE_CONFIG_START(tim011_state::tim011)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z180, XTAL(12'288'000) / 2) // location U17 HD64180
- MCFG_CPU_PROGRAM_MAP(tim011_mem)
- MCFG_CPU_IO_MAP(tim011_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tim011_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu",Z180, XTAL(12'288'000) / 2) // location U17 HD64180
+ MCFG_DEVICE_PROGRAM_MAP(tim011_mem)
+ MCFG_DEVICE_IO_MAP(tim011_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tim011_state, irq0_line_hold)
-// MCFG_CPU_ADD("keyboard",CDP1802, XTAL(1'750'000)) // CDP1802, unknown clock
+// MCFG_DEVICE_ADD("keyboard",CDP1802, XTAL(1'750'000)) // CDP1802, unknown clock
// FDC9266 location U43 XTAL(8'000'000)
MCFG_UPD765A_ADD(FDC9266_TAG, true, true)
diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp
index 5c66d7e6e16..335c9820468 100644
--- a/src/mame/drivers/tim100.cpp
+++ b/src/mame/drivers/tim100.cpp
@@ -161,9 +161,9 @@ WRITE_LINE_MEMBER( tim100_state::irq_w )
MACHINE_CONFIG_START(tim100_state::tim100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(4'915'200)) // divider unknown
- MCFG_CPU_PROGRAM_MAP(tim100_mem)
- MCFG_CPU_IO_MAP(tim100_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(4'915'200)) // divider unknown
+ MCFG_DEVICE_PROGRAM_MAP(tim100_mem)
+ MCFG_DEVICE_IO_MAP(tim100_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -178,39 +178,39 @@ MACHINE_CONFIG_START(tim100_state::tim100)
MCFG_DEVICE_ADD("crtc", I8275, XTAL(4'915'200))
MCFG_I8275_CHARACTER_WIDTH(12)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(tim100_state, crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(WRITELINE(tim100_state, drq_w))
- MCFG_I8275_IRQ_CALLBACK(WRITELINE(tim100_state, irq_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(*this, tim100_state, drq_w))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE(*this, tim100_state, irq_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_PALETTE_ADD("palette", 3)
MCFG_DEVICE_ADD("uart_u17", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_u17", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_u17", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_u17", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_u17", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_u17", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_u17", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("keyboard", tim100)
MCFG_DEVICE_ADD("uart_u18", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal") //"keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart_u18", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart_u18", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart_u18", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal") //"keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart_u18", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart_u18", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart_u18", i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", tim100)
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart_u17", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart_u17", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart_u18", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart_u18", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart_u17", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart_u17", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart_u18", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart_u18", i8251_device, write_rxc))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp
index 8ae5f0aafe7..d33e3a3d92f 100644
--- a/src/mame/drivers/timelimt.cpp
+++ b/src/mame/drivers/timelimt.cpp
@@ -225,21 +225,21 @@ INTERRUPT_GEN_MEMBER(timelimt_state::irq)
MACHINE_CONFIG_START(timelimt_state::timelimt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", timelimt_state, irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", timelimt_state, irq)
- MCFG_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", timelimt_state, irq0_line_hold) /* ? */
+ MCFG_DEVICE_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", timelimt_state, irq0_line_hold) /* ? */
MCFG_QUANTUM_TIME(attotime::from_hz(3000))
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // IC15
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(timelimt_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(timelimt_state, coin_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, timelimt_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, timelimt_state, coin_lockout_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // probably flip screen
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // probably flip screen
@@ -264,11 +264,11 @@ MACHINE_CONFIG_START(timelimt_state::timelimt)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, 18432000/12)
+ MCFG_DEVICE_ADD("ay1", AY8910, 18432000/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, 18432000/12)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
+ MCFG_DEVICE_ADD("ay2", AY8910, 18432000/12)
+ MCFG_AY8910_PORT_A_READ_CB(READ8("soundlatch", generic_latch_8_device, read))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp
index 44da15cf628..d4ed2ca7c80 100644
--- a/src/mame/drivers/timeplt.cpp
+++ b/src/mame/drivers/timeplt.cpp
@@ -428,17 +428,17 @@ void timeplt_state::machine_reset()
MACHINE_CONFIG_START(timeplt_state::timeplt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */
- MCFG_CPU_PROGRAM_MAP(timeplt_main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */
+ MCFG_DEVICE_PROGRAM_MAP(timeplt_main_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // B3
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(timeplt_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(timeplt_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(timeplt_state, video_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(timeplt_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(timeplt_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, timeplt_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, timeplt_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, sh_irqtrigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, timeplt_state, video_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, timeplt_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, timeplt_state, coin_counter_2_w))
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) // PAY OUT - not used
MCFG_WATCHDOG_ADD("watchdog")
@@ -451,7 +451,7 @@ MACHINE_CONFIG_START(timeplt_state::timeplt)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(timeplt_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(timeplt_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, timeplt_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", timeplt)
MCFG_PALETTE_ADD("palette", 32*4+64*4)
@@ -459,7 +459,7 @@ MACHINE_CONFIG_START(timeplt_state::timeplt)
/* sound hardware */
- MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
+ MCFG_DEVICE_ADD("timeplt_audio", TIMEPLT_AUDIO)
MACHINE_CONFIG_END
@@ -467,8 +467,8 @@ MACHINE_CONFIG_START(timeplt_state::psurge)
timeplt(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(psurge_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(psurge_main_map)
MCFG_DEVICE_MODIFY("screen")
MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
@@ -488,8 +488,8 @@ MACHINE_CONFIG_START(timeplt_state::bikkuric)
MCFG_GFXDECODE_MODIFY("gfxdecode", chkun)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(chkun_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(chkun_main_map)
MCFG_VIDEO_START_OVERRIDE(timeplt_state,chkun)
MACHINE_CONFIG_END
@@ -500,8 +500,8 @@ MACHINE_CONFIG_START(timeplt_state::chkun)
MCFG_GFXDECODE_MODIFY("gfxdecode", chkun)
/* sound hardware */
- MCFG_SOUND_MODIFY("timeplt_audio:ay2")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(timeplt_state, chkun_sound_w))
+ MCFG_DEVICE_MODIFY("timeplt_audio:ay2")
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, timeplt_state, chkun_sound_w))
MCFG_TC8830F_ADD("tc8830f", XTAL(512'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "timeplt_audio:mono", 0.10)
diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp
index c11303a5bf4..d193d120968 100644
--- a/src/mame/drivers/timetrv.cpp
+++ b/src/mame/drivers/timetrv.cpp
@@ -141,21 +141,21 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(timetrv_state::timetrv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I80188,20000000) //???
- MCFG_CPU_PROGRAM_MAP(timetrv_map)
- MCFG_CPU_IO_MAP(timetrv_io)
+ MCFG_DEVICE_ADD("maincpu",I80188,20000000) //???
+ MCFG_DEVICE_PROGRAM_MAP(timetrv_map)
+ MCFG_DEVICE_IO_MAP(timetrv_io)
// interrupts are generated by internally-driven timers
MCFG_EEPROM_2816_ADD("eeprom")
MCFG_DEVICE_ADD("ppi1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(timetrv_state, test1_r)) //inputs
- MCFG_I8255_IN_PORTB_CB(READ8(timetrv_state, test2_r)) //eeprom read bit + inputs
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, timetrv_state, test1_r)) //inputs
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, timetrv_state, test2_r)) //eeprom read bit + inputs
MCFG_DEVICE_ADD("ppi2", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(timetrv_state, in_r)) //dsw
- MCFG_I8255_IN_PORTB_CB(READ8(timetrv_state, in_r)) //dsw
- MCFG_I8255_IN_PORTC_CB(READ8(timetrv_state, in_r)) //dsw
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, timetrv_state, in_r)) //dsw
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, timetrv_state, in_r)) //dsw
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, timetrv_state, in_r)) //dsw
MCFG_DEVICE_ADD("uart", NS16450, 1843200) // P82050 (serial interface for laserdisc)
diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp
index 8f1416178b2..82491a8a790 100644
--- a/src/mame/drivers/timex.cpp
+++ b/src/mame/drivers/timex.cpp
@@ -688,10 +688,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(spectrum_state::ts2068)
spectrum_128(config);
- MCFG_CPU_REPLACE("maincpu", Z80, XTAL(14'112'000)/4) /* From Schematic; 3.528 MHz */
- MCFG_CPU_PROGRAM_MAP(ts2068_mem)
- MCFG_CPU_IO_MAP(ts2068_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, XTAL(14'112'000)/4) /* From Schematic; 3.528 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(ts2068_mem)
+ MCFG_DEVICE_IO_MAP(ts2068_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spectrum_state, spec_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, ts2068 )
@@ -702,14 +702,14 @@ MACHINE_CONFIG_START(spectrum_state::ts2068)
MCFG_SCREEN_SIZE(TS2068_SCREEN_WIDTH, TS2068_SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, TS2068_SCREEN_WIDTH-1, 0, TS2068_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(spectrum_state, screen_update_ts2068)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(spectrum_state, screen_vblank_timex))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, spectrum_state, screen_vblank_timex))
MCFG_GFXDECODE_MODIFY("gfxdecode", ts2068)
MCFG_VIDEO_START_OVERRIDE(spectrum_state, ts2068 )
/* sound */
- MCFG_SOUND_REPLACE("ay8912", AY8912, XTAL(14'112'000)/8) /* From Schematic; 1.764 MHz */
+ MCFG_DEVICE_REPLACE("ay8912", AY8912, XTAL(14'112'000)/8) /* From Schematic; 1.764 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* cartridge */
@@ -735,9 +735,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(spectrum_state::tc2048)
spectrum(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tc2048_mem)
- MCFG_CPU_IO_MAP(tc2048_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tc2048_mem)
+ MCFG_DEVICE_IO_MAP(tc2048_io)
MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, tc2048 )
@@ -747,7 +747,7 @@ MACHINE_CONFIG_START(spectrum_state::tc2048)
MCFG_SCREEN_SIZE(TS2068_SCREEN_WIDTH, SPEC_SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, TS2068_SCREEN_WIDTH-1, 0, SPEC_SCREEN_HEIGHT-1)
MCFG_SCREEN_UPDATE_DRIVER(spectrum_state, screen_update_tc2048)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(spectrum_state, screen_vblank_timex))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, spectrum_state, screen_vblank_timex))
MCFG_VIDEO_START_OVERRIDE(spectrum_state, spectrum_128 )
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index e24a048bb02..433572affc9 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -1273,25 +1273,25 @@ MACHINE_CONFIG_START(tispeak_state::tms5110_route)
/* sound hardware */
MCFG_DEVICE_MODIFY("tms5100")
- MCFG_TMS5110_M0_CB(DEVWRITELINE("tms6100", tms6100_device, m0_w))
- MCFG_TMS5110_M1_CB(DEVWRITELINE("tms6100", tms6100_device, m1_w))
- MCFG_TMS5110_ADDR_CB(DEVWRITE8("tms6100", tms6100_device, add_w))
- MCFG_TMS5110_DATA_CB(DEVREADLINE("tms6100", tms6100_device, data_line_r))
- MCFG_TMS5110_ROMCLK_CB(DEVWRITELINE("tms6100", tms6100_device, clk_w))
+ MCFG_TMS5110_M0_CB(WRITELINE("tms6100", tms6100_device, m0_w))
+ MCFG_TMS5110_M1_CB(WRITELINE("tms6100", tms6100_device, m1_w))
+ MCFG_TMS5110_ADDR_CB(WRITE8("tms6100", tms6100_device, add_w))
+ MCFG_TMS5110_DATA_CB(READLINE("tms6100", tms6100_device, data_line_r))
+ MCFG_TMS5110_ROMCLK_CB(WRITELINE("tms6100", tms6100_device, clk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tispeak_state::snmath)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0270, MASTER_CLOCK/2)
- MCFG_TMS1XXX_READ_K_CB(READ8(tispeak_state, snspell_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, snmath_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispeak_state, snspell_write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS0270, MASTER_CLOCK/2)
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispeak_state, snspell_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snmath_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, snspell_write_r))
- MCFG_TMS0270_READ_CTL_CB(DEVREAD8("tms5100", tms5110_device, ctl_r))
- MCFG_TMS0270_WRITE_CTL_CB(DEVWRITE8("tms5100", tms5110_device, ctl_w))
- MCFG_TMS0270_WRITE_PDC_CB(DEVWRITELINE("tms5100", tms5110_device, pdc_w))
+ MCFG_TMS0270_READ_CTL_CB(READ8("tms5100", tms5110_device, ctl_r))
+ MCFG_TMS0270_WRITE_CTL_CB(WRITE8("tms5100", tms5110_device, ctl_w))
+ MCFG_TMS0270_WRITE_PDC_CB(WRITELINE("tms5100", tms5110_device, pdc_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_snmath)
@@ -1300,7 +1300,7 @@ MACHINE_CONFIG_START(tispeak_state::snmath)
MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", CD2801, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("tms5100", CD2801, MASTER_CLOCK)
tms5110_route(config);
MACHINE_CONFIG_END
@@ -1309,8 +1309,8 @@ MACHINE_CONFIG_START(tispeak_state::sns_cd2801)
snmath(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, snspell_write_o))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspell_write_o))
MCFG_DEFAULT_LAYOUT(layout_snspell)
@@ -1333,7 +1333,7 @@ MACHINE_CONFIG_START(tispeak_state::sns_tmc0281)
sns_cd2801(config);
/* sound hardware */
- MCFG_SOUND_REPLACE("tms5100", TMC0281, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("tms5100", TMC0281, MASTER_CLOCK)
tms5110_route(config);
MACHINE_CONFIG_END
@@ -1348,7 +1348,7 @@ MACHINE_CONFIG_START(tispeak_state::sns_tmc0281d)
sns_cd2801(config);
/* sound hardware */
- MCFG_SOUND_REPLACE("tms5100", TMC0281D, MASTER_CLOCK)
+ MCFG_DEVICE_REPLACE("tms5100", TMC0281D, MASTER_CLOCK)
tms5110_route(config);
MACHINE_CONFIG_END
@@ -1357,8 +1357,8 @@ MACHINE_CONFIG_START(tispeak_state::snread)
snmath(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, snspell_write_o))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspell_write_o))
MCFG_DEFAULT_LAYOUT(layout_snread)
@@ -1375,9 +1375,9 @@ MACHINE_CONFIG_START(tispeak_state::lantutor)
snmath(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, snspell_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispeak_state, lantutor_write_r))
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspell_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, lantutor_write_r))
MCFG_DEFAULT_LAYOUT(layout_snread)
@@ -1394,10 +1394,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tispeak_state::snspellc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, MASTER_CLOCK/2)
- MCFG_TMS1XXX_READ_K_CB(READ8(tispeak_state, snspellc_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, snspellc_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispeak_state, snspellc_write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, MASTER_CLOCK/2)
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispeak_state, snspellc_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspellc_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, snspellc_write_r))
/* no visual feedback! */
@@ -1405,7 +1405,7 @@ MACHINE_CONFIG_START(tispeak_state::snspellc)
MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", TMC0281D, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("tms5100", TMC0281D, MASTER_CLOCK)
tms5110_route(config);
/* cartridge */
@@ -1420,7 +1420,7 @@ MACHINE_CONFIG_START(tispeak_state::snspellcuk)
snspellc(config);
/* sound hardware */
- MCFG_SOUND_REPLACE("tms5100", CD2801, MASTER_CLOCK) // CD2801A!
+ MCFG_DEVICE_REPLACE("tms5100", CD2801, MASTER_CLOCK) // CD2801A!
tms5110_route(config);
MACHINE_CONFIG_END
@@ -1428,10 +1428,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tispeak_state::vocaid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1100, MASTER_CLOCK/2)
- MCFG_TMS1XXX_READ_K_CB(READ8(tispeak_state, tntell_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, snspellc_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispeak_state, snspellc_write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1100, MASTER_CLOCK/2)
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispeak_state, tntell_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspellc_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, snspellc_write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ol_timer", tispeak_state, tntell_get_overlay, attotime::from_msec(50))
@@ -1441,7 +1441,7 @@ MACHINE_CONFIG_START(tispeak_state::vocaid)
MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", CD2802, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("tms5100", CD2802, MASTER_CLOCK)
tms5110_route(config);
MACHINE_CONFIG_END
@@ -1460,10 +1460,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tispeak_state::k28m2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS1400, MASTER_CLOCK/2)
- MCFG_TMS1XXX_READ_K_CB(READ8(tispeak_state, k28_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispeak_state, k28_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispeak_state, k28_write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS1400, MASTER_CLOCK/2)
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispeak_state, k28_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, k28_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, k28_write_r))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_k28m2)
@@ -1472,7 +1472,7 @@ MACHINE_CONFIG_START(tispeak_state::k28m2)
MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("tms5100", TMS5110A, MASTER_CLOCK)
+ MCFG_DEVICE_ADD("tms5100", TMS5110A, MASTER_CLOCK)
tms5110_route(config);
/* cartridge */
diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp
index 846b57059e9..35de2223520 100644
--- a/src/mame/drivers/tispellb.cpp
+++ b/src/mame/drivers/tispellb.cpp
@@ -347,17 +347,17 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tispellb_state::rev1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0270, 350000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(tispellb_state, main_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispellb_state, main_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispellb_state, main_write_r))
- MCFG_TMS0270_READ_CTL_CB(READ8(tispellb_state, rev1_ctl_r))
- MCFG_TMS0270_WRITE_CTL_CB(WRITE8(tispellb_state, rev1_ctl_w))
-
- MCFG_CPU_ADD("subcpu", TMS1980, 350000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(tispellb_state, sub_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispellb_state, sub_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispellb_state, sub_write_r))
+ MCFG_DEVICE_ADD("maincpu", TMS0270, 350000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispellb_state, main_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispellb_state, main_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispellb_state, main_write_r))
+ MCFG_TMS0270_READ_CTL_CB(READ8(*this, tispellb_state, rev1_ctl_r))
+ MCFG_TMS0270_WRITE_CTL_CB(WRITE8(*this, tispellb_state, rev1_ctl_w))
+
+ MCFG_DEVICE_ADD("subcpu", TMS1980, 350000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispellb_state, sub_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispellb_state, sub_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispellb_state, sub_write_r))
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -371,12 +371,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tispellb_state::rev2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", TMS0270, 350000) // approximation
- MCFG_TMS1XXX_READ_K_CB(READ8(tispellb_state, main_read_k))
- MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tispellb_state, rev2_write_o))
- MCFG_TMS1XXX_WRITE_R_CB(WRITE16(tispellb_state, rev2_write_r))
- MCFG_TMS0270_READ_CTL_CB(DEVREAD8("tms6100", tms6100_device, data_r))
- MCFG_TMS0270_WRITE_CTL_CB(DEVWRITE8("tms6100", tms6100_device, add_w))
+ MCFG_DEVICE_ADD("maincpu", TMS0270, 350000) // approximation
+ MCFG_TMS1XXX_READ_K_CB(READ8(*this, tispellb_state, main_read_k))
+ MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispellb_state, rev2_write_o))
+ MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispellb_state, rev2_write_r))
+ MCFG_TMS0270_READ_CTL_CB(READ8("tms6100", tms6100_device, data_r))
+ MCFG_TMS0270_WRITE_CTL_CB(WRITE8("tms6100", tms6100_device, add_w))
MCFG_DEVICE_ADD("tms6100", TMS6100, 350000)
MCFG_TMS6100_4BIT_MODE()
@@ -386,7 +386,7 @@ MACHINE_CONFIG_START(tispellb_state::rev2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index e6a75db7ce0..c0bcd428d6e 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -574,8 +574,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tk2000_state::tk2000)
/* basic machine hardware */
- MCFG_CPU_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_CPU_PROGRAM_MAP(apple2_map)
+ MCFG_DEVICE_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(apple2_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tk2000_state, apple2_interrupt, "screen", 0, 1)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -594,7 +594,7 @@ MACHINE_CONFIG_START(tk2000_state::tk2000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(A2_SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(A2_SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* /INH banking */
diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp
index 1ed95effc2e..8ce344e5d02 100644
--- a/src/mame/drivers/tk80.cpp
+++ b/src/mame/drivers/tk80.cpp
@@ -286,60 +286,60 @@ WRITE8_MEMBER( tk80_state::mikrolab_serial_w )
MACHINE_CONFIG_START(tk80_state::tk80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080A, XTAL(18'432'000) / 9)
- MCFG_CPU_PROGRAM_MAP(tk80_mem)
- MCFG_CPU_IO_MAP(tk80_io)
+ MCFG_DEVICE_ADD("maincpu", I8080A, XTAL(18'432'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(tk80_mem)
+ MCFG_DEVICE_IO_MAP(tk80_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_tk80)
/* Devices */
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(tk80_state, key_matrix_r))
- MCFG_I8255_IN_PORTB_CB(READ8(tk80_state, serial_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, serial_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, tk80_state, key_matrix_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, tk80_state, serial_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tk80_state, serial_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tk80_state::mikrolab)
tk80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tk85_mem)
- MCFG_CPU_IO_MAP(mikrolab_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tk85_mem)
+ MCFG_DEVICE_IO_MAP(mikrolab_io)
/* Devices */
MCFG_DEVICE_REMOVE("ppi8255")
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(tk80_state, key_matrix_r))
- MCFG_I8255_IN_PORTB_CB(READ8(tk80_state, serial_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, mikrolab_serial_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, tk80_state, key_matrix_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, tk80_state, serial_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tk80_state, mikrolab_serial_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tk80_state::nd80z)
- MCFG_CPU_ADD("maincpu", Z80, 1e6 ) // Sharp LH0080A, can't see writing on xtal
- MCFG_CPU_PROGRAM_MAP(tk85_mem)
- MCFG_CPU_IO_MAP(nd80z_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 1e6 ) // Sharp LH0080A, can't see writing on xtal
+ MCFG_DEVICE_PROGRAM_MAP(tk85_mem)
+ MCFG_DEVICE_IO_MAP(nd80z_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_tk80)
/* Devices */
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(tk80_state, nd80z_key_r))
- MCFG_I8255_IN_PORTB_CB(READ8(tk80_state, serial_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, mikrolab_serial_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, tk80_state, nd80z_key_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, tk80_state, serial_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tk80_state, mikrolab_serial_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tk80_state::tk85)
tk80(config);
- MCFG_CPU_REPLACE("maincpu", I8085A, XTAL(4'915'200))
- MCFG_CPU_PROGRAM_MAP(tk85_mem)
- MCFG_CPU_IO_MAP(tk80_io)
+ MCFG_DEVICE_REPLACE("maincpu", I8085A, XTAL(4'915'200))
+ MCFG_DEVICE_PROGRAM_MAP(tk85_mem)
+ MCFG_DEVICE_IO_MAP(tk80_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tk80_state::ics8080)
tk80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(ics8080_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(ics8080_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp
index 1bb5c5c3f8e..83f50c9668a 100644
--- a/src/mame/drivers/tk80bs.cpp
+++ b/src/mame/drivers/tk80bs.cpp
@@ -171,8 +171,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(tk80bs_state::tk80bs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(1'000'000)) //unknown clock
- MCFG_CPU_PROGRAM_MAP(tk80bs_mem)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(1'000'000)) //unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(tk80bs_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -188,8 +188,8 @@ MACHINE_CONFIG_START(tk80bs_state::tk80bs)
/* Devices */
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(tk80bs_state, port_a_r))
- MCFG_I8255_IN_PORTB_CB(READ8(tk80bs_state, port_b_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, tk80bs_state, port_a_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, tk80bs_state, port_b_r))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(tk80bs_state, kbd_put))
diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp
index 56362ca0b77..90a98eb1f4e 100644
--- a/src/mame/drivers/tm990189.cpp
+++ b/src/mame/drivers/tm990189.cpp
@@ -814,7 +814,7 @@ void tm990189_state::tm990_189_cru_map(address_map &map)
MACHINE_CONFIG_START(tm990189_state::tm990_189)
/* basic machine hardware */
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_memmap, tm990_189_cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(tm990189_state, external_operation) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, tm990189_state, external_operation) )
MCFG_MACHINE_START_OVERRIDE(tm990189_state, tm990_189 )
MCFG_MACHINE_RESET_OVERRIDE(tm990189_state, tm990_189 )
@@ -826,41 +826,41 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_CASSETTE_ADD( "cassette" )
MCFG_DEVICE_ADD(TMS9901_0_TAG, TMS9901, 2000000)
- MCFG_TMS9901_P0_HANDLER( WRITELINE( tm990189_state, usr9901_led0_w) )
- MCFG_TMS9901_P1_HANDLER( WRITELINE( tm990189_state, usr9901_led1_w) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( tm990189_state, usr9901_led2_w) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( tm990189_state, usr9901_led3_w) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( tm990189_state, usr9901_interrupt_callback) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led0_w) )
+ MCFG_TMS9901_P1_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led1_w) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led2_w) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led3_w) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, tm990189_state, usr9901_interrupt_callback) )
MCFG_DEVICE_ADD(TMS9901_1_TAG, TMS9901, 2000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(tm990189_state, sys9901_r) )
- MCFG_TMS9901_P0_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel0_w) )
- MCFG_TMS9901_P1_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel1_w) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel2_w) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel3_w) )
- MCFG_TMS9901_P4_HANDLER( WRITELINE( tm990189_state, sys9901_segment0_w) )
- MCFG_TMS9901_P5_HANDLER( WRITELINE( tm990189_state, sys9901_segment1_w) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( tm990189_state, sys9901_segment2_w) )
- MCFG_TMS9901_P7_HANDLER( WRITELINE( tm990189_state, sys9901_segment3_w) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( tm990189_state, sys9901_segment4_w) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( tm990189_state, sys9901_segment5_w) )
- MCFG_TMS9901_P10_HANDLER( WRITELINE( tm990189_state, sys9901_segment6_w) )
- MCFG_TMS9901_P11_HANDLER( WRITELINE( tm990189_state, sys9901_segment7_w) )
- MCFG_TMS9901_P12_HANDLER( WRITELINE( tm990189_state, sys9901_dsplytrgr_w) )
- MCFG_TMS9901_P13_HANDLER( WRITELINE( tm990189_state, sys9901_shiftlight_w) )
- MCFG_TMS9901_P14_HANDLER( WRITELINE( tm990189_state, sys9901_spkrdrive_w) )
- MCFG_TMS9901_P15_HANDLER( WRITELINE( tm990189_state, sys9901_tapewdata_w) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( tm990189_state, sys9901_interrupt_callback) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, tm990189_state, sys9901_r) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel0_w) )
+ MCFG_TMS9901_P1_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel1_w) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel2_w) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel3_w) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment0_w) )
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment1_w) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment2_w) )
+ MCFG_TMS9901_P7_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment3_w) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment4_w) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment5_w) )
+ MCFG_TMS9901_P10_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment6_w) )
+ MCFG_TMS9901_P11_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment7_w) )
+ MCFG_TMS9901_P12_HANDLER( WRITELINE( *this, tm990189_state, sys9901_dsplytrgr_w) )
+ MCFG_TMS9901_P13_HANDLER( WRITELINE( *this, tm990189_state, sys9901_shiftlight_w) )
+ MCFG_TMS9901_P14_HANDLER( WRITELINE( *this, tm990189_state, sys9901_spkrdrive_w) )
+ MCFG_TMS9901_P15_HANDLER( WRITELINE( *this, tm990189_state, sys9901_tapewdata_w) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, tm990189_state, sys9901_interrupt_callback) )
MCFG_DEVICE_ADD("tms9902", TMS9902, 2000000) // MZ: needs to be fixed once the RS232 support is complete
- MCFG_TMS9902_XMIT_CB(WRITE8(tm990189_state, xmit_callback)) /* called when a character is transmitted */
+ MCFG_TMS9902_XMIT_CB(WRITE8(*this, tm990189_state, xmit_callback)) /* called when a character is transmitted */
MCFG_TM990_189_RS232_ADD("rs232")
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_timer", tm990189_state, display_callback, attotime::from_hz(30))
// Need to delay the timer, or it will spoil the initial LOAD
@@ -871,7 +871,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tm990189_state::tm990_189_v)
/* basic machine hardware */
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_v_memmap, tm990_189_cru_map)
- MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(tm990189_state, external_operation) )
+ MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(*this, tm990189_state, external_operation) )
MCFG_MACHINE_START_OVERRIDE(tm990189_state, tm990_189_v )
MCFG_MACHINE_RESET_OVERRIDE(tm990189_state, tm990_189_v )
@@ -887,40 +887,40 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189_v)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0) /* one two-level buzzer */
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) /* one two-level buzzer */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
MCFG_CASSETTE_ADD( "cassette" )
MCFG_DEVICE_ADD(TMS9901_0_TAG, TMS9901, 2000000)
- MCFG_TMS9901_P0_HANDLER( WRITELINE( tm990189_state, usr9901_led0_w) )
- MCFG_TMS9901_P1_HANDLER( WRITELINE( tm990189_state, usr9901_led1_w) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( tm990189_state, usr9901_led2_w) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( tm990189_state, usr9901_led3_w) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( tm990189_state, usr9901_interrupt_callback) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led0_w) )
+ MCFG_TMS9901_P1_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led1_w) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led2_w) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, tm990189_state, usr9901_led3_w) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, tm990189_state, usr9901_interrupt_callback) )
MCFG_DEVICE_ADD(TMS9901_1_TAG, TMS9901, 2000000)
- MCFG_TMS9901_READBLOCK_HANDLER( READ8(tm990189_state, sys9901_r) )
- MCFG_TMS9901_P0_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel0_w) )
- MCFG_TMS9901_P1_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel1_w) )
- MCFG_TMS9901_P2_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel2_w) )
- MCFG_TMS9901_P3_HANDLER( WRITELINE( tm990189_state, sys9901_digitsel3_w) )
- MCFG_TMS9901_P4_HANDLER( WRITELINE( tm990189_state, sys9901_segment0_w) )
- MCFG_TMS9901_P5_HANDLER( WRITELINE( tm990189_state, sys9901_segment1_w) )
- MCFG_TMS9901_P6_HANDLER( WRITELINE( tm990189_state, sys9901_segment2_w) )
- MCFG_TMS9901_P7_HANDLER( WRITELINE( tm990189_state, sys9901_segment3_w) )
- MCFG_TMS9901_P8_HANDLER( WRITELINE( tm990189_state, sys9901_segment4_w) )
- MCFG_TMS9901_P9_HANDLER( WRITELINE( tm990189_state, sys9901_segment5_w) )
- MCFG_TMS9901_P10_HANDLER( WRITELINE( tm990189_state, sys9901_segment6_w) )
- MCFG_TMS9901_P11_HANDLER( WRITELINE( tm990189_state, sys9901_segment7_w) )
- MCFG_TMS9901_P12_HANDLER( WRITELINE( tm990189_state, sys9901_dsplytrgr_w) )
- MCFG_TMS9901_P13_HANDLER( WRITELINE( tm990189_state, sys9901_shiftlight_w) )
- MCFG_TMS9901_P14_HANDLER( WRITELINE( tm990189_state, sys9901_spkrdrive_w) )
- MCFG_TMS9901_P15_HANDLER( WRITELINE( tm990189_state, sys9901_tapewdata_w) )
- MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( tm990189_state, sys9901_interrupt_callback) )
+ MCFG_TMS9901_READBLOCK_HANDLER( READ8(*this, tm990189_state, sys9901_r) )
+ MCFG_TMS9901_P0_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel0_w) )
+ MCFG_TMS9901_P1_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel1_w) )
+ MCFG_TMS9901_P2_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel2_w) )
+ MCFG_TMS9901_P3_HANDLER( WRITELINE( *this, tm990189_state, sys9901_digitsel3_w) )
+ MCFG_TMS9901_P4_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment0_w) )
+ MCFG_TMS9901_P5_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment1_w) )
+ MCFG_TMS9901_P6_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment2_w) )
+ MCFG_TMS9901_P7_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment3_w) )
+ MCFG_TMS9901_P8_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment4_w) )
+ MCFG_TMS9901_P9_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment5_w) )
+ MCFG_TMS9901_P10_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment6_w) )
+ MCFG_TMS9901_P11_HANDLER( WRITELINE( *this, tm990189_state, sys9901_segment7_w) )
+ MCFG_TMS9901_P12_HANDLER( WRITELINE( *this, tm990189_state, sys9901_dsplytrgr_w) )
+ MCFG_TMS9901_P13_HANDLER( WRITELINE( *this, tm990189_state, sys9901_shiftlight_w) )
+ MCFG_TMS9901_P14_HANDLER( WRITELINE( *this, tm990189_state, sys9901_spkrdrive_w) )
+ MCFG_TMS9901_P15_HANDLER( WRITELINE( *this, tm990189_state, sys9901_tapewdata_w) )
+ MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( *this, tm990189_state, sys9901_interrupt_callback) )
MCFG_DEVICE_ADD("tms9902", TMS9902, 2000000) // MZ: needs to be fixed once the RS232 support is complete
- MCFG_TMS9902_XMIT_CB(WRITE8(tm990189_state, xmit_callback)) /* called when a character is transmitted */
+ MCFG_TMS9902_XMIT_CB(WRITE8(*this, tm990189_state, xmit_callback)) /* called when a character is transmitted */
MCFG_TM990_189_RS232_ADD("rs232")
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_timer", tm990189_state, display_callback, attotime::from_hz(30))
MCFG_TIMER_START_DELAY(attotime::from_msec(150))
diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp
index 45e2978afdd..cf1d5e74f3e 100644
--- a/src/mame/drivers/tmaster.cpp
+++ b/src/mame/drivers/tmaster.cpp
@@ -364,15 +364,15 @@ int tmaster_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high)
}
MACHINE_CONFIG_START(tmaster_state::tm)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12MHz */
- MCFG_CPU_PROGRAM_MAP(tmaster_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 12MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tmaster_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmaster_state, scanline_interrupt, "screen", 0, 1)
MCFG_DEVICE_ADD( "duart68681", MC68681, XTAL(8'664'000) / 2 /*??*/)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(tmaster_state, duart_irq_handler))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, tmaster_state, duart_irq_handler))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("microtouch", microtouch_device, rx))
- MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("duart68681", mc68681_device, rx_a_w) )
+ MCFG_MICROTOUCH_ADD( "microtouch", 9600, WRITELINE("duart68681", mc68681_device, rx_a_w) )
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(tmaster_state::tm)
MCFG_CESBLIT_ADD("blitter", "screen", XTAL(32'000'000))
MCFG_CESBLIT_COMPUTE_ADDR(tmaster_compute_addr)
- MCFG_CESBLIT_IRQ_CB(WRITELINE(tmaster_state, blitter_irq_callback))
+ MCFG_CESBLIT_IRQ_CB(WRITELINE(*this, tmaster_state, blitter_irq_callback))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp
index 22c218d0645..175effaa81e 100644
--- a/src/mame/drivers/tmc1800.cpp
+++ b/src/mame/drivers/tmc1800.cpp
@@ -714,15 +714,15 @@ QUICKLOAD_LOAD_MEMBER( tmc1800_base_state, tmc1800 )
MACHINE_CONFIG_START(tmc1800_state::tmc1800)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(tmc1800_map)
- MCFG_CPU_IO_MAP(tmc1800_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(tmc1800_map)
+ MCFG_DEVICE_IO_MAP(tmc1800_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(tmc1800_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(tmc1800_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(tmc1800_state, ef3_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(tmc1800_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(DEVWRITE8(CDP1861_TAG, cdp1861_device, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, tmc1800_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, tmc1800_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, tmc1800_state, ef3_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, tmc1800_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(CDP1861_TAG, cdp1861_device, dma_w))
// video hardware
tmc1800_video(config);
@@ -730,7 +730,7 @@ MACHINE_CONFIG_START(tmc1800_state::tmc1800)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 0)
+ MCFG_DEVICE_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
@@ -746,14 +746,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(osc1000b_state::osc1000b)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(osc1000b_map)
- MCFG_CPU_IO_MAP(osc1000b_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(osc1000b_map)
+ MCFG_DEVICE_IO_MAP(osc1000b_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(osc1000b_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(osc1000b_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(osc1000b_state, ef3_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(osc1000b_state, q_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, osc1000b_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, osc1000b_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, osc1000b_state, ef3_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, osc1000b_state, q_w))
// video hardware
osc1000b_video(config);
@@ -761,7 +761,7 @@ MACHINE_CONFIG_START(osc1000b_state::osc1000b)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 0)
+ MCFG_DEVICE_ADD("beeper", BEEP, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
@@ -777,15 +777,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmc2000_state::tmc2000)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(tmc2000_map)
- MCFG_CPU_IO_MAP(tmc2000_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(tmc2000_map)
+ MCFG_DEVICE_IO_MAP(tmc2000_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(tmc2000_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(tmc2000_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(tmc2000_state, ef3_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(tmc2000_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(WRITE8(tmc2000_state, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, tmc2000_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, tmc2000_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, tmc2000_state, ef3_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, tmc2000_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, tmc2000_state, dma_w))
// video hardware
tmc2000_video(config);
@@ -803,15 +803,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(nano_state::nano)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(nano_map)
- MCFG_CPU_IO_MAP(nano_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(nano_map)
+ MCFG_DEVICE_IO_MAP(nano_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(nano_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(nano_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(nano_state, ef3_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(nano_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(DEVWRITE8(CDP1864_TAG, cdp1864_device, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, nano_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, nano_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, nano_state, ef3_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, nano_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(CDP1864_TAG, cdp1864_device, dma_w))
// video hardware
nano_video(config);
diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp
index 95916d9070c..6a7bece2f4b 100644
--- a/src/mame/drivers/tmc2000e.cpp
+++ b/src/mame/drivers/tmc2000e.cpp
@@ -280,15 +280,15 @@ void tmc2000e_state::machine_reset()
MACHINE_CONFIG_START(tmc2000e_state::tmc2000e)
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
- MCFG_CPU_PROGRAM_MAP(tmc2000e_map)
- MCFG_CPU_IO_MAP(tmc2000e_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(1'750'000))
+ MCFG_DEVICE_PROGRAM_MAP(tmc2000e_map)
+ MCFG_DEVICE_IO_MAP(tmc2000e_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(tmc2000e_state, clear_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(tmc2000e_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(tmc2000e_state, ef3_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(tmc2000e_state, q_w))
- MCFG_COSMAC_DMAW_CALLBACK(WRITE8(tmc2000e_state, dma_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, tmc2000e_state, clear_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, tmc2000e_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, tmc2000e_state, ef3_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, tmc2000e_state, q_w))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, tmc2000e_state, dma_w))
// video hardware
MCFG_CDP1864_SCREEN_ADD(SCREEN_TAG, XTAL(1'750'000))
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(tmc2000e_state::tmc2000e)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(tmc2000e_state, rdata_r), READLINE(tmc2000e_state, bdata_r), READLINE(tmc2000e_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(*this, tmc2000e_state, rdata_r), READLINE(*this, tmc2000e_state, bdata_r), READLINE(*this, tmc2000e_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(2.2), RES_K(1), RES_K(5.1), RES_K(4.7)) // unverified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp
index 26cbf690de0..0eb0533d38b 100644
--- a/src/mame/drivers/tmc600.cpp
+++ b/src/mame/drivers/tmc600.cpp
@@ -255,14 +255,14 @@ WRITE8_MEMBER( tmc600_state::sc_w )
MACHINE_CONFIG_START(tmc600_state::tmc600)
// CPU
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'570'000))
- MCFG_CPU_PROGRAM_MAP(tmc600_map)
- MCFG_CPU_IO_MAP(tmc600_io_map)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(3'570'000))
+ MCFG_DEVICE_PROGRAM_MAP(tmc600_map)
+ MCFG_DEVICE_IO_MAP(tmc600_io_map)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_EF2_CALLBACK(READLINE(tmc600_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(tmc600_state, ef3_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(tmc600_state, q_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(tmc600_state, sc_w))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, tmc600_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, tmc600_state, ef3_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, tmc600_state, q_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, tmc600_state, sc_w))
// sound and video hardware
tmc600_video(config);
@@ -278,11 +278,11 @@ MACHINE_CONFIG_START(tmc600_state::tmc600)
// printer output latch
MCFG_DEVICE_ADD(CDP1852_TMC700_TAG, CDP1852, XTAL(3'570'000)/8) // clock is CDP1802 TPB
MCFG_CDP1852_MODE_CALLBACK(VCC)
- MCFG_CDP1852_DO_CALLBACK(WRITE8(tmc600_state, printer_w))
+ MCFG_CDP1852_DO_CALLBACK(WRITE8(*this, tmc600_state, printer_w))
// printer connector
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, nullptr)
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(CDP1802_TAG, cosmac_device, ef4_w)) MCFG_DEVCB_XOR(1)
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(CDP1802_TAG, cosmac_device, ef4_w)) MCFG_DEVCB_XOR(1)
// cassette
MCFG_CASSETTE_ADD("cassette")
diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp
index 84fdcd971bb..f4d1daa65a8 100644
--- a/src/mame/drivers/tmmjprd.cpp
+++ b/src/mame/drivers/tmmjprd.cpp
@@ -769,8 +769,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(tmmjprd_state::scanline)
}
MACHINE_CONFIG_START(tmmjprd_state::tmmjprd)
- MCFG_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
- MCFG_CPU_PROGRAM_MAP(tmmjprd_map)
+ MCFG_DEVICE_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tmmjprd_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmmjprd_state, scanline, "lscreen", 0, 1)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index da40ffb32c2..85d3e4e7e42 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -1913,9 +1913,9 @@ MACHINE_RESET_MEMBER(tmnt_state,common)
MACHINE_CONFIG_START(tmnt_state::cuebrick)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz */
- MCFG_CPU_PROGRAM_MAP(cuebrick_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 8000000) /* 8 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cuebrick_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
@@ -1965,12 +1965,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::mia)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(mia_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(mia_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(mia_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(mia_audio_map)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
@@ -2013,8 +2013,8 @@ MACHINE_CONFIG_START(tmnt_state::mia)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(tmnt_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, tmnt_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
@@ -2030,12 +2030,12 @@ MACHINE_RESET_MEMBER(tmnt_state,tmnt)
MACHINE_CONFIG_START(tmnt_state::tmnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(tmnt_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(tmnt_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, tmnt_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(tmnt_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(tmnt_audio_map)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,tmnt)
@@ -2079,15 +2079,15 @@ MACHINE_CONFIG_START(tmnt_state::tmnt)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(tmnt_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, tmnt_state, volume_callback))
MCFG_SOUND_ROUTE(0, "mono", 0.33)
MCFG_SOUND_ROUTE(1, "mono", 0.33)
- MCFG_SOUND_ADD("upd", UPD7759, XTAL(640'000))
+ MCFG_DEVICE_ADD("upd", UPD7759, XTAL(640'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1) /* 1 channel for the title music */
MCFG_SAMPLES_START_CB(tmnt_state, tmnt_decode_sample)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -2097,12 +2097,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::punkshot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(punkshot_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(punkshot_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(punkshot_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(punkshot_audio_map)
/* NMIs are generated by the 053260 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2151,12 +2151,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::lgtnfght)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(lgtnfght_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(lgtnfght_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(lgtnfght_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(lgtnfght_audio_map)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
@@ -2207,12 +2207,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::blswhstl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
- MCFG_CPU_PROGRAM_MAP(blswhstl_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(blswhstl_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2230,7 +2230,7 @@ MACHINE_CONFIG_START(tmnt_state::blswhstl)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(12*8, (64-12)*8-1, 2*8, 30*8-1 )
MCFG_SCREEN_UPDATE_DRIVER(tmnt_state, screen_update_lgtnfght)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tmnt_state, screen_vblank_blswhstl))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tmnt_state, screen_vblank_blswhstl))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 2048)
@@ -2285,12 +2285,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(tmnt_state::glfgreat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
- MCFG_CPU_PROGRAM_MAP(glfgreat_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(glfgreat_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(glfgreat_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(glfgreat_audio_map)
/* NMIs are generated by the 053260 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2351,12 +2351,12 @@ MACHINE_START_MEMBER(tmnt_state,prmrsocr)
MACHINE_CONFIG_START(tmnt_state::prmrsocr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
- MCFG_CPU_PROGRAM_MAP(prmrsocr_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* Confirmed */
+ MCFG_DEVICE_PROGRAM_MAP(prmrsocr_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, lgtnfght_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(prmrsocr_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(prmrsocr_audio_map)
/* NMIs are generated by the 054539 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,prmrsocr)
@@ -2416,16 +2416,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::tmnt2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(tmnt2_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(tmnt2_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000) /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) /* 8 MHz; clock is correct, but there's 1 cycle wait for ROM/RAM */
/* access. Access speed of ROM/RAM used on the machine is 150ns, */
/* without the wait, they cannot run on 8MHz. */
/* We are not emulating the wait state, so the ROM test ends at */
/* 02 instead of 00. */
- MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
+ MCFG_DEVICE_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2479,12 +2479,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::ssriders)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(ssriders_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(ssriders_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(ssriders_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(ssriders_audio_map)
/* NMIs are generated by the 053260 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
@@ -2538,9 +2538,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::sunsetbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(sunsetbl_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sunsetbl_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, irq4_line_hold)
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
MCFG_MACHINE_RESET_OVERRIDE(tmnt_state,common)
@@ -2584,12 +2584,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tmnt_state::thndrx2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
- MCFG_CPU_PROGRAM_MAP(thndrx2_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(thndrx2_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmnt_state, punkshot_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(thndrx2_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(thndrx2_audio_map)
/* NMIs are generated by the 053260 */
MCFG_MACHINE_START_OVERRIDE(tmnt_state,common)
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index 6aeb15315d2..74ef1c93824 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -559,7 +559,7 @@ MACHINE_CONFIG_START(tmspoker_state::tmspoker)
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, MASTER_CLOCK/4, tmspoker_map, tmspoker_cru_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tmspoker_state, tmspoker_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tmspoker_state, tmspoker_interrupt)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp
index 6acaceb32f7..2ff8f32d9ef 100644
--- a/src/mame/drivers/tnzs.cpp
+++ b/src/mame/drivers/tnzs.cpp
@@ -1535,13 +1535,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(tnzs_base_state::tnzs_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tnzs_base_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(12'000'000)/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tnzs_base_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80,XTAL(12'000'000)/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
- MCFG_CPU_PROGRAM_MAP(base_sub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tnzs_base_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80,XTAL(12'000'000)/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
+ MCFG_DEVICE_PROGRAM_MAP(base_sub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tnzs_base_state, irq0_line_hold)
tnzs_mainbank(config);
@@ -1557,7 +1557,7 @@ MACHINE_CONFIG_START(tnzs_base_state::tnzs_base)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(tnzs_base_state, screen_update_tnzs)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tnzs_base_state, screen_vblank_tnzs))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tnzs_base_state, screen_vblank_tnzs))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tnzs)
@@ -1570,15 +1570,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tnzs_mcu_state::tnzs)
tnzs_base(config);
- MCFG_CPU_ADD("mcu", I8742, 12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */
- MCFG_MCS48_PORT_P1_IN_CB(READ8(tnzs_mcu_state, mcu_port1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(tnzs_mcu_state, mcu_port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(tnzs_mcu_state, mcu_port2_w))
+ MCFG_DEVICE_ADD("mcu", I8742, 12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, tnzs_mcu_state, mcu_port1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, tnzs_mcu_state, mcu_port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, tnzs_mcu_state, mcu_port2_w))
MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COIN1"))
MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COIN2"))
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(tnzs_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(tnzs_sub_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1586,7 +1586,7 @@ MACHINE_CONFIG_START(tnzs_mcu_state::tnzs)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
@@ -1595,8 +1595,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(extrmatn_state::extrmatn)
tnzs(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(prompal_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(prompal_main_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1617,27 +1617,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(arknoid2_state::arknoid2)
plumppop(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_VBLANK_INT_DRIVER("screen", arknoid2_state, mcu_interrupt)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", arknoid2_state, mcu_interrupt)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(arknoid2_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(arknoid2_sub_map)
- MCFG_CPU_MODIFY("mcu")
+ MCFG_DEVICE_MODIFY("mcu")
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
MACHINE_CONFIG_START(insectx_state::insectx)
tnzs_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(insectx_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(insectx_sub_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", insectx)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
@@ -1647,19 +1647,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(kageki_state::kageki)
tnzs_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(kageki_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(kageki_sub_map)
/* sound hardware */
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_AY8910_PORT_A_READ_CB(READ8(kageki_state, csport_r))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kageki_state, csport_w))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, kageki_state, csport_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, kageki_state, csport_w))
MCFG_SOUND_ROUTE(0, "speaker", 0.15)
MCFG_SOUND_ROUTE(1, "speaker", 0.15)
MCFG_SOUND_ROUTE(2, "speaker", 0.15)
MCFG_SOUND_ROUTE(3, "speaker", 0.35)
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(1)
MCFG_SAMPLES_START_CB(kageki_state, init_samples)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
@@ -1668,15 +1668,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tnzsb_state::tnzsb)
tnzs_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tnzsb_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tnzsb_main_map)
- MCFG_CPU_MODIFY("sub") /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tnzsb_sub_map)
+ MCFG_DEVICE_MODIFY("sub") /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tnzsb_sub_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tnzsb_cpu2_map)
- MCFG_CPU_IO_MAP(tnzsb_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tnzsb_cpu2_map)
+ MCFG_DEVICE_IO_MAP(tnzsb_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1685,8 +1685,8 @@ MACHINE_CONFIG_START(tnzsb_state::tnzsb)
/* sound hardware */
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
- MCFG_YM2203_IRQ_HANDLER(WRITELINE(tnzsb_state, ym2203_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, tnzsb_state, ym2203_irqhandler))
MCFG_SOUND_ROUTE(0, "speaker", 1.0)
MCFG_SOUND_ROUTE(1, "speaker", 1.0)
MCFG_SOUND_ROUTE(2, "speaker", 1.0)
@@ -1698,18 +1698,18 @@ MACHINE_CONFIG_START(kabukiz_state::kabukiz)
tnzsb(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(kabukiz_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(kabukiz_sub_map)
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(kabukiz_cpu2_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(kabukiz_cpu2_map)
/* sound hardware */
- MCFG_SOUND_MODIFY("ymsnd")
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(kabukiz_state, sound_bank_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("dac", dac_byte_interface, write))
+ MCFG_DEVICE_MODIFY("ymsnd")
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, kabukiz_state, sound_bank_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("dac", dac_byte_interface, write))
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1718,11 +1718,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(jpopnics_state::jpopnics)
tnzs_base(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jpopnics_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jpopnics_main_map)
- MCFG_CPU_MODIFY("sub")
- MCFG_CPU_PROGRAM_MAP(jpopnics_sub_map)
+ MCFG_DEVICE_MODIFY("sub")
+ MCFG_DEVICE_PROGRAM_MAP(jpopnics_sub_map)
MCFG_DEVICE_ADD("upd4701", UPD4701A, 0)
MCFG_UPD4701_PORTX("AN1")
diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp
index 4144b29e5aa..a6d41236a5b 100644
--- a/src/mame/drivers/toaplan1.cpp
+++ b/src/mame/drivers/toaplan1.cpp
@@ -1912,20 +1912,20 @@ GFXDECODE_END
MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(rallybik_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(rallybik_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(rallybik_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(rallybik_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
MCFG_DEVICE_ADD("coinlatch", LS259, 0) // 19L
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(toaplan1_rallybik_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(toaplan1_rallybik_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(toaplan1_rallybik_state, coin_lockout_1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(toaplan1_rallybik_state, coin_lockout_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, toaplan1_rallybik_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, toaplan1_rallybik_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, toaplan1_rallybik_state, coin_lockout_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, toaplan1_rallybik_state, coin_lockout_2_w))
MCFG_MACHINE_RESET_OVERRIDE(toaplan1_state,toaplan1)
@@ -1934,7 +1934,7 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL55, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_rallybik_state, screen_update_rallybik)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_rallybik_state, screen_vblank_rallybik))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_rallybik_state, screen_vblank_rallybik))
MCFG_SCREEN_PALETTE("palette")
MCFG_TOAPLAN_SCU_ADD("scu", "palette", 31, 15)
@@ -1948,7 +1948,7 @@ MACHINE_CONFIG_START(toaplan1_rallybik_state::rallybik)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1957,12 +1957,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::truxton)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(truxton_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(truxton_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(truxton_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(truxton_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -1973,7 +1973,7 @@ MACHINE_CONFIG_START(toaplan1_state::truxton)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -1985,7 +1985,7 @@ MACHINE_CONFIG_START(toaplan1_state::truxton)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1994,12 +1994,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::hellfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(hellfire_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(hellfire_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(hellfire_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(hellfire_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2010,7 +2010,7 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND+16, VBSTART+16)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2022,7 +2022,7 @@ MACHINE_CONFIG_START(toaplan1_state::hellfire)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2031,12 +2031,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::zerowing)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(zerowing_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(zerowing_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(zerowing_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(zerowing_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2047,7 +2047,7 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND+16, VBSTART+16)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2059,7 +2059,7 @@ MACHINE_CONFIG_START(toaplan1_state::zerowing)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2068,17 +2068,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::demonwld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(demonwld_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(demonwld_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(demonwld_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(demonwld_sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL(28'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(DSP_program_map)
- MCFG_CPU_IO_MAP(DSP_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(toaplan1_state, demonwld_BIO_r))
+ MCFG_DEVICE_ADD("dsp", TMS32010, XTAL(28'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(DSP_program_map)
+ MCFG_DEVICE_IO_MAP(DSP_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, toaplan1_state, demonwld_BIO_r))
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2089,7 +2089,7 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL55, VBEND+16, VBSTART+16)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2101,7 +2101,7 @@ MACHINE_CONFIG_START(toaplan1_state::demonwld)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2110,12 +2110,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::samesame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(samesame_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(samesame_main_map)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */
- MCFG_CPU_PROGRAM_MAP(samesame_hd647180_mem_map)
- MCFG_CPU_IO_MAP(samesame_hd647180_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */
+ MCFG_DEVICE_PROGRAM_MAP(samesame_hd647180_mem_map)
+ MCFG_DEVICE_IO_MAP(samesame_hd647180_io_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -2126,7 +2126,7 @@ MACHINE_CONFIG_START(toaplan1_state::samesame)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_samesame))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_samesame))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2138,7 +2138,7 @@ MACHINE_CONFIG_START(toaplan1_state::samesame)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2147,12 +2147,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::outzone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(outzone_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(outzone_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(outzone_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(outzone_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2163,7 +2163,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzone)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL55, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2175,7 +2175,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzone)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2184,12 +2184,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::outzonecv)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(outzonecv_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(outzonecv_main_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(toaplan1_sound_map)
- MCFG_CPU_IO_MAP(zerowing_sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(toaplan1_sound_map)
+ MCFG_DEVICE_IO_MAP(zerowing_sound_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -2200,7 +2200,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2212,7 +2212,7 @@ MACHINE_CONFIG_START(toaplan1_state::outzonecv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2221,12 +2221,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan1_state::vimana)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(vimana_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(vimana_main_map)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */
- MCFG_CPU_PROGRAM_MAP(vimana_hd647180_mem_map)
- MCFG_CPU_IO_MAP(vimana_hd647180_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z180, XTAL(28'000'000)/8) /* HD647180XOFS6 CPU */
+ MCFG_DEVICE_PROGRAM_MAP(vimana_hd647180_mem_map)
+ MCFG_DEVICE_IO_MAP(vimana_hd647180_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600)) // GUESSED
@@ -2237,7 +2237,7 @@ MACHINE_CONFIG_START(toaplan1_state::vimana)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(toaplan1_state, screen_update_toaplan1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan1_state, screen_vblank_toaplan1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan1_state, screen_vblank_toaplan1))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toaplan1)
@@ -2249,7 +2249,7 @@ MACHINE_CONFIG_START(toaplan1_state::vimana)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp
index 29eb062bf8e..c302202608f 100644
--- a/src/mame/drivers/toaplan2.cpp
+++ b/src/mame/drivers/toaplan2.cpp
@@ -3240,12 +3240,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(toaplan2_state::tekipaki)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(tekipaki_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(tekipaki_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL(10'000'000)) /* HD647180 CPU actually */
- MCFG_CPU_PROGRAM_MAP(hd647180_mem_map)
- MCFG_CPU_IO_MAP(hd647180_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z180, XTAL(10'000'000)) /* HD647180 CPU actually */
+ MCFG_DEVICE_PROGRAM_MAP(hd647180_mem_map)
+ MCFG_DEVICE_IO_MAP(hd647180_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3259,7 +3259,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3276,7 +3276,7 @@ MACHINE_CONFIG_START(toaplan2_state::tekipaki)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(27'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(27'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3284,11 +3284,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::ghox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(ghox_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(ghox_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z180, XTAL(10'000'000)) /* HD647180 CPU actually */
- MCFG_CPU_PROGRAM_MAP(ghox_hd647180_mem_map)
+ MCFG_DEVICE_ADD("audiocpu", Z180, XTAL(10'000'000)) /* HD647180 CPU actually */
+ MCFG_DEVICE_PROGRAM_MAP(ghox_hd647180_mem_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3302,7 +3302,7 @@ MACHINE_CONFIG_START(toaplan2_state::ghox)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3374,11 +3374,11 @@ a4849 cd
MACHINE_CONFIG_START(toaplan2_state::dogyuun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(25'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(dogyuun_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(25'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(dogyuun_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL(25'000'000)/2) /* NEC V25 type Toaplan marked CPU ??? */
- MCFG_CPU_PROGRAM_MAP(v25_mem)
+ MCFG_DEVICE_ADD("audiocpu", V25, XTAL(25'000'000)/2) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_DEVICE_PROGRAM_MAP(v25_mem)
MCFG_V25_CONFIG(nitro_decryption_table)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWB")) MCFG_DEVCB_XOR(0xff)
MCFG_V25_PORT_P0_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
@@ -3390,7 +3390,7 @@ MACHINE_CONFIG_START(toaplan2_state::dogyuun)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_dogyuun)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3419,12 +3419,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::kbash)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(kbash_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(kbash_68k_mem)
/* ROM based v25 */
- MCFG_CPU_ADD("audiocpu", V25, XTAL(16'000'000)) /* NEC V25 type Toaplan marked CPU ??? */
- MCFG_CPU_PROGRAM_MAP(kbash_v25_mem)
+ MCFG_DEVICE_ADD("audiocpu", V25, XTAL(16'000'000)) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_DEVICE_PROGRAM_MAP(kbash_v25_mem)
MCFG_V25_CONFIG(nitro_decryption_table)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
MCFG_V25_PORT_P0_READ_CB(IOPORT("DSWB")) MCFG_DEVCB_XOR(0xff)
@@ -3439,7 +3439,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3465,8 +3465,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::kbash2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(kbash2_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(kbash2_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3476,7 +3476,7 @@ MACHINE_CONFIG_START(toaplan2_state::kbash2)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3502,15 +3502,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::truxton2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(truxton2_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(truxton2_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", truxton2)
@@ -3549,11 +3549,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::pipibibs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(pipibibs_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(pipibibs_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(27'000'000)/8) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(27'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(pipibibs_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3567,7 +3567,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3582,7 +3582,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibs)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(27'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(27'000'000)/8) /* verified on pcb */
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3591,12 +3591,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(pipibibi_bootleg_68k_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(toaplan2_state, pipibibsbl_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(pipibibi_bootleg_68k_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(toaplan2_state, pipibibsbl_irq_ack)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(27'000'000)/8) /* ??? 3.37MHz */
- MCFG_CPU_PROGRAM_MAP(pipibibs_sound_z80_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(27'000'000)/8) /* ??? 3.37MHz */
+ MCFG_DEVICE_PROGRAM_MAP(pipibibs_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3610,7 +3610,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3625,7 +3625,7 @@ MACHINE_CONFIG_START(toaplan2_state::pipibibsbl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(27'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(27'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3672,11 +3672,11 @@ static const uint8_t ts001turbo_decryption_table[256] = {
MACHINE_CONFIG_START(toaplan2_state::fixeight)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(fixeight_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(fixeight_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL(16'000'000)) /* NEC V25 type Toaplan marked CPU ??? */
- MCFG_CPU_PROGRAM_MAP(fixeight_v25_mem)
+ MCFG_DEVICE_ADD("audiocpu", V25, XTAL(16'000'000)) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_DEVICE_PROGRAM_MAP(fixeight_v25_mem)
MCFG_V25_CONFIG(ts001turbo_decryption_table)
MCFG_V25_PORT_P0_READ_CB(IOPORT("EEPROM"))
MCFG_V25_PORT_P0_WRITE_CB(IOPORT("EEPROM"))
@@ -3688,7 +3688,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeight)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240) /* verified on pcb */
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", truxton2)
@@ -3715,9 +3715,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::fixeightbl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(fixeightbl_68k_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(toaplan2_state, fixeightbl_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(10'000'000)) /* 10MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(fixeightbl_68k_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(toaplan2_state, fixeightbl_irq_ack)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3727,7 +3727,7 @@ MACHINE_CONFIG_START(toaplan2_state::fixeightbl)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_bootleg)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fixeightbl)
@@ -3752,11 +3752,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::vfive)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(vfive_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(vfive_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL(20'000'000)/2) /* Verified on pcb, NEC V25 type Toaplan mark scratched out */
- MCFG_CPU_PROGRAM_MAP(vfive_v25_mem)
+ MCFG_DEVICE_ADD("audiocpu", V25, XTAL(20'000'000)/2) /* Verified on pcb, NEC V25 type Toaplan mark scratched out */
+ MCFG_DEVICE_PROGRAM_MAP(vfive_v25_mem)
MCFG_V25_CONFIG(nitro_decryption_table)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
MCFG_V25_PORT_P0_READ_CB(IOPORT("DSWB")) MCFG_DEVCB_XOR(0xff)
@@ -3768,7 +3768,7 @@ MACHINE_CONFIG_START(toaplan2_state::vfive)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240) /* verified on pcb */
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3791,11 +3791,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::batsugun)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(batsugun_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(batsugun_68k_mem)
- MCFG_CPU_ADD("audiocpu", V25, XTAL(32'000'000)/2) /* NEC V25 type Toaplan marked CPU ??? */
- MCFG_CPU_PROGRAM_MAP(v25_mem)
+ MCFG_DEVICE_ADD("audiocpu", V25, XTAL(32'000'000)/2) /* NEC V25 type Toaplan marked CPU ??? */
+ MCFG_DEVICE_PROGRAM_MAP(v25_mem)
MCFG_V25_PORT_PT_READ_CB(IOPORT("DSWA")) MCFG_DEVCB_XOR(0xff)
MCFG_V25_PORT_P0_READ_CB(IOPORT("DSWB")) MCFG_DEVCB_XOR(0xff)
MCFG_V25_PORT_P1_READ_CB(IOPORT("JMPR")) MCFG_DEVCB_XOR(0xff)
@@ -3809,7 +3809,7 @@ MACHINE_CONFIG_START(toaplan2_state::batsugun)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_batsugun)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3837,8 +3837,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::pwrkick)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(pwrkick_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(pwrkick_68k_mem)
MCFG_UPD4992_ADD("rtc")
@@ -3851,7 +3851,7 @@ MACHINE_CONFIG_START(toaplan2_state::pwrkick)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3872,8 +3872,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::othldrby)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(othldrby_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(othldrby_68k_mem)
MCFG_UPD4992_ADD("rtc")
@@ -3884,7 +3884,7 @@ MACHINE_CONFIG_START(toaplan2_state::othldrby)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3906,15 +3906,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::enmadaio)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(enmadaio_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(20'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(enmadaio_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(27'000'000)/4,432,0,320,262,0,240)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3940,8 +3940,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::snowbro2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(snowbro2_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(snowbro2_68k_mem)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -3951,7 +3951,7 @@ MACHINE_CONFIG_START(toaplan2_state::snowbro2)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_toaplan2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", T2PALETTE_LENGTH)
@@ -3977,11 +3977,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::mahoudai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(mahoudai_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(mahoudai_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(raizing_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -3995,7 +3995,7 @@ MACHINE_CONFIG_START(toaplan2_state::mahoudai)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", raizing)
@@ -4022,11 +4022,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::shippumd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(shippumd_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(shippumd_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(raizing_sound_z80_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(raizing_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -4040,7 +4040,7 @@ MACHINE_CONFIG_START(toaplan2_state::shippumd)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", raizing)
@@ -4066,11 +4066,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::bgaregga)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(bgaregga_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(bgaregga_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(bgaregga_sound_z80_mem)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/8) /* 4MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(bgaregga_sound_z80_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -4084,7 +4084,7 @@ MACHINE_CONFIG_START(toaplan2_state::bgaregga)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", raizing)
@@ -4126,12 +4126,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::batrider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator (verified) */
- MCFG_CPU_PROGRAM_MAP(batrider_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator (verified) */
+ MCFG_DEVICE_PROGRAM_MAP(batrider_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) /* 5.333MHz , 32MHz Oscillator (verified) */
- MCFG_CPU_PROGRAM_MAP(batrider_sound_z80_mem)
- MCFG_CPU_IO_MAP(batrider_sound_z80_port)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/6) /* 5.333MHz , 32MHz Oscillator (verified) */
+ MCFG_DEVICE_PROGRAM_MAP(batrider_sound_z80_mem)
+ MCFG_DEVICE_IO_MAP(batrider_sound_z80_port)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -4145,7 +4145,7 @@ MACHINE_CONFIG_START(toaplan2_state::batrider)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", batrider)
@@ -4184,13 +4184,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(toaplan2_state::bbakraid)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(bbakraid_68k_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(bbakraid_68k_mem)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/6) /* 5.3333MHz , 32MHz Oscillator */
- MCFG_CPU_PROGRAM_MAP(bbakraid_sound_z80_mem)
- MCFG_CPU_IO_MAP(bbakraid_sound_z80_port)
- MCFG_CPU_PERIODIC_INT_DRIVER(toaplan2_state, bbakraid_snd_interrupt, 448)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/6) /* 5.3333MHz , 32MHz Oscillator */
+ MCFG_DEVICE_PROGRAM_MAP(bbakraid_sound_z80_mem)
+ MCFG_DEVICE_IO_MAP(bbakraid_sound_z80_port)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(toaplan2_state, bbakraid_snd_interrupt, 448)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
@@ -4206,7 +4206,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid)
//MCFG_SCREEN_SIZE(432, 262)
//MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_truxton2)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(toaplan2_state, screen_vblank_toaplan2))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, toaplan2_state, screen_vblank_toaplan2))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", batrider)
@@ -4227,7 +4227,7 @@ MACHINE_CONFIG_START(toaplan2_state::bbakraid)
MCFG_GENERIC_LATCH_8_ADD("soundlatch3")
MCFG_GENERIC_LATCH_8_ADD("soundlatch4")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
// IRQ not used ??? Connected to a test pin (TP082)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index 6a6e2044507..c06ef647d33 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -495,13 +495,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(20'000'000) /2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(toki_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", toki_state, irq1_line_hold)/* VBL */
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(20'000'000) /2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(toki_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", toki_state, irq1_line_hold)/* VBL */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'318'181)/4) // verified on pcb
- MCFG_CPU_PROGRAM_MAP(toki_audio_map)
- MCFG_CPU_OPCODES_MAP(toki_audio_opcodes_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'318'181)/4) // verified on pcb
+ MCFG_DEVICE_PROGRAM_MAP(toki_audio_map)
+ MCFG_DEVICE_OPCODES_MAP(toki_audio_opcodes_map)
MCFG_DEVICE_ADD("sei80bu", SEI80BU, 0)
MCFG_DEVICE_ROM("audiocpu")
@@ -514,7 +514,7 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* verified */
MCFG_SCREEN_UPDATE_DRIVER(toki_state, screen_update_toki)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toki)
@@ -524,8 +524,8 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
- MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4)
+ MCFG_YM3812_IRQ_HANDLER(WRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/12, PIN7_HIGH) // verified on pcb
@@ -534,8 +534,8 @@ MACHINE_CONFIG_START(toki_state::toki) /* KOYO 20.000MHz near the cpu */
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
MCFG_SEIBU_SOUND_CPU("audiocpu")
MCFG_SEIBU_SOUND_ROMBANK("seibu_bank1")
- MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read))
- MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
+ MCFG_SEIBU_SOUND_YM_READ_CB(READ8("ymsnd", ym3812_device, read))
+ MCFG_SEIBU_SOUND_YM_WRITE_CB(WRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toki_state::jujuba)
@@ -543,19 +543,19 @@ MACHINE_CONFIG_START(toki_state::jujuba)
MCFG_DEVICE_REMOVE("sei80bu")
MCFG_DEVICE_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(jujuba_audio_map)
- MCFG_CPU_OPCODES_MAP(jujuba_audio_opcodes_map)
+ MCFG_DEVICE_PROGRAM_MAP(jujuba_audio_map)
+ MCFG_DEVICE_OPCODES_MAP(jujuba_audio_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(toki_state::tokib)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */
- MCFG_CPU_PROGRAM_MAP(tokib_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", toki_state, irq6_line_hold)/* VBL (could be level1, same vector) */
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */
+ MCFG_DEVICE_PROGRAM_MAP(tokib_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", toki_state, irq6_line_hold)/* VBL (could be level1, same vector) */
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
- MCFG_CPU_PROGRAM_MAP(tokib_audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) /* verified with PCB */
+ MCFG_DEVICE_PROGRAM_MAP(tokib_audio_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -567,7 +567,7 @@ MACHINE_CONFIG_START(toki_state::tokib)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* verified */
MCFG_SCREEN_UPDATE_DRIVER(toki_state, screen_update_tokib)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tokib)
@@ -579,11 +579,11 @@ MACHINE_CONFIG_START(toki_state::tokib)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, 3579545)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(toki_state, tokib_adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, toki_state, tokib_adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index 9f846ce6a27..4ef1106c225 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -310,18 +310,18 @@ void tomcat_state::machine_start()
}
MACHINE_CONFIG_START(tomcat_state::tomcat)
- MCFG_CPU_ADD("maincpu", M68010, 12.096_MHz_XTAL / 2)
- MCFG_CPU_PROGRAM_MAP(tomcat_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 5*60)
- //MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 12.096_MHz_XTAL / 16 / 16 / 16 / 12)
+ MCFG_DEVICE_ADD("maincpu", M68010, 12.096_MHz_XTAL / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tomcat_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 5*60)
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 12.096_MHz_XTAL / 16 / 16 / 16 / 12)
- MCFG_CPU_ADD("dsp", TMS32010, 16_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP( dsp_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(tomcat_state, dsp_BIO_r))
+ MCFG_DEVICE_ADD("dsp", TMS32010, 16_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP( dsp_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, tomcat_state, dsp_BIO_r))
- MCFG_CPU_ADD("soundcpu", M6502, 14.318181_MHz_XTAL / 8 )
+ MCFG_DEVICE_ADD("soundcpu", M6502, 14.318181_MHz_XTAL / 8 )
MCFG_DEVICE_DISABLE()
- MCFG_CPU_PROGRAM_MAP( sound_map)
+ MCFG_DEVICE_PROGRAM_MAP( sound_map)
MCFG_DEVICE_ADD("adc", ADC0809, 12.096_MHz_XTAL / 16)
MCFG_ADC0808_IN0_CB(IOPORT("STICKY"))
@@ -348,12 +348,12 @@ MACHINE_CONFIG_START(tomcat_state::tomcat)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led1")) MCFG_DEVCB_INVERT
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led2")) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tomcat_state, mres_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tomcat_state, sndres_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(tomcat_state, lnkmode_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(tomcat_state, err_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(tomcat_state, ack_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(tomcat_state, txbuff_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tomcat_state, mres_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tomcat_state, sndres_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, tomcat_state, lnkmode_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, tomcat_state, err_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, tomcat_state, ack_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, tomcat_state, txbuff_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -373,13 +373,13 @@ MACHINE_CONFIG_START(tomcat_state::tomcat)
MCFG_AVGDVG_VECTOR("vector")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("pokey1", POKEY, XTAL(14'318'181) / 8)
+ MCFG_DEVICE_ADD("pokey1", POKEY, XTAL(14'318'181) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
- MCFG_SOUND_ADD("pokey2", POKEY, XTAL(14'318'181) / 8)
+ MCFG_DEVICE_ADD("pokey2", POKEY, XTAL(14'318'181) / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
- MCFG_SOUND_ADD("tms", TMS5220, 325000)
+ MCFG_DEVICE_ADD("tms", TMS5220, 325000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp
index 72876e96a9d..d6edb8964df 100644
--- a/src/mame/drivers/tonton.cpp
+++ b/src/mame/drivers/tonton.cpp
@@ -223,9 +223,9 @@ WRITE8_MEMBER(tonton_state::ay_bout_w)
MACHINE_CONFIG_START(tonton_state::tonton)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK) /* Guess. According to other MSX2 based gambling games */
- MCFG_CPU_PROGRAM_MAP(tonton_map)
- MCFG_CPU_IO_MAP(tonton_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, CPU_CLOCK) /* Guess. According to other MSX2 based gambling games */
+ MCFG_DEVICE_PROGRAM_MAP(tonton_map)
+ MCFG_DEVICE_IO_MAP(tonton_io)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -239,7 +239,7 @@ MACHINE_CONFIG_START(tonton_state::tonton)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", YM2149, YM2149_CLOCK) /* Guess. According to other MSX2 based gambling games */
+ MCFG_DEVICE_ADD("aysnd", YM2149, YM2149_CLOCK) /* Guess. According to other MSX2 based gambling games */
/*
AY8910: Port A out: FF
AY8910: Port B out: FF
@@ -248,8 +248,8 @@ MACHINE_CONFIG_START(tonton_state::tonton)
AY8910: Port A out: 00
AY8910: Port B out: 00
*/
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tonton_state, ay_aout_w)) /* Write all bits twice, and then reset them at boot */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tonton_state, ay_bout_w)) /* Write all bits twice, and then reset them at boot */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tonton_state, ay_aout_w)) /* Write all bits twice, and then reset them at boot */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tonton_state, ay_bout_w)) /* Write all bits twice, and then reset them at boot */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp
index e8ff30c0454..db052459a9b 100644
--- a/src/mame/drivers/toobin.cpp
+++ b/src/mame/drivers/toobin.cpp
@@ -206,8 +206,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(toobin_state::toobin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68010, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
@@ -232,7 +232,7 @@ MACHINE_CONFIG_START(toobin_state::toobin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(toobin_state, sound_int_write_line))
+ MCFG_ATARI_JSA_I_ADD("jsa", WRITELINE(*this, toobin_state, sound_int_write_line))
MCFG_ATARI_JSA_TEST_PORT("FF9000", 12)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp
index a04188726d8..2dc485aef8b 100644
--- a/src/mame/drivers/topspeed.cpp
+++ b/src/mame/drivers/topspeed.cpp
@@ -578,20 +578,20 @@ void topspeed_state::machine_reset()
MACHINE_CONFIG_START(topspeed_state::topspeed)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(cpua_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", topspeed_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cpua_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", topspeed_state, irq6_line_hold)
- MCFG_CPU_ADD("subcpu", M68000, XTAL(16'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", topspeed_state, irq5_line_hold)
+ MCFG_DEVICE_ADD("subcpu", M68000, XTAL(16'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", topspeed_state, irq5_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(z80_prg)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(z80_prg)
+ MCFG_DEVICE_IO_MAP(z80_io)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
- MCFG_Z80CTC_ZC0_CB(WRITELINE(topspeed_state, z80ctc_to0))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, topspeed_state, z80ctc_to0))
MCFG_DEVICE_ADD("pc080sn_1", PC080SN, 0)
MCFG_PC080SN_GFX_REGION(1)
@@ -612,7 +612,7 @@ MACHINE_CONFIG_START(topspeed_state::topspeed)
MCFG_TC0040IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0040IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0040IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0040IOC_WRITE_4_CB(WRITE8(topspeed_state, coins_w))
+ MCFG_TC0040IOC_WRITE_4_CB(WRITE8(*this, topspeed_state, coins_w))
MCFG_TC0040IOC_READ_7_CB(IOPORT("IN2"))
// video hardware
@@ -633,16 +633,16 @@ MACHINE_CONFIG_START(topspeed_state::topspeed)
MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000) / 4)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(topspeed_state, sound_bankswitch_w))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, topspeed_state, sound_bankswitch_w))
MCFG_SOUND_ROUTE(0, "filter1l", 1.0)
MCFG_SOUND_ROUTE(1, "filter1r", 1.0)
- MCFG_SOUND_ADD("msm1", MSM5205, XTAL(384'000))
- MCFG_MSM5205_VCLK_CB(WRITELINE(topspeed_state, msm5205_1_vck)) // VCK function
+ MCFG_DEVICE_ADD("msm1", MSM5205, XTAL(384'000))
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, topspeed_state, msm5205_1_vck)) // VCK function
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8 kHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 1.0)
- MCFG_SOUND_ADD("msm2", MSM5205, XTAL(384'000))
+ MCFG_DEVICE_ADD("msm2", MSM5205, XTAL(384'000))
MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) // Slave mode, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 1.0)
diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp
index 07a60105f91..700d9fae1d3 100644
--- a/src/mame/drivers/toratora.cpp
+++ b/src/mame/drivers/toratora.cpp
@@ -396,26 +396,26 @@ void toratora_state::machine_reset()
MACHINE_CONFIG_START(toratora_state::toratora)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 5185000 / 8) /* 5.185 MHz XTAL divided by 8 (@ U94.12) */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(toratora_state, toratora_timer, 250) /* timer counting at 250 Hz */
+ MCFG_DEVICE_ADD("maincpu", M6800, 5185000 / 8) /* 5.185 MHz XTAL divided by 8 (@ U94.12) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(toratora_state, toratora_timer, 250) /* timer counting at 250 Hz */
MCFG_DEVICE_ADD("pia_u1", PIA6821, 0)
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(toratora_state,port_b_u1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(toratora_state,main_cpu_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(toratora_state,main_cpu_irq))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, toratora_state,port_b_u1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, toratora_state,main_cpu_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, toratora_state,main_cpu_irq))
MCFG_DEVICE_ADD("pia_u3", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(toratora_state, sn1_port_a_u3_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(toratora_state, sn1_port_b_u3_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(toratora_state, sn1_ca2_u3_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, toratora_state, sn1_port_a_u3_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, toratora_state, sn1_port_b_u3_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, toratora_state, sn1_ca2_u3_w))
MCFG_DEVICE_ADD("pia_u2", PIA6821, 0)
MCFG_PIA_READPB_HANDLER(IOPORT("DSW"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(toratora_state,sn2_port_a_u2_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(toratora_state,sn2_port_b_u2_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(toratora_state,sn2_ca2_u2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(toratora_state,cb2_u2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, toratora_state,sn2_port_a_u2_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, toratora_state,sn2_port_b_u2_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, toratora_state,sn2_ca2_u2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, toratora_state,cb2_u2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -428,7 +428,7 @@ MACHINE_CONFIG_START(toratora_state::toratora)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_DEVICE_ADD("sn1", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(470), CAP_P(470)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_M(2)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.2), RES_K(3.3)) // attack_decay_cap + attack_res
@@ -444,7 +444,7 @@ MACHINE_CONFIG_START(toratora_state::toratora)
MCFG_SN76477_ENABLE(1) // enable
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_DEVICE_ADD("sn2", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(470), CAP_P(470)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_M(2)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(0.2), RES_K(3.3)) // attack_decay_cap + attack_res
diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp
index 86b8d302c05..cbd3173cf5b 100644
--- a/src/mame/drivers/tosh1000.cpp
+++ b/src/mame/drivers/tosh1000.cpp
@@ -253,10 +253,10 @@ void tosh1000_state::cfg_fdc_35(device_t *device)
}
MACHINE_CONFIG_START(tosh1000_state::tosh1000)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(5'000'000))
- MCFG_CPU_PROGRAM_MAP(tosh1000_map)
- MCFG_CPU_IO_MAP(tosh1000_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(5'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tosh1000_map)
+ MCFG_DEVICE_IO_MAP(tosh1000_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(tosh1000_romdos)
@@ -271,13 +271,14 @@ MACHINE_CONFIG_START(tosh1000_state::tosh1000)
MCFG_DEVICE_ADD("rtc", TC8521, XTAL(32'768))
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa1", pc_isa8_cards, "cga", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, "fdc_xt", false)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa1", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "cga", false)
+ MCFG_DEVICE_ADD("isa2", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "fdc_xt", false)
MCFG_SLOT_OPTION_MACHINE_CONFIG("fdc_xt", cfg_fdc_35)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, "lpt", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, "com", false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa5", pc_isa8_cards, nullptr, false)
- MCFG_ISA8_SLOT_ADD("mb:isa", "isa6", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa3", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "lpt", false)
+ MCFG_DEVICE_ADD("isa4", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, "com", false)
+ MCFG_DEVICE_ADD("isa5", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA8_SLOT, 0, "mb:isa", pc_isa8_cards, nullptr, false)
// MCFG_SOFTWARE_LIST_ADD("flop_list","tosh1000")
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index 9b61f13cb5b..517ab55e403 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -155,25 +155,25 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tourtabl_state::tourtabl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("riot1", RIOT6532, MASTER_CLOCK / 3)
MCFG_RIOT6532_IN_PA_CB(IOPORT("RIOT0_SWA"))
MCFG_RIOT6532_IN_PB_CB(IOPORT("RIOT0_SWB"))
- MCFG_RIOT6532_OUT_PB_CB(DEVWRITE8("watchdog", watchdog_timer_device, reset_w))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8("watchdog", watchdog_timer_device, reset_w))
MCFG_DEVICE_ADD("riot2", RIOT6532, MASTER_CLOCK / 3)
MCFG_RIOT6532_IN_PA_CB(IOPORT("RIOT1_SWA"))
MCFG_RIOT6532_IN_PB_CB(IOPORT("RIOT1_SWB"))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(tourtabl_state, tourtabl_led_w))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, tourtabl_state, tourtabl_led_w))
MCFG_WATCHDOG_ADD("watchdog")
/* video hardware */
MCFG_DEVICE_ADD("tia_video", TIA_NTSC_VIDEO, 0)
- MCFG_TIA_READ_INPUT_PORT_CB(READ16(tourtabl_state, tourtabl_read_input_port))
- MCFG_TIA_DATABUS_CONTENTS_CB(READ8(tourtabl_state, tourtabl_get_databus_contents))
+ MCFG_TIA_READ_INPUT_PORT_CB(READ16(*this, tourtabl_state, tourtabl_read_input_port))
+ MCFG_TIA_DATABUS_CONTENTS_CB(READ8(*this, tourtabl_state, tourtabl_get_databus_contents))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK, 228, 34, 34 + 160, 262, 46, 46 + 200 )
diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp
index c7992e3626a..439c637fbe5 100644
--- a/src/mame/drivers/tourvis.cpp
+++ b/src/mame/drivers/tourvis.cpp
@@ -394,13 +394,13 @@ WRITE_LINE_MEMBER(tourvision_state::tourvision_timer_out)
MACHINE_CONFIG_START(tourvision_state::tourvision)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(pce_mem)
- MCFG_CPU_IO_MAP(pce_io)
+ MCFG_DEVICE_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(pce_mem)
+ MCFG_DEVICE_IO_MAP(pce_io)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CPU_ADD("subcpu", I8085A, 18000000/3 /*?*/)
- MCFG_CPU_PROGRAM_MAP(tourvision_8085_map)
+ MCFG_DEVICE_ADD("subcpu", I8085A, 18000000/3 /*?*/)
+ MCFG_DEVICE_PROGRAM_MAP(tourvision_8085_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -409,22 +409,22 @@ MACHINE_CONFIG_START(tourvision_state::tourvision)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD( "huc6260", HUC6260, PCE_MAIN_CLOCK )
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6270", huc6270_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6270", huc6270_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6270", huc6270_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6270", huc6270_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
MCFG_DEVICE_ADD("i8155", I8155, 1000000 /*?*/)
- MCFG_I8155_OUT_PORTA_CB(WRITE8(tourvision_state, tourvision_i8155_a_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(tourvision_state, tourvision_i8155_b_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(tourvision_state, tourvision_i8155_c_w))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(tourvision_state, tourvision_timer_out))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(*this, tourvision_state, tourvision_i8155_a_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, tourvision_state, tourvision_i8155_b_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, tourvision_state, tourvision_i8155_c_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, tourvision_state, tourvision_timer_out))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MCFG_C6280_CPU("maincpu")
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index 34d32d35ac2..3f5490d5389 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -665,16 +665,16 @@ WRITE_LINE_MEMBER(namcos16_state::slave_vblank_irq)
}
MACHINE_CONFIG_START(namcos16_state::liblrabl)
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(master_liblrabl_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(master_liblrabl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos16_state, master_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("slave", M68000, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(slave_map)
+ MCFG_DEVICE_ADD("slave", M68000, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(slave_map)
- MCFG_CPU_ADD("audiocpu", MC6809E, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(namcos16_state, irq0_line_hold, 60)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(namcos16_state, irq0_line_hold, 60)
MCFG_DEVICE_ADD("58xx", NAMCO_58XX, 0)
@@ -684,11 +684,11 @@ MACHINE_CONFIG_START(namcos16_state::liblrabl)
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_DEVICE_ADD("56xx_1", NAMCO_56XX, 0)
- MCFG_NAMCO56XX_IN_0_CB(READ8(namcos16_state, dipA_h))
- MCFG_NAMCO56XX_IN_1_CB(READ8(namcos16_state, dipB_l))
- MCFG_NAMCO56XX_IN_2_CB(READ8(namcos16_state, dipB_h))
- MCFG_NAMCO56XX_IN_3_CB(READ8(namcos16_state, dipA_l))
- MCFG_NAMCO56XX_OUT_0_CB(WRITE8(namcos16_state, flip))
+ MCFG_NAMCO56XX_IN_0_CB(READ8(*this, namcos16_state, dipA_h))
+ MCFG_NAMCO56XX_IN_1_CB(READ8(*this, namcos16_state, dipB_l))
+ MCFG_NAMCO56XX_IN_2_CB(READ8(*this, namcos16_state, dipB_h))
+ MCFG_NAMCO56XX_IN_3_CB(READ8(*this, namcos16_state, dipA_l))
+ MCFG_NAMCO56XX_OUT_0_CB(WRITE8(*this, namcos16_state, flip))
MCFG_DEVICE_ADD("56xx_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1_LEFT"))
@@ -699,7 +699,7 @@ MACHINE_CONFIG_START(namcos16_state::liblrabl)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK,384,0,288,264,0,224) // derived from Galaxian HW, 60.606060
MCFG_SCREEN_UPDATE_DRIVER(namcos16_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(namcos16_state, slave_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, namcos16_state, slave_vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", toypop)
MCFG_PALETTE_ADD("palette", 128*4+64*4+16*2)
@@ -708,15 +708,15 @@ MACHINE_CONFIG_START(namcos16_state::liblrabl)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("namco", NAMCO_15XX, 24000)
+ MCFG_DEVICE_ADD("namco", NAMCO_15XX, 24000)
MCFG_NAMCO_AUDIO_VOICES(8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(namcos16_state::toypop)
liblrabl(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(master_toypop_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(master_toypop_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp
index 861221daf9e..e2b01d1a4a2 100644
--- a/src/mame/drivers/tp84.cpp
+++ b/src/mame/drivers/tp84.cpp
@@ -333,24 +333,24 @@ GFXDECODE_END
MACHINE_CONFIG_START(tp84_state::tp84)
/* basic machine hardware */
- MCFG_CPU_ADD("cpu1", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(tp84_cpu1_map)
+ MCFG_DEVICE_ADD("cpu1", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(tp84_cpu1_map)
- MCFG_CPU_ADD("sub", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_ADD("sub", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_ADD("audiocpu", Z80,XTAL(14'318'181)/4) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(audio_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,XTAL(14'318'181)/4) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(audio_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame - an high value to ensure proper */
/* synchronization of the CPUs */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 3B
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(tp84_state, irq_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(tp84_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tp84_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(tp84_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(tp84_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tp84_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tp84_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tp84_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, tp84_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, tp84_state, flip_screen_y_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -362,7 +362,7 @@ MACHINE_CONFIG_START(tp84_state::tp84)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(tp84_state, screen_update_tp84)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tp84_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tp84_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tp84)
MCFG_PALETTE_ADD("palette", 4096)
@@ -374,27 +374,27 @@ MACHINE_CONFIG_START(tp84_state::tp84)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("y2404_1", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("y2404_1", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 0.75)
- MCFG_SOUND_ADD("y2404_2", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("y2404_2", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 0.75)
- MCFG_SOUND_ADD("y2404_3", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("y2404_3", Y2404, XTAL(14'318'181)/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 0.75)
- MCFG_FILTER_RC_ADD("filter1", 0)
+ MCFG_DEVICE_ADD("filter1", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter2", 0)
+ MCFG_DEVICE_ADD("filter2", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_FILTER_RC_ADD("filter3", 0)
+ MCFG_DEVICE_ADD("filter3", FILTER_RC)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tp84_state::tp84b)
tp84(config);
- MCFG_CPU_MODIFY("cpu1")
- MCFG_CPU_PROGRAM_MAP(tp84b_cpu1_map)
+ MCFG_DEVICE_MODIFY("cpu1")
+ MCFG_DEVICE_PROGRAM_MAP(tp84b_cpu1_map)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp
index b751d640407..68015ae90ab 100644
--- a/src/mame/drivers/tr175.cpp
+++ b/src/mame/drivers/tr175.cpp
@@ -85,8 +85,8 @@ static INPUT_PORTS_START( tr175 )
INPUT_PORTS_END
MACHINE_CONFIG_START(tr175_state::tr175)
- MCFG_CPU_ADD("maincpu", M68000, 12'000'000)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12'000'000)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'322'000), 900, 0, 720, 449, 0, 416) // guess
diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp
index 601a233cad3..0294a67e919 100644
--- a/src/mame/drivers/tr606.cpp
+++ b/src/mame/drivers/tr606.cpp
@@ -81,7 +81,7 @@ void tr606_state::machine_start()
MACHINE_CONFIG_START(tr606_state::tr606)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NEC_D650, TP2_HZ)
+ MCFG_DEVICE_ADD("maincpu", NEC_D650, TP2_HZ)
MCFG_TIMER_DRIVER_ADD_PERIODIC("tp3_clock", tr606_state, tp3_clock, TP3_PERIOD)
MCFG_TIMER_START_DELAY(TP3_PERIOD - TP3_LOW)
diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index b254713addb..3120f904307 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -904,24 +904,24 @@ WRITE_LINE_MEMBER(trackfld_state::vblank_nmi)
MACHINE_CONFIG_START(trackfld_state::trackfld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/6/2) /* a guess for now */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", KONAMI1, MASTER_CLOCK/6/2) /* a guess for now */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(trackfld_state,trackfld)
MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 1D
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(trackfld_state, flipscreen_w)) // FLIP
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("trackfld_audio", trackfld_audio_device, sh_irqtrigger_w)) // 26 = SOUND ON
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, trackfld_state, flipscreen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("trackfld_audio", trackfld_audio_device, sh_irqtrigger_w)) // 26 = SOUND ON
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // 25 = MUT?
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(trackfld_state, coin_counter_1_w)) // 24 = OUT1
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(trackfld_state, coin_counter_2_w)) // 23 = OUT2
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, trackfld_state, coin_counter_1_w)) // 24 = OUT1
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, trackfld_state, coin_counter_2_w)) // 23 = OUT2
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP) // CN3.2
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) // CN3.4
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(trackfld_state, irq_mask_w)) // INT
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, trackfld_state, irq_mask_w)) // INT
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -935,7 +935,7 @@ MACHINE_CONFIG_START(trackfld_state::trackfld)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(trackfld_state, screen_update_trackfld)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(trackfld_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, trackfld_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", trackfld)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -948,24 +948,24 @@ MACHINE_CONFIG_START(trackfld_state::trackfld)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_DEVICE_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // ls374.8e + r34-r47(20k) + r35-r53(10k) + r54(20k) + upc324.8f
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // ls374.8e + r34-r47(20k) + r35-r53(10k) + r54(20k) + upc324.8f
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76496, SOUND_CLOCK/8)
+ MCFG_DEVICE_ADD("snsnd", SN76496, SOUND_CLOCK/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
+ MCFG_DEVICE_ADD("vlm", VLM5030, VLM_CLOCK)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(trackfld_state::trackfldu)
trackfld(config);
- MCFG_CPU_REPLACE("maincpu", MC6809E, MASTER_CLOCK/6/2) /* exact M6809 model unknown */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_REPLACE("maincpu", MC6809E, MASTER_CLOCK/6/2) /* exact M6809 model unknown */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MACHINE_CONFIG_END
@@ -978,26 +978,26 @@ INTERRUPT_GEN_MEMBER(trackfld_state::yieartf_timer_irq)
MACHINE_CONFIG_START(trackfld_state::yieartf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/6/2) /* a guess for now */
- MCFG_CPU_PROGRAM_MAP(yieartf_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(trackfld_state, yieartf_timer_irq, 480)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/6/2) /* a guess for now */
+ MCFG_DEVICE_PROGRAM_MAP(yieartf_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(trackfld_state, yieartf_timer_irq, 480)
// z80 isn't used
-// MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK/4)
-// MCFG_CPU_PROGRAM_MAP(sound_map)
+// MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK/4)
+// MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(trackfld_state,trackfld)
MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(trackfld_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("trackfld_audio", trackfld_audio_device, sh_irqtrigger_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(trackfld_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(trackfld_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(trackfld_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, trackfld_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("trackfld_audio", trackfld_audio_device, sh_irqtrigger_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, trackfld_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, trackfld_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, trackfld_state, coin_counter_2_w))
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(NOOP)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP)
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(trackfld_state, irq_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, trackfld_state, irq_mask_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1011,7 +1011,7 @@ MACHINE_CONFIG_START(trackfld_state::yieartf)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(trackfld_state, screen_update_trackfld)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(trackfld_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, trackfld_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", trackfld)
MCFG_PALETTE_ADD("palette", 16*16+16*16)
@@ -1024,16 +1024,16 @@ MACHINE_CONFIG_START(trackfld_state::yieartf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_DEVICE_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // ls374.8e + r34-r47(20k) + r35-r53(10k) + r54(20k) + upc324.8f
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) // ls374.8e + r34-r47(20k) + r35-r53(10k) + r54(20k) + upc324.8f
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("snsnd", SN76496, MASTER_CLOCK/6/2)
+ MCFG_DEVICE_ADD("snsnd", SN76496, MASTER_CLOCK/6/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, VLM_CLOCK)
+ MCFG_DEVICE_ADD("vlm", VLM5030, VLM_CLOCK)
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1066,23 +1066,23 @@ void trackfld_state::hyprolyb_adpcm_map(address_map &map)
MACHINE_CONFIG_START(trackfld_state::hyprolyb)
trackfld(config);
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(hyprolyb_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(hyprolyb_sound_map)
MCFG_MACHINE_START_OVERRIDE(trackfld_state,trackfld)
MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld)
/* sound hardware */
MCFG_DEVICE_REMOVE("vlm")
- MCFG_CPU_ADD("adpcm", M6802, XTAL(14'318'181)/8) /* unknown clock */
- MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
+ MCFG_DEVICE_ADD("adpcm", M6802, XTAL(14'318'181)/8) /* unknown clock */
+ MCFG_DEVICE_PROGRAM_MAP(hyprolyb_adpcm_map)
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
+ MCFG_DEVICE_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(DEVWRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
@@ -1098,8 +1098,8 @@ MACHINE_CONFIG_START(trackfld_state::mastkin)
trackfld(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", MC6809E, MASTER_CLOCK/6/2) /* a guess for now */
- MCFG_CPU_PROGRAM_MAP(mastkin_map)
+ MCFG_DEVICE_REPLACE("maincpu", MC6809E, MASTER_CLOCK/6/2) /* a guess for now */
+ MCFG_DEVICE_PROGRAM_MAP(mastkin_map)
MCFG_DEVICE_MODIFY("mainlatch")
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // actually not used
@@ -1111,23 +1111,23 @@ MACHINE_CONFIG_START(trackfld_state::wizzquiz)
/* basic machine hardware */
// right cpu?
- MCFG_CPU_REPLACE("maincpu",M6800,2048000) /* 1.400 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(wizzquiz_map)
+ MCFG_DEVICE_REPLACE("maincpu",M6800,2048000) /* 1.400 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(wizzquiz_map)
MCFG_DEVICE_MODIFY("screen")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(trackfld_state, vblank_nmi))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, trackfld_state, vblank_nmi))
MCFG_DEVICE_MODIFY("mainlatch")
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(trackfld_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, trackfld_state, nmi_mask_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(trackfld_state::reaktor)
trackfld(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu",Z80,MASTER_CLOCK/6)
- MCFG_CPU_PROGRAM_MAP(reaktor_map)
- MCFG_CPU_IO_MAP(reaktor_io_map)
+ MCFG_DEVICE_REPLACE("maincpu",Z80,MASTER_CLOCK/6)
+ MCFG_DEVICE_PROGRAM_MAP(reaktor_map)
+ MCFG_DEVICE_IO_MAP(reaktor_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp
index 3a4a623c985..1d75c22be54 100644
--- a/src/mame/drivers/tranz330.cpp
+++ b/src/mame/drivers/tranz330.cpp
@@ -148,7 +148,7 @@ void tranz330_state::tranz330(machine_config &config)
m_cpu->set_daisy_config(tranz330_daisy_chain);
CLOCK(config, "ctc_clock", XTAL(7'159'090)/4) // ?
- .set_signal_handler(DEVCB_WRITELINE(tranz330_state, clock_w));
+ .set_signal_handler(DEVCB_WRITELINE(*this, tranz330_state, clock_w));
MSM6242(config, RTC_TAG, XTAL(32'768));
@@ -156,33 +156,33 @@ void tranz330_state::tranz330(machine_config &config)
.set_output_handler(DEVCB_INPUTLINE(m_cpu, INPUT_LINE_IRQ0));
Z80PIO(config, m_pio, XTAL(7'159'090)/2); //*
- m_pio->set_out_int_callback(DEVCB_DEVWRITELINE("irq", input_merger_device, in_w<0>)); //*
- m_pio->set_out_pa_callback(DEVCB_WRITE8(tranz330_state, pio_a_w));
- m_pio->set_in_pa_callback(DEVCB_READ8(tranz330_state, card_r));
- m_pio->set_in_pb_callback(DEVCB_READ8(tranz330_state, pio_b_r));
+ m_pio->set_out_int_callback(DEVCB_WRITELINE("irq", input_merger_device, in_w<0>)); //*
+ m_pio->set_out_pa_callback(DEVCB_WRITE8(*this, tranz330_state, pio_a_w));
+ m_pio->set_in_pa_callback(DEVCB_READ8(*this, tranz330_state, card_r));
+ m_pio->set_in_pb_callback(DEVCB_READ8(*this, tranz330_state, pio_b_r));
Z80DART(config, m_dart, XTAL(7'159'090)/2); //*
- m_dart->set_out_syncb_callback(DEVCB_WRITELINE(tranz330_state, syncb_w));
- m_dart->set_out_txdb_callback(DEVCB_DEVWRITELINE(m_rs232, rs232_port_device, write_txd)); //?
- m_dart->set_out_dtrb_callback(DEVCB_DEVWRITELINE(m_rs232, rs232_port_device, write_dtr)); //?
- m_dart->set_out_rtsb_callback(DEVCB_DEVWRITELINE(m_rs232, rs232_port_device, write_rts)); //?
- m_dart->set_out_int_callback(DEVCB_DEVWRITELINE("irq", input_merger_device, in_w<1>));
+ m_dart->set_out_syncb_callback(DEVCB_WRITELINE(*this, tranz330_state, syncb_w));
+ m_dart->set_out_txdb_callback(DEVCB_WRITELINE(m_rs232, rs232_port_device, write_txd)); //?
+ m_dart->set_out_dtrb_callback(DEVCB_WRITELINE(m_rs232, rs232_port_device, write_dtr)); //?
+ m_dart->set_out_rtsb_callback(DEVCB_WRITELINE(m_rs232, rs232_port_device, write_rts)); //?
+ m_dart->set_out_int_callback(DEVCB_WRITELINE("irq", input_merger_device, in_w<1>));
Z80CTC(config, m_ctc, XTAL(7'159'090)/2); //*
- m_ctc->set_zc_callback<2>(DEVCB_WRITELINE(tranz330_state, sound_w));
- m_ctc->set_intr_callback(DEVCB_DEVWRITELINE("irq", input_merger_device, in_w<2>));
+ m_ctc->set_zc_callback<2>(DEVCB_WRITELINE(*this, tranz330_state, sound_w));
+ m_ctc->set_intr_callback(DEVCB_WRITELINE("irq", input_merger_device, in_w<2>));
RS232_PORT(config, m_rs232, default_rs232_devices, nullptr);
- m_rs232->set_rxd_handler(DEVCB_DEVWRITELINE(m_dart, z80dart_device, rxb_w));
- m_rs232->set_dcd_handler(DEVCB_DEVWRITELINE(m_dart, z80dart_device, dcdb_w));
- m_rs232->set_cts_handler(DEVCB_DEVWRITELINE(m_dart, z80dart_device, ctsb_w));
+ m_rs232->set_rxd_handler(DEVCB_WRITELINE(m_dart, z80dart_device, rxb_w));
+ m_rs232->set_dcd_handler(DEVCB_WRITELINE(m_dart, z80dart_device, dcdb_w));
+ m_rs232->set_cts_handler(DEVCB_WRITELINE(m_dart, z80dart_device, ctsb_w));
// video
MIC10937(config, VFD_TAG).set_port_value(0);
config.m_default_layout = &layout_tranz330;
// sound
- SPEAKER(config, "mono", 0).standard_mono();
+ SPEAKER(config, "mono").standard_mono();
SPEAKER_SOUND(config, "speaker", 0)
.add_route(ALL_OUTPUTS, "mono", 0.25);
}
diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp
index 90a3d698804..ee0c9cbe2ed 100644
--- a/src/mame/drivers/travrusa.cpp
+++ b/src/mame/drivers/travrusa.cpp
@@ -307,9 +307,9 @@ void travrusa_state::machine_reset()
MACHINE_CONFIG_START(travrusa_state::travrusa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", travrusa_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", travrusa_state, irq0_line_hold)
/* video hardware */
diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp
index d0bab99c53a..870230c34ce 100644
--- a/src/mame/drivers/tricep.cpp
+++ b/src/mame/drivers/tricep.cpp
@@ -93,23 +93,23 @@ static DEVICE_INPUT_DEFAULTS_START( terminal )
DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(tricep_state::tricep)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(tricep_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(tricep_mem)
MCFG_DEVICE_ADD("pci0", MC2661, 4915200)
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
MCFG_DEVICE_ADD("pci1", MC2661, 4915200)
MCFG_DEVICE_ADD("pci2", MC2661, 4915200)
MCFG_DEVICE_ADD("pci3", MC2661, 4915200)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("pci0", mc2661_device, rx_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("pci0", mc2661_device, dsr_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("pci0", mc2661_device, dcd_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("pci0", mc2661_device, cts_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("pci0", mc2661_device, rx_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("pci0", mc2661_device, dsr_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("pci0", mc2661_device, dcd_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("pci0", mc2661_device, cts_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp
index 85b3c004cbb..d5b35b35e6d 100644
--- a/src/mame/drivers/triforce.cpp
+++ b/src/mame/drivers/triforce.cpp
@@ -571,8 +571,8 @@ void triforce_state::machine_start()
MACHINE_CONFIG_START(triforce_state::triforce_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC603, 64000000) /* Correct CPU is a PowerPC 750 (what Apple called "G3") with paired-single vector instructions added */
- MCFG_CPU_PROGRAM_MAP(gc_map)
+ MCFG_DEVICE_ADD("maincpu", PPC603, 64000000) /* Correct CPU is a PowerPC 750 (what Apple called "G3") with paired-single vector instructions added */
+ MCFG_DEVICE_PROGRAM_MAP(gc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp
index be1955f6246..5d92c79579d 100644
--- a/src/mame/drivers/triplhnt.cpp
+++ b/src/mame/drivers/triplhnt.cpp
@@ -293,23 +293,23 @@ PALETTE_INIT_MEMBER(triplhnt_state, triplhnt)
MACHINE_CONFIG_START(triplhnt_state::triplhnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6800, 800000)
- MCFG_CPU_PROGRAM_MAP(triplhnt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", triplhnt_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M6800, 800000)
+ MCFG_DEVICE_PROGRAM_MAP(triplhnt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", triplhnt_state, irq0_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram") // battery-backed 74C89 at J5
MCFG_DEVICE_ADD("latch", F9334, 0) // J7
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // unused
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(triplhnt_state, lamp1_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("discrete", discrete_device, write_line<TRIPLHNT_LAMP_EN>)) // Lamp is used to reset noise
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<TRIPLHNT_SCREECH_EN>)) // screech
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(triplhnt_state, coin_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(triplhnt_state, sprite_zoom_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(triplhnt_state, ram_2_w)) // CMOS write
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(triplhnt_state, tape_control_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(triplhnt_state, sprite_bank_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("discrete", discrete_device, write_line<TRIPLHNT_BEAR_EN>)) // bear
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, triplhnt_state, lamp1_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("discrete", discrete_device, write_line<TRIPLHNT_LAMP_EN>)) // Lamp is used to reset noise
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("discrete", discrete_device, write_line<TRIPLHNT_SCREECH_EN>)) // screech
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, triplhnt_state, coin_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, triplhnt_state, sprite_zoom_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, triplhnt_state, ram_2_w)) // CMOS write
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, triplhnt_state, tape_control_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, triplhnt_state, sprite_bank_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("discrete", discrete_device, write_line<TRIPLHNT_BEAR_EN>)) // bear
MCFG_WATCHDOG_ADD("watchdog")
@@ -328,12 +328,12 @@ MACHINE_CONFIG_START(triplhnt_state::triplhnt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(2) /* 2 channels */
MCFG_SAMPLES_NAMES(triplhnt_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(triplhnt)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index 73583392b0b..8c045d5698b 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -608,10 +608,10 @@ static void trs80_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(trs80_state::trs80) // the original model I, level I, with no extras
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 10.6445_MHz_XTAL / 6) // "a little over 1.774 MHz"
+ MCFG_DEVICE_ADD("maincpu", Z80, 10.6445_MHz_XTAL / 6) // "a little over 1.774 MHz"
// MAME driver previously configured CPU at "1.796 MHz"; where did this number come from?
- MCFG_CPU_PROGRAM_MAP(trs80_map)
- MCFG_CPU_IO_MAP(trs80_io)
+ MCFG_DEVICE_PROGRAM_MAP(trs80_map)
+ MCFG_DEVICE_IO_MAP(trs80_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -624,7 +624,7 @@ MACHINE_CONFIG_START(trs80_state::trs80) // the original model I, level I,
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
@@ -635,10 +635,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::model1) // model I, level II
trs80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(model1_map)
- MCFG_CPU_IO_MAP(model1_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(trs80_state, trs80_rtc_interrupt, 40)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(model1_map)
+ MCFG_DEVICE_IO_MAP(model1_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(trs80_state, trs80_rtc_interrupt, 40)
/* devices */
MCFG_CASSETTE_MODIFY("cassette")
@@ -648,7 +648,7 @@ MACHINE_CONFIG_START(trs80_state::model1) // model I, level II
MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 0.5)
MCFG_FD1793_ADD("fdc", 4_MHz_XTAL / 4) // todo: should be fd1771
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(trs80_state,trs80_fdc_intrq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, trs80_state,trs80_fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", trs80_floppies, "sssd", trs80_state::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -658,10 +658,10 @@ MACHINE_CONFIG_START(trs80_state::model1) // model I, level II
MCFG_FLOPPY_DRIVE_ADD("fdc:3", trs80_floppies, "", trs80_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit7))
- MCFG_CENTRONICS_PERROR_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit6))
- MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit5))
- MCFG_CENTRONICS_FAULT_HANDLER(DEVWRITELINE("cent_status_in", input_buffer_device, write_bit4))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit7))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit6))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit5))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE("cent_status_in", input_buffer_device, write_bit4))
MCFG_DEVICE_ADD("cent_status_in", INPUT_BUFFER, 0)
@@ -675,11 +675,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::model3)
model1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(20.2752_MHz_XTAL / 10)
- MCFG_CPU_PROGRAM_MAP(model3_map)
- MCFG_CPU_IO_MAP(model3_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(trs80_state, trs80_rtc_interrupt, 20.2752_MHz_XTAL / 10 / 67584)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(20.2752_MHz_XTAL / 10)
+ MCFG_DEVICE_PROGRAM_MAP(model3_map)
+ MCFG_DEVICE_IO_MAP(model3_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(trs80_state, trs80_rtc_interrupt, 20.2752_MHz_XTAL / 10 / 67584)
MCFG_MACHINE_RESET_OVERRIDE(trs80_state, trs80m4)
@@ -692,20 +692,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::model4)
model3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(model4_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(model4_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::model4p)
model3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(model4p_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(model4p_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::sys80)
model1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(sys80_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(sys80_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::ht1080z)
@@ -717,10 +717,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::lnw80)
model1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(16_MHz_XTAL / 4) // or 16MHz / 9; 4MHz or 1.77MHz operation selected by HI/LO switch
- MCFG_CPU_PROGRAM_MAP(lnw80_map)
- MCFG_CPU_IO_MAP(lnw80_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(16_MHz_XTAL / 4) // or 16MHz / 9; 4MHz or 1.77MHz operation selected by HI/LO switch
+ MCFG_DEVICE_PROGRAM_MAP(lnw80_map)
+ MCFG_DEVICE_IO_MAP(lnw80_io)
MCFG_MACHINE_RESET_OVERRIDE(trs80_state, lnw80)
MCFG_GFXDECODE_MODIFY("gfxdecode",lnw80)
@@ -736,10 +736,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::radionic)
model1(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(12_MHz_XTAL / 6) // or 3.579MHz / 2 (selectable?)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(12_MHz_XTAL / 6) // or 3.579MHz / 2 (selectable?)
// Komtek I "User Friendly Manual" calls for "Z80 running at 1.97 MHz." Schematics mark XTAL as 12 MHz, but is that rounded off?
- MCFG_CPU_PERIODIC_INT_DRIVER(trs80_state, nmi_line_pulse, 12_MHz_XTAL / 12 / 16384)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(trs80_state, nmi_line_pulse, 12_MHz_XTAL / 12 / 16384)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(12_MHz_XTAL, 768, 0, 512, 312, 0, 256)
@@ -749,9 +749,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::meritum)
sys80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(meritum_map)
- MCFG_CPU_IO_MAP(meritum_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(meritum_map)
+ MCFG_DEVICE_IO_MAP(meritum_io)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(trs80_state, screen_update_meritum)
MCFG_GFXDECODE_MODIFY("gfxdecode", meritum)
@@ -759,8 +759,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80_state::cp500)
model3(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(cp500_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(cp500_io)
MCFG_MACHINE_RESET_OVERRIDE(trs80_state, cp500)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp
index 1977a415d4d..933da7140d7 100644
--- a/src/mame/drivers/trs80dt1.cpp
+++ b/src/mame/drivers/trs80dt1.cpp
@@ -309,11 +309,11 @@ I8275_DRAW_CHARACTER_MEMBER( trs80dt1_state::crtc_update_row )
MACHINE_CONFIG_START(trs80dt1_state::trs80dt1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, 7372800)
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(trs80dt1_state, port1_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(trs80dt1_state, port3_w))
+ MCFG_DEVICE_ADD("maincpu", I8051, 7372800)
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, trs80dt1_state, port1_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, trs80dt1_state, port3_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -328,9 +328,9 @@ MACHINE_CONFIG_START(trs80dt1_state::trs80dt1)
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(trs80dt1_state, crtc_update_row)
MCFG_I8275_DRQ_CALLBACK(INPUTLINE("maincpu", MCS51_INT0_LINE)) // BRDY pin goes through inverter to /INT0, so we don't invert
- MCFG_I8275_IRQ_CALLBACK(DEVWRITELINE("7474", ttl7474_device, clear_w)) // INT pin
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("7474", ttl7474_device, d_w))
- MCFG_I8275_VRTC_CALLBACK(DEVWRITELINE("7474", ttl7474_device, clock_w))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE("7474", ttl7474_device, clear_w)) // INT pin
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("7474", ttl7474_device, d_w))
+ MCFG_I8275_VRTC_CALLBACK(WRITELINE("7474", ttl7474_device, clock_w))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_PALETTE_ADD("palette", 3)
@@ -341,7 +341,7 @@ MACHINE_CONFIG_START(trs80dt1_state::trs80dt1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 2000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index d85ef889dea..4726bb2d76e 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -709,10 +709,10 @@ void trs80m2_state::machine_reset()
MACHINE_CONFIG_START(trs80m2_state::trs80m2)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(z80_io)
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(z80_io)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
@@ -728,13 +728,13 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(trs80m2_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(trs80m2_state, de_w))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(trs80m2_state, vsync_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, trs80m2_state, de_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, trs80m2_state, vsync_w))
// devices
MCFG_FD1791_ADD(FD1791_TAG, XTAL(8'000'000)/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITE8(Z80PIO_TAG, z80pio_device, pa_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(Z80PIO_TAG, z80pio_device, pa_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -742,39 +742,39 @@ MACHINE_CONFIG_START(trs80m2_state::trs80m2)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, txca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80SIO_TAG, z80dart_device, txca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/2/2))
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(trs80m2_state, read))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(trs80m2_state, write))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(trs80m2_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(trs80m2_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, trs80m2_state, read))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, trs80m2_state, write))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, trs80m2_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, trs80m2_state, io_write_byte))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(trs80m2_state, pio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(trs80m2_state, pio_pa_w))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(trs80m2_state, strobe_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, trs80m2_state, pio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, trs80m2_state, pio_pa_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, trs80m2_state, strobe_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(Z80PIO_TAG, z80pio_device, strobe_b))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(trs80m2_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(trs80m2_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(trs80m2_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(Z80PIO_TAG, z80pio_device, strobe_b))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD(TRS80M2_KEYBOARD_TAG, TRS80M2_KEYBOARD, 0)
- MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(WRITELINE(trs80m2_state, kb_clock_w))
+ MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(WRITELINE(*this, trs80m2_state, kb_clock_w))
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(trs80m2_state, kbd_w))
@@ -794,14 +794,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(trs80m16_state::trs80m16)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
- MCFG_CPU_PROGRAM_MAP(z80_mem)
- MCFG_CPU_IO_MAP(m16_z80_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, am9519_device, iack_cb)
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_IO_MAP(m16_z80_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(AM9519A_TAG, am9519_device, iack_cb)
- MCFG_CPU_ADD(M68000_TAG, M68000, XTAL(24'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(m68000_mem)
+ MCFG_DEVICE_ADD(M68000_TAG, M68000, XTAL(24'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(m68000_mem)
MCFG_DEVICE_DISABLE()
// video hardware
@@ -818,13 +818,13 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(trs80m2_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(trs80m2_state, de_w))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(trs80m2_state, vsync_w))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, trs80m2_state, de_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, trs80m2_state, vsync_w))
// devices
MCFG_FD1791_ADD(FD1791_TAG, XTAL(8'000'000)/4)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITE8(Z80PIO_TAG, z80pio_device, pa_w))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITE8(Z80PIO_TAG, z80pio_device, pa_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(Z80DMA_TAG, z80dma_device, rdy_w))
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":1", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":2", trs80m2_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -832,26 +832,26 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, txca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxca_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(Z80SIO_TAG, z80dart_device, txca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", trs80m2_state, ctc_tick, attotime::from_hz(XTAL(8'000'000)/2/2))
MCFG_DEVICE_ADD(Z80DMA_TAG, Z80DMA, XTAL(8'000'000)/2)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE(Z80_TAG, INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(trs80m2_state, read))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(trs80m2_state, write))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(trs80m2_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(trs80m2_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, trs80m2_state, read))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, trs80m2_state, write))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, trs80m2_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, trs80m2_state, io_write_byte))
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(8'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(trs80m2_state, pio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(trs80m2_state, pio_pa_w))
- MCFG_Z80PIO_OUT_PB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(trs80m2_state, strobe_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, trs80m2_state, pio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, trs80m2_state, pio_pa_w))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(*this, trs80m2_state, strobe_w))
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(8'000'000)/2)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
@@ -860,14 +860,14 @@ MACHINE_CONFIG_START(trs80m16_state::trs80m16)
MCFG_AM9519_OUT_INT_CB(INPUTLINE(M68000_TAG, M68K_IRQ_5))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(Z80PIO_TAG, z80pio_device, strobe_b))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(trs80m2_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(trs80m2_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(trs80m2_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(Z80PIO_TAG, z80pio_device, strobe_b))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, trs80m2_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
MCFG_DEVICE_ADD(TRS80M2_KEYBOARD_TAG, TRS80M2_KEYBOARD, 0)
- MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(WRITELINE(trs80m2_state, kb_clock_w))
+ MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(WRITELINE(*this, trs80m2_state, kb_clock_w))
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
MCFG_GENERIC_KEYBOARD_CB(PUT(trs80m2_state, kbd_w))
diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp
index d2816e73c86..bde86316cba 100644
--- a/src/mame/drivers/truco.cpp
+++ b/src/mame/drivers/truco.cpp
@@ -420,9 +420,9 @@ INTERRUPT_GEN_MEMBER(truco_state::interrupt)
MACHINE_CONFIG_START(truco_state::truco)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", truco_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6809, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", truco_state, interrupt)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_seconds(1.6)) /* 1.6 seconds */
@@ -430,11 +430,11 @@ MACHINE_CONFIG_START(truco_state::truco)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("P1"))
MCFG_PIA_READPB_HANDLER(IOPORT("JMPRS"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(truco_state,porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(truco_state,portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(truco_state,pia_ca2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(truco_state,pia_irqa_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(truco_state,pia_irqb_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, truco_state,porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, truco_state,portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, truco_state,pia_ca2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, truco_state,pia_irqa_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, truco_state,pia_irqb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(truco_state::truco)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp
index 414e949ff21..69e99bce43b 100644
--- a/src/mame/drivers/trucocl.cpp
+++ b/src/mame/drivers/trucocl.cpp
@@ -145,9 +145,9 @@ INTERRUPT_GEN_MEMBER(trucocl_state::trucocl_interrupt)
MACHINE_CONFIG_START(trucocl_state::trucocl)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", trucocl_state, trucocl_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", trucocl_state, trucocl_interrupt)
MCFG_WATCHDOG_ADD("watchdog")
@@ -167,7 +167,7 @@ MACHINE_CONFIG_START(trucocl_state::trucocl)
/* 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
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index 1a71d393909..1e6fef491c2 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -385,9 +385,9 @@ void trvmadns_state::machine_reset()
}
MACHINE_CONFIG_START(trvmadns_state::trvmadns)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(10'000'000)/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2))
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(10'000'000)/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2))
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
@@ -407,7 +407,7 @@ MACHINE_CONFIG_START(trvmadns_state::trvmadns)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(10'000'000)/2/4) //?
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(10'000'000)/2/4) //?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp
index 70a8faaad89..e77a7fecbdc 100644
--- a/src/mame/drivers/trvquest.cpp
+++ b/src/mame/drivers/trvquest.cpp
@@ -180,9 +180,9 @@ INTERRUPT_GEN_MEMBER(gameplan_state::trvquest_interrupt)
MACHINE_CONFIG_START(gameplan_state::trvquest)
- MCFG_CPU_ADD("maincpu", M6809,XTAL(6'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", gameplan_state, trvquest_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M6809,XTAL(6'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gameplan_state, trvquest_interrupt)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_MACHINE_START_OVERRIDE(gameplan_state,trvquest)
@@ -194,28 +194,28 @@ MACHINE_CONFIG_START(gameplan_state::trvquest)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(6'000'000)/2)
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(6'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(6'000'000)/2)
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(6'000'000)/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, XTAL(6'000'000)/4)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(gameplan_state, video_data_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(gameplan_state, gameplan_video_command_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, video_command_trigger_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, gameplan_state, video_data_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, gameplan_state, gameplan_video_command_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, video_command_trigger_w))
MCFG_DEVICE_ADD("via6522_1", VIA6522, XTAL(6'000'000)/4)
MCFG_VIA6522_READPA_HANDLER(IOPORT("IN0"))
MCFG_VIA6522_READPB_HANDLER(IOPORT("IN1"))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, trvquest_coin_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, trvquest_coin_w))
MCFG_DEVICE_ADD("via6522_2", VIA6522, XTAL(6'000'000)/4)
MCFG_VIA6522_READPA_HANDLER(IOPORT("UNK"))
MCFG_VIA6522_READPB_HANDLER(IOPORT("DSW"))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(gameplan_state, trvquest_misc_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(gameplan_state, via_irq))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, gameplan_state, trvquest_misc_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, gameplan_state, via_irq))
MACHINE_CONFIG_END
ROM_START( trvquest )
diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp
index bfb81950633..e2a6741cbfd 100644
--- a/src/mame/drivers/tryout.cpp
+++ b/src/mame/drivers/tryout.cpp
@@ -193,12 +193,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(tryout_state::tryout)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 2000000) /* ? */
- MCFG_CPU_PROGRAM_MAP(main_cpu)
+ MCFG_DEVICE_ADD("maincpu", M6502, 2000000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_cpu)
- MCFG_CPU_ADD("audiocpu", M6502, 1500000) /* ? */
- MCFG_CPU_PROGRAM_MAP(sound_cpu)
- MCFG_CPU_PERIODIC_INT_DRIVER(tryout_state, nmi_line_pulse, 1000) /* controls BGM tempo, 1000 is an hand-tuned value to match a side-by-side video */
+ MCFG_DEVICE_ADD("audiocpu", M6502, 1500000) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tryout_state, nmi_line_pulse, 1000) /* controls BGM tempo, 1000 is an hand-tuned value to match a side-by-side video */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -218,7 +218,7 @@ MACHINE_CONFIG_START(tryout_state::tryout)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ts3000.cpp b/src/mame/drivers/ts3000.cpp
index 6c364df7865..5c9c8c99c99 100644
--- a/src/mame/drivers/ts3000.cpp
+++ b/src/mame/drivers/ts3000.cpp
@@ -45,9 +45,9 @@ static INPUT_PORTS_START( ts3000 )
INPUT_PORTS_END
MACHINE_CONFIG_START(ts3000_state::ts3000)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3) // no idea of clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3) // no idea of clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MACHINE_CONFIG_END
ROM_START( ts3000 )
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index dd39d82a41b..e014e70e80e 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -187,9 +187,9 @@ DRIVER_INIT_MEMBER( ts802_state, ts802 )
MACHINE_CONFIG_START(ts802_state::ts802)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ts802_mem)
- MCFG_CPU_IO_MAP(ts802_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ts802_mem)
+ MCFG_DEVICE_IO_MAP(ts802_io)
//MCFG_Z80_DAISY_CHAIN(daisy_chain_intf) // causes problems
MCFG_MACHINE_RESET_OVERRIDE(ts802_state, ts802)
@@ -200,10 +200,10 @@ MACHINE_CONFIG_START(ts802_state::ts802)
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(ts802_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(ts802_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(ts802_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(ts802_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, ts802_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, ts802_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, ts802_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, ts802_state, io_write_byte))
MCFG_DEVICE_ADD("dart1", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 0b563ed0482..bae0381343e 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -418,9 +418,9 @@ static const z80_daisy_config daisy_chain[] =
};
MACHINE_CONFIG_START(ts803_state::ts803)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(ts803_mem)
- MCFG_CPU_IO_MAP(ts803_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(ts803_mem)
+ MCFG_DEVICE_IO_MAP(ts803_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
/* video hardware */
@@ -439,27 +439,27 @@ MACHINE_CONFIG_START(ts803_state::ts803)
MCFG_MC6845_ADDR_CHANGED_CB(ts803_state, crtc_update_addr)
MCFG_DEVICE_ADD("sti_clock", CLOCK, XTAL(16'000'000) / 13)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("sti", z80sti_device, tc_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sti", z80sti_device, rc_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("sti", z80sti_device, tc_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sti", z80sti_device, rc_w))
MCFG_DEVICE_ADD("dart_clock", CLOCK, (XTAL(16'000'000) / 13) / 8)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("dart", z80dart_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("dart", z80dart_device, rxca_w))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("dart", z80dart_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("dart", z80dart_device, rxca_w))
MCFG_DEVICE_ADD("sti", Z80STI, XTAL(16'000'000)/4)
- MCFG_Z80STI_OUT_TBO_CB(DEVWRITELINE("dart", z80dart_device, rxtxcb_w))
+ MCFG_Z80STI_OUT_TBO_CB(WRITELINE("dart", z80dart_device, rxtxcb_w))
MCFG_Z80STI_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("dart", Z80DART, XTAL(16'000'000) / 4)
MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "keyboard")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("dart", z80dart_device, rxa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "keyboard")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("dart", z80dart_device, rxa_w))
/* floppy disk */
MCFG_FD1793_ADD("fdc", XTAL(1'000'000))
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("sti", z80sti_device, i7_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("sti", z80sti_device, i7_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", ts803_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", ts803_floppies, "525dd", floppy_image_device::default_floppy_formats)
diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp
index 88c9298501a..d6c457c80a3 100644
--- a/src/mame/drivers/ts816.cpp
+++ b/src/mame/drivers/ts816.cpp
@@ -262,9 +262,9 @@ DRIVER_INIT_MEMBER( ts816_state, ts816 )
MACHINE_CONFIG_START(ts816_state::ts816)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(ts816_mem)
- MCFG_CPU_IO_MAP(ts816_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(ts816_mem)
+ MCFG_DEVICE_IO_MAP(ts816_io)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
/* video hardware */
@@ -294,9 +294,9 @@ MACHINE_CONFIG_START(ts816_state::ts816)
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- //MCFG_Z80PIO_IN_PA_CB(READ8(ts816_state, porta_r))
- //MCFG_Z80PIO_IN_PB_CB(READ8(ts816_state, portb_r))
- //MCFG_Z80PIO_OUT_PB_CB(WRITE8(ts816_state, portb_w))
+ //MCFG_Z80PIO_IN_PA_CB(READ8(*this, ts816_state, porta_r))
+ //MCFG_Z80PIO_IN_PB_CB(READ8(*this, ts816_state, portb_r))
+ //MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, ts816_state, portb_w))
MCFG_DEVICE_ADD("ctc1", Z80CTC, XTAL(16'000'000) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -304,7 +304,7 @@ MACHINE_CONFIG_START(ts816_state::ts816)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(16'000'000) / 4)
- //MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(ts816_state, busreq_w))
+ //MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, ts816_state, busreq_w))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp
index 06fbeaebd0b..785a5e9dba3 100644
--- a/src/mame/drivers/tsamurai.cpp
+++ b/src/mame/drivers/tsamurai.cpp
@@ -719,24 +719,24 @@ GFXDECODE_END
MACHINE_CONFIG_START(tsamurai_state::tsamurai)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(z80_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(z80_io_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound1_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound1_map)
- MCFG_CPU_ADD("audio2", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound2_map)
+ MCFG_DEVICE_ADD("audio2", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound2_map)
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,tsamurai)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(tsamurai_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(tsamurai_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tsamurai_state, textbank1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tsamurai_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(tsamurai_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tsamurai_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tsamurai_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tsamurai_state, textbank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tsamurai_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, tsamurai_state, coin2_counter_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -746,7 +746,7 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai)
MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255-16)
MCFG_SCREEN_UPDATE_DRIVER(tsamurai_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tsamurai_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
@@ -755,11 +755,11 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
@@ -769,22 +769,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tsamurai_state::vsgongf)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(vsgongf_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(vsgongf_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound_vsgongf_map)
- MCFG_CPU_IO_MAP(vsgongf_audio_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tsamurai_state, vsgongf_sound_interrupt, 3*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound_vsgongf_map)
+ MCFG_DEVICE_IO_MAP(vsgongf_audio_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tsamurai_state, vsgongf_sound_interrupt, 3*60)
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,vsgongf)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 4L
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // vreg? always 0
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(tsamurai_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tsamurai_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tsamurai_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(tsamurai_state, textbank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tsamurai_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tsamurai_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tsamurai_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, tsamurai_state, textbank1_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -794,7 +794,7 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf)
MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255-16)
MCFG_SCREEN_UPDATE_DRIVER(tsamurai_state, screen_update_vsgongf)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tsamurai_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai)
MCFG_PALETTE_ADD_RRRRGGGGBBBB_PROMS("palette", "proms", 256)
@@ -805,10 +805,10 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -817,29 +817,29 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tsamurai_state::m660)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(m660_map)
- MCFG_CPU_IO_MAP(z80_m660_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(m660_map)
+ MCFG_DEVICE_IO_MAP(z80_m660_io_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound1_m660_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound1_m660_map)
- MCFG_CPU_ADD("audio2", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound2_m660_map)
+ MCFG_DEVICE_ADD("audio2", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound2_m660_map)
- MCFG_CPU_ADD("audio3", Z80, XTAL(24'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(sound3_m660_map)
- MCFG_CPU_IO_MAP(sound3_m660_io_map)
+ MCFG_DEVICE_ADD("audio3", Z80, XTAL(24'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(sound3_m660_map)
+ MCFG_DEVICE_IO_MAP(sound3_m660_io_map)
MCFG_MACHINE_START_OVERRIDE(tsamurai_state,m660)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(tsamurai_state, flip_screen_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(tsamurai_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tsamurai_state, textbank1_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tsamurai_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(tsamurai_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(tsamurai_state, textbank2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tsamurai_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tsamurai_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tsamurai_state, textbank1_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tsamurai_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, tsamurai_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, tsamurai_state, textbank2_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -849,7 +849,7 @@ MACHINE_CONFIG_START(tsamurai_state::m660)
MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255-16)
MCFG_SCREEN_UPDATE_DRIVER(tsamurai_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tsamurai_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq))
MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("audio3", INPUT_LINE_NMI))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", tsamurai)
@@ -859,11 +859,11 @@ MACHINE_CONFIG_START(tsamurai_state::m660)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(24'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1)
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp
index 9766de49c87..7d7b6ea2dd0 100644
--- a/src/mame/drivers/tsispch.cpp
+++ b/src/mame/drivers/tsispch.cpp
@@ -379,19 +379,19 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tsispch_state::prose2k)
/* basic machine hardware */
/* There are two crystals on the board: a 24MHz xtal at Y2 and a 16MHz xtal at Y1 */
- MCFG_CPU_ADD("maincpu", I8086, 8000000) /* VERIFIED clock, unknown divider */
- MCFG_CPU_PROGRAM_MAP(i8086_mem)
- MCFG_CPU_IO_MAP(i8086_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8086, 8000000) /* VERIFIED clock, unknown divider */
+ MCFG_DEVICE_PROGRAM_MAP(i8086_mem)
+ MCFG_DEVICE_IO_MAP(i8086_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb)
/* TODO: the UPD7720 has a 10KHz clock to its INT pin */
/* TODO: the UPD7720 has a 2MHz clock to its SCK pin */
/* TODO: hook up p0, p1, int */
- MCFG_CPU_ADD("dsp", UPD7725, 8000000) /* VERIFIED clock, unknown divider; correct dsp type is UPD77P20 */
- MCFG_CPU_PROGRAM_MAP(dsp_prg_map)
- MCFG_CPU_DATA_MAP(dsp_data_map)
- MCFG_NECDSP_OUT_P0_CB(WRITELINE(tsispch_state, dsp_to_8086_p0_w))
- MCFG_NECDSP_OUT_P1_CB(WRITELINE(tsispch_state, dsp_to_8086_p1_w))
+ MCFG_DEVICE_ADD("dsp", UPD7725, 8000000) /* VERIFIED clock, unknown divider; correct dsp type is UPD77P20 */
+ MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map)
+ MCFG_DEVICE_DATA_MAP(dsp_data_map)
+ MCFG_NECDSP_OUT_P0_CB(WRITELINE(*this, tsispch_state, dsp_to_8086_p0_w))
+ MCFG_NECDSP_OUT_P1_CB(WRITELINE(*this, tsispch_state, dsp_to_8086_p1_w))
/* PIC 8259 */
MCFG_DEVICE_ADD("pic8259", PIC8259, 0)
@@ -400,13 +400,13 @@ MACHINE_CONFIG_START(tsispch_state::prose2k)
/* uarts */
MCFG_DEVICE_ADD("i8251a_u15", I8251, 0)
// (todo: proper hookup, currently using hack w/i8251_receive_character())
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(tsispch_state, i8251_rxrdy_int))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(tsispch_state, i8251_txrdy_int))
- MCFG_I8251_TXEMPTY_HANDLER(WRITELINE(tsispch_state, i8251_txempty_int))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, tsispch_state, i8251_rxrdy_int))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, tsispch_state, i8251_txrdy_int))
+ MCFG_I8251_TXEMPTY_HANDLER(WRITELINE(*this, tsispch_state, i8251_txempty_int))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC (TODO: correctly figure out how the DAC works; apparently it is connected to the serial output of the upd7720, which will be "fun" to connect up)
+ MCFG_DEVICE_ADD("dac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC (TODO: correctly figure out how the DAC works; apparently it is connected to the serial output of the upd7720, which will be "fun" to connect up)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp
index 9939a3910e4..971530ebd56 100644
--- a/src/mame/drivers/ttchamp.cpp
+++ b/src/mame/drivers/ttchamp.cpp
@@ -644,10 +644,10 @@ INTERRUPT_GEN_MEMBER(ttchamp_state::irq)/* right? */
MACHINE_CONFIG_START(ttchamp_state::ttchamp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, 8000000)
- MCFG_CPU_PROGRAM_MAP(ttchamp_map)
- MCFG_CPU_IO_MAP(ttchamp_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ttchamp_state, irq)
+ MCFG_DEVICE_ADD("maincpu", V30, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(ttchamp_map)
+ MCFG_DEVICE_IO_MAP(ttchamp_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ttchamp_state, irq)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/tti.cpp b/src/mame/drivers/tti.cpp
index 5f4e191778c..cfac8b5750e 100644
--- a/src/mame/drivers/tti.cpp
+++ b/src/mame/drivers/tti.cpp
@@ -58,26 +58,26 @@ void tti_state::prg_map(address_map &map)
MACHINE_CONFIG_START(tti_state::tti)
MCFG_DEVICE_ADD("maincpu", M68008, XTAL(20'000'000) / 2) // guess
- MCFG_CPU_PROGRAM_MAP(prg_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(tti_state, intack)
+ MCFG_DEVICE_PROGRAM_MAP(prg_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(tti_state, intack)
MCFG_DEVICE_ADD("mfp", MC68901, 0)
MCFG_MC68901_TIMER_CLOCK(XTAL(20'000'000) / 2) // guess
MCFG_MC68901_RX_CLOCK(9600) // for testing (FIXME: actually 16x)
MCFG_MC68901_TX_CLOCK(9600) // for testing (FIXME: actually 16x)
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_MC68901_OUT_IRQ_CB(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("mfp", mc68901_device, write_rx))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("mfp", mc68901_device, write_rx))
MCFG_EEPROM_SERIAL_X24C44_ADD("novram")
- MCFG_EEPROM_SERIAL_DO_CALLBACK(DEVWRITELINE("mfp", mc68901_device, i0_w))
+ MCFG_EEPROM_SERIAL_DO_CALLBACK(WRITELINE("mfp", mc68901_device, i0_w))
MCFG_DEVICE_ADD("bitlatch", LS259, 0) // U17
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(DEVWRITELINE("novram", eeprom_serial_x24c44_device, di_write))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(DEVWRITELINE("novram", eeprom_serial_x24c44_device, clk_write))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("novram", eeprom_serial_x24c44_device, cs_write))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE("novram", eeprom_serial_x24c44_device, di_write))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE("novram", eeprom_serial_x24c44_device, clk_write))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("novram", eeprom_serial_x24c44_device, cs_write))
MACHINE_CONFIG_END
ROM_START( tti )
diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp
index 287148884b5..b7671cfef27 100644
--- a/src/mame/drivers/tubep.cpp
+++ b/src/mame/drivers/tubep.cpp
@@ -823,30 +823,30 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tubep_state::tubep)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(tubep_main_map)
- MCFG_CPU_IO_MAP(tubep_main_portmap)
+ MCFG_DEVICE_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tubep_main_map)
+ MCFG_DEVICE_IO_MAP(tubep_main_portmap)
- MCFG_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(tubep_second_map)
- MCFG_CPU_IO_MAP(tubep_second_portmap)
+ MCFG_DEVICE_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(tubep_second_map)
+ MCFG_DEVICE_IO_MAP(tubep_second_portmap)
- MCFG_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
- MCFG_CPU_PROGRAM_MAP(tubep_sound_map)
- MCFG_CPU_IO_MAP(tubep_sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
+ MCFG_DEVICE_PROGRAM_MAP(tubep_sound_map)
+ MCFG_DEVICE_IO_MAP(tubep_sound_portmap)
- MCFG_CPU_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
- MCFG_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_DEVICE_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
+ MCFG_DEVICE_PROGRAM_MAP(nsc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(tubep_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(tubep_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tubep_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tubep_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) //something...
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(tubep_state, screen_flip_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(tubep_state, background_romselect_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(tubep_state, colorproms_A4_line_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, tubep_state, screen_flip_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, tubep_state, background_romselect_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, tubep_state, colorproms_A4_line_w))
MCFG_MACHINE_START_OVERRIDE(tubep_state,tubep)
MCFG_MACHINE_RESET_OVERRIDE(tubep_state,tubep)
@@ -866,19 +866,19 @@ MACHINE_CONFIG_START(tubep_state::tubep)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tubep_state, ay8910_portA_0_w)) /* write port A */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tubep_state, ay8910_portB_0_w)) /* write port B */
+ MCFG_DEVICE_ADD("ay1", AY8910, 19968000 / 8 / 2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portA_0_w)) /* write port A */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portB_0_w)) /* write port B */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tubep_state, ay8910_portA_1_w)) /* write port A */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tubep_state, ay8910_portB_1_w)) /* write port B */
+ MCFG_DEVICE_ADD("ay2", AY8910, 19968000 / 8 / 2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portA_1_w)) /* write port A */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portB_1_w)) /* write port B */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tubep_state, ay8910_portA_2_w)) /* write port A */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tubep_state, ay8910_portB_2_w)) /* write port B */
+ MCFG_DEVICE_ADD("ay3", AY8910, 19968000 / 8 / 2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portA_2_w)) /* write port A */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portB_2_w)) /* write port B */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -886,8 +886,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tubep_state::tubepb)
tubep(config);
- MCFG_CPU_REPLACE("mcu", M6802,6000000) /* ? MHz Xtal */
- MCFG_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_DEVICE_REPLACE("mcu", M6802,6000000) /* ? MHz Xtal */
+ MCFG_DEVICE_PROGRAM_MAP(nsc_map)
//MCFG_SCREEN_MODIFY("screen")
//MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("mcu", INPUT_LINE_NMI))
@@ -897,28 +897,28 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tubep_state::rjammer)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(rjammer_main_map)
- MCFG_CPU_IO_MAP(rjammer_main_portmap)
+ MCFG_DEVICE_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rjammer_main_map)
+ MCFG_DEVICE_IO_MAP(rjammer_main_portmap)
- MCFG_CPU_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(rjammer_second_map)
- MCFG_CPU_IO_MAP(rjammer_second_portmap)
+ MCFG_DEVICE_ADD("slave",Z80,16000000 / 4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(rjammer_second_map)
+ MCFG_DEVICE_IO_MAP(rjammer_second_portmap)
- MCFG_CPU_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
- MCFG_CPU_PROGRAM_MAP(rjammer_sound_map)
- MCFG_CPU_IO_MAP(rjammer_sound_portmap)
+ MCFG_DEVICE_ADD("soundcpu",Z80,19968000 / 8) /* X2 19968000 Hz divided by LS669 (on Qc output) (signal RH0) */
+ MCFG_DEVICE_PROGRAM_MAP(rjammer_sound_map)
+ MCFG_DEVICE_IO_MAP(rjammer_sound_portmap)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("soundcpu", INPUT_LINE_NMI))
- MCFG_CPU_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
- MCFG_CPU_PROGRAM_MAP(nsc_map)
+ MCFG_DEVICE_ADD("mcu",NSC8105,6000000) /* 6 MHz Xtal - divided internally ??? */
+ MCFG_DEVICE_PROGRAM_MAP(nsc_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 3A
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(tubep_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(tubep_state, coin2_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(tubep_state, screen_flip_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tubep_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, tubep_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, tubep_state, screen_flip_w))
MCFG_MACHINE_START_OVERRIDE(tubep_state,rjammer)
MCFG_MACHINE_RESET_OVERRIDE(tubep_state,rjammer)
@@ -939,23 +939,23 @@ MACHINE_CONFIG_START(tubep_state::rjammer)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay1", AY8910, 19968000 / 8 / 2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tubep_state, ay8910_portA_0_w)) /* write port A */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tubep_state, ay8910_portB_0_w)) /* write port B */
+ MCFG_DEVICE_ADD("ay1", AY8910, 19968000 / 8 / 2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portA_0_w)) /* write port A */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portB_0_w)) /* write port B */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ay2", AY8910, 19968000 / 8 / 2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tubep_state, ay8910_portA_1_w)) /* write port A */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tubep_state, ay8910_portB_1_w)) /* write port B */
+ MCFG_DEVICE_ADD("ay2", AY8910, 19968000 / 8 / 2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portA_1_w)) /* write port A */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portB_1_w)) /* write port B */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("ay3", AY8910, 19968000 / 8 / 2)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(tubep_state, ay8910_portA_2_w)) /* write port A */
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(tubep_state, ay8910_portB_2_w)) /* write port B */
+ MCFG_DEVICE_ADD("ay3", AY8910, 19968000 / 8 / 2)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portA_2_w)) /* write port A */
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, tubep_state, ay8910_portB_2_w)) /* write port B */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_VCLK_CB(WRITELINE(tubep_state, rjammer_adpcm_vck)) /* VCK function */
+ MCFG_DEVICE_ADD("msm", MSM5205, 384000)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, tubep_state, rjammer_adpcm_vck)) /* VCK function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz (changes at run time) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp
index 10cf8557f15..0e5f3b63d76 100644
--- a/src/mame/drivers/tugboat.cpp
+++ b/src/mame/drivers/tugboat.cpp
@@ -362,15 +362,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(tugboat_state::tugboat)
- MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(tugboat_state,input_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, tugboat_state,input_r))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("DSW"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tugboat_state, ctrl_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tugboat_state, ctrl_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -387,7 +387,7 @@ MACHINE_CONFIG_START(tugboat_state::tugboat)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, XTAL(10'000'000)/8)
+ MCFG_DEVICE_ADD("aysnd", AY8912, XTAL(10'000'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp
index 3ff73f94e12..cabcd1ffbb8 100644
--- a/src/mame/drivers/tumbleb.cpp
+++ b/src/mame/drivers/tumbleb.cpp
@@ -2022,9 +2022,9 @@ MACHINE_RESET_MEMBER(tumbleb_state,tumbleb)
MACHINE_CONFIG_START(tumbleb_state::tumblepb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(tumblepopb_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(tumblepopb_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb)
@@ -2060,9 +2060,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tumbleb_state::tumbleb2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(tumblepopb_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, tumbleb2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(tumblepopb_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, tumbleb2_interrupt)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb)
@@ -2097,13 +2097,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tumbleb_state::jumpkids)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(jumpkids_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(jumpkids_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
/* z80? */
- MCFG_CPU_ADD("audiocpu", Z80, 8000000/2)
- MCFG_CPU_PROGRAM_MAP(jumpkids_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(jumpkids_sound_map)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb)
@@ -2140,9 +2140,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tumbleb_state::fncywld)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000)
- MCFG_CPU_PROGRAM_MAP(fncywld_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(fncywld_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb)
@@ -2198,12 +2198,12 @@ MACHINE_RESET_MEMBER(tumbleb_state,htchctch)
MACHINE_CONFIG_START(tumbleb_state::htchctch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 15000000) /* verified */
- MCFG_CPU_PROGRAM_MAP(htchctch_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 15000000) /* verified */
+ MCFG_DEVICE_PROGRAM_MAP(htchctch_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 15000000/4) /* verified on dquizgo */
- MCFG_CPU_PROGRAM_MAP(semicom_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 15000000/4) /* verified on dquizgo */
+ MCFG_DEVICE_PROGRAM_MAP(semicom_sound_map)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,htchctch)
@@ -2264,10 +2264,10 @@ MACHINE_CONFIG_START(tumbleb_state::cookbib_mcu)
htchctch(config);
/* basic machine hardware */
- MCFG_CPU_ADD("protection", I8052, 16000000) // AT89C52
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(tumbleb_state, prot_p0_w))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(tumbleb_state, prot_p1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(tumbleb_state, prot_p2_w))
+ MCFG_DEVICE_ADD("protection", I8052, 16000000) // AT89C52
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, tumbleb_state, prot_p0_w))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, tumbleb_state, prot_p1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, tumbleb_state, prot_p2_w))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2279,7 +2279,7 @@ MACHINE_CONFIG_START(tumbleb_state::bcstory)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(tumbleb_state, screen_update_bcstory)
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 3427190)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 3427190)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -2303,7 +2303,7 @@ MACHINE_CONFIG_START(tumbleb_state::metlsavr)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR)
- MCFG_SOUND_REPLACE("ymsnd", YM2151, 3427190)
+ MCFG_DEVICE_REPLACE("ymsnd", YM2151, 3427190)
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -2314,12 +2314,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tumbleb_state::suprtrio)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
- MCFG_CPU_PROGRAM_MAP(suprtrio_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
+ MCFG_DEVICE_PROGRAM_MAP(suprtrio_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, irq6_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000)
- MCFG_CPU_PROGRAM_MAP(suprtrio_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(suprtrio_sound_map)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb)
@@ -2356,9 +2356,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tumbleb_state::pangpang)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14000000)
- MCFG_CPU_PROGRAM_MAP(pangpang_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tumbleb_state, tumbleb2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14000000)
+ MCFG_DEVICE_PROGRAM_MAP(pangpang_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tumbleb_state, tumbleb2_interrupt)
MCFG_MACHINE_START_OVERRIDE(tumbleb_state,tumbleb)
MCFG_MACHINE_RESET_OVERRIDE(tumbleb_state,tumbleb)
diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp
index bb91e646063..dda1b529f08 100644
--- a/src/mame/drivers/tunhunt.cpp
+++ b/src/mame/drivers/tunhunt.cpp
@@ -272,9 +272,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(tunhunt_state::tunhunt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12.096_MHz_XTAL/6) /* ??? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(tunhunt_state, irq0_line_hold, 4*60) /* 48V, 112V, 176V, 240V */
+ MCFG_DEVICE_ADD("maincpu", M6502, 12.096_MHz_XTAL/6) /* ??? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tunhunt_state, irq0_line_hold, 4*60) /* 48V, 112V, 176V, 240V */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -293,19 +293,19 @@ MACHINE_CONFIG_START(tunhunt_state::tunhunt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey1", POKEY, 12.096_MHz_XTAL/10)
+ MCFG_DEVICE_ADD("pokey1", POKEY, 12.096_MHz_XTAL/10)
MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW"))
MCFG_POKEY_OUTPUT_RC(RES_K(1), CAP_U(0.047), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("pokey2", POKEY, 12.096_MHz_XTAL/10)
+ MCFG_DEVICE_ADD("pokey2", POKEY, 12.096_MHz_XTAL/10)
MCFG_POKEY_POT0_R_CB(IOPORT("IN1"))
MCFG_POKEY_POT1_R_CB(IOPORT("IN2"))
- MCFG_POKEY_POT2_R_CB(READ8(tunhunt_state, dsw2_0r))
- MCFG_POKEY_POT3_R_CB(READ8(tunhunt_state, dsw2_1r))
- MCFG_POKEY_POT4_R_CB(READ8(tunhunt_state, dsw2_2r))
- MCFG_POKEY_POT5_R_CB(READ8(tunhunt_state, dsw2_3r))
- MCFG_POKEY_POT6_R_CB(READ8(tunhunt_state, dsw2_4r))
+ MCFG_POKEY_POT2_R_CB(READ8(*this, tunhunt_state, dsw2_0r))
+ MCFG_POKEY_POT3_R_CB(READ8(*this, tunhunt_state, dsw2_1r))
+ MCFG_POKEY_POT4_R_CB(READ8(*this, tunhunt_state, dsw2_2r))
+ MCFG_POKEY_POT5_R_CB(READ8(*this, tunhunt_state, dsw2_3r))
+ MCFG_POKEY_POT6_R_CB(READ8(*this, tunhunt_state, dsw2_4r))
MCFG_POKEY_OUTPUT_RC(RES_K(1), CAP_U(0.047), 5.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp
index 3b04fd5726b..079d47aa32e 100644
--- a/src/mame/drivers/turbo.cpp
+++ b/src/mame/drivers/turbo.cpp
@@ -846,39 +846,39 @@ GFXDECODE_END
MACHINE_CONFIG_START(turbo_state::turbo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(turbo_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(turbo_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, turbo_ppi0a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, turbo_ppi0b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, turbo_ppi0c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, turbo_ppi0a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, turbo_ppi0b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, turbo_ppi0c_w))
MCFG_DEVICE_ADD("i8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, turbo_ppi1a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, turbo_ppi1b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, turbo_ppi1c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, turbo_ppi1a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, turbo_ppi1b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, turbo_ppi1c_w))
MCFG_DEVICE_ADD("i8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, turbo_sound_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, turbo_sound_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, turbo_sound_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, turbo_sound_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, turbo_sound_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, turbo_sound_c_w))
MCFG_DEVICE_ADD("i8255_3", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(turbo_state, turbo_analog_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, turbo_state, turbo_analog_r))
MCFG_I8255_IN_PORTB_CB(IOPORT("DSW2"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, turbo_ppi3c_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, turbo_ppi3c_w))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(turbo_state, digit_w)) // display A&B
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, turbo_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, turbo_state, digit_w)) // display A&B
MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines
MCFG_DEVICE_ADD("outlatch", LS259, 0) // IC125 - outputs passed through CN5
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(turbo_state, coin_meter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(turbo_state, coin_meter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(turbo_state, start_lamp_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, turbo_state, coin_meter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, turbo_state, coin_meter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, turbo_state, start_lamp_w))
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", turbo)
@@ -901,23 +901,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(turbo_state::subroc3d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(subroc3d_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(subroc3d_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, subroc3d_ppi0a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, subroc3d_ppi0b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, subroc3d_ppi0c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, subroc3d_ppi0a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, subroc3d_ppi0b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, subroc3d_ppi0c_w))
MCFG_DEVICE_ADD("i8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, subroc3d_sound_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, subroc3d_sound_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, subroc3d_sound_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, subroc3d_sound_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, subroc3d_sound_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, subroc3d_sound_c_w))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(turbo_state, digit_w)) // display A&B
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, turbo_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, turbo_state, digit_w)) // display A&B
MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines
/* video hardware */
@@ -941,31 +941,31 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(turbo_state::buckrog)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(buckrog_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(buckrog_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
- MCFG_CPU_ADD("subcpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(buckrog_cpu2_map)
- MCFG_CPU_IO_MAP(buckrog_cpu2_portmap)
+ MCFG_DEVICE_ADD("subcpu", Z80, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(buckrog_cpu2_map)
+ MCFG_DEVICE_IO_MAP(buckrog_cpu2_portmap)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
MCFG_MACHINE_RESET_OVERRIDE(turbo_state,buckrog)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, buckrog_ppi0a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, buckrog_ppi0b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, buckrog_ppi0c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, buckrog_ppi0a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, buckrog_ppi0b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, buckrog_ppi0c_w))
MCFG_DEVICE_ADD("i8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(turbo_state, buckrog_sound_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(turbo_state, buckrog_sound_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(turbo_state, buckrog_ppi1c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, turbo_state, buckrog_sound_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, turbo_state, buckrog_sound_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, turbo_state, buckrog_ppi1c_w))
MCFG_DEVICE_ADD("i8279", I8279, MASTER_CLOCK/4) // unknown clock
- MCFG_I8279_OUT_SL_CB(WRITE8(turbo_state, scanlines_w)) // scan SL lines
- MCFG_I8279_OUT_DISP_CB(WRITE8(turbo_state, digit_w)) // display A&B
+ MCFG_I8279_OUT_SL_CB(WRITE8(*this, turbo_state, scanlines_w)) // scan SL lines
+ MCFG_I8279_OUT_DISP_CB(WRITE8(*this, turbo_state, digit_w)) // display A&B
MCFG_I8279_IN_RL_CB(IOPORT("DSW1")) // kbd RL lines
/* video hardware */
@@ -987,7 +987,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(turbo_state::buckrogu)
buckrog(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES)
MACHINE_CONFIG_END
@@ -996,10 +996,10 @@ MACHINE_CONFIG_START(turbo_state::buckroge)
buckrog(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5014, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(buckrog_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5014, MASTER_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(buckrog_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", turbo_state, irq0_line_hold)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp
index d146d0a27af..bc4f2e5c39f 100644
--- a/src/mame/drivers/turrett.cpp
+++ b/src/mame/drivers/turrett.cpp
@@ -355,13 +355,13 @@ void turrett_devices(device_slot_interface &device)
MACHINE_CONFIG_START(turrett_state::turrett)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R3041, R3041_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", R3041, R3041_CLOCK)
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
- MCFG_R3000_BRCOND2_INPUT(READLINE(turrett_state, sbrc2_r))
- MCFG_R3000_BRCOND3_INPUT(READLINE(turrett_state, sbrc3_r))
- MCFG_CPU_PROGRAM_MAP(cpu_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", turrett_state, vblank)
- MCFG_CPU_PERIODIC_INT_DRIVER(turrett_state, adc, 60)
+ MCFG_R3000_BRCOND2_INPUT(READLINE(*this, turrett_state, sbrc2_r))
+ MCFG_R3000_BRCOND3_INPUT(READLINE(*this, turrett_state, sbrc3_r))
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", turrett_state, vblank)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(turrett_state, adc, 60)
MCFG_ATA_INTERFACE_ADD("ata", turrett_devices, "hdd", nullptr, true)
diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp
index 7a55db6252a..ba6ebff8cf9 100644
--- a/src/mame/drivers/tutankhm.cpp
+++ b/src/mame/drivers/tutankhm.cpp
@@ -211,7 +211,7 @@ INPUT_PORTS_END
*
*************************************/
-MACHINE_START_MEMBER(tutankhm_state,tutankhm)
+void tutankhm_state::machine_start()
{
membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x1000);
@@ -221,7 +221,7 @@ MACHINE_START_MEMBER(tutankhm_state,tutankhm)
save_item(NAME(m_flip_y));
}
-MACHINE_RESET_MEMBER(tutankhm_state,tutankhm)
+void tutankhm_state::machine_reset()
{
m_irq_toggle = 0;
}
@@ -229,21 +229,18 @@ MACHINE_RESET_MEMBER(tutankhm_state,tutankhm)
MACHINE_CONFIG_START(tutankhm_state::tutankhm)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* 1.5 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(main_map)
-
- MCFG_MACHINE_START_OVERRIDE(tutankhm_state,tutankhm)
- MCFG_MACHINE_RESET_OVERRIDE(tutankhm_state,tutankhm)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* 1.5 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // C3
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(tutankhm_state, irq_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, tutankhm_state, irq_enable_w))
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(NOOP) // PAY OUT - not used
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(tutankhm_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(tutankhm_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, tutankhm_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, tutankhm_state, coin_counter_1_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) // starfield?
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(tutankhm_state, flip_screen_x_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(tutankhm_state, flip_screen_y_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("timeplt_audio", timeplt_audio_device, mute_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, tutankhm_state, flip_screen_x_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, tutankhm_state, flip_screen_y_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -254,14 +251,14 @@ MACHINE_CONFIG_START(tutankhm_state::tutankhm)
MCFG_SCREEN_SIZE(32*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) /* not sure about the visible area */
MCFG_SCREEN_UPDATE_DRIVER(tutankhm_state, screen_update_tutankhm)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tutankhm_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tutankhm_state, vblank_irq))
MCFG_PALETTE_ADD("palette", 16)
MCFG_PALETTE_FORMAT(BBGGGRRR)
/* sound hardware */
- MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
+ MCFG_DEVICE_ADD("timeplt_audio", TIMEPLT_AUDIO)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp
index 14b6c168b7f..33915ba8704 100644
--- a/src/mame/drivers/tutor.cpp
+++ b/src/mame/drivers/tutor.cpp
@@ -757,14 +757,14 @@ MACHINE_CONFIG_START(tutor_state::tutor)
/* sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76489a", SN76489A, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD("sn76489a", SN76489A, 3579545) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(tutor_state, write_centronics_busy))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, tutor_state, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
@@ -779,8 +779,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(tutor_state::pyuutajr)
tutor(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(pyuutajr_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(pyuutajr_mem)
//MCFG_DEVICE_REMOVE("centronics")
//MCFG_DEVICE_REMOVE("cassette")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp
index a0dadea416c..23ded4031d9 100644
--- a/src/mame/drivers/tv910.cpp
+++ b/src/mame/drivers/tv910.cpp
@@ -509,8 +509,8 @@ MC6845_UPDATE_ROW( tv910_state::crtc_update_row )
MACHINE_CONFIG_START(tv910_state::tv910)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
- MCFG_CPU_PROGRAM_MAP(tv910_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/8)
+ MCFG_DEVICE_PROGRAM_MAP(tv910_mem)
MCFG_INPUT_MERGER_ANY_HIGH("mainirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", M6502_IRQ_LINE))
@@ -524,7 +524,7 @@ MACHINE_CONFIG_START(tv910_state::tv910)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(tv910_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(tv910_state, crtc_update_addr)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(tv910_state, vbl_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, tv910_state, vbl_w))
MCFG_DEVICE_ADD(KBDC_TAG, AY3600, 0)
MCFG_AY3600_MATRIX_X0(IOPORT("X0"))
@@ -536,24 +536,24 @@ MACHINE_CONFIG_START(tv910_state::tv910)
MCFG_AY3600_MATRIX_X6(IOPORT("X6"))
MCFG_AY3600_MATRIX_X7(IOPORT("X7"))
MCFG_AY3600_MATRIX_X8(IOPORT("X8"))
- MCFG_AY3600_SHIFT_CB(READLINE(tv910_state, ay3600_shift_r))
- MCFG_AY3600_CONTROL_CB(READLINE(tv910_state, ay3600_control_r))
- MCFG_AY3600_DATA_READY_CB(WRITELINE(tv910_state, ay3600_data_ready_w))
- MCFG_AY3600_AKO_CB(WRITELINE(tv910_state, ay3600_ako_w))
+ MCFG_AY3600_SHIFT_CB(READLINE(*this, tv910_state, ay3600_shift_r))
+ MCFG_AY3600_CONTROL_CB(READLINE(*this, tv910_state, ay3600_control_r))
+ MCFG_AY3600_DATA_READY_CB(WRITELINE(*this, tv910_state, ay3600_data_ready_w))
+ MCFG_AY3600_AKO_CB(WRITELINE(*this, tv910_state, ay3600_ako_w))
MCFG_DEVICE_ADD(ACIA_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(XTAL(1'843'200))
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
- MCFG_MOS6551_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_MOS6551_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_MOS6551_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MOS6551_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(ACIA_TAG, mos6551_device, write_rxd))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(ACIA_TAG, mos6551_device, write_dcd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(ACIA_TAG, mos6551_device, write_cts))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(ACIA_TAG, mos6551_device, write_rxd))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(ACIA_TAG, mos6551_device, write_dcd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(ACIA_TAG, mos6551_device, write_cts))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("bell", BEEP, MASTER_CLOCK / 8400) // 1620 Hz (Row 10 signal)
+ MCFG_DEVICE_ADD("bell", BEEP, MASTER_CLOCK / 8400) // 1620 Hz (Row 10 signal)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp
index 0987f4689f0..ba51d3d952b 100644
--- a/src/mame/drivers/tv912.cpp
+++ b/src/mame/drivers/tv912.cpp
@@ -871,15 +871,15 @@ static INPUT_PORTS_START( tv912c )
INPUT_PORTS_END
MACHINE_CONFIG_START(tv912_state::tv912)
- MCFG_CPU_ADD("maincpu", I8035, XTAL(23'814'000) / 4) // nominally +6MHz, actually 5.9535 MHz
- MCFG_CPU_PROGRAM_MAP(prog_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(tv912_state, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(tv912_state, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(tv912_state, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("rs232", rs232_port_device, cts_r))
- MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("crtc", tms9927_device, bl_r)) MCFG_DEVCB_INVERT
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("uart", ay51013_device, write_xr)) MCFG_DEVCB_INVERT
+ MCFG_DEVICE_ADD("maincpu", I8035, XTAL(23'814'000) / 4) // nominally +6MHz, actually 5.9535 MHz
+ MCFG_DEVICE_PROGRAM_MAP(prog_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, tv912_state, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, tv912_state, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, tv912_state, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE("rs232", rs232_port_device, cts_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE("crtc", tms9927_device, bl_r)) MCFG_DEVCB_INVERT
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("uart", ay51013_device, write_xr)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("bankdev", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank_map)
@@ -897,14 +897,14 @@ MACHINE_CONFIG_START(tv912_state::tv912)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD("uart", AY51013, 0)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_AY51013_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "loopback")
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "loopback")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, XTAL(23'814'000) / 7 / 11 / 256) // nominally 1200 Hz
+ MCFG_DEVICE_ADD("beep", BEEP, XTAL(23'814'000) / 7 / 11 / 256) // nominally 1200 Hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp
index 5882163affd..517da51c994 100644
--- a/src/mame/drivers/tv950.cpp
+++ b/src/mame/drivers/tv950.cpp
@@ -272,8 +272,8 @@ MC6845_UPDATE_ROW( tv950_state::crtc_update_row )
MACHINE_CONFIG_START(tv950_state::tv950)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/14)
- MCFG_CPU_PROGRAM_MAP(tv950_mem)
+ MCFG_DEVICE_ADD("maincpu", M6502, MASTER_CLOCK/14)
+ MCFG_DEVICE_PROGRAM_MAP(tv950_mem)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK, 1200, 0, 1120, 370, 0, 250 ) // not real values
@@ -285,17 +285,17 @@ MACHINE_CONFIG_START(tv950_state::tv950)
MCFG_MC6845_CHAR_WIDTH(14)
MCFG_MC6845_UPDATE_ROW_CB(tv950_state, crtc_update_row)
MCFG_MC6845_ADDR_CHANGED_CB(tv950_state, crtc_update_addr)
- MCFG_MC6845_OUT_HSYNC_CB(DEVWRITELINE(VIA_TAG, via6522_device, write_pb6))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(tv950_state, crtc_vs_w))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(VIA_TAG, via6522_device, write_pb6))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, tv950_state, crtc_vs_w))
MCFG_VIDEO_SET_SCREEN(nullptr)
MCFG_DEVICE_ADD(VIA_TAG, VIA6522, MASTER_CLOCK/14)
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6502_NMI_LINE))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(tv950_state, via_a_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(tv950_state, via_b_w))
- MCFG_VIA6522_READPB_HANDLER(READ8(tv950_state, via_b_r))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(tv950_state, via_crtc_reset_w))
- //MCFG_VIA6522_CB2_HANDLER(WRITELINE(tv950_state, via_blink_rate_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, tv950_state, via_a_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, tv950_state, via_b_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, tv950_state, via_b_r))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, tv950_state, via_crtc_reset_w))
+ //MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, tv950_state, via_blink_rate_w))
MCFG_DEVICE_ADD(ACIA1_TAG, MOS6551, 0)
MCFG_MOS6551_XTAL(MASTER_CLOCK/13)
diff --git a/src/mame/drivers/tv955.cpp b/src/mame/drivers/tv955.cpp
index 232d3d7de96..b99dedd61f7 100644
--- a/src/mame/drivers/tv955.cpp
+++ b/src/mame/drivers/tv955.cpp
@@ -83,13 +83,13 @@ static INPUT_PORTS_START( tv955 )
INPUT_PORTS_END
MACHINE_CONFIG_START(tv955_state::tv955)
- MCFG_CPU_ADD("maincpu", M65C02, 19.3396_MHz_XTAL / 9)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("maincpu", M65C02, 19.3396_MHz_XTAL / 9)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_INPUT_MERGER_ANY_HIGH("mainirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", m6502_device::IRQ_LINE))
- MCFG_CPU_ADD("keyboard", I8049, 5.7143_MHz_XTAL)
+ MCFG_DEVICE_ADD("keyboard", I8049, 5.7143_MHz_XTAL)
MCFG_NVRAM_ADD_0FILL("nvram") // HM6116LP-4 + 3.2V battery
@@ -108,15 +108,15 @@ MACHINE_CONFIG_START(tv955_state::tv955)
MCFG_DEVICE_ADD("hostuart", MOS6551, 0)
MCFG_MOS6551_XTAL(3.6864_MHz_XTAL)
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("printuart", MOS6551, 0)
MCFG_MOS6551_XTAL(3.6864_MHz_XTAL / 2)
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("keybuart", MOS6551, 0)
MCFG_MOS6551_XTAL(3.6864_MHz_XTAL / 2)
- MCFG_MOS6551_IRQ_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<2>))
+ MCFG_MOS6551_IRQ_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<2>))
MACHINE_CONFIG_END
/**************************************************************************************************************
diff --git a/src/mame/drivers/tv965.cpp b/src/mame/drivers/tv965.cpp
index 03c5a316352..403d59d46db 100644
--- a/src/mame/drivers/tv965.cpp
+++ b/src/mame/drivers/tv965.cpp
@@ -71,9 +71,9 @@ static INPUT_PORTS_START( tv965 )
INPUT_PORTS_END
MACHINE_CONFIG_START(tv965_state::tv965)
- MCFG_CPU_ADD("maincpu", G65816, 44.4528_MHz_XTAL / 10)
- MCFG_CPU_DATA_MAP(mem_map)
- MCFG_CPU_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_ADD("maincpu", G65816, 44.4528_MHz_XTAL / 10)
+ MCFG_DEVICE_DATA_MAP(mem_map)
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
MCFG_NVRAM_ADD_0FILL("nvram") // CXK5864BP-10L + battery
diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp
index 8d66b73b2b6..fd104f3828b 100644
--- a/src/mame/drivers/tv990.cpp
+++ b/src/mame/drivers/tv990.cpp
@@ -372,9 +372,9 @@ void tv990_state::device_post_load()
MACHINE_CONFIG_START(tv990_state::tv990)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 14967500) // verified (59.86992/4)
- MCFG_CPU_PROGRAM_MAP(tv990_mem)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tv990_state, vblank)
+ MCFG_DEVICE_ADD("maincpu", M68000, 14967500) // verified (59.86992/4)
+ MCFG_DEVICE_PROGRAM_MAP(tv990_mem)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tv990_state, vblank)
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DRIVER(tv990_state, screen_update)
@@ -384,29 +384,29 @@ MACHINE_CONFIG_START(tv990_state::tv990)
MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
MCFG_DEVICE_ADD( UART0_TAG, NS16450, XTAL(3'686'400) )
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(tv990_state, uart0_irq))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, tv990_state, uart0_irq))
MCFG_DEVICE_ADD( UART1_TAG, NS16450, XTAL(3'686'400) )
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_rts))
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
- MCFG_INS8250_OUT_INT_CB(WRITELINE(tv990_state, uart1_irq))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, tv990_state, uart1_irq))
MCFG_DEVICE_ADD(LPT_TAG, PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(tv990_state, lpt_irq))
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(*this, tv990_state, lpt_irq))
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UART0_TAG, ns16450_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(UART0_TAG, ns16450_device, dcd_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UART0_TAG, ns16450_device, cts_w))
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UART0_TAG, ns16450_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(UART0_TAG, ns16450_device, dcd_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UART0_TAG, ns16450_device, cts_w))
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UART1_TAG, ns16450_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(UART1_TAG, ns16450_device, dcd_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UART1_TAG, ns16450_device, cts_w))
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UART1_TAG, ns16450_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(UART1_TAG, ns16450_device, dcd_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UART1_TAG, ns16450_device, cts_w))
MCFG_DEVICE_ADD("pc_kbdc", KBDC8042, 0)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_AT386)
@@ -415,7 +415,7 @@ MACHINE_CONFIG_START(tv990_state::tv990)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beep", BEEP, 1000); //whats the freq?
+ MCFG_DEVICE_ADD("beep", BEEP, 1000); //whats the freq?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tvboy.cpp b/src/mame/drivers/tvboy.cpp
index dbc54ebc6b2..a61fcef179e 100644
--- a/src/mame/drivers/tvboy.cpp
+++ b/src/mame/drivers/tvboy.cpp
@@ -79,15 +79,15 @@ void tvboy_state::tvboy_mem(address_map &map)
MACHINE_CONFIG_START(tvboy_state::tvboyii)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_PAL / 3)
- MCFG_CPU_PROGRAM_MAP(tvboy_mem)
+ MCFG_DEVICE_ADD("maincpu", M6507, MASTER_CLOCK_PAL / 3)
+ MCFG_DEVICE_PROGRAM_MAP(tvboy_mem)
MCFG_M6502_DISABLE_DIRECT()
/* video hardware */
MCFG_DEVICE_ADD("tia_video", TIA_PAL_VIDEO, 0)
- MCFG_TIA_READ_INPUT_PORT_CB(READ16(tvboy_state, a2600_read_input_port))
- MCFG_TIA_DATABUS_CONTENTS_CB(READ8(tvboy_state, a2600_get_databus_contents))
- MCFG_TIA_VSYNC_CB(WRITE16(tvboy_state, a2600_tia_vsync_callback_pal))
+ MCFG_TIA_READ_INPUT_PORT_CB(READ16(*this, tvboy_state, a2600_read_input_port))
+ MCFG_TIA_DATABUS_CONTENTS_CB(READ8(*this, tvboy_state, a2600_get_databus_contents))
+ MCFG_TIA_VSYNC_CB(WRITE16(*this, tvboy_state, a2600_tia_vsync_callback_pal))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS( MASTER_CLOCK_PAL, 228, 26, 26 + 160 + 16, 312, 32, 32 + 228 + 31 )
@@ -102,18 +102,18 @@ MACHINE_CONFIG_START(tvboy_state::tvboyii)
/* devices */
#if USE_NEW_RIOT
MCFG_DEVICE_ADD("riot", MOS6532n, MASTER_CLOCK_PAL / 3)
- MCFG_MOS6530n_IN_PA_CB(READ8(tvboy_state, switch_A_r))
- MCFG_MOS6530n_OUT_PA_CB(WRITE8(tvboy_state, switch_A_w))
- MCFG_MOS6530n_IN_PB_CB(READ8(tvboy_state, riot_input_port_8_r))
- MCFG_MOS6530n_OUT_PB_CB(WRITE8(tvboy_state, switch_B_w))
- MCFG_MOS6530n_IRQ_CB(WRITELINE(tvboy_state, irq_callback))
+ MCFG_MOS6530n_IN_PA_CB(READ8(*this, tvboy_state, switch_A_r))
+ MCFG_MOS6530n_OUT_PA_CB(WRITE8(*this, tvboy_state, switch_A_w))
+ MCFG_MOS6530n_IN_PB_CB(READ8(*this, tvboy_state, riot_input_port_8_r))
+ MCFG_MOS6530n_OUT_PB_CB(WRITE8(*this, tvboy_state, switch_B_w))
+ MCFG_MOS6530n_IRQ_CB(WRITELINE(*this, tvboy_state, irq_callback))
#else
MCFG_DEVICE_ADD("riot", RIOT6532, MASTER_CLOCK_PAL / 3)
- MCFG_RIOT6532_IN_PA_CB(READ8(tvboy_state, switch_A_r))
- MCFG_RIOT6532_OUT_PA_CB(WRITE8(tvboy_state, switch_A_w))
- MCFG_RIOT6532_IN_PB_CB(READ8(tvboy_state, riot_input_port_8_r))
- MCFG_RIOT6532_OUT_PB_CB(WRITE8(tvboy_state, switch_B_w))
- MCFG_RIOT6532_IRQ_CB(WRITELINE(tvboy_state, irq_callback))
+ MCFG_RIOT6532_IN_PA_CB(READ8(*this, tvboy_state, switch_A_r))
+ MCFG_RIOT6532_OUT_PA_CB(WRITE8(*this, tvboy_state, switch_A_w))
+ MCFG_RIOT6532_IN_PB_CB(READ8(*this, tvboy_state, riot_input_port_8_r))
+ MCFG_RIOT6532_OUT_PB_CB(WRITE8(*this, tvboy_state, switch_B_w))
+ MCFG_RIOT6532_IRQ_CB(WRITELINE(*this, tvboy_state, irq_callback))
#endif
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy")
diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp
index f71440da574..075a6242ae7 100644
--- a/src/mame/drivers/tvc.cpp
+++ b/src/mame/drivers/tvc.cpp
@@ -768,9 +768,9 @@ void tvc_exp(device_slot_interface &device)
MACHINE_CONFIG_START(tvc_state::tvc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, 3125000)
- MCFG_CPU_PROGRAM_MAP(tvc_mem)
- MCFG_CPU_IO_MAP(tvc_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, 3125000)
+ MCFG_DEVICE_PROGRAM_MAP(tvc_mem)
+ MCFG_DEVICE_IO_MAP(tvc_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -787,7 +787,7 @@ MACHINE_CONFIG_START(tvc_state::tvc)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) /*?*/
MCFG_MC6845_UPDATE_ROW_CB(tvc_state, crtc_update_row)
- MCFG_MC6845_OUT_CUR_CB(WRITELINE(tvc_state, int_ff_set))
+ MCFG_MC6845_OUT_CUR_CB(WRITELINE(*this, tvc_state, int_ff_set))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -796,12 +796,12 @@ MACHINE_CONFIG_START(tvc_state::tvc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", TVC_SOUND, 0)
- MCFG_TVC_SOUND_SNDINT_CALLBACK(WRITELINE(tvc_state, int_ff_set))
+ MCFG_DEVICE_ADD("custom", TVC_SOUND, 0)
+ MCFG_TVC_SOUND_SNDINT_CALLBACK(WRITELINE(*this, tvc_state, int_ff_set))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(tvc_state, centronics_ack))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, tvc_state, centronics_ack))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp
index 1e55af9bdbb..ff932400958 100644
--- a/src/mame/drivers/tvcapcom.cpp
+++ b/src/mame/drivers/tvcapcom.cpp
@@ -54,8 +54,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(tvcapcom_state::tvcapcom)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC603, 72900000) // IBM PowerPC Broadway CPU @ 729 MHz ?
- MCFG_CPU_PROGRAM_MAP(gc_map)
+ MCFG_DEVICE_ADD("maincpu", PPC603, 72900000) // IBM PowerPC Broadway CPU @ 729 MHz ?
+ MCFG_DEVICE_PROGRAM_MAP(gc_map)
MCFG_DEVICE_DISABLE()
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp
index 6b89c78935e..3818c501d3c 100644
--- a/src/mame/drivers/tvgame.cpp
+++ b/src/mame/drivers/tvgame.cpp
@@ -100,9 +100,9 @@ uint32_t tvgame_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
MACHINE_CONFIG_START(tvgame_state::tvgame)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -116,13 +116,13 @@ MACHINE_CONFIG_START(tvgame_state::tvgame)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// Devices
MCFG_DEVICE_ADD("ppi", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("LINE0"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tvgame_state, speaker_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tvgame_state, speaker_w))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp
index 71c4d8ae419..a30287199f7 100644
--- a/src/mame/drivers/twin16.cpp
+++ b/src/mame/drivers/twin16.cpp
@@ -651,14 +651,14 @@ void twin16_state::machine_start()
MACHINE_CONFIG_START(twin16_state::twin16)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, XTAL(18'432'000)/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(18'432'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
- MCFG_CPU_ADD("sub", M68000, XTAL(18'432'000)/2)
- MCFG_CPU_PROGRAM_MAP(sub_map)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(18'432'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(sub_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -670,7 +670,7 @@ MACHINE_CONFIG_START(twin16_state::twin16)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 0, 40*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(twin16_state, screen_update_twin16)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(twin16_state, screen_vblank_twin16))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, twin16_state, screen_vblank_twin16))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", twin16)
@@ -689,14 +689,14 @@ MACHINE_CONFIG_START(twin16_state::twin16)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(twin16_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, twin16_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.12) // estimated with gradius2 OST
MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.12)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.12)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
@@ -708,11 +708,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(fround_state::fround)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(18'432'000)/2)
- MCFG_CPU_PROGRAM_MAP(fround_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(18'432'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(fround_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -724,7 +724,7 @@ MACHINE_CONFIG_START(fround_state::fround)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(18'432'000)/2, 576, 0, 40*8, 264, 2*8, 30*8)
MCFG_SCREEN_UPDATE_DRIVER(twin16_state, screen_update_twin16)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(twin16_state, screen_vblank_twin16))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, twin16_state, screen_vblank_twin16))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", fround)
@@ -743,14 +743,14 @@ MACHINE_CONFIG_START(fround_state::fround)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("k007232", K007232, XTAL(3'579'545))
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(twin16_state, volume_callback))
+ MCFG_DEVICE_ADD("k007232", K007232, XTAL(3'579'545))
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, twin16_state, volume_callback))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.12)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.12)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.12)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp
index 87d5da0a8f6..181a3c3c4dc 100644
--- a/src/mame/drivers/twincobr.cpp
+++ b/src/mame/drivers/twincobr.cpp
@@ -654,36 +654,36 @@ GFXDECODE_END
MACHINE_CONFIG_START(twincobr_state::twincobr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* 7MHz - Main board Crystal is 28MHz */
- MCFG_CPU_PROGRAM_MAP(main_program_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(28'000'000)/4) /* 7MHz - Main board Crystal is 28MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_program_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(28'000'000)/8) /* 3.5MHz */
- MCFG_CPU_PROGRAM_MAP(sound_program_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(28'000'000)/8) /* 3.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_program_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL(28'000'000)/2) /* 14MHz CLKin */
- MCFG_CPU_PROGRAM_MAP(DSP_program_map)
+ MCFG_DEVICE_ADD("dsp", TMS32010, XTAL(28'000'000)/2) /* 14MHz CLKin */
+ MCFG_DEVICE_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MCFG_CPU_IO_MAP(DSP_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(twincobr_state, twincobr_BIO_r))
+ MCFG_DEVICE_IO_MAP(DSP_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, twincobr_state, twincobr_BIO_r))
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
MCFG_MACHINE_RESET_OVERRIDE(twincobr_state,twincobr)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(twincobr_state, int_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(twincobr_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(twincobr_state, bg_ram_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(twincobr_state, fg_rom_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(twincobr_state, dsp_int_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(twincobr_state, display_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, twincobr_state, int_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, twincobr_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, twincobr_state, bg_ram_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, twincobr_state, fg_rom_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, twincobr_state, dsp_int_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, twincobr_state, display_on_w))
MCFG_DEVICE_ADD("coinlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(twincobr_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(twincobr_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(twincobr_state, coin_lockout_1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(twincobr_state, coin_lockout_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, twincobr_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, twincobr_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, twincobr_state, coin_lockout_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, twincobr_state, coin_lockout_2_w))
/* video hardware */
MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(28'000'000)/8) /* 3.5MHz measured on CLKin */
@@ -698,8 +698,8 @@ MACHINE_CONFIG_START(twincobr_state::twincobr)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000)/4, 446, 0, 320, 286, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(twincobr_state, screen_update_toaplan0)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram16", buffered_spriteram16_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(twincobr_state, twincobr_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram16", buffered_spriteram16_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, twincobr_state, twincobr_vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", twincobr)
@@ -711,7 +711,7 @@ MACHINE_CONFIG_START(twincobr_state::twincobr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(28'000'000)/8)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -723,7 +723,7 @@ MACHINE_CONFIG_START(twincobr_state::fshark)
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP)
MCFG_DEVICE_MODIFY("coinlatch")
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(twincobr_state, dsp_int_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, twincobr_state, dsp_int_w))
MCFG_DEVICE_MODIFY("scu")
MCFG_TOAPLAN_SCU_SET_XOFFSETS(32, 14)
@@ -733,7 +733,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(twincobr_state::fsharkbt)
fshark(config);
- MCFG_CPU_ADD("mcu", I8741, XTAL(28'000'000)/16)
+ MCFG_DEVICE_ADD("mcu", I8741, XTAL(28'000'000)/16)
/* Program Map is internal to the CPU */
MCFG_DEVICE_DISABLE() /* Internal program code is not dumped */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index f2e150c6d9a..bfb7907b7f3 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -1075,8 +1075,8 @@ void twinkle_state::cdrom_config(device_t *device)
MACHINE_CONFIG_START(twinkle_state::twinkle)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( main_map )
+ MCFG_DEVICE_ADD( "maincpu", CXD8530CQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( main_map )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
@@ -1084,10 +1084,10 @@ MACHINE_CONFIG_START(twinkle_state::twinkle)
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&twinkle_state::scsi_dma_read, this ) )
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&twinkle_state::scsi_dma_write, this ) )
- MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */
- MCFG_CPU_PROGRAM_MAP( sound_map )
- MCFG_CPU_PERIODIC_INT_DRIVER(twinkle_state, irq1_line_assert, 60)
- MCFG_CPU_PERIODIC_INT_DRIVER(twinkle_state, irq2_line_assert, 60)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP( sound_map )
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(twinkle_state, irq1_line_assert, 60)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(twinkle_state, irq2_line_assert, 60)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(1200)) /* check TD pin on LTC1232 */
@@ -1098,11 +1098,11 @@ MACHINE_CONFIG_START(twinkle_state::twinkle)
MCFG_DEVICE_ADD("am53cf96", AM53CF96, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
+ MCFG_AM53CF96_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(twinkle_state, spu_ata_irq))
- MCFG_ATA_INTERFACE_DMARQ_HANDLER(WRITELINE(twinkle_state, spu_ata_dmarq))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, twinkle_state, spu_ata_irq))
+ MCFG_ATA_INTERFACE_DMARQ_HANDLER(WRITELINE(*this, twinkle_state, spu_ata_dmarq))
MCFG_DEVICE_ADD("rtc", RTC65271, 0)
@@ -1112,16 +1112,16 @@ MACHINE_CONFIG_START(twinkle_state::twinkle)
MCFG_SLOT_OPTION_ADD("xvd701", JVC_XVD701)
// MCFG_SLOT_OPTION_ADD("xvs1100", JVC_XVS1100) // 8th mix only
MCFG_SLOT_DEFAULT_OPTION("xvd701")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("fdc37c665gt:uart2", ins8250_uart_device, cts_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("fdc37c665gt:uart2", ins8250_uart_device, cts_w))
MCFG_DEVICE_MODIFY("fdc37c665gt:uart2")
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("rs232", rs232_port_device, write_rts))
/* video hardware */
MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL(53'693'175) )
diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp
index 3bbd3921d87..a5ac53011a9 100644
--- a/src/mame/drivers/twins.cpp
+++ b/src/mame/drivers/twins.cpp
@@ -391,9 +391,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(twins_state::twins)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, 8000000)
- MCFG_CPU_PROGRAM_MAP(twins_map)
- MCFG_CPU_IO_MAP(twins_io)
+ MCFG_DEVICE_ADD("maincpu", V30, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(twins_map)
+ MCFG_DEVICE_IO_MAP(twins_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -409,7 +409,7 @@ MACHINE_CONFIG_START(twins_state::twins)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -438,9 +438,9 @@ void twins_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(twins_state::twinsa)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(twins_map)
- MCFG_CPU_IO_MAP(twinsa_io)
+ MCFG_DEVICE_ADD("maincpu", V30, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(twins_map)
+ MCFG_DEVICE_IO_MAP(twinsa_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -458,7 +458,7 @@ MACHINE_CONFIG_START(twins_state::twinsa)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(16'000'000)/8) /* verified on pcb */
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(16'000'000)/8) /* verified on pcb */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -565,9 +565,9 @@ void twins_state::spider_io(address_map &map)
MACHINE_CONFIG_START(twins_state::spider)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30, 8000000)
- MCFG_CPU_PROGRAM_MAP(twins_map)
- MCFG_CPU_IO_MAP(spider_io)
+ MCFG_DEVICE_ADD("maincpu", V30, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(twins_map)
+ MCFG_DEVICE_IO_MAP(spider_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -583,7 +583,7 @@ MACHINE_CONFIG_START(twins_state::spider)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp
index ccc1ff44400..49989a6f44f 100644
--- a/src/mame/drivers/tx0.cpp
+++ b/src/mame/drivers/tx0.cpp
@@ -1542,22 +1542,22 @@ INTERRUPT_GEN_MEMBER(tx0_state::tx0_interrupt)
MACHINE_CONFIG_START(tx0_state::tx0_64kw)
/* basic machine hardware */
/* TX0 CPU @ approx. 167 kHz (no master clock, but the memory cycle time is approximately 6usec) */
- MCFG_CPU_ADD("maincpu", TX0_64KW, 166667)
+ MCFG_DEVICE_ADD("maincpu", TX0_64KW, 166667)
MCFG_TX0_CONFIG(
- WRITELINE( tx0_state, tx0_io_cpy ),
- WRITELINE( tx0_state, tx0_io_r1l ),
- WRITELINE( tx0_state, tx0_io_dis ),
- WRITELINE( tx0_state, tx0_io_r3l ),
- WRITELINE( tx0_state, tx0_io_prt ),
+ WRITELINE( *this, tx0_state, tx0_io_cpy ),
+ WRITELINE( *this, tx0_state, tx0_io_r1l ),
+ WRITELINE( *this, tx0_state, tx0_io_dis ),
+ WRITELINE( *this, tx0_state, tx0_io_r3l ),
+ WRITELINE( *this, tx0_state, tx0_io_prt ),
NOOP,
- WRITELINE( tx0_state, tx0_io_p6h ),
- WRITELINE( tx0_state, tx0_io_p7h ),
- WRITELINE( tx0_state, tx0_sel ),
- WRITELINE( tx0_state, tx0_io_reset_callback )
+ WRITELINE( *this, tx0_state, tx0_io_p6h ),
+ WRITELINE( *this, tx0_state, tx0_io_p7h ),
+ WRITELINE( *this, tx0_state, tx0_sel ),
+ WRITELINE( *this, tx0_state, tx0_io_reset_callback )
)
- MCFG_CPU_PROGRAM_MAP(tx0_64kw_map)
+ MCFG_DEVICE_PROGRAM_MAP(tx0_64kw_map)
/* dummy interrupt: handles input */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", tx0_state, tx0_interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", tx0_state, tx0_interrupt)
/* video hardware (includes the control panel and typewriter output) */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1566,7 +1566,7 @@ MACHINE_CONFIG_START(tx0_state::tx0_64kw)
MCFG_SCREEN_SIZE(virtual_width, virtual_height)
MCFG_SCREEN_VISIBLE_AREA(0, virtual_width-1, 0, virtual_height-1)
MCFG_SCREEN_UPDATE_DRIVER(tx0_state, screen_update_tx0)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tx0_state, screen_vblank_tx0))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tx0_state, screen_vblank_tx0))
MCFG_SCREEN_PALETTE("palette")
MCFG_DEVICE_ADD("crt", CRT, 0)
@@ -1591,8 +1591,8 @@ MACHINE_CONFIG_START(tx0_state::tx0_8kw)
/* basic machine hardware */
/* TX0 CPU @ approx. 167 kHz (no master clock, but the memory cycle time is
approximately 6usec) */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(tx0_8kw_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(tx0_8kw_map)
/*MCFG_CPU_PORTS(readport, writeport)*/
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp
index aaddeba89e1..af561d92686 100644
--- a/src/mame/drivers/tx1.cpp
+++ b/src/mame/drivers/tx1.cpp
@@ -42,6 +42,7 @@
#include "emu.h"
#include "includes/tx1.h"
+#include "audio/tx1.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
@@ -617,28 +618,28 @@ void tx1_state::buggyboy_sound_io(address_map &map)
*************************************/
MACHINE_CONFIG_START(tx1_state::tx1)
- MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MCFG_CPU_PROGRAM_MAP(tx1_main)
+ MCFG_DEVICE_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_DEVICE_PROGRAM_MAP(tx1_main)
MCFG_WATCHDOG_ADD("watchdog")
// MCFG_WATCHDOG_TIME_INIT(5)
- MCFG_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MCFG_CPU_PROGRAM_MAP(tx1_math)
+ MCFG_DEVICE_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_DEVICE_PROGRAM_MAP(tx1_math)
- MCFG_CPU_ADD("audio_cpu", Z80, TX1_PIXEL_CLOCK / 2)
- MCFG_CPU_PROGRAM_MAP(tx1_sound_prg)
- MCFG_CPU_IO_MAP(tx1_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(tx1_state, irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2)
+ MCFG_DEVICE_ADD("audio_cpu", Z80, TX1_PIXEL_CLOCK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tx1_sound_prg)
+ MCFG_DEVICE_IO_MAP(tx1_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tx1_state, irq0_line_hold, TX1_PIXEL_CLOCK / 4 / 2048 / 2)
MCFG_MACHINE_RESET_OVERRIDE(tx1_state,tx1)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(tx1_state, tx1_ppi_porta_r))
- MCFG_I8255_IN_PORTB_CB(READ8(tx1_state, tx1_ppi_portb_r))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, tx1_state, tx1_ppi_porta_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, tx1_state, tx1_ppi_portb_r))
MCFG_I8255_IN_PORTC_CB(IOPORT("PPI_PORTC"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(tx1_state, tx1_coin_cnt_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, tx1_state, tx1_coin_cnt_w))
MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(tx1_state,tx1)
@@ -658,7 +659,7 @@ MACHINE_CONFIG_START(tx1_state::tx1)
MCFG_SCREEN_ADD("rscreen", RASTER)
MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(tx1_state, screen_update_tx1_right)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tx1_state, screen_vblank_tx1))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tx1_state, screen_vblank_tx1))
MCFG_SCREEN_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(tx1_state,tx1)
@@ -667,32 +668,32 @@ MACHINE_CONFIG_START(tx1_state::tx1)
// MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright") /* Atari TX-1 TM262 manual shows 4 speakers (TX-1 Audio PCB Assembly A042016-01 A) */
- MCFG_SOUND_ADD("aysnd", AY8910, TX1_PIXEL_CLOCK / 8)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("tx1", tx1_sound_device, ay8910_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("tx1", tx1_sound_device, ay8910_b_w))
+ MCFG_DEVICE_ADD("aysnd", AY8910, TX1_PIXEL_CLOCK / 8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("tx1", tx1_sound_device, ay8910_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("tx1", tx1_sound_device, ay8910_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.1)
- MCFG_SOUND_ADD("tx1", TX1, 0)
+ MCFG_DEVICE_ADD("tx1", TX1_SOUND, TX1_PIXEL_CLOCK)
MCFG_SOUND_ROUTE(0, "frontleft", 0.2)
MCFG_SOUND_ROUTE(1, "frontright", 0.2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tx1_state::buggyboy)
- MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MCFG_CPU_PROGRAM_MAP(buggyboy_main)
+ MCFG_DEVICE_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_DEVICE_PROGRAM_MAP(buggyboy_main)
MCFG_WATCHDOG_ADD("watchdog")
// MCFG_WATCHDOG_TIME_INIT(5)
- MCFG_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MCFG_CPU_PROGRAM_MAP(buggyboy_math)
+ MCFG_DEVICE_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_DEVICE_PROGRAM_MAP(buggyboy_math)
- MCFG_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
- MCFG_CPU_PROGRAM_MAP(buggyboy_sound_prg)
- MCFG_CPU_PERIODIC_INT_DRIVER(tx1_state, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
- MCFG_CPU_IO_MAP(buggyboy_sound_io)
+ MCFG_DEVICE_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(buggyboy_sound_prg)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tx1_state, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
+ MCFG_DEVICE_IO_MAP(buggyboy_sound_io)
MCFG_MACHINE_RESET_OVERRIDE(tx1_state,buggyboy)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -700,7 +701,7 @@ MACHINE_CONFIG_START(tx1_state::buggyboy)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
/* Buggy Boy uses an 8255 PPI instead of YM2149 ports for inputs! */
MCFG_I8255_IN_PORTA_CB(IOPORT("PPI_PORTA"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(tx1_state, bb_coin_cnt_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, tx1_state, bb_coin_cnt_w))
MCFG_I8255_IN_PORTC_CB(IOPORT("PPI_PORTC"))
MCFG_DEFAULT_LAYOUT(layout_triphsxs)
@@ -718,7 +719,7 @@ MACHINE_CONFIG_START(tx1_state::buggyboy)
MCFG_SCREEN_ADD("rscreen", RASTER)
MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(tx1_state, screen_update_buggyboy_right)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tx1_state, screen_vblank_buggyboy))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tx1_state, screen_vblank_buggyboy))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 256)
@@ -728,35 +729,35 @@ MACHINE_CONFIG_START(tx1_state::buggyboy)
MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
// MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
- MCFG_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("buggyboy", buggyboy_sound_device, ym1_a_w))
+ MCFG_DEVICE_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("buggyboy", buggyboy_sound_device, ym1_a_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
- MCFG_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("buggyboy", buggyboy_sound_device, ym2_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("buggyboy", buggyboy_sound_device, ym2_b_w))
+ MCFG_DEVICE_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("buggyboy", buggyboy_sound_device, ym2_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("buggyboy", buggyboy_sound_device, ym2_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
- MCFG_SOUND_ADD("buggyboy", BUGGYBOY, 0)
+ MCFG_DEVICE_ADD("buggyboy", BUGGYBOY_SOUND, BUGGYBOY_ZCLK)
MCFG_SOUND_ROUTE(0, "frontleft", 0.2)
MCFG_SOUND_ROUTE(1, "frontright", 0.2)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(tx1_state::buggybjr)
- MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MCFG_CPU_PROGRAM_MAP(buggybjr_main)
+ MCFG_DEVICE_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_DEVICE_PROGRAM_MAP(buggybjr_main)
MCFG_WATCHDOG_ADD("watchdog")
// MCFG_WATCHDOG_TIME_INIT(5)
- MCFG_CPU_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
- MCFG_CPU_PROGRAM_MAP(buggyboy_math)
+ MCFG_DEVICE_ADD("math_cpu", I8086, CPU_MASTER_CLOCK / 3)
+ MCFG_DEVICE_PROGRAM_MAP(buggyboy_math)
- MCFG_CPU_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
- MCFG_CPU_PROGRAM_MAP(buggybjr_sound_prg)
- MCFG_CPU_IO_MAP(buggyboy_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(tx1_state, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
+ MCFG_DEVICE_ADD("audio_cpu", Z80, BUGGYBOY_ZCLK / 2)
+ MCFG_DEVICE_PROGRAM_MAP(buggybjr_sound_prg)
+ MCFG_DEVICE_IO_MAP(buggyboy_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(tx1_state, z80_irq, BUGGYBOY_ZCLK / 2 / 4 / 2048)
MCFG_MACHINE_RESET_OVERRIDE(tx1_state,buggyboy)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -764,7 +765,7 @@ MACHINE_CONFIG_START(tx1_state::buggybjr)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(tx1_state, screen_update_buggybjr)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(tx1_state, screen_vblank_buggyboy))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tx1_state, screen_vblank_buggyboy))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 256)
@@ -774,17 +775,17 @@ MACHINE_CONFIG_START(tx1_state::buggybjr)
MCFG_SPEAKER_STANDARD_STEREO("frontleft", "frontright")
// MCFG_SPEAKER_STANDARD_STEREO("rearleft", "rearright")
- MCFG_SOUND_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC19 */
+ MCFG_DEVICE_ADD("ym1", YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC19 */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("YM2149_IC19_A"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("YM2149_IC19_B"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontleft", 0.15)
- MCFG_SOUND_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC24 */
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("buggyboy", buggyboy_sound_device, ym2_a_w))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("buggyboy", buggyboy_sound_device, ym2_b_w))
+ MCFG_DEVICE_ADD("ym2", YM2149, BUGGYBOY_ZCLK / 4) /* YM2149 IC24 */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("buggyboy", buggyboy_sound_device, ym2_a_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8("buggyboy", buggyboy_sound_device, ym2_b_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "frontright", 0.15)
- MCFG_SOUND_ADD("buggyboy", BUGGYBOY, 0)
+ MCFG_DEVICE_ADD("buggyboy", BUGGYBOY_SOUND, BUGGYBOY_ZCLK)
MCFG_SOUND_ROUTE(0, "frontleft", 0.2)
MCFG_SOUND_ROUTE(1, "frontright", 0.2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp
index 957135cd496..926aa8c3288 100644
--- a/src/mame/drivers/uapce.cpp
+++ b/src/mame/drivers/uapce.cpp
@@ -307,12 +307,12 @@ void uapce_state::pce_io(address_map &map)
MACHINE_CONFIG_START(uapce_state::uapce)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(pce_mem)
- MCFG_CPU_IO_MAP(pce_io)
+ MCFG_DEVICE_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(pce_mem)
+ MCFG_DEVICE_IO_MAP(pce_io)
- MCFG_CPU_ADD("sub", Z80, 1400000)
- MCFG_CPU_PROGRAM_MAP(z80_map)
+ MCFG_DEVICE_ADD("sub", Z80, 1400000)
+ MCFG_DEVICE_PROGRAM_MAP(z80_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -323,21 +323,21 @@ MACHINE_CONFIG_START(uapce_state::uapce)
MCFG_SCREEN_PALETTE("huc6260:palette")
MCFG_DEVICE_ADD( "huc6260", HUC6260, PCE_MAIN_CLOCK )
- MCFG_HUC6260_NEXT_PIXEL_DATA_CB(DEVREAD16("huc6270", huc6270_device, next_pixel))
- MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(DEVREAD16("huc6270", huc6270_device, time_until_next_event))
- MCFG_HUC6260_VSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, vsync_changed))
- MCFG_HUC6260_HSYNC_CHANGED_CB(DEVWRITELINE("huc6270", huc6270_device, hsync_changed))
+ MCFG_HUC6260_NEXT_PIXEL_DATA_CB(READ16("huc6270", huc6270_device, next_pixel))
+ MCFG_HUC6260_TIME_TIL_NEXT_EVENT_CB(READ16("huc6270", huc6270_device, time_until_next_event))
+ MCFG_HUC6260_VSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, vsync_changed))
+ MCFG_HUC6260_HSYNC_CHANGED_CB(WRITELINE("huc6270", huc6270_device, hsync_changed))
MCFG_DEVICE_ADD( "huc6270", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x10000)
MCFG_HUC6270_IRQ_CHANGED_CB(INPUTLINE("maincpu", 0))
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MCFG_C6280_CPU("maincpu")
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.5)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(uapce)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp
index 88f918f382a..3e09a9a028c 100644
--- a/src/mame/drivers/uknc.cpp
+++ b/src/mame/drivers/uknc.cpp
@@ -64,13 +64,13 @@ uint32_t uknc_state::screen_update_uknc(screen_device &screen, bitmap_ind16 &bit
MACHINE_CONFIG_START(uknc_state::uknc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", K1801VM2, 8000000)
+ MCFG_DEVICE_ADD("maincpu", K1801VM2, 8000000)
MCFG_T11_INITIAL_MODE(0x8000)
- MCFG_CPU_PROGRAM_MAP(uknc_mem)
+ MCFG_DEVICE_PROGRAM_MAP(uknc_mem)
- MCFG_CPU_ADD("subcpu", K1801VM2, 6000000)
+ MCFG_DEVICE_ADD("subcpu", K1801VM2, 6000000)
MCFG_T11_INITIAL_MODE(0x8000)
- MCFG_CPU_PROGRAM_MAP(uknc_sub_mem)
+ MCFG_DEVICE_PROGRAM_MAP(uknc_sub_mem)
/* video hardware */
diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp
index 67d6bd5facb..46f46c89117 100644
--- a/src/mame/drivers/ultraman.cpp
+++ b/src/mame/drivers/ultraman.cpp
@@ -175,13 +175,13 @@ void ultraman_state::machine_reset()
MACHINE_CONFIG_START(ultraman_state::ultraman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ultraman_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ultraman_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,24000000/6) /* 4 MHz? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,24000000/6) /* 4 MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
MCFG_INPUT_MERGER_ALL_HIGH("soundnmi")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI))
diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp
index 543858cf242..27c4336d891 100644
--- a/src/mame/drivers/ultratnk.cpp
+++ b/src/mame/drivers/ultratnk.cpp
@@ -292,15 +292,15 @@ GFXDECODE_END
MACHINE_CONFIG_START(ultratnk_state::ultratnk)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
- MCFG_CPU_PROGRAM_MAP(ultratnk_cpu_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
+ MCFG_DEVICE_PROGRAM_MAP(ultratnk_cpu_map)
MCFG_DEVICE_ADD("latch", F9334, 0) // E11
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(ultratnk_state, lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, ultratnk_state, lockout_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(OUTPUT("led0")) // LED1 (left player start)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(OUTPUT("led1")) // LED2 (right player start)
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ULTRATNK_FIRE_EN_2>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("discrete", discrete_device, write_line<ULTRATNK_FIRE_EN_1>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ULTRATNK_FIRE_EN_2>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("discrete", discrete_device, write_line<ULTRATNK_FIRE_EN_1>))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 8)
@@ -309,7 +309,7 @@ MACHINE_CONFIG_START(ultratnk_state::ultratnk)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, 0, 256, VTOTAL, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(ultratnk_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(ultratnk_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ultratnk_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", ultratnk)
@@ -320,7 +320,7 @@ MACHINE_CONFIG_START(ultratnk_state::ultratnk)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(ultratnk)
MCFG_SOUND_ROUTE(0, "mono", 1.0)
diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp
index 7f2ffa2b697..8cbd70ef485 100644
--- a/src/mame/drivers/ultrsprt.cpp
+++ b/src/mame/drivers/ultrsprt.cpp
@@ -236,12 +236,12 @@ void ultrsprt_state::machine_reset()
MACHINE_CONFIG_START(ultrsprt_state::ultrsprt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, 25000000)
- MCFG_CPU_PROGRAM_MAP(ultrsprt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", ultrsprt_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, 25000000)
+ MCFG_DEVICE_PROGRAM_MAP(ultrsprt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ultrsprt_state, irq1_line_assert)
- MCFG_CPU_ADD("audiocpu", M68000, 8000000) // Unconfirmed
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", M68000, 8000000) // Unconfirmed
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp
index f1ecaeaad9c..52ffc47a5fc 100644
--- a/src/mame/drivers/umipoker.cpp
+++ b/src/mame/drivers/umipoker.cpp
@@ -695,12 +695,12 @@ void saiyukip_state::machine_start()
MACHINE_CONFIG_START(umipoker_state::umipoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL(14'318'181)) // TMP68HC000-16
- MCFG_CPU_PROGRAM_MAP(umipoker_map)
+ MCFG_DEVICE_ADD("maincpu",M68000, XTAL(14'318'181)) // TMP68HC000-16
+ MCFG_DEVICE_PROGRAM_MAP(umipoker_map)
- MCFG_CPU_ADD("audiocpu",Z80, XTAL(14'318'181)/4) // 3.579545MHz
- MCFG_CPU_PROGRAM_MAP(umipoker_audio_map)
- MCFG_CPU_IO_MAP(umipoker_audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu",Z80, XTAL(14'318'181)/4) // 3.579545MHz
+ MCFG_DEVICE_PROGRAM_MAP(umipoker_audio_map)
+ MCFG_DEVICE_IO_MAP(umipoker_audio_io_map)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -724,7 +724,7 @@ MACHINE_CONFIG_START(umipoker_state::umipoker)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym", YM3812, XTAL(14'318'181)/4) // 3.579545MHz
+ MCFG_DEVICE_ADD("ym", YM3812, XTAL(14'318'181)/4) // 3.579545MHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
@@ -735,8 +735,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(saiyukip_state::saiyukip)
umipoker(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(saiyukip_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(saiyukip_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp
index f1e8860f099..af69fee3800 100644
--- a/src/mame/drivers/undrfire.cpp
+++ b/src/mame/drivers/undrfire.cpp
@@ -567,9 +567,9 @@ INTERRUPT_GEN_MEMBER(undrfire_state::undrfire_interrupt)
MACHINE_CONFIG_START(undrfire_state::undrfire)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20 MHz - NOT verified */
- MCFG_CPU_PROGRAM_MAP(undrfire_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, undrfire_interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20 MHz - NOT verified */
+ MCFG_DEVICE_PROGRAM_MAP(undrfire_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", undrfire_state, undrfire_interrupt)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -577,12 +577,12 @@ MACHINE_CONFIG_START(undrfire_state::undrfire)
MCFG_TC0510NIO_READ_0_CB(IOPORT("INPUTS0"))
MCFG_TC0510NIO_READ_1_CB(IOPORT("INPUTS1"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("INPUTS2"))
- MCFG_TC0510NIO_READ_3_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_INPUT(READLINE(undrfire_state, frame_counter_r)) MCFG_DEVCB_BIT(0)
- MCFG_TC0510NIO_WRITE_3_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(undrfire_state, coin_word_w))
+ MCFG_TC0510NIO_READ_3_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVCB_CHAIN_INPUT(READLINE(*this, undrfire_state, frame_counter_r)) MCFG_DEVCB_BIT(0)
+ MCFG_TC0510NIO_WRITE_3_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, undrfire_state, coin_word_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("SYSTEM"))
/* video hardware */
@@ -620,13 +620,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(undrfire_state::cbombers)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20 MHz - NOT verified */
- MCFG_CPU_PROGRAM_MAP(cbombers_cpua_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, XTAL(40'000'000)/2) /* 20 MHz - NOT verified */
+ MCFG_DEVICE_PROGRAM_MAP(cbombers_cpua_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", undrfire_state, irq4_line_hold)
- MCFG_CPU_ADD("sub", M68000, XTAL(32'000'000)/2) /* 16 MHz */
- MCFG_CPU_PROGRAM_MAP(cbombers_cpub_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", undrfire_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("sub", M68000, XTAL(32'000'000)/2) /* 16 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(cbombers_cpub_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", undrfire_state, irq4_line_hold)
MCFG_QUANTUM_TIME(attotime::from_hz(480)) /* CPU slices - Need to interleave Cpu's 1 & 3 */
@@ -640,12 +640,12 @@ MACHINE_CONFIG_START(undrfire_state::cbombers)
MCFG_TC0510NIO_READ_0_CB(IOPORT("INPUTS0"))
MCFG_TC0510NIO_READ_1_CB(IOPORT("INPUTS1"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("INPUTS2"))
- MCFG_TC0510NIO_READ_3_CB(DEVREADLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
- MCFG_DEVCB_CHAIN_INPUT(READLINE(undrfire_state, frame_counter_r)) MCFG_DEVCB_BIT(0)
- MCFG_TC0510NIO_WRITE_3_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(undrfire_state, coin_word_w))
+ MCFG_TC0510NIO_READ_3_CB(READLINE("eeprom", eeprom_serial_93cxx_device, do_read)) MCFG_DEVCB_BIT(7)
+ MCFG_DEVCB_CHAIN_INPUT(READLINE(*this, undrfire_state, frame_counter_r)) MCFG_DEVCB_BIT(0)
+ MCFG_TC0510NIO_WRITE_3_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) MCFG_DEVCB_BIT(5)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) MCFG_DEVCB_BIT(6)
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) MCFG_DEVCB_BIT(4)
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, undrfire_state, coin_word_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("SYSTEM"))
/* video hardware */
diff --git a/src/mame/drivers/unianapc.cpp b/src/mame/drivers/unianapc.cpp
index 37fa6cba49b..4ddb9e537a1 100644
--- a/src/mame/drivers/unianapc.cpp
+++ b/src/mame/drivers/unianapc.cpp
@@ -73,8 +73,8 @@ void unianapc_state::machine_reset()
MACHINE_CONFIG_START(unianapc_state::unianapc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // actually a Celeron at 1.70 GHz
- MCFG_CPU_PROGRAM_MAP(unianapc_map)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 100000000) // actually a Celeron at 1.70 GHz
+ MCFG_DEVICE_PROGRAM_MAP(unianapc_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp
index d25f2bedd36..f228a37baff 100644
--- a/src/mame/drivers/unichamp.cpp
+++ b/src/mame/drivers/unichamp.cpp
@@ -238,14 +238,14 @@ MACHINE_CONFIG_START(unichamp_state::unichamp)
/* basic machine hardware */
//The CPU is really clocked this way:
- //MCFG_CPU_ADD("maincpu", CP1610, XTAL(3'579'545)/4)
+ //MCFG_DEVICE_ADD("maincpu", CP1610, XTAL(3'579'545)/4)
//But since it is only running 7752/29868 th's of the time...
//TODO find a more accurate method? (the emulation will me the same though)
- MCFG_CPU_ADD("maincpu", CP1610, (7752.0/29868.0)*XTAL(3'579'545)/4)
+ MCFG_DEVICE_ADD("maincpu", CP1610, (7752.0/29868.0)*XTAL(3'579'545)/4)
- MCFG_CPU_PROGRAM_MAP(unichamp_mem)
+ MCFG_DEVICE_PROGRAM_MAP(unichamp_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
- MCFG_CP1610_BEXT_CALLBACK(READ8(unichamp_state, bext_r))
+ MCFG_CP1610_BEXT_CALLBACK(READ8(*this, unichamp_state, bext_r))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -265,7 +265,7 @@ MACHINE_CONFIG_START(unichamp_state::unichamp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_GIC_ADD( "gic", XTAL(3'579'545), "screen", READ8(unichamp_state, unichamp_gicram_r) )
+ MCFG_GIC_ADD( "gic", XTAL(3'579'545), "screen", READ8(*this, unichamp_state, unichamp_gicram_r) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
/* cartridge */
diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp
index 6c346e4852e..8b57666a2c8 100644
--- a/src/mame/drivers/unico.cpp
+++ b/src/mame/drivers/unico.cpp
@@ -572,9 +572,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(unico_state::burglarx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(burglarx_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(burglarx_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -591,7 +591,7 @@ MACHINE_CONFIG_START(unico_state::burglarx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
@@ -609,9 +609,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zeropnt_state::zeropnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(zeropnt_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32_MHz_XTAL/2) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(zeropnt_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -628,7 +628,7 @@ MACHINE_CONFIG_START(zeropnt_state::zeropnt)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'318'181)/4) /* 3.579545 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
@@ -646,9 +646,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zeropnt2_state::zeropnt2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68EC020, 32_MHz_XTAL/2) /* 16MHz */
- MCFG_CPU_PROGRAM_MAP(zeropnt2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68EC020, 32_MHz_XTAL/2) /* 16MHz */
+ MCFG_DEVICE_PROGRAM_MAP(zeropnt2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", unico_state, irq2_line_hold)
MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp
index 9b83a23b713..4d71b0f1f67 100644
--- a/src/mame/drivers/unior.cpp
+++ b/src/mame/drivers/unior.cpp
@@ -380,9 +380,9 @@ void unior_state::machine_reset()
MACHINE_CONFIG_START(unior_state::unior)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(20'000'000) / 9)
- MCFG_CPU_PROGRAM_MAP(unior_mem)
- MCFG_CPU_IO_MAP(unior_io)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(20'000'000) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(unior_mem)
+ MCFG_DEVICE_IO_MAP(unior_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -396,7 +396,7 @@ MACHINE_CONFIG_START(unior_state::unior)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -405,34 +405,34 @@ MACHINE_CONFIG_START(unior_state::unior)
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(20'000'000) / 12)
MCFG_PIT8253_CLK1(XTAL(20'000'000) / 9)
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_PIT8253_CLK2(XTAL(16'000'000) / 9 / 64) // unknown frequency
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_DEVICE_ADD("ppi0", I8255, 0)
// ports a & c connect to an external slot
- MCFG_I8255_IN_PORTB_CB(READ8(unior_state, ppi0_b_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(unior_state, ppi0_b_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, unior_state, ppi0_b_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, unior_state, ppi0_b_w))
MCFG_DEVICE_ADD("ppi1", I8255, 0)
// ports a & b are for the keyboard
// port c operates various control lines for mostly unknown purposes
- MCFG_I8255_IN_PORTA_CB(READ8(unior_state, ppi1_a_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(unior_state, ppi1_a_w))
- MCFG_I8255_IN_PORTB_CB(READ8(unior_state, ppi1_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(unior_state, ppi1_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(unior_state, ppi1_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, unior_state, ppi1_a_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, unior_state, ppi1_a_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, unior_state, ppi1_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, unior_state, ppi1_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, unior_state, ppi1_c_w))
MCFG_DEVICE_ADD("dma", I8257, XTAL(20'000'000) / 9)
- MCFG_I8257_OUT_HRQ_CB(WRITELINE(unior_state, hrq_w))
- MCFG_I8257_IN_MEMR_CB(READ8(unior_state, dma_r))
- MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("crtc", i8275_device, dack_w))
+ MCFG_I8257_OUT_HRQ_CB(WRITELINE(*this, unior_state, hrq_w))
+ MCFG_I8257_IN_MEMR_CB(READ8(*this, unior_state, dma_r))
+ MCFG_I8257_OUT_IOW_2_CB(WRITE8("crtc", i8275_device, dack_w))
MCFG_DEVICE_ADD("crtc", I8275, XTAL(20'000'000) / 12)
MCFG_I8275_CHARACTER_WIDTH(6)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(unior_state, display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma",i8257_device, dreq2_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("dma",i8257_device, dreq2_w))
MCFG_VIDEO_SET_SCREEN("screen")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp
index 9ba207b4360..715f658c95c 100644
--- a/src/mame/drivers/unistar.cpp
+++ b/src/mame/drivers/unistar.cpp
@@ -97,12 +97,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(unistar_state::unistar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8085A, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(unistar_mem)
- MCFG_CPU_IO_MAP(unistar_io)
+ MCFG_DEVICE_ADD("maincpu",I8085A, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(unistar_mem)
+ MCFG_DEVICE_IO_MAP(unistar_io)
MCFG_DEVICE_ADD("stc", AM9513, XTAL(8'000'000))
- MCFG_AM9513_FOUT_CALLBACK(DEVWRITELINE("stc", am9513_device, source1_w))
+ MCFG_AM9513_FOUT_CALLBACK(WRITELINE("stc", am9513_device, source1_w))
MCFG_DEVICE_ADD("ppi", I8255A, 0)
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index fd5b5139970..9241c266aa2 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -313,9 +313,9 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_START(univac_state::uts20)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(4'000'000)) // unknown clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(4'000'000)) // unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_Z80_DAISY_CHAIN(daisy_chain)
/* video hardware */
@@ -332,27 +332,27 @@ MACHINE_CONFIG_START(univac_state::uts20)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_DEVICE_ADD("ctc_clock", CLOCK, 2000000)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(4'000'000))
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("uart", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", z80sio_device, rxca_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("uart", z80sio_device, rxtxcb_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("uart", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", z80sio_device, rxca_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("uart", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("uart", Z80SIO, XTAL(4'000'000))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("uart", z80sio_device, rxa_w)) // FIXME: hacked in permanent loopback to pass test
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("uart", z80sio_device, rxb_w)) // FIXME: hacked in permanent loopback to pass test
- MCFG_Z80SIO_OUT_WRDYB_CB(DEVWRITELINE("uart", z80sio_device, dcdb_w)) // FIXME: hacked in permanent loopback to pass test
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", z80sio_device, ctsb_w)) // FIXME: hacked in permanent loopback to pass test
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("uart", z80sio_device, rxa_w)) // FIXME: hacked in permanent loopback to pass test
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("uart", z80sio_device, rxb_w)) // FIXME: hacked in permanent loopback to pass test
+ MCFG_Z80SIO_OUT_WRDYB_CB(WRITELINE("uart", z80sio_device, dcdb_w)) // FIXME: hacked in permanent loopback to pass test
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", z80sio_device, ctsb_w)) // FIXME: hacked in permanent loopback to pass test
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950) // guess
+ MCFG_DEVICE_ADD("beeper", BEEP, 950) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index 2c6c589113d..44754f73c5d 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -324,8 +324,8 @@ static void unixpc_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(unixpc_state::unixpc)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68010, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(unixpc_mem)
+ MCFG_DEVICE_ADD("maincpu", M68010, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(unixpc_mem)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -352,8 +352,8 @@ MACHINE_CONFIG_START(unixpc_state::unixpc)
// floppy
MCFG_DEVICE_ADD("wd2797", WD2797, 1000000)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(unixpc_state, wd2797_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(unixpc_state, wd2797_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, unixpc_state, wd2797_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, unixpc_state, wd2797_drq_w))
MCFG_FLOPPY_DRIVE_ADD("wd2797:0", unixpc_floppies, "525dd", floppy_image_device::default_floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp
index 9e8a446b3e4..984f98e426b 100644
--- a/src/mame/drivers/unkhorse.cpp
+++ b/src/mame/drivers/unkhorse.cpp
@@ -192,14 +192,14 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(horse_state::horse)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(12'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(horse_map)
- MCFG_CPU_IO_MAP(horse_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(12'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(horse_map)
+ MCFG_DEVICE_IO_MAP(horse_io_map)
MCFG_DEVICE_ADD("i8155", I8155, XTAL(12'000'000) / 4) // port A input, B output, C output but unused
- MCFG_I8155_IN_PORTA_CB(READ8(horse_state, input_r))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(horse_state, output_w))
- MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_I8155_IN_PORTA_CB(READ8(*this, horse_state, input_r))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, horse_state, output_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE("speaker", speaker_sound_device, level_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -214,7 +214,7 @@ MACHINE_CONFIG_START(horse_state::horse)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp
index 6a6ea53f5ac..6b8c9c2eb9f 100644
--- a/src/mame/drivers/upscope.cpp
+++ b/src/mame/drivers/upscope.cpp
@@ -266,8 +266,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(upscope_state::upscope)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_DEVICE_ADD("overlay", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(overlay_512kb_map)
@@ -289,38 +289,38 @@ MACHINE_CONFIG_START(upscope_state::upscope)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
+ MCFG_DEVICE_ADD("amiga", PAULA_8364, amiga_state::CLK_C1_NTSC)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(2, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
- MCFG_PAULA_MEM_READ_CB(READ16(amiga_state, chip_ram_r))
- MCFG_PAULA_INT_CB(WRITELINE(amiga_state, paula_int_w))
+ MCFG_PAULA_MEM_READ_CB(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_PAULA_INT_CB(WRITELINE(*this, amiga_state, paula_int_w))
/* cia */
MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_0_irq))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_0_port_a_write))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_0_portb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_0_portb_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, upscope_state, upscope_cia_0_portb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, upscope_state, upscope_cia_0_portb_w))
MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(upscope_state, upscope_cia_1_porta_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(upscope_state, upscope_cia_1_porta_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, upscope_state, upscope_cia_1_porta_r))
+ MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, upscope_state, upscope_cia_1_porta_w))
/* fdc */
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_NTSC)
- MCFG_AMIGA_FDC_INDEX_CALLBACK(DEVWRITELINE("cia_1", mos8520_device, flag_w))
- MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(amiga_state, chip_ram_r))
- MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(amiga_state, chip_ram_w))
- MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(amiga_state, fdc_dskblk_w))
- MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(amiga_state, fdc_dsksyn_w))
+ MCFG_AMIGA_FDC_INDEX_CALLBACK(WRITELINE("cia_1", mos8520_device, flag_w))
+ MCFG_AMIGA_FDC_READ_DMA_CALLBACK(READ16(*this, amiga_state, chip_ram_r))
+ MCFG_AMIGA_FDC_WRITE_DMA_CALLBACK(WRITE16(*this, amiga_state, chip_ram_w))
+ MCFG_AMIGA_FDC_DSKBLK_CALLBACK(WRITELINE(*this, amiga_state, fdc_dskblk_w))
+ MCFG_AMIGA_FDC_DSKSYN_CALLBACK(WRITELINE(*this, amiga_state, fdc_dsksyn_w))
// i/o extension
MCFG_DEVICE_ADD("ppi", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IO0"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(upscope_state, lamps_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(upscope_state, coin_counter_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, upscope_state, lamps_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, upscope_state, coin_counter_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp
index 80d8c57d3dc..61af4fa703a 100644
--- a/src/mame/drivers/usgames.cpp
+++ b/src/mame/drivers/usgames.cpp
@@ -221,9 +221,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(usgames_state::usg32)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ?? */
- MCFG_CPU_PROGRAM_MAP(usgames_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(usgames_state, irq0_line_hold, 5*60) /* ?? */
+ MCFG_DEVICE_ADD("maincpu", M6809, 2000000) /* ?? */
+ MCFG_DEVICE_PROGRAM_MAP(usgames_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(usgames_state, irq0_line_hold, 5*60) /* ?? */
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -247,14 +247,14 @@ MACHINE_CONFIG_START(usgames_state::usg32)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8912, 2000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(usgames_state::usg185)
usg32(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(usg185_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(usg185_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp
index 49df616377b..97ee70367a9 100644
--- a/src/mame/drivers/ut88.cpp
+++ b/src/mame/drivers/ut88.cpp
@@ -189,9 +189,9 @@ INPUT_PORTS_END
/* Machine driver */
MACHINE_CONFIG_START(ut88_state::ut88)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(ut88_mem)
- MCFG_CPU_IO_MAP(ut88_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(ut88_mem)
+ MCFG_DEVICE_IO_MAP(ut88_io)
MCFG_MACHINE_RESET_OVERRIDE(ut88_state, ut88 )
/* video hardware */
@@ -209,7 +209,7 @@ MACHINE_CONFIG_START(ut88_state::ut88)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
@@ -218,9 +218,9 @@ MACHINE_CONFIG_START(ut88_state::ut88)
/* Devices */
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(ut88_state, ut88_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(ut88_state, ut88_8255_portb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(ut88_state, ut88_8255_portc_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ut88_state, ut88_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, ut88_state, ut88_8255_portb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, ut88_state, ut88_8255_portc_r))
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_FORMATS(rku_cassette_formats)
@@ -232,9 +232,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(ut88_state::ut88mini)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 2000000)
- MCFG_CPU_PROGRAM_MAP(ut88mini_mem)
- MCFG_CPU_IO_MAP(ut88mini_io)
+ MCFG_DEVICE_ADD("maincpu", I8080, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(ut88mini_mem)
+ MCFG_DEVICE_IO_MAP(ut88mini_io)
MCFG_MACHINE_START_OVERRIDE(ut88_state,ut88mini)
MCFG_MACHINE_RESET_OVERRIDE(ut88_state, ut88mini )
diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp
index 8a7a4674d77..dbad8ba8842 100644
--- a/src/mame/drivers/uzebox.cpp
+++ b/src/mame/drivers/uzebox.cpp
@@ -285,10 +285,10 @@ DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart)
MACHINE_CONFIG_START(uzebox_state::uzebox)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ATMEGA644, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(uzebox_prg_map)
- MCFG_CPU_DATA_MAP(uzebox_data_map)
- MCFG_CPU_IO_MAP(uzebox_io_map)
+ MCFG_DEVICE_ADD("maincpu", ATMEGA644, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(uzebox_prg_map)
+ MCFG_DEVICE_DATA_MAP(uzebox_data_map)
+ MCFG_DEVICE_IO_MAP(uzebox_io_map)
MCFG_CPU_AVR8_EEPROM("eeprom")
/* video hardware */
@@ -301,7 +301,7 @@ MACHINE_CONFIG_START(uzebox_state::uzebox)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(0, "mono", 1.00)
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "uzebox")
diff --git a/src/mame/drivers/v100.cpp b/src/mame/drivers/v100.cpp
index ca16ff3b765..6a56084db02 100644
--- a/src/mame/drivers/v100.cpp
+++ b/src/mame/drivers/v100.cpp
@@ -354,22 +354,22 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(v100_state::v100)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(47'736'000) / 12) // divider not verified
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(v100_state, irq_ack)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(47'736'000) / 12) // divider not verified
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(v100_state, irq_ack)
MCFG_DEVICE_ADD("usart1", I8251, XTAL(47'736'000) / 12) // divider not verified
MCFG_DEVICE_ADD("brg1", COM8116, 5068800) // TODO: clock and divisors for this customized variant
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("usart1", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("usart1", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("usart1", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("usart1", i8251_device, write_txc))
MCFG_DEVICE_ADD("usart2", I8251, XTAL(47'736'000) / 12)
MCFG_DEVICE_ADD("brg2", COM8116, 5068800)
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("usart2", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("usart2", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("usart2", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("usart2", i8251_device, write_txc))
MCFG_SCREEN_ADD("screen", RASTER)
//MCFG_SCREEN_RAW_PARAMS(XTAL(47'736'000) / 2, 102 * CHAR_WIDTH, 0, 80 * CHAR_WIDTH, 260, 0, 240)
@@ -379,19 +379,19 @@ MACHINE_CONFIG_START(v100_state::v100)
MCFG_DEVICE_ADD("vtac", CRT5037, XTAL(47'736'000) / CHAR_WIDTH)
MCFG_TMS9927_CHAR_WIDTH(CHAR_WIDTH)
MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_TMS9927_HSYN_CALLBACK(WRITELINE(v100_state, picu_r_w<7>)) MCFG_DEVCB_INVERT
- MCFG_TMS9927_VSYN_CALLBACK(WRITELINE(v100_state, picu_r_w<6>)) MCFG_DEVCB_INVERT
+ MCFG_TMS9927_HSYN_CALLBACK(WRITELINE(*this, v100_state, picu_r_w<7>)) MCFG_DEVCB_INVERT
+ MCFG_TMS9927_VSYN_CALLBACK(WRITELINE(*this, v100_state, picu_r_w<6>)) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("picu", I8214, XTAL(47'736'000) / 12)
MCFG_I8214_INT_CALLBACK(ASSERTLINE("maincpu", 0))
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(v100_state, ppi_porta_w))
- MCFG_I8255_OUT_PORTB_CB(DEVWRITELINE("earom", er1400_device, c3_w)) MCFG_DEVCB_BIT(6) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("earom", er1400_device, c2_w)) MCFG_DEVCB_BIT(5) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("earom", er1400_device, c1_w)) MCFG_DEVCB_BIT(4) MCFG_DEVCB_INVERT
- MCFG_I8255_OUT_PORTC_CB(DEVWRITELINE("earom", er1400_device, data_w)) MCFG_DEVCB_BIT(6) MCFG_DEVCB_INVERT
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("earom", er1400_device, clock_w)) MCFG_DEVCB_BIT(0) MCFG_DEVCB_INVERT
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, v100_state, ppi_porta_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITELINE("earom", er1400_device, c3_w)) MCFG_DEVCB_BIT(6) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("earom", er1400_device, c2_w)) MCFG_DEVCB_BIT(5) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("earom", er1400_device, c1_w)) MCFG_DEVCB_BIT(4) MCFG_DEVCB_INVERT
+ MCFG_I8255_OUT_PORTC_CB(WRITELINE("earom", er1400_device, data_w)) MCFG_DEVCB_BIT(6) MCFG_DEVCB_INVERT
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("earom", er1400_device, clock_w)) MCFG_DEVCB_BIT(0) MCFG_DEVCB_INVERT
MCFG_DEVICE_ADD("earom", ER1400, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/v102.cpp b/src/mame/drivers/v102.cpp
index 05be661af58..4ad28271e92 100644
--- a/src/mame/drivers/v102.cpp
+++ b/src/mame/drivers/v102.cpp
@@ -77,9 +77,9 @@ static INPUT_PORTS_START( v102 )
INPUT_PORTS_END
MACHINE_CONFIG_START(v102_state::v102)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'575'000) / 5) // divider not verified
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'575'000) / 5) // divider not verified
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(18'575'000), 970, 0, 800, 319, 0, 300)
@@ -92,10 +92,10 @@ MACHINE_CONFIG_START(v102_state::v102)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_DEVICE_ADD("mpsc", UPD7201_NEW, XTAL(18'575'000) / 5) // divider not verified
- MCFG_Z80SIO_OUT_INT_CB(DEVWRITELINE("mainirq", input_merger_device, in_w<0>))
+ MCFG_Z80SIO_OUT_INT_CB(WRITELINE("mainirq", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("usart", I8251, XTAL(18'575'000) / 5) // divider not verified
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("mainirq", input_merger_device, in_w<1>))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("mainirq", input_merger_device, in_w<1>))
MCFG_INPUT_MERGER_ANY_HIGH("mainirq")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("maincpu", 0))
@@ -104,8 +104,8 @@ MACHINE_CONFIG_START(v102_state::v102)
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_CPU_ADD("kbdcpu", I8039, 12000000)
- MCFG_CPU_PROGRAM_MAP(kbd_map)
+ MCFG_DEVICE_ADD("kbdcpu", I8039, 12000000)
+ MCFG_DEVICE_PROGRAM_MAP(kbd_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp
index 24c3adc2418..907fdd35d3e 100644
--- a/src/mame/drivers/v1050.cpp
+++ b/src/mame/drivers/v1050.cpp
@@ -1026,15 +1026,15 @@ void v1050_state::machine_reset()
MACHINE_CONFIG_START(v1050_state::v1050)
// basic machine hardware
- MCFG_CPU_ADD(Z80_TAG, Z80, 16_MHz_XTAL/4)
- MCFG_CPU_PROGRAM_MAP(v1050_mem)
- MCFG_CPU_IO_MAP(v1050_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(v1050_state,v1050_int_ack)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 16_MHz_XTAL/4)
+ MCFG_DEVICE_PROGRAM_MAP(v1050_mem)
+ MCFG_DEVICE_IO_MAP(v1050_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(v1050_state,v1050_int_ack)
MCFG_QUANTUM_PERFECT_CPU(Z80_TAG)
- MCFG_CPU_ADD(M6502_TAG, M6502, 15.36_MHz_XTAL/16)
- MCFG_CPU_PROGRAM_MAP(v1050_crt_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, 15.36_MHz_XTAL/16)
+ MCFG_DEVICE_PROGRAM_MAP(v1050_crt_mem)
MCFG_QUANTUM_PERFECT_CPU(M6502_TAG)
// keyboard HACK
@@ -1045,64 +1045,64 @@ MACHINE_CONFIG_START(v1050_state::v1050)
// devices
MCFG_DEVICE_ADD(UPB8214_TAG, I8214, 16_MHz_XTAL/4)
- MCFG_I8214_INT_CALLBACK(WRITELINE(v1050_state, pic_int_w))
+ MCFG_I8214_INT_CALLBACK(WRITELINE(*this, v1050_state, pic_int_w))
MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, 32.768_kHz_XTAL)
- MCFG_MSM58321_D0_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_0_w))
- MCFG_MSM58321_D1_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_1_w))
- MCFG_MSM58321_D2_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_2_w))
- MCFG_MSM58321_D3_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_3_w))
- MCFG_MSM58321_BUSY_HANDLER(WRITELINE(v1050_state, rtc_ppi_pc_3_w))
+ MCFG_MSM58321_D0_HANDLER(WRITELINE(*this, v1050_state, rtc_ppi_pa_0_w))
+ MCFG_MSM58321_D1_HANDLER(WRITELINE(*this, v1050_state, rtc_ppi_pa_1_w))
+ MCFG_MSM58321_D2_HANDLER(WRITELINE(*this, v1050_state, rtc_ppi_pa_2_w))
+ MCFG_MSM58321_D3_HANDLER(WRITELINE(*this, v1050_state, rtc_ppi_pa_3_w))
+ MCFG_MSM58321_BUSY_HANDLER(WRITELINE(*this, v1050_state, rtc_ppi_pc_3_w))
MCFG_DEVICE_ADD(I8255A_DISP_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8(I8255A_M6502_TAG, i8255_device, pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(v1050_state, disp_ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(I8255A_M6502_TAG, i8255_device, pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, v1050_state, disp_ppi_pc_w))
MCFG_DEVICE_ADD(I8255A_MISC_TAG, I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(v1050_state, misc_ppi_pa_w))
- MCFG_I8255_OUT_PORTB_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_IN_PORTC_CB(READ8(v1050_state,misc_ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(v1050_state,misc_ppi_pc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, v1050_state, misc_ppi_pa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, v1050_state,misc_ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, v1050_state,misc_ppi_pc_w))
MCFG_DEVICE_ADD(I8255A_RTC_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(v1050_state, rtc_ppi_pa_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(v1050_state, rtc_ppi_pa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(v1050_state, rtc_ppi_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(v1050_state, rtc_ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(v1050_state, rtc_ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, v1050_state, rtc_ppi_pa_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, v1050_state, rtc_ppi_pa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, v1050_state, rtc_ppi_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, v1050_state, rtc_ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, v1050_state, rtc_ppi_pc_w))
MCFG_DEVICE_ADD(I8255A_M6502_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8(I8255A_DISP_TAG, i8255_device, pb_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(v1050_state, m6502_ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(I8255A_DISP_TAG, i8255_device, pb_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, v1050_state, m6502_ppi_pc_w))
MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0/*16_MHz_XTAL/8,*/)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(V1050_KEYBOARD_TAG, v1050_keyboard_device, si_w))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(v1050_state, kb_rxrdy_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(V1050_KEYBOARD_TAG, v1050_keyboard_device, si_w))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, v1050_state, kb_rxrdy_w))
MCFG_DEVICE_ADD(CLOCK_KB_TAG, CLOCK, 16_MHz_XTAL/4/13/8)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, v1050_state, write_keyboard_clock))
// keyboard
MCFG_DEVICE_ADD(V1050_KEYBOARD_TAG, V1050_KEYBOARD, 0)
- MCFG_V1050_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE(I8251A_KB_TAG, i8251_device, write_rxd))
+ MCFG_V1050_KEYBOARD_OUT_TX_HANDLER(WRITELINE(I8251A_KB_TAG, i8251_device, write_rxd))
MCFG_DEVICE_ADD(I8251A_SIO_TAG, I8251, 0/*16_MHz_XTAL/8,*/)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(v1050_state, sio_rxrdy_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(v1050_state, sio_txrdy_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, v1050_state, sio_rxrdy_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, v1050_state, sio_txrdy_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_SIO_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_SIO_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251A_SIO_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251A_SIO_TAG, i8251_device, write_dsr))
MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, 16_MHz_XTAL/4)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_sio_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, v1050_state, write_sio_clock))
MCFG_MB8877_ADD(MB8877_TAG, 16_MHz_XTAL/16)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(v1050_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(v1050_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, v1050_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, v1050_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", v1050_floppies, nullptr, floppy_image_device::default_floppy_formats)
@@ -1111,11 +1111,11 @@ MACHINE_CONFIG_START(v1050_state::v1050)
// SASI bus
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("scsi_data_in")
- MCFG_SCSI_REQ_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit0)) MCFG_DEVCB_XOR(1)
- MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit1))
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit2))
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("scsi_ctrl_in", input_buffer_device, write_bit3))
- MCFG_SCSI_IO_HANDLER(WRITELINE(v1050_state, write_sasi_io)) MCFG_DEVCB_XOR(1) // bit4
+ MCFG_SCSI_REQ_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit0)) MCFG_DEVCB_XOR(1)
+ MCFG_SCSI_BSY_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit1))
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit2))
+ MCFG_SCSI_CD_HANDLER(WRITELINE("scsi_ctrl_in", input_buffer_device, write_bit3))
+ MCFG_SCSI_IO_HANDLER(WRITELINE(*this, v1050_state, write_sasi_io)) MCFG_DEVCB_XOR(1) // bit4
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", S1410, SCSI_ID_0)
MCFG_SCSI_OUTPUT_LATCH_ADD("scsi_data_out", SASIBUS_TAG)
@@ -1131,8 +1131,8 @@ MACHINE_CONFIG_START(v1050_state::v1050)
// printer
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(v1050_state, write_centronics_busy))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(v1050_state, write_centronics_perror))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, v1050_state, write_centronics_busy))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, v1050_state, write_centronics_perror))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index 828ae6786fd..c7273eb9a74 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -280,8 +280,8 @@ static void v6809_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(v6809_state::v6809)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(16'000'000) / 4) // divided by 4 again internally
- MCFG_CPU_PROGRAM_MAP(v6809_mem)
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(16'000'000) / 4) // divided by 4 again internally
+ MCFG_DEVICE_PROGRAM_MAP(v6809_mem)
MCFG_MACHINE_RESET_OVERRIDE(v6809_state, v6809)
/* video hardware */
@@ -296,7 +296,7 @@ MACHINE_CONFIG_START(v6809_state::v6809)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
@@ -312,8 +312,8 @@ MACHINE_CONFIG_START(v6809_state::v6809)
// port A = drive select and 2 control lines ; port B = keyboard
// CB2 connects to the interrupt pin of the RTC (the rtc code doesn't support it)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(v6809_state, pb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(v6809_state, pa_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, v6809_state, pb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, v6809_state, pa_w))
MCFG_PIA_IRQA_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
@@ -324,8 +324,8 @@ MACHINE_CONFIG_START(v6809_state::v6809)
MCFG_DEVICE_ADD("ptm", PTM6840, XTAL(16'000'000) / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(4000000/14, 4000000/14, 4000000/14/8)
- MCFG_PTM6840_O1_CB(WRITELINE(v6809_state, speaker_w))
- MCFG_PTM6840_O2_CB(WRITELINE(v6809_state, speaker_en_w))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, v6809_state, speaker_w))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, v6809_state, speaker_en_w))
MCFG_PTM6840_IRQ_CB(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia0", ACIA6850, 0)
@@ -333,10 +333,10 @@ MACHINE_CONFIG_START(v6809_state::v6809)
MCFG_DEVICE_ADD("acia1", ACIA6850, 0)
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia0", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia0", acia6850_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia1", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia0", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia0", acia6850_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia1", acia6850_device, write_rxc))
MCFG_DEVICE_ADD("rtc", MM58274C, 0)
// this is all guess
diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp
index 83a9aa84713..5552ee3e30f 100644
--- a/src/mame/drivers/vamphalf.cpp
+++ b/src/mame/drivers/vamphalf.cpp
@@ -1039,9 +1039,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(vamphalf_state::common)
- MCFG_CPU_ADD("maincpu", E116T, 50000000) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(common_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E116T, 50000000) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(common_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
// various games require fast timing to save settings, probably because our Hyperstone core timings are incorrect
@@ -1098,103 +1098,103 @@ MACHINE_CONFIG_START(vamphalf_state::sound_qs1000)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("qs1000", qs1000_device, set_irq))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("qs1000", qs1000_device, set_irq))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
+ MCFG_DEVICE_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
- MCFG_QS1000_IN_P1_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_QS1000_OUT_P3_CB(WRITE8(vamphalf_state, qs1000_p3_w))
+ MCFG_QS1000_IN_P1_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_QS1000_OUT_P3_CB(WRITE8(*this, vamphalf_state, qs1000_p3_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::vamphalf)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(vamphalf_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(vamphalf_io)
sound_ym_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::misncrft)
common(config);
- MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL(50'000'000)) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(common_map)
- MCFG_CPU_IO_MAP(misncrft_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", GMS30C2116, XTAL(50'000'000)) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(common_map)
+ MCFG_DEVICE_IO_MAP(misncrft_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
sound_qs1000(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::coolmini)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(coolmini_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(coolmini_io)
sound_ym_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::mrkicker)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mrkicker_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mrkicker_io)
sound_ym_banked_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::suplup)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(suplup_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(suplup_io)
sound_suplup(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::jmpbreak)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(jmpbreak_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(jmpbreak_io)
sound_ym_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::newxpang)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mrdig_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mrdig_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
sound_ym_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::mrdig)
common(config);
- MCFG_CPU_REPLACE("maincpu", GMS30C2116, XTAL(50'000'000)) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(common_map)
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(mrdig_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", GMS30C2116, XTAL(50'000'000)) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(common_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(mrdig_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
sound_ym_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::wyvernwg)
common(config);
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(common_32bit_map)
- MCFG_CPU_IO_MAP(wyvernwg_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(common_32bit_map)
+ MCFG_DEVICE_IO_MAP(wyvernwg_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
sound_qs1000(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::finalgdr)
common(config);
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(common_32bit_map)
- MCFG_CPU_IO_MAP(finalgdr_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(common_32bit_map)
+ MCFG_DEVICE_IO_MAP(finalgdr_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1203,10 +1203,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::mrkickera)
common(config);
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(common_32bit_map)
- MCFG_CPU_IO_MAP(mrkickera_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(common_32bit_map)
+ MCFG_DEVICE_IO_MAP(mrkickera_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1216,10 +1216,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::aoh)
- MCFG_CPU_ADD("maincpu", E132XN, XTAL(20'000'000)*4) /* 4x internal multiplier */
- MCFG_CPU_PROGRAM_MAP(aoh_map)
- MCFG_CPU_IO_MAP(aoh_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", E132XN, XTAL(20'000'000)*4) /* 4x internal multiplier */
+ MCFG_DEVICE_PROGRAM_MAP(aoh_map)
+ MCFG_DEVICE_IO_MAP(aoh_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -1255,18 +1255,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::boonggab)
common(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(boonggab_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(boonggab_io)
sound_ym_banked_oki(config);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vamphalf_state::yorijori)
common(config);
- MCFG_CPU_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
- MCFG_CPU_PROGRAM_MAP(yorijori_32bit_map)
- MCFG_CPU_IO_MAP(yorijori_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
+ MCFG_DEVICE_REPLACE("maincpu", E132T, XTAL(50'000'000)) /* 50 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(yorijori_32bit_map)
+ MCFG_DEVICE_IO_MAP(yorijori_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
sound_qs1000(config);
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp
index 37c9cbd00fd..340e04ff5a0 100644
--- a/src/mame/drivers/vaportra.cpp
+++ b/src/mame/drivers/vaportra.cpp
@@ -212,12 +212,12 @@ void vaportra_state::machine_reset()
MACHINE_CONFIG_START(vaportra_state::vaportra)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(24'000'000)/2) /* Custom chip 59 */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vaportra_state, irq6_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(24'000'000)/2) /* Custom chip 59 */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vaportra_state, irq6_line_assert)
- MCFG_CPU_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", H6280, XTAL(24'000'000)/4) /* Custom chip 45; Audio section crystal is 32.220 MHz but CPU clock is confirmed as coming from the 24MHz crystal (6Mhz exactly on the CPU) */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
@@ -277,7 +277,7 @@ MACHINE_CONFIG_START(vaportra_state::vaportra)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ym1", YM2203, XTAL(32'220'000)/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, XTAL(32'220'000)/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_YM2151_ADD("ym2", XTAL(32'220'000)/9) // uses a preset LS163 to force the odd speed
diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp
index 33908279968..e221bf7962f 100644
--- a/src/mame/drivers/vastar.cpp
+++ b/src/mame/drivers/vastar.cpp
@@ -420,21 +420,21 @@ INTERRUPT_GEN_MEMBER(vastar_state::vblank_irq)
MACHINE_CONFIG_START(vastar_state::vastar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_port_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vastar_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_port_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vastar_state, vblank_irq)
- MCFG_CPU_ADD("sub", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_IO_MAP(cpu2_port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vastar_state, irq0_line_hold, 242) /* 4 * vsync_freq(60.58) measured, it is not known yet how long it is asserted so we'll use HOLD_LINE for now */
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_IO_MAP(cpu2_port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vastar_state, irq0_line_hold, 242) /* 4 * vsync_freq(60.58) measured, it is not known yet how long it is asserted so we'll use HOLD_LINE for now */
MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* 10 CPU slices per frame - seems enough to ensure proper synchronization of the CPUs */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(vastar_state, nmi_mask_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(vastar_state, flip_screen_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, vastar_state, nmi_mask_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, vastar_state, flip_screen_w))
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT
MCFG_WATCHDOG_ADD("watchdog")
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(vastar_state::vastar)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(18'432'000)/12)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp
index 97003bf6f81..62332a75e98 100644
--- a/src/mame/drivers/vax11.cpp
+++ b/src/mame/drivers/vax11.cpp
@@ -142,9 +142,9 @@ void vax11_state::kbd_put(u8 data)
MACHINE_CONFIG_START(vax11_state::vax11)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",T11, XTAL(4'000'000)) // Need proper CPU here
+ MCFG_DEVICE_ADD("maincpu",T11, XTAL(4'000'000)) // Need proper CPU here
MCFG_T11_INITIAL_MODE(0 << 13)
- MCFG_CPU_PROGRAM_MAP(vax11_mem)
+ MCFG_DEVICE_PROGRAM_MAP(vax11_mem)
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp
index 16c24551058..76f20180757 100644
--- a/src/mame/drivers/vball.cpp
+++ b/src/mame/drivers/vball.cpp
@@ -399,12 +399,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(vball_state::vball)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", vball_state, vball_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545) /* 3.579545 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index 404575393fd..8fbc7920e12 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -1353,9 +1353,9 @@ static void vboy_cart(device_slot_interface &device)
MACHINE_CONFIG_START(vboy_state::vboy)
/* basic machine hardware */
- MCFG_CPU_ADD( "maincpu", V810, XTAL(20'000'000) )
- MCFG_CPU_PROGRAM_MAP(vboy_mem)
- MCFG_CPU_IO_MAP(vboy_io)
+ MCFG_DEVICE_ADD( "maincpu", V810, XTAL(20'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(vboy_mem)
+ MCFG_DEVICE_IO_MAP(vboy_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer_l", vboy_state, vboy_scanlineL, "3dleft", 0, 1)
//MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer_r", vboy_state, vboy_scanlineR, "3dright", 0, 1)
diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp
index 705bc3f1d6a..b0eff20b5b0 100644
--- a/src/mame/drivers/vc4000.cpp
+++ b/src/mame/drivers/vc4000.cpp
@@ -528,11 +528,11 @@ static void vc4000_cart(device_slot_interface &device)
MACHINE_CONFIG_START(vc4000_state::vc4000)
/* basic machine hardware */
-// MCFG_CPU_ADD("maincpu", S2650, 865000) /* 3550000/4, 3580000/3, 4430000/3 */
- MCFG_CPU_ADD("maincpu", S2650, 3546875/4)
- MCFG_CPU_PROGRAM_MAP(vc4000_mem)
- MCFG_S2650_SENSE_INPUT(READLINE(vc4000_state, vc4000_vsync_r))
- MCFG_CPU_PERIODIC_INT_DRIVER(vc4000_state, vc4000_video_line, 312*53) // GOLF needs this exact value
+// MCFG_DEVICE_ADD("maincpu", S2650, 865000) /* 3550000/4, 3580000/3, 4430000/3 */
+ MCFG_DEVICE_ADD("maincpu", S2650, 3546875/4)
+ MCFG_DEVICE_PROGRAM_MAP(vc4000_mem)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, vc4000_state, vc4000_vsync_r))
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vc4000_state, vc4000_video_line, 312*53) // GOLF needs this exact value
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -547,7 +547,7 @@ MACHINE_CONFIG_START(vc4000_state::vc4000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("custom", VC4000_SND, 0)
+ MCFG_DEVICE_ADD("custom", VC4000_SND, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* quickload */
@@ -595,8 +595,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vc4000_state::elektor)
vc4000(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(elektor_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(elektor_mem)
MCFG_CASSETTE_ADD( "cassette" )
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp
index 34149e352a2..46dd6b467c7 100644
--- a/src/mame/drivers/vcombat.cpp
+++ b/src/mame/drivers/vcombat.cpp
@@ -554,22 +554,22 @@ WRITE_LINE_MEMBER(vcombat_state::sound_update)
}
MACHINE_CONFIG_START(vcombat_state::vcombat)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
/* The middle board i860 */
- MCFG_CPU_ADD("vid_0", I860, XTAL(20'000'000))
- MCFG_CPU_PROGRAM_MAP(vid_0_map)
+ MCFG_DEVICE_ADD("vid_0", I860, XTAL(20'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vid_0_map)
/* The top board i860 */
- MCFG_CPU_ADD("vid_1", I860, XTAL(20'000'000))
- MCFG_CPU_PROGRAM_MAP(vid_1_map)
+ MCFG_DEVICE_ADD("vid_1", I860, XTAL(20'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vid_1_map)
/* Sound CPU */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vcombat_state, irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */
+ MCFG_DEVICE_ADD("soundcpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vcombat_state, irq1_line_hold, 15000) /* Remove this if MC6845 is enabled */
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_MACHINE_RESET_OVERRIDE(vcombat_state,vcombat)
@@ -595,24 +595,24 @@ MACHINE_CONFIG_START(vcombat_state::vcombat)
MCFG_SCREEN_UPDATE_DRIVER(vcombat_state, screen_update_vcombat_aux)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vcombat_state::shadfgtr)
- MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
/* The middle board i860 */
- MCFG_CPU_ADD("vid_0", I860, XTAL(20'000'000))
- MCFG_CPU_PROGRAM_MAP(vid_0_map)
+ MCFG_DEVICE_ADD("vid_0", I860, XTAL(20'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vid_0_map)
/* Sound CPU */
- MCFG_CPU_ADD("soundcpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_MACHINE_RESET_OVERRIDE(vcombat_state,shadfgtr)
@@ -622,14 +622,14 @@ MACHINE_CONFIG_START(vcombat_state::shadfgtr)
MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(20'000'000) / 4 / 16)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(16)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(vcombat_state, sound_update))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, vcombat_state, sound_update))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(20'000'000) / 4, 320, 0, 256, 277, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(vcombat_state, screen_update_vcombat_main)
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp
index bbe40dc72f5..fe76e97b584 100644
--- a/src/mame/drivers/vcs80.cpp
+++ b/src/mame/drivers/vcs80.cpp
@@ -215,9 +215,9 @@ void vcs80_state::machine_start()
MACHINE_CONFIG_START(vcs80_state::vcs80)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(5'000'000)/2) /* U880D */
- MCFG_CPU_PROGRAM_MAP(vcs80_mem)
- MCFG_CPU_IO_MAP(vcs80_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(5'000'000)/2) /* U880D */
+ MCFG_DEVICE_PROGRAM_MAP(vcs80_mem)
+ MCFG_DEVICE_IO_MAP(vcs80_io)
MCFG_Z80_DAISY_CHAIN(vcs80_daisy_chain)
/* keyboard timer */
@@ -229,8 +229,8 @@ MACHINE_CONFIG_START(vcs80_state::vcs80)
/* devices */
MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(5'000'000)/2)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(vcs80_state, pio_pa_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(vcs80_state, pio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, vcs80_state, pio_pa_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, vcs80_state, pio_pb_w))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp
index 0509f5f34ff..6daaeeaaf3c 100644
--- a/src/mame/drivers/vd.cpp
+++ b/src/mame/drivers/vd.cpp
@@ -187,19 +187,19 @@ void vd_state::machine_reset()
MACHINE_CONFIG_START(vd_state::vd)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4000000)
- MCFG_CPU_PROGRAM_MAP(vd_map)
- MCFG_CPU_IO_MAP(vd_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(vd_map)
+ MCFG_DEVICE_IO_MAP(vd_io)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", vd_state, irq, attotime::from_hz(484))
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ay1", AY8910, 2000000) //?
+ MCFG_DEVICE_ADD("ay1", AY8910, 2000000) //?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33/3)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW2"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1"))
- MCFG_SOUND_ADD("ay2", AY8910, 2000000) //?
+ MCFG_DEVICE_ADD("ay2", AY8910, 2000000) //?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33/3)
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) //?
diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp
index 1cc4e725d4c..db20dee1220 100644
--- a/src/mame/drivers/vector06.cpp
+++ b/src/mame/drivers/vector06.cpp
@@ -161,12 +161,12 @@ static void vector06_floppies(device_slot_interface &device)
/* Machine driver */
MACHINE_CONFIG_START(vector06_state::vector06)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, 3000000) // actual speed is wrong due to unemulated latency
- MCFG_CPU_PROGRAM_MAP(vector06_mem)
- MCFG_CPU_IO_MAP(vector06_io)
- MCFG_I8085A_STATUS(WRITE8(vector06_state, vector06_status_callback))
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vector06_state, vector06_interrupt)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vector06_state,vector06_irq_callback)
+ MCFG_DEVICE_ADD("maincpu", I8080, 3000000) // actual speed is wrong due to unemulated latency
+ MCFG_DEVICE_PROGRAM_MAP(vector06_mem)
+ MCFG_DEVICE_IO_MAP(vector06_io)
+ MCFG_I8085A_STATUS(WRITE8(*this, vector06_state, vector06_status_callback))
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vector06_state, vector06_interrupt)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vector06_state,vector06_irq_callback)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -186,16 +186,16 @@ MACHINE_CONFIG_START(vector06_state::vector06)
/* devices */
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(vector06_state, vector06_8255_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(vector06_state, vector06_8255_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(vector06_state, vector06_8255_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(vector06_state, vector06_8255_portc_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, vector06_state, vector06_8255_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, vector06_state, vector06_8255_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, vector06_state, vector06_8255_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, vector06_state, vector06_8255_portc_r))
MCFG_DEVICE_ADD("ppi8255_2", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(vector06_state, vector06_romdisk_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(vector06_state, vector06_romdisk_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(vector06_state, vector06_romdisk_portb_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(vector06_state, vector06_romdisk_portc_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, vector06_state, vector06_romdisk_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, vector06_state, vector06_romdisk_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, vector06_state, vector06_romdisk_portb_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, vector06_state, vector06_romdisk_portc_w))
MCFG_CASSETTE_ADD("cassette")
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
@@ -217,19 +217,19 @@ MACHINE_CONFIG_START(vector06_state::vector06)
MCFG_RAM_DEFAULT_SIZE("320K")
MCFG_RAM_DEFAULT_VALUE(0)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(1500000)
MCFG_PIT8253_CLK1(1500000)
MCFG_PIT8253_CLK2(1500000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(vector06_state, speaker_w))
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(vector06_state, speaker_w))
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(vector06_state, speaker_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, vector06_state, speaker_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, vector06_state, speaker_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, vector06_state, speaker_w))
// optional
- MCFG_SOUND_ADD("aysnd", AY8910, 1773400)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 1773400)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vector4.cpp b/src/mame/drivers/vector4.cpp
index ccbbefb563a..35af28b3260 100644
--- a/src/mame/drivers/vector4.cpp
+++ b/src/mame/drivers/vector4.cpp
@@ -68,48 +68,48 @@ void vector4_state::machine_reset()
MACHINE_CONFIG_START(vector4_state::vector4)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(vector4_mem)
- MCFG_CPU_IO_MAP(vector4_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vector4_mem)
+ MCFG_DEVICE_IO_MAP(vector4_io)
/* video hardware */
MCFG_DEVICE_ADD("uart_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart3", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart3", i8251_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("uart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart1", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart2", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart3", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart3", i8251_device, write_rxc))
MCFG_DEVICE_ADD("uart1", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232a", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232a", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232a", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232a", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1", i8251_device, write_cts))
MCFG_DEVICE_ADD("uart2", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232b", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232b", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232b", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232b", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2", i8251_device, write_cts))
MCFG_DEVICE_ADD("uart3", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232c", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232c", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232c", rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD("rs232c", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart3", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart3", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart3", i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232c", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232c", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232c", rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD("rs232c", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart3", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart3", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart3", i8251_device, write_cts))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp
index 327e93bd347..7073cbd7710 100644
--- a/src/mame/drivers/vectrex.cpp
+++ b/src/mame/drivers/vectrex.cpp
@@ -99,7 +99,7 @@ static void vectrex_cart(device_slot_interface &device)
MACHINE_CONFIG_START(vectrex_base_state::vectrex_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809, 6_MHz_XTAL) // 68A09
+ MCFG_DEVICE_ADD("maincpu", MC6809, 6_MHz_XTAL) // 68A09
/* video hardware */
MCFG_VECTOR_ADD("vector")
@@ -111,31 +111,31 @@ MACHINE_CONFIG_START(vectrex_base_state::vectrex_base)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // mc1408.ic301 (also used for vector generation)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // mc1408.ic301 (also used for vector generation)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_SOUND_ADD("ay8912", AY8912, 6_MHz_XTAL / 4)
+ MCFG_DEVICE_ADD("ay8912", AY8912, 6_MHz_XTAL / 4)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("BUTTONS"))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(vectrex_base_state, vectrex_psg_port_w))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, vectrex_base_state, vectrex_psg_port_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2)
/* via */
MCFG_DEVICE_ADD("via6522_0", VIA6522, 6_MHz_XTAL / 4)
- MCFG_VIA6522_READPA_HANDLER(READ8(vectrex_base_state, vectrex_via_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(vectrex_base_state, vectrex_via_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vectrex_base_state, v_via_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vectrex_base_state, v_via_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(vectrex_base_state, v_via_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(vectrex_base_state, v_via_cb2_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(vectrex_base_state, vectrex_via_irq))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, vectrex_base_state, vectrex_via_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, vectrex_base_state, vectrex_via_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, vectrex_base_state, v_via_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, vectrex_base_state, v_via_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, vectrex_base_state, v_via_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, vectrex_base_state, v_via_cb2_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, vectrex_base_state, vectrex_via_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vectrex_state::vectrex)
vectrex_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vectrex_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vectrex_map)
/* cartridge */
MCFG_VECTREX_CARTRIDGE_ADD("cartslot", vectrex_cart, nullptr)
@@ -227,13 +227,13 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(raaspec_state::raaspec)
vectrex_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(raaspec_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(raaspec_map)
MCFG_NVRAM_ADD_0FILL("nvram")
/* via */
MCFG_DEVICE_MODIFY("via6522_0")
- MCFG_VIA6522_READPB_HANDLER(READ8(raaspec_state, vectrex_s1_via_pb_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, raaspec_state, vectrex_s1_via_pb_r))
MACHINE_CONFIG_END
ROM_START(raaspec)
diff --git a/src/mame/drivers/vectrix.cpp b/src/mame/drivers/vectrix.cpp
index d3dc9bfc80c..eb4dd284ca9 100644
--- a/src/mame/drivers/vectrix.cpp
+++ b/src/mame/drivers/vectrix.cpp
@@ -50,9 +50,9 @@ static INPUT_PORTS_START( vectrix )
INPUT_PORTS_END
MACHINE_CONFIG_START(vectrix_state::vectrix)
- MCFG_CPU_ADD("maincpu", I8088, XTAL(14'318'181)/3) // no idea of clock
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8088, XTAL(14'318'181)/3) // no idea of clock
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_DEVICE_ADD("uart1", I8251, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp
index 7f2e0f6f0aa..60ee41482ba 100644
--- a/src/mame/drivers/vega.cpp
+++ b/src/mame/drivers/vega.cpp
@@ -795,30 +795,30 @@ void vega_state::machine_start()
MACHINE_CONFIG_START(vega_state::vega)
- MCFG_CPU_ADD("maincpu", I8035, 4000000)
- MCFG_CPU_PROGRAM_MAP(vega_map)
- MCFG_CPU_IO_MAP(vega_io_map)
+ MCFG_DEVICE_ADD("maincpu", I8035, 4000000)
+ MCFG_DEVICE_PROGRAM_MAP(vega_map)
+ MCFG_DEVICE_IO_MAP(vega_io_map)
MCFG_MCS48_PORT_P1_IN_CB(IOPORT("DSW"))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(vega_state, rombank_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(vega_state, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(vega_state, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(vega_state, t1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, vega_state, rombank_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, vega_state, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, vega_state, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, vega_state, t1_r))
MCFG_MCS48_PORT_PROG_OUT_CB(NOOP) /* prog - inputs CLK */
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vega_state, irq0_line_hold)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vega_state, irq0_line_hold)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(vega_state, txtram_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(vega_state, txtram_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, vega_state, txtram_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, vega_state, txtram_w))
MCFG_I8255_IN_PORTB_CB(IOPORT("IN0"))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(vega_state, ppi_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(vega_state, randomizer))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(vega_state, ppi_pc_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, vega_state, ppi_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, vega_state, randomizer))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, vega_state, ppi_pc_w))
MCFG_DEVICE_ADD( "ins8154", INS8154, 0 )
- MCFG_INS8154_IN_A_CB(READ8(vega_state, ins8154_pa_r))
- MCFG_INS8154_OUT_A_CB(WRITE8(vega_state, ins8154_pa_w))
- MCFG_INS8154_IN_B_CB(READ8(vega_state, ins8154_pb_r))
- MCFG_INS8154_OUT_B_CB(WRITE8(vega_state, ins8154_pb_w))
+ MCFG_INS8154_IN_A_CB(READ8(*this, vega_state, ins8154_pa_r))
+ MCFG_INS8154_OUT_A_CB(WRITE8(*this, vega_state, ins8154_pa_w))
+ MCFG_INS8154_IN_B_CB(READ8(*this, vega_state, ins8154_pb_r))
+ MCFG_INS8154_OUT_B_CB(WRITE8(*this, vega_state, ins8154_pb_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -838,11 +838,11 @@ MACHINE_CONFIG_START(vega_state::vega)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay8910", AY8910, 1500000 )
- MCFG_AY8910_PORT_A_READ_CB(READ8(vega_state, ay8910_pa_r))
- MCFG_AY8910_PORT_B_READ_CB(READ8(vega_state, ay8910_pb_r))
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(vega_state, ay8910_pa_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(vega_state, ay8910_pb_w))
+ MCFG_DEVICE_ADD("ay8910", AY8910, 1500000 )
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, vega_state, ay8910_pa_r))
+ MCFG_AY8910_PORT_B_READ_CB(READ8(*this, vega_state, ay8910_pb_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, vega_state, ay8910_pa_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, vega_state, ay8910_pb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index 7b09ac58337..ea4bbf2561e 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -171,8 +171,8 @@ uint32_t vegaeo_state::screen_update_vega(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vegaeo_state::vega)
- MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL(55'000'000))
- MCFG_CPU_PROGRAM_MAP(vega_map)
+ MCFG_DEVICE_ADD("maincpu", GMS30C2132, XTAL(55'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vega_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", vegaeo_state, eolith_speedup, "screen", 0, 1)
MCFG_AT28C16_ADD("at28c16", nullptr)
@@ -196,15 +196,15 @@ MACHINE_CONFIG_START(vegaeo_state::vega)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("qs1000", qs1000_device, set_irq))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("qs1000", qs1000_device, set_irq))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("qs1000", QS1000, XTAL(24'000'000))
+ MCFG_DEVICE_ADD("qs1000", QS1000, XTAL(24'000'000))
MCFG_QS1000_EXTERNAL_ROM(true)
- MCFG_QS1000_IN_P1_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_QS1000_OUT_P1_CB(WRITE8(vegaeo_state, qs1000_p1_w))
- MCFG_QS1000_OUT_P2_CB(WRITE8(vegaeo_state, qs1000_p2_w))
- MCFG_QS1000_OUT_P3_CB(WRITE8(vegaeo_state, qs1000_p3_w))
+ MCFG_QS1000_IN_P1_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_QS1000_OUT_P1_CB(WRITE8(*this, vegaeo_state, qs1000_p1_w))
+ MCFG_QS1000_OUT_P2_CB(WRITE8(*this, vegaeo_state, qs1000_p2_w))
+ MCFG_QS1000_OUT_P3_CB(WRITE8(*this, vegaeo_state, qs1000_p3_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index 365ce816a1a..a2cff296ca7 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -1721,7 +1721,7 @@ void vegas_state::vegas_cs8_map(address_map &map)
MACHINE_CONFIG_START(vegas_state::vegascore)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R5000LE, vegas_state::SYSTEM_CLOCK*2)
+ MCFG_DEVICE_ADD(m_maincpu, R5000LE, vegas_state::SYSTEM_CLOCK*2)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK)
@@ -1739,21 +1739,21 @@ MACHINE_CONFIG_START(vegas_state::vegascore)
MCFG_VRC5074_SET_CS(7, vegas_state::vegas_cs7_map)
MCFG_IDE_PCI_ADD(PCI_ID_IDE, 0x10950646, 0x05, 0x0)
- MCFG_IDE_PCI_IRQ_HANDLER(DEVWRITELINE(PCI_ID_NILE, vrc5074_device, pci_intr_d))
+ MCFG_IDE_PCI_IRQ_HANDLER(WRITELINE(PCI_ID_NILE, vrc5074_device, pci_intr_d))
//MCFG_IDE_PCI_SET_PIF(0x8f)
MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_2, ":maincpu")
MCFG_VOODOO_PCI_FBMEM(2)
MCFG_VOODOO_PCI_TMUMEM(4, 4)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
- MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert))
- MCFG_M48T37_ADD("timekeeper")
- MCFG_M48T37_RESET_HANDLER(WRITELINE(vegas_state, watchdog_reset))
- MCFG_M48T37_IRQ_HANDLER(WRITELINE(vegas_state, watchdog_irq))
+ MCFG_M48T37_ADD(m_timekeeper)
+ MCFG_M48T37_RESET_HANDLER(WRITELINE(*this, vegas_state, watchdog_reset))
+ MCFG_M48T37_IRQ_HANDLER(WRITELINE(*this, vegas_state, watchdog_irq))
- MCFG_SMC91C94_ADD("ethernet")
- MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(vegas_state, ethernet_interrupt))
+ MCFG_SMC91C94_ADD(m_ethernet)
+ MCFG_SMC91C94_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ethernet_interrupt))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1774,8 +1774,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::vegas250)
vegascore(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(vegas_state::SYSTEM_CLOCK*2.5)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(vegas_state::SYSTEM_CLOCK*2.5)
MACHINE_CONFIG_END
@@ -1792,13 +1792,13 @@ MACHINE_CONFIG_START(vegas_state::vegasban)
MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_BANSHEE, ":maincpu")
MCFG_VOODOO_PCI_FBMEM(16)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
- MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::vegasv3)
vegas32m(config);
- MCFG_CPU_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5)
+ MCFG_DEVICE_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK)
@@ -1807,13 +1807,13 @@ MACHINE_CONFIG_START(vegas_state::vegasv3)
MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_3, ":maincpu")
MCFG_VOODOO_PCI_FBMEM(16)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
- MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::denver)
vegascore(config);
- MCFG_CPU_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5)
+ MCFG_DEVICE_REPLACE("maincpu", RM7000LE, vegas_state::SYSTEM_CLOCK*2.5)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
MCFG_MIPS3_SYSTEM_CLOCK(vegas_state::SYSTEM_CLOCK)
@@ -1826,34 +1826,34 @@ MACHINE_CONFIG_START(vegas_state::denver)
MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_3, ":maincpu")
MCFG_VOODOO_PCI_FBMEM(16)
MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
- MCFG_VOODOO_VBLANK_CB(DEVWRITELINE(":", vegas_state, vblank_assert))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(":", vegas_state, vblank_assert))
// TL16C552 UART
- MCFG_DEVICE_ADD("uart1", NS16550, vegas_state::SYSTEM_CLOCK / 12)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("ttys01", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("ttys01", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("ttys01", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", vegas_state, duart_irq_cb))
-
- MCFG_DEVICE_ADD("uart2", NS16550, vegas_state::SYSTEM_CLOCK / 12)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("ttys02", rs232_port_device, write_txd))
- MCFG_INS8250_OUT_DTR_CB(DEVWRITELINE("ttys02", rs232_port_device, write_dtr))
- MCFG_INS8250_OUT_RTS_CB(DEVWRITELINE("ttys02", rs232_port_device, write_rts))
- MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(":", vegas_state, duart_irq_cb))
-
- MCFG_RS232_PORT_ADD("ttys01", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1", ins8250_uart_device, cts_w))
-
- MCFG_RS232_PORT_ADD("ttys02", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, dsr_w))
- MCFG_RS232_RI_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, ri_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2", ins8250_uart_device, cts_w))
+ MCFG_DEVICE_ADD(m_uart1, NS16550, vegas_state::SYSTEM_CLOCK / 12)
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("ttys01", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("ttys01", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("ttys01", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, vegas_state, duart_irq_cb))
+
+ MCFG_DEVICE_ADD(m_uart2, NS16550, vegas_state::SYSTEM_CLOCK / 12)
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("ttys02", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_DTR_CB(WRITELINE("ttys02", rs232_port_device, write_dtr))
+ MCFG_INS8250_OUT_RTS_CB(WRITELINE("ttys02", rs232_port_device, write_rts))
+ MCFG_INS8250_OUT_INT_CB(WRITELINE(*this, vegas_state, duart_irq_cb))
+
+ MCFG_DEVICE_ADD("ttys01", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart1, ins8250_uart_device, cts_w))
+
+ MCFG_DEVICE_ADD("ttys02", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, dsr_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, ri_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart2, ins8250_uart_device, cts_w))
MACHINE_CONFIG_END
@@ -1865,11 +1865,11 @@ MACHINE_CONFIG_START(vegas_state::gauntleg)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CALSPEED)
MCFG_MIDWAY_IOASIC_UPPER(340/* 340=39", 322=27", others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
@@ -1879,11 +1879,11 @@ MACHINE_CONFIG_START(vegas_state::gauntdl)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL)
MCFG_MIDWAY_IOASIC_UPPER(346/* 347, others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
@@ -1893,11 +1893,11 @@ MACHINE_CONFIG_START(vegas_state::warfa)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE)
MCFG_MIDWAY_IOASIC_UPPER(337/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
@@ -1907,11 +1907,11 @@ MACHINE_CONFIG_START(vegas_state::tenthdeg)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0afb)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL)
MCFG_MIDWAY_IOASIC_UPPER(330/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
@@ -1921,11 +1921,11 @@ MACHINE_CONFIG_START(vegas_state::roadburn)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0ddd)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_IOASIC_UPPER(325/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
@@ -1935,14 +1935,14 @@ MACHINE_CONFIG_START(vegas_state::nbashowt)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_MACE)
// 528 494 478 development pic, 487 NBA
MCFG_MIDWAY_IOASIC_UPPER(487/* or 478 or 487 */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
//MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, i40_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::nbanfl)
@@ -1950,13 +1950,13 @@ MACHINE_CONFIG_START(vegas_state::nbanfl)
MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_BLITZ99)
MCFG_MIDWAY_IOASIC_UPPER(498/* or 478 or 487 */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
//MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, i40_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::nbagold)
@@ -1965,13 +1965,13 @@ MACHINE_CONFIG_START(vegas_state::nbagold)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_GAUNTDL)
MCFG_MIDWAY_IOASIC_UPPER( 494 /* 494 109 ??? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
//MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, i40_w))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, i40_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::sf2049)
@@ -1980,13 +1980,13 @@ MACHINE_CONFIG_START(vegas_state::sf2049)
MCFG_DCS2_AUDIO_DRAM_IN_MB(8)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x872)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
MCFG_MIDWAY_IOASIC_UPPER(336/* others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, wheel_board_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::sf2049se)
@@ -1995,13 +1995,13 @@ MACHINE_CONFIG_START(vegas_state::sf2049se)
MCFG_DCS2_AUDIO_DRAM_IN_MB(8)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x872)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_SFRUSHRK)
MCFG_MIDWAY_IOASIC_UPPER(352/*352 336 others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, wheel_board_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::sf2049te)
@@ -2010,13 +2010,13 @@ MACHINE_CONFIG_START(vegas_state::sf2049te)
MCFG_DCS2_AUDIO_DRAM_IN_MB(8)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x872)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_SFRUSHRK)
MCFG_MIDWAY_IOASIC_UPPER(348/* 348 others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
- MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(vegas_state, wheel_board_w))
+ MCFG_MIDWAY_IOASIC_AUX_OUT_CB(WRITE32(*this, vegas_state, wheel_board_w))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vegas_state::cartfury)
@@ -2025,12 +2025,12 @@ MACHINE_CONFIG_START(vegas_state::cartfury)
MCFG_DCS2_AUDIO_DRAM_IN_MB(4)
MCFG_DCS2_AUDIO_POLLING_OFFSET(0x0b5d)
- MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
+ MCFG_DEVICE_ADD(m_ioasic, MIDWAY_IOASIC, 0)
MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_CARNEVIL)
// 433, 495 Development PIC
MCFG_MIDWAY_IOASIC_UPPER(495/*433, 495 others? */)
MCFG_MIDWAY_IOASIC_YEAR_OFFS(80)
- MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(vegas_state, ioasic_irq))
+ MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(WRITELINE(*this, vegas_state, ioasic_irq))
//MCFG_MIDWAY_IOASIC_AUTO_ACK(1)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index 6b8f48fcc42..dada75a07d2 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -430,10 +430,10 @@ WRITE8_MEMBER( vendetta_state::banking_callback )
MACHINE_CONFIG_START(vendetta_state::vendetta)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vendetta_state, irq)
- MCFG_KONAMICPU_LINE_CB(WRITE8(vendetta_state, banking_callback))
+ MCFG_DEVICE_ADD("maincpu", KONAMI, XTAL(24'000'000)/8) /* 052001 (verified on pcb) */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vendetta_state, irq)
+ MCFG_KONAMICPU_LINE_CB(WRITE8(*this, vendetta_state, banking_callback))
MCFG_DEVICE_ADD("videobank0", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(videobank0_map)
@@ -449,8 +449,8 @@ MACHINE_CONFIG_START(vendetta_state::vendetta)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(13)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified with PCB */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545)) /* verified with PCB */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* interrupts are triggered by the main CPU */
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -500,8 +500,8 @@ MACHINE_CONFIG_START(vendetta_state::esckids)
vendetta(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(esckids_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(esckids_map)
MCFG_SCREEN_MODIFY("screen")
//MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 ) /* black areas on the edges */
diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp
index 44e1e1ed7ec..2756809ab66 100644
--- a/src/mame/drivers/vertigo.cpp
+++ b/src/mame/drivers/vertigo.cpp
@@ -128,12 +128,12 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vertigo_state::vertigo)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 24_MHz_XTAL / 3)
- MCFG_CPU_PROGRAM_MAP(vertigo_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vertigo_state, vertigo_interrupt, 60)
+ MCFG_DEVICE_ADD("maincpu", M68000, 24_MHz_XTAL / 3)
+ MCFG_DEVICE_PROGRAM_MAP(vertigo_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vertigo_state, vertigo_interrupt, 60)
MCFG_DEVICE_ADD("adc", ADC0808, 24_MHz_XTAL / 30) // E clock from 68000
- MCFG_ADC0808_EOC_FF_CB(WRITELINE(vertigo_state, adc_eoc_w))
+ MCFG_ADC0808_EOC_FF_CB(WRITELINE(*this, vertigo_state, adc_eoc_w))
MCFG_ADC0808_IN0_CB(IOPORT("P1X"))
MCFG_ADC0808_IN1_CB(IOPORT("P1Y"))
MCFG_ADC0808_IN2_CB(IOPORT("PADDLE"))
@@ -143,16 +143,16 @@ MACHINE_CONFIG_START(vertigo_state::vertigo)
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(24_MHz_XTAL / 100)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(vertigo_state, v_irq4_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, vertigo_state, v_irq4_w))
MCFG_PIT8253_CLK1(24_MHz_XTAL / 100)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(vertigo_state, v_irq3_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, vertigo_state, v_irq3_w))
MCFG_PIT8253_CLK2(24_MHz_XTAL / 100)
MCFG_DEVICE_ADD("74148", TTL74148, 0)
MCFG_74148_OUTPUT_CB(vertigo_state, update_irq)
/* motor controller */
- MCFG_CPU_ADD("motorcpu", M68705P3, 24_MHz_XTAL / 6)
+ MCFG_DEVICE_ADD("motorcpu", M68705P3, 24_MHz_XTAL / 6)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -167,26 +167,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vertigo_state::exidy440_audio)
- MCFG_CPU_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK)
- MCFG_CPU_PROGRAM_MAP(exidy440_audio_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, EXIDY440_AUDIO_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(exidy440_audio_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", driver_device, irq0_line_assert)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", EXIDY440, EXIDY440_MC3418_CLOCK)
+ MCFG_DEVICE_ADD("custom", EXIDY440, EXIDY440_MC3418_CLOCK)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_DEVICE_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_DEVICE_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_DEVICE_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MCFG_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_DEVICE_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index 2a8e0916149..c31d58deb76 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -366,9 +366,9 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k)
MACHINE_CONFIG_START(vg5k_state::vg5k)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(vg5k_mem)
- MCFG_CPU_IO_MAP(vg5k_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vg5k_mem)
+ MCFG_DEVICE_IO_MAP(vg5k_io)
MCFG_TIMER_DRIVER_ADD_SCANLINE("vg5k_scanline", vg5k_state, vg5k_scanline, "screen", 0, 10)
@@ -390,7 +390,7 @@ MACHINE_CONFIG_START(vg5k_state::vg5k)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125)
+ MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.125)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index f6bdea817f8..b8818ef661a 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -41,7 +41,7 @@
#include <zlib.h>
#define AS_IO16 1
-#define MCFG_CPU_IO16_MAP MCFG_CPU_DATA_MAP
+#define MCFG_CPU_IO16_MAP MCFG_DEVICE_DATA_MAP
class vgmplay_disassembler : public util::disasm_interface
{
@@ -1620,9 +1620,9 @@ void vgmplay_state::h6280_io_map(address_map &map)
}
MACHINE_CONFIG_START(vgmplay_state::vgmplay)
- MCFG_CPU_ADD("vgmplay", VGMPLAY, 44100)
- MCFG_CPU_PROGRAM_MAP( file_map )
- MCFG_CPU_IO_MAP( soundchips_map )
+ MCFG_DEVICE_ADD("vgmplay", VGMPLAY, 44100)
+ MCFG_DEVICE_PROGRAM_MAP( file_map )
+ MCFG_DEVICE_IO_MAP( soundchips_map )
MCFG_CPU_IO16_MAP( soundchips16_map )
MCFG_DEVICE_ADD("file", BITBANGER, 0)
@@ -1630,68 +1630,68 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ym2612", YM2612, 7670454)
+ MCFG_DEVICE_ADD("ym2612", YM2612, 7670454)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("ym2151", YM2151, 3579545)
+ MCFG_DEVICE_ADD("ym2151", YM2151, 3579545)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("ym2413", YM2413, 3579545)
+ MCFG_DEVICE_ADD("ym2413", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
- MCFG_SOUND_ADD("sn76496", SN76496, 3579545)
+ MCFG_DEVICE_ADD("sn76496", SN76496, 3579545)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.5)
- MCFG_SOUND_ADD("segapcm", SEGAPCM, 4000000)
+ MCFG_DEVICE_ADD("segapcm", SEGAPCM, 4000000)
MCFG_SEGAPCM_BANK(BANK_512) // Should be configurable for yboard...
MCFG_DEVICE_ADDRESS_MAP(0, segapcm_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("multipcma", MULTIPCM, 8000000)
+ MCFG_DEVICE_ADD("multipcma", MULTIPCM, 8000000)
MCFG_DEVICE_ADDRESS_MAP(0, multipcma_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("multipcmb", MULTIPCM, 8000000)
+ MCFG_DEVICE_ADD("multipcmb", MULTIPCM, 8000000)
MCFG_DEVICE_ADDRESS_MAP(0, multipcmb_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("dmg", DMG_APU, XTAL(4'194'304))
+ MCFG_DEVICE_ADD("dmg", DMG_APU, XTAL(4'194'304))
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("ay8910a", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay8910a", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- MCFG_SOUND_ADD("ay8910b", AY8910, 1500000)
+ MCFG_DEVICE_ADD("ay8910b", AY8910, 1500000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- MCFG_SOUND_ADD("ym2203a", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2203a", YM2203, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_ADD("ym2203b", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ym2203b", YM2203, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_ADD("ym3526", YM3526, 4000000)
+ MCFG_DEVICE_ADD("ym3526", YM3526, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
- MCFG_SOUND_ADD("ym3812", YM3812, 4000000)
+ MCFG_DEVICE_ADD("ym3812", YM3812, 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_CPU_ADD("nescpu", N2A03, 1000000)
- MCFG_CPU_PROGRAM_MAP(nescpu_map)
+ MCFG_DEVICE_ADD("nescpu", N2A03, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(nescpu_map)
MCFG_DEVICE_DISABLE()
MCFG_DEVICE_MODIFY("nescpu:nesapu")
@@ -1699,12 +1699,12 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":rspeaker", 0.50)
- MCFG_CPU_ADD("h6280", H6280, 1000000)
- MCFG_CPU_PROGRAM_MAP(h6280_map)
- MCFG_CPU_IO_MAP(h6280_io_map)
+ MCFG_DEVICE_ADD("h6280", H6280, 1000000)
+ MCFG_DEVICE_PROGRAM_MAP(h6280_map)
+ MCFG_DEVICE_IO_MAP(h6280_io_map)
MCFG_DEVICE_DISABLE()
- MCFG_SOUND_ADD("c6280", C6280, 3579545)
+ MCFG_DEVICE_ADD("c6280", C6280, 3579545)
MCFG_C6280_CPU("h6280")
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
@@ -1714,11 +1714,11 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("pokeya", POKEY, 1789772)
+ MCFG_DEVICE_ADD("pokeya", POKEY, 1789772)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
- MCFG_SOUND_ADD("pokeyb", POKEY, 1789772)
+ MCFG_DEVICE_ADD("pokeyb", POKEY, 1789772)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
@@ -1737,17 +1737,17 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_SOUND_ADD("ymf271", YMF271, 16934400)
+ MCFG_DEVICE_ADD("ymf271", YMF271, 16934400)
MCFG_DEVICE_ADDRESS_MAP(0, ymf271_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("ymz280b", YMZ280B, 16934400)
+ MCFG_DEVICE_ADD("ymz280b", YMZ280B, 16934400)
MCFG_DEVICE_ADDRESS_MAP(0, ymz280b_map)
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_SOUND_ADD("ym2608", YM2608, 8000000)
+ MCFG_DEVICE_ADD("ym2608", YM2608, 8000000)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.50)
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index c85b375d683..837b26bcd90 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -697,17 +697,17 @@ void vic10_state::machine_reset()
MACHINE_CONFIG_START(vic10_state::vic10)
// basic hardware
- MCFG_CPU_ADD(M6510_TAG, M6510, XTAL(8'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(vic10_mem)
+ MCFG_DEVICE_ADD(M6510_TAG, M6510, XTAL(8'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(vic10_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
- MCFG_M6510_PORT_CALLBACKS(READ8(vic10_state, cpu_r), WRITE8(vic10_state, cpu_w))
+ MCFG_M6510_PORT_CALLBACKS(READ8(*this, vic10_state, cpu_r), WRITE8(*this, vic10_state, cpu_w))
MCFG_M6510_PORT_PULLS(0x10, 0x20)
MCFG_QUANTUM_PERFECT_CPU(M6510_TAG)
// video hardware
MCFG_DEVICE_ADD(MOS6566_TAG, MOS6566, XTAL(8'000'000)/8)
MCFG_MOS6566_CPU(M6510_TAG)
- MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(vic10_state, vic_irq_w))
+ MCFG_MOS6566_IRQ_CALLBACK(WRITELINE(*this, vic10_state, vic_irq_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADDRESS_MAP(0, vic_videoram_map)
MCFG_DEVICE_ADDRESS_MAP(1, vic_colorram_map)
@@ -719,29 +719,29 @@ MACHINE_CONFIG_START(vic10_state::vic10)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MOS6581_TAG, MOS6581, XTAL(8'000'000)/8)
- MCFG_MOS6581_POTX_CALLBACK(READ8(vic10_state, sid_potx_r))
- MCFG_MOS6581_POTY_CALLBACK(READ8(vic10_state, sid_poty_r))
+ MCFG_DEVICE_ADD(MOS6581_TAG, MOS6581, XTAL(8'000'000)/8)
+ MCFG_MOS6581_POTX_CALLBACK(READ8(*this, vic10_state, sid_potx_r))
+ MCFG_MOS6581_POTY_CALLBACK(READ8(*this, vic10_state, sid_poty_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
// devices
MCFG_DEVICE_ADD(MOS6526_TAG, MOS6526, XTAL(8'000'000)/8)
MCFG_MOS6526_TOD(60)
- MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(vic10_state, cia_irq_w))
- MCFG_MOS6526_CNT_CALLBACK(DEVWRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, cnt_w))
- MCFG_MOS6526_SP_CALLBACK(DEVWRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, sp_w))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(vic10_state, cia_pa_r))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(vic10_state, cia_pb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(vic10_state, cia_pb_w))
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(MOS6526_TAG, mos6526_device, flag_w))
+ MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, vic10_state, cia_irq_w))
+ MCFG_MOS6526_CNT_CALLBACK(WRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, cnt_w))
+ MCFG_MOS6526_SP_CALLBACK(WRITELINE(VIC10_EXPANSION_SLOT_TAG, vic10_expansion_slot_device, sp_w))
+ MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, vic10_state, cia_pa_r))
+ MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, vic10_state, cia_pb_r))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, vic10_state, cia_pb_w))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", WRITELINE(MOS6526_TAG, mos6526_device, flag_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, nullptr)
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(DEVWRITELINE(MOS6566_TAG, mos6566_device, lp_w))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(MOS6566_TAG, mos6566_device, lp_w))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL2_TAG, vcs_control_port_devices, "joy")
MCFG_VIC10_EXPANSION_SLOT_ADD(VIC10_EXPANSION_SLOT_TAG, XTAL(8'000'000)/8, vic10_expansion_cards, nullptr)
- MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(vic10_state, exp_irq_w))
- MCFG_VIC10_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(vic10_state, exp_reset_w))
- MCFG_VIC10_EXPANSION_SLOT_CNT_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
- MCFG_VIC10_EXPANSION_SLOT_SP_CALLBACK(DEVWRITELINE(MOS6526_TAG, mos6526_device, sp_w))
+ MCFG_VIC10_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(*this, vic10_state, exp_irq_w))
+ MCFG_VIC10_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(*this, vic10_state, exp_reset_w))
+ MCFG_VIC10_EXPANSION_SLOT_CNT_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, cnt_w))
+ MCFG_VIC10_EXPANSION_SLOT_SP_CALLBACK(WRITELINE(MOS6526_TAG, mos6526_device, sp_w))
// software list
MCFG_SOFTWARE_LIST_ADD("cart_list", "vic10")
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 5bd39d91024..ee295f6f496 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -798,30 +798,30 @@ WRITE_LINE_MEMBER(vic20_state::write_user_cassette_switch)
MACHINE_CONFIG_START(vic20_state::vic20)
// devices
- MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", DEVWRITELINE(M6522_2_TAG, via6522_device, write_ca1))
+ MCFG_PET_DATASSETTE_PORT_ADD(PET_DATASSETTE_PORT_TAG, cbm_datassette_devices, "c1530", WRITELINE(M6522_2_TAG, via6522_device, write_ca1))
MCFG_CBM_IEC_ADD("c1541")
- MCFG_CBM_IEC_BUS_SRQ_CALLBACK(DEVWRITELINE(M6522_2_TAG, via6522_device, write_cb1))
+ MCFG_CBM_IEC_BUS_SRQ_CALLBACK(WRITELINE(M6522_2_TAG, via6522_device, write_cb1))
MCFG_VCS_CONTROL_PORT_ADD(CONTROL1_TAG, vcs_control_port_devices, "joy")
- MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(vic20_state, write_light_pen))
+ MCFG_VCS_CONTROL_PORT_TRIGGER_CALLBACK(WRITELINE(*this, vic20_state, write_light_pen))
MCFG_PET_USER_PORT_ADD(PET_USER_PORT_TAG, vic20_user_port_cards, nullptr)
- MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(vic20_state, exp_reset_w))
- MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(vic20_state, write_user_joy0))
- MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(vic20_state, write_user_joy1))
- MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(vic20_state, write_user_joy2))
- MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(vic20_state, write_user_light_pen))
- MCFG_PET_USER_PORT_8_HANDLER(WRITELINE(vic20_state, write_user_cassette_switch))
- MCFG_PET_USER_PORT_B_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_cb1))
- MCFG_PET_USER_PORT_C_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb0))
- MCFG_PET_USER_PORT_D_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb1))
- MCFG_PET_USER_PORT_E_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb2))
- MCFG_PET_USER_PORT_F_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb3))
- MCFG_PET_USER_PORT_H_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb4))
- MCFG_PET_USER_PORT_J_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb5))
- MCFG_PET_USER_PORT_K_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb6))
- MCFG_PET_USER_PORT_L_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb7))
- MCFG_PET_USER_PORT_M_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_cb2))
+ MCFG_PET_USER_PORT_3_HANDLER(WRITELINE(*this, vic20_state, exp_reset_w))
+ MCFG_PET_USER_PORT_4_HANDLER(WRITELINE(*this, vic20_state, write_user_joy0))
+ MCFG_PET_USER_PORT_5_HANDLER(WRITELINE(*this, vic20_state, write_user_joy1))
+ MCFG_PET_USER_PORT_6_HANDLER(WRITELINE(*this, vic20_state, write_user_joy2))
+ MCFG_PET_USER_PORT_7_HANDLER(WRITELINE(*this, vic20_state, write_user_light_pen))
+ MCFG_PET_USER_PORT_8_HANDLER(WRITELINE(*this, vic20_state, write_user_cassette_switch))
+ MCFG_PET_USER_PORT_B_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_cb1))
+ MCFG_PET_USER_PORT_C_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb0))
+ MCFG_PET_USER_PORT_D_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb1))
+ MCFG_PET_USER_PORT_E_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb2))
+ MCFG_PET_USER_PORT_F_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb3))
+ MCFG_PET_USER_PORT_H_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb4))
+ MCFG_PET_USER_PORT_J_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb5))
+ MCFG_PET_USER_PORT_K_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb6))
+ MCFG_PET_USER_PORT_L_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb7))
+ MCFG_PET_USER_PORT_M_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_cb2))
MCFG_QUICKLOAD_ADD("quickload", vic20_state, cbm_vc20, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@@ -843,39 +843,39 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vic20_state::ntsc)
vic20(config);
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, MOS6560_CLOCK)
- MCFG_CPU_PROGRAM_MAP(vic20_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, MOS6560_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(vic20_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, MOS6560_CLOCK)
- MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via1_pb_w))
- MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, vic20_state, via1_pa_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, vic20_state, via1_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, vic20_state, via1_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_NMI_LINE))
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, MOS6560_CLOCK)
- MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(vic20_state, via2_pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, vic20_state, via2_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, vic20_state, via2_pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, vic20_state, via2_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, vic20_state, via2_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, vic20_state, via2_cb2_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_IRQ_LINE))
// video/sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_MOS6560_ADD(M6560_TAG, SCREEN_TAG, MOS6560_CLOCK, vic_videoram_map, vic_colorram_map)
- MCFG_MOS6560_POTX_CALLBACK(DEVREAD8(CONTROL1_TAG, vcs_control_port_device, pot_x_r))
- MCFG_MOS6560_POTY_CALLBACK(DEVREAD8(CONTROL1_TAG, vcs_control_port_device, pot_y_r))
+ MCFG_MOS6560_POTX_CALLBACK(READ8(CONTROL1_TAG, vcs_control_port_device, pot_x_r))
+ MCFG_MOS6560_POTY_CALLBACK(READ8(CONTROL1_TAG, vcs_control_port_device, pot_y_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6560_CLOCK, vic20_expansion_cards, nullptr)
MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(M6502_TAG, M6502_IRQ_LINE))
MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(INPUTLINE(M6502_TAG, M6502_NMI_LINE))
- MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(vic20_state, exp_reset_w))
+ MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(*this, vic20_state, exp_reset_w))
// software lists
MCFG_SOFTWARE_LIST_FILTER("cart_list", "NTSC")
@@ -891,39 +891,39 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vic20_state::pal)
vic20(config);
// basic machine hardware
- MCFG_CPU_ADD(M6502_TAG, M6502, MOS6561_CLOCK)
- MCFG_CPU_PROGRAM_MAP(vic20_mem)
+ MCFG_DEVICE_ADD(M6502_TAG, M6502, MOS6561_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(vic20_mem)
MCFG_M6502_DISABLE_DIRECT() // address decoding is 100% dynamic, no RAM/ROM banks
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, MOS6561_CLOCK)
- MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(vic20_state, via1_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via1_pb_w))
- MCFG_VIA6522_CB1_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
- MCFG_VIA6522_CA2_HANDLER(DEVWRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
- MCFG_VIA6522_CB2_HANDLER(DEVWRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, vic20_state, via1_pa_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, vic20_state, via1_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, vic20_state, via1_pb_w))
+ MCFG_VIA6522_CB1_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_b))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(PET_DATASSETTE_PORT_TAG, pet_datassette_port_device, motor_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(PET_USER_PORT_TAG, pet_user_port_device, write_m))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_NMI_LINE))
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, MOS6561_CLOCK)
- MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via2_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(vic20_state, via2_pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(vic20_state, via2_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(vic20_state, via2_ca2_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(vic20_state, via2_cb2_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, vic20_state, via2_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, vic20_state, via2_pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, vic20_state, via2_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, vic20_state, via2_ca2_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, vic20_state, via2_cb2_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE(M6502_TAG, M6502_IRQ_LINE))
// video/sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_MOS6561_ADD(M6560_TAG, SCREEN_TAG, MOS6561_CLOCK, vic_videoram_map, vic_colorram_map)
- MCFG_MOS6560_POTX_CALLBACK(DEVREAD8(CONTROL1_TAG, vcs_control_port_device, pot_x_r))
- MCFG_MOS6560_POTY_CALLBACK(DEVREAD8(CONTROL1_TAG, vcs_control_port_device, pot_y_r))
+ MCFG_MOS6560_POTX_CALLBACK(READ8(CONTROL1_TAG, vcs_control_port_device, pot_x_r))
+ MCFG_MOS6560_POTY_CALLBACK(READ8(CONTROL1_TAG, vcs_control_port_device, pot_y_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_VIC20_EXPANSION_SLOT_ADD(VIC20_EXPANSION_SLOT_TAG, MOS6561_CLOCK, vic20_expansion_cards, nullptr)
MCFG_VIC20_EXPANSION_SLOT_IRQ_CALLBACK(INPUTLINE(M6502_TAG, M6502_IRQ_LINE))
MCFG_VIC20_EXPANSION_SLOT_NMI_CALLBACK(INPUTLINE(M6502_TAG, M6502_NMI_LINE))
- MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(vic20_state, exp_reset_w))
+ MCFG_VIC20_EXPANSION_SLOT_RES_CALLBACK(WRITELINE(*this, vic20_state, exp_reset_w))
// software lists
MCFG_SOFTWARE_LIST_FILTER("cart_list", "PAL")
diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index 427fa46fde7..b1d59374808 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -253,7 +253,7 @@ void vicdual_state::machine_start()
MACHINE_CONFIG_START(vicdual_state::vicdual_root)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
MCFG_TIMER_DRIVER_ADD("coinstate", vicdual_state, clear_coin_status)
@@ -333,9 +333,9 @@ MACHINE_CONFIG_START(vicdual_state::depthch)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_REPLACE("maincpu", I8080, VICDUAL_MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(depthch_map)
- MCFG_CPU_IO_MAP(depthch_io_map)
+ MCFG_DEVICE_REPLACE("maincpu", I8080, VICDUAL_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(depthch_map)
+ MCFG_DEVICE_IO_MAP(depthch_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -423,9 +423,9 @@ MACHINE_CONFIG_START(vicdual_state::safari)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(safari_map)
- MCFG_CPU_IO_MAP(safari_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(safari_map)
+ MCFG_DEVICE_IO_MAP(safari_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -530,9 +530,9 @@ MACHINE_CONFIG_START(vicdual_state::frogs)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(frogs_map)
- MCFG_CPU_IO_MAP(frogs_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(frogs_map)
+ MCFG_DEVICE_IO_MAP(frogs_io_map)
MCFG_MACHINE_START_OVERRIDE(vicdual_state,frogs_audio)
@@ -778,9 +778,9 @@ MACHINE_CONFIG_START(vicdual_state::headon)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(headon_map)
- MCFG_CPU_IO_MAP(headon_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(headon_map)
+ MCFG_DEVICE_IO_MAP(headon_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -804,9 +804,9 @@ MACHINE_CONFIG_START(vicdual_state::sspaceat)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(headon_map)
- MCFG_CPU_IO_MAP(sspaceat_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(headon_map)
+ MCFG_DEVICE_IO_MAP(sspaceat_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1001,9 +1001,9 @@ MACHINE_CONFIG_START(vicdual_state::headon2)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(headon2_map)
- MCFG_CPU_IO_MAP(headon2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(headon2_map)
+ MCFG_DEVICE_IO_MAP(headon2_io_map)
MCFG_MACHINE_RESET_OVERRIDE(vicdual_state, headon2)
@@ -1030,9 +1030,9 @@ MACHINE_CONFIG_START(vicdual_state::digger)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(headon2_map)
- MCFG_CPU_IO_MAP(digger_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(headon2_map)
+ MCFG_DEVICE_IO_MAP(digger_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2076,8 +2076,8 @@ MACHINE_CONFIG_START(vicdual_state::vicdual_dualgame_root)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vicdual_dualgame_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vicdual_dualgame_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -2090,8 +2090,8 @@ MACHINE_CONFIG_START(vicdual_state::invho2)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(invho2_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(invho2_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2105,8 +2105,8 @@ MACHINE_CONFIG_START(vicdual_state::invds)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(invds_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(invds_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2117,9 +2117,9 @@ MACHINE_CONFIG_START(vicdual_state::carhntds)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(carhntds_dualgame_map)
- MCFG_CPU_IO_MAP(carhntds_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(carhntds_dualgame_map)
+ MCFG_DEVICE_IO_MAP(carhntds_io_map)
MACHINE_CONFIG_END
@@ -2127,8 +2127,8 @@ MACHINE_CONFIG_START(vicdual_state::sspacaho)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(sspacaho_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(sspacaho_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2140,8 +2140,8 @@ MACHINE_CONFIG_START(vicdual_state::spacetrk)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(spacetrk_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(spacetrk_io_map)
MACHINE_CONFIG_END
@@ -2149,8 +2149,8 @@ MACHINE_CONFIG_START(vicdual_state::carnival)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(carnival_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(carnival_io_map)
MCFG_QUANTUM_PERFECT_CPU("maincpu")
@@ -2163,8 +2163,8 @@ MACHINE_CONFIG_START(vicdual_state::carnivalh)
carnival(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(headon_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(headon_io_map)
MACHINE_CONFIG_END
@@ -2172,8 +2172,8 @@ MACHINE_CONFIG_START(vicdual_state::tranqgun)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(tranqgun_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(tranqgun_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2185,8 +2185,8 @@ MACHINE_CONFIG_START(vicdual_state::brdrline)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(brdrline_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(brdrline_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2198,8 +2198,8 @@ MACHINE_CONFIG_START(vicdual_state::pulsar)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(pulsar_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(pulsar_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2211,8 +2211,8 @@ MACHINE_CONFIG_START(vicdual_state::heiankyo)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(heiankyo_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(heiankyo_io_map)
MACHINE_CONFIG_END
@@ -2220,8 +2220,8 @@ MACHINE_CONFIG_START(vicdual_state::alphaho)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(alphaho_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(alphaho_io_map)
MACHINE_CONFIG_END
@@ -2229,8 +2229,8 @@ MACHINE_CONFIG_START(vicdual_state::headonn)
vicdual_dualgame_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(headonn_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(headonn_io_map)
/* audio hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -2360,9 +2360,9 @@ MACHINE_CONFIG_START(vicdual_state::samurai)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(samurai_map)
- MCFG_CPU_IO_MAP(samurai_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(samurai_map)
+ MCFG_DEVICE_IO_MAP(samurai_io_map)
MCFG_MACHINE_START_OVERRIDE(vicdual_state,samurai)
@@ -2546,9 +2546,9 @@ MACHINE_RESET_MEMBER(nsub_state, nsub)
MACHINE_CONFIG_START(nsub_state::nsub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(nsub_map)
- MCFG_CPU_IO_MAP(nsub_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(nsub_map)
+ MCFG_DEVICE_IO_MAP(nsub_io_map)
MCFG_TIMER_DRIVER_ADD("coinstate", nsub_state, clear_coin_status)
MCFG_TIMER_DRIVER_ADD("nsub_coin", nsub_state, nsub_coin_pulse)
@@ -2658,9 +2658,9 @@ MACHINE_CONFIG_START(vicdual_state::invinco)
vicdual_root(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(invinco_map)
- MCFG_CPU_IO_MAP(invinco_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(invinco_map)
+ MCFG_DEVICE_IO_MAP(invinco_io_map)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index 71298463a79..52e1cd159c9 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -679,9 +679,9 @@ void victor9k_state::machine_reset()
MACHINE_CONFIG_START(victor9k_state::victor9k)
// basic machine hardware
- MCFG_CPU_ADD(I8088_TAG, I8088, XTAL(30'000'000)/6)
- MCFG_CPU_PROGRAM_MAP(victor9k_mem)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(I8088_TAG, I8088, XTAL(30'000'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(victor9k_mem)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
@@ -697,92 +697,92 @@ MACHINE_CONFIG_START(victor9k_state::victor9k)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(10)
MCFG_MC6845_UPDATE_ROW_CB(victor9k_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(victor9k_state, vert_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, victor9k_state, vert_w))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(HC55516_TAG, HC55516, 0)
- //MCFG_HC55516_DIG_OUT_CB(DEVWRITELINE(MC6852_TAG, mc6852_device, rx_w))
+ MCFG_DEVICE_ADD(HC55516_TAG, HC55516, 0)
+ //MCFG_HC55516_DIG_OUT_CB(WRITELINE(MC6852_TAG, mc6852_device, rx_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// devices
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_DAV_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb0))
- MCFG_IEEE488_EOI_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb1))
- MCFG_IEEE488_REN_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb2))
- MCFG_IEEE488_ATN_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb3))
- MCFG_IEEE488_IFC_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb4))
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb5))
- MCFG_IEEE488_NRFD_CALLBACK(WRITELINE(victor9k_state, write_nfrd))
- MCFG_IEEE488_NDAC_CALLBACK(WRITELINE(victor9k_state, write_ndac))
+ MCFG_IEEE488_DAV_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_pb0))
+ MCFG_IEEE488_EOI_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_pb1))
+ MCFG_IEEE488_REN_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_pb2))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_pb3))
+ MCFG_IEEE488_IFC_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_pb4))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(M6522_1_TAG, via6522_device, write_pb5))
+ MCFG_IEEE488_NRFD_CALLBACK(WRITELINE(*this, victor9k_state, write_nfrd))
+ MCFG_IEEE488_NDAC_CALLBACK(WRITELINE(*this, victor9k_state, write_ndac))
MCFG_DEVICE_ADD(I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8088_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(2500000)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(victor9k_state, mux_serial_b_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, victor9k_state, mux_serial_b_w))
MCFG_PIT8253_CLK1(2500000)
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(victor9k_state, mux_serial_a_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, victor9k_state, mux_serial_a_w))
MCFG_PIT8253_CLK2(100000)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(I8259A_TAG, pic8259_device, ir2_w))
MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, XTAL(30'000'000)/30)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir1_w))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_INT_CB(WRITELINE(I8259A_TAG, pic8259_device, ir1_w))
MCFG_DEVICE_ADD(MC6852_TAG, MC6852, XTAL(30'000'000)/30)
- MCFG_MC6852_TX_DATA_CALLBACK(DEVWRITELINE(HC55516_TAG, hc55516_device, digit_w))
- MCFG_MC6852_SM_DTR_CALLBACK(WRITELINE(victor9k_state, ssda_sm_dtr_w))
- MCFG_MC6852_IRQ_CALLBACK(WRITELINE(victor9k_state, ssda_irq_w))
+ MCFG_MC6852_TX_DATA_CALLBACK(WRITELINE(HC55516_TAG, hc55516_device, digit_w))
+ MCFG_MC6852_SM_DTR_CALLBACK(WRITELINE(*this, victor9k_state, ssda_sm_dtr_w))
+ MCFG_MC6852_IRQ_CALLBACK(WRITELINE(*this, victor9k_state, ssda_irq_w))
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, XTAL(30'000'000)/30)
- MCFG_VIA6522_READPA_HANDLER(DEVREAD8(IEEE488_TAG, ieee488_device, dio_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor9k_state, via1_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via1_pb_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(victor9k_state, codec_vol_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via1_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(IEEE488_TAG, ieee488_device, dio_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, victor9k_state, via1_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor9k_state, via1_pb_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, victor9k_state, codec_vol_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor9k_state, via1_irq_w))
MCFG_DEVICE_ADD(M6522_2_TAG, VIA6522, XTAL(30'000'000)/30)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor9k_state, via2_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via2_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via2_irq_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, victor9k_state, via2_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor9k_state, via2_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor9k_state, via2_irq_w))
MCFG_DEVICE_ADD(M6522_3_TAG, VIA6522, XTAL(30'000'000)/30)
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor9k_state, via3_pb_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor9k_state, via3_irq_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor9k_state, via3_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor9k_state, via3_irq_w))
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb5))
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb6))
- MCFG_CENTRONICS_SELECT_HANDLER(DEVWRITELINE(M6522_1_TAG, via6522_device, write_pb7))
-
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, dcda_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(victor9k_state, write_ria))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, ctsa_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(M6522_2_TAG, via6522_device, write_pa3))
-
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, dcdb_w))
- MCFG_RS232_RI_HANDLER(WRITELINE(victor9k_state, write_ria))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, ctsb_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(M6522_2_TAG, via6522_device, write_pa5))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb5))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb6))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(M6522_1_TAG, via6522_device, write_pb7))
+
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, dcda_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(*this, victor9k_state, write_ria))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, ctsa_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(M6522_2_TAG, via6522_device, write_pa3))
+
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, dcdb_w))
+ MCFG_RS232_RI_HANDLER(WRITELINE(*this, victor9k_state, write_ria))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(UPD7201_TAG, z80dart_device, ctsb_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(M6522_2_TAG, via6522_device, write_pa5))
MCFG_DEVICE_ADD(KB_TAG, VICTOR9K_KEYBOARD, 0)
- MCFG_VICTOR9K_KBRDY_HANDLER(WRITELINE(victor9k_state, kbrdy_w))
- MCFG_VICTOR9K_KBDATA_HANDLER(WRITELINE(victor9k_state, kbdata_w))
+ MCFG_VICTOR9K_KBRDY_HANDLER(WRITELINE(*this, victor9k_state, kbrdy_w))
+ MCFG_VICTOR9K_KBDATA_HANDLER(WRITELINE(*this, victor9k_state, kbdata_w))
MCFG_DEVICE_ADD(FDC_TAG, VICTOR_9000_FDC, 0)
- MCFG_VICTOR_9000_FDC_IRQ_CB(WRITELINE(victor9k_state, fdc_irq_w))
- MCFG_VICTOR_9000_FDC_SYN_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir0_w)) MCFG_DEVCB_XOR(1)
+ MCFG_VICTOR_9000_FDC_IRQ_CB(WRITELINE(*this, victor9k_state, fdc_irq_w))
+ MCFG_VICTOR_9000_FDC_SYN_CB(WRITELINE(I8259A_TAG, pic8259_device, ir0_w)) MCFG_DEVCB_XOR(1)
MCFG_VICTOR_9000_FDC_LBRDY_CB(INPUTLINE(I8088_TAG, INPUT_LINE_TEST)) MCFG_DEVCB_XOR(1)
// internal ram
diff --git a/src/mame/drivers/victory.cpp b/src/mame/drivers/victory.cpp
index f27544c7c01..342187efdab 100644
--- a/src/mame/drivers/victory.cpp
+++ b/src/mame/drivers/victory.cpp
@@ -213,10 +213,10 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(victory_state::victory)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(main_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", victory_state, vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", victory_state, vblank_interrupt)
MCFG_NVRAM_ADD_0FILL("nvram")
diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp
index 86c2ed09cd4..fad4a334526 100644
--- a/src/mame/drivers/vidbrain.cpp
+++ b/src/mame/drivers/vidbrain.cpp
@@ -504,22 +504,22 @@ void vidbrain_state::machine_reset()
MACHINE_CONFIG_START(vidbrain_state::vidbrain)
// basic machine hardware
- MCFG_CPU_ADD(F3850_TAG, F8, XTAL(4'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(vidbrain_mem)
- MCFG_CPU_IO_MAP(vidbrain_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vidbrain_state,vidbrain_int_ack)
+ MCFG_DEVICE_ADD(F3850_TAG, F8, XTAL(4'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(vidbrain_mem)
+ MCFG_DEVICE_IO_MAP(vidbrain_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vidbrain_state,vidbrain_int_ack)
// video hardware
MCFG_DEFAULT_LAYOUT(layout_vidbrain)
MCFG_UV201_ADD(UV201_TAG, SCREEN_TAG, 3636363, uv_intf)
- MCFG_UV201_EXT_INT_CALLBACK(WRITELINE(vidbrain_state, ext_int_w))
- MCFG_UV201_HBLANK_CALLBACK(WRITELINE(vidbrain_state, hblank_w))
- MCFG_UV201_DB_CALLBACK(READ8(vidbrain_state, memory_read_byte))
+ MCFG_UV201_EXT_INT_CALLBACK(WRITELINE(*this, vidbrain_state, ext_int_w))
+ MCFG_UV201_HBLANK_CALLBACK(WRITELINE(*this, vidbrain_state, hblank_w))
+ MCFG_UV201_DB_CALLBACK(READ8(*this, vidbrain_state, memory_read_byte))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", DAC_2BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.167) // 74ls74.u16 + 120k + 56k
+ MCFG_DEVICE_ADD("dac", DAC_2BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.167) // 74ls74.u16 + 120k + 56k
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp
index aead39d63c8..a7fb255b8b9 100644
--- a/src/mame/drivers/videopin.cpp
+++ b/src/mame/drivers/videopin.cpp
@@ -362,8 +362,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(videopin_state::videopin)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 16)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -382,7 +382,7 @@ MACHINE_CONFIG_START(videopin_state::videopin)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(videopin)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index d3aacee79e1..b70cfbc092b 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -1262,24 +1262,24 @@ void videopkr_state::machine_start()
MACHINE_CONFIG_START(videopkr_state::videopkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(i8039_map)
- MCFG_CPU_IO_MAP(i8039_io_port)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(videopkr_state, videopkr_p1_data_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(videopkr_state, videopkr_p1_data_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(videopkr_state, videopkr_p2_data_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(videopkr_state, videopkr_p2_data_w))
- MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(videopkr_state, prog_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(videopkr_state, videopkr_t0_latch))
-
- MCFG_CPU_VBLANK_INT_DRIVER("screen", videopkr_state, irq0_line_assert)
-
- MCFG_CPU_ADD("soundcpu", I8039, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(i8039_sound_mem)
- MCFG_CPU_IO_MAP(i8039_sound_port)
- MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(videopkr_state, sound_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(videopkr_state, sound_p2_w))
+ MCFG_DEVICE_ADD("maincpu", I8039, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(i8039_map)
+ MCFG_DEVICE_IO_MAP(i8039_io_port)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, videopkr_state, videopkr_p1_data_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, videopkr_state, videopkr_p1_data_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, videopkr_state, videopkr_p2_data_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, videopkr_state, videopkr_p2_data_w))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE(*this, videopkr_state, prog_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, videopkr_state, videopkr_t0_latch))
+
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", videopkr_state, irq0_line_assert)
+
+ MCFG_DEVICE_ADD("soundcpu", I8039, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(i8039_sound_mem)
+ MCFG_DEVICE_IO_MAP(i8039_sound_port)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("dac", dac_byte_interface, write))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, videopkr_state, sound_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, videopkr_state, sound_p2_w))
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1302,7 +1302,7 @@ MACHINE_CONFIG_START(videopkr_state::videopkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.275)
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.275)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -1324,8 +1324,8 @@ MACHINE_CONFIG_START(videopkr_state::videodad)
videopkr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(CPU_CLOCK_ALT)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(CPU_CLOCK_ALT)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1341,20 +1341,20 @@ MACHINE_CONFIG_START(videopkr_state::babypkr)
videopkr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(CPU_CLOCK_ALT)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(CPU_CLOCK_ALT)
/* most likely romless or eprom */
- MCFG_CPU_REPLACE("soundcpu", I8031, CPU_CLOCK )
- MCFG_CPU_PROGRAM_MAP(i8051_sound_mem)
- MCFG_CPU_IO_MAP(i8051_sound_port)
- MCFG_MCS51_PORT_P0_IN_CB(READ8(videopkr_state, baby_sound_p0_r))
- MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(videopkr_state, baby_sound_p0_w))
- MCFG_MCS51_PORT_P1_IN_CB(READ8(videopkr_state, baby_sound_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(videopkr_state, baby_sound_p1_w))
- MCFG_MCS51_PORT_P2_IN_CB(READ8(videopkr_state, baby_sound_p2_r))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(videopkr_state, baby_sound_p2_w))
- MCFG_MCS51_PORT_P3_IN_CB(READ8(videopkr_state, baby_sound_p3_r))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(videopkr_state, baby_sound_p3_w))
+ MCFG_DEVICE_REPLACE("soundcpu", I8031, CPU_CLOCK )
+ MCFG_DEVICE_PROGRAM_MAP(i8051_sound_mem)
+ MCFG_DEVICE_IO_MAP(i8051_sound_port)
+ MCFG_MCS51_PORT_P0_IN_CB(READ8(*this, videopkr_state, baby_sound_p0_r))
+ MCFG_MCS51_PORT_P0_OUT_CB(WRITE8(*this, videopkr_state, baby_sound_p0_w))
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, videopkr_state, baby_sound_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, videopkr_state, baby_sound_p1_w))
+ MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, videopkr_state, baby_sound_p2_r))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, videopkr_state, baby_sound_p2_w))
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, videopkr_state, baby_sound_p3_r))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, videopkr_state, baby_sound_p3_w))
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
@@ -1366,7 +1366,7 @@ MACHINE_CONFIG_START(videopkr_state::babypkr)
MCFG_GFXDECODE_MODIFY("gfxdecode", videodad)
MCFG_VIDEO_START_OVERRIDE(videopkr_state,vidadcba)
- MCFG_SOUND_ADD("aysnd", AY8910, CPU_CLOCK / 6) /* no ports used */
+ MCFG_DEVICE_ADD("aysnd", AY8910, CPU_CLOCK / 6) /* no ports used */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MACHINE_CONFIG_END
@@ -1374,8 +1374,8 @@ MACHINE_CONFIG_START(videopkr_state::fortune1)
videopkr(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(CPU_CLOCK_ALT)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(CPU_CLOCK_ALT)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(videopkr_state,fortune1)
@@ -1383,9 +1383,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(videopkr_state::bpoker)
babypkr(config);
- MCFG_CPU_REPLACE("maincpu", I8751, XTAL(6'000'000))
- MCFG_CPU_PROGRAM_MAP(i8751_map)
- MCFG_CPU_IO_MAP(i8751_io_port)
+ MCFG_DEVICE_REPLACE("maincpu", I8751, XTAL(6'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(i8751_map)
+ MCFG_DEVICE_IO_MAP(i8751_io_port)
MCFG_MCS51_PORT_P0_IN_CB(NOOP) // ???
MCFG_MCS51_PORT_P1_IN_CB(NOOP) // ???
MCFG_MCS51_PORT_P1_OUT_CB(NOOP) // ???
diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp
index 9e46003850b..85047960c3e 100644
--- a/src/mame/drivers/vigilant.cpp
+++ b/src/mame/drivers/vigilant.cpp
@@ -483,17 +483,17 @@ GFXDECODE_END
MACHINE_CONFIG_START(vigilant_state::vigilant)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
- MCFG_CPU_PROGRAM_MAP(vigilant_map)
- MCFG_CPU_IO_MAP(vigilant_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold)
-
- MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */
+ MCFG_DEVICE_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(vigilant_map)
+ MCFG_DEVICE_IO_MAP(vigilant_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -512,20 +512,20 @@ MACHINE_CONFIG_START(vigilant_state::vigilant)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
- MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
+ MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO)
MCFG_YM2151_ADD("ymsnd", 3579645)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.55)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.55)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -533,17 +533,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vigilant_state::buccanrs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */
- MCFG_CPU_PROGRAM_MAP(vigilant_map)
- MCFG_CPU_IO_MAP(vigilant_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold)
-
- MCFG_CPU_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(buccanrs_sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */
+ MCFG_DEVICE_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(vigilant_map)
+ MCFG_DEVICE_IO_MAP(vigilant_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, 18432000/6) /* 3.072000 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(buccanrs_sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -562,16 +562,16 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
- MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
+ MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO)
- MCFG_SOUND_ADD("ym1", YM2203, 18432000/6)
- MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_DEVICE_ADD("ym1", YM2203, 18432000/6)
+ MCFG_YM2203_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.35)
@@ -581,7 +581,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
- MCFG_SOUND_ADD("ym2", YM2203, 18432000/6)
+ MCFG_DEVICE_ADD("ym2", YM2203, 18432000/6)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "lspeaker", 0.35)
@@ -591,7 +591,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs)
MCFG_SOUND_ROUTE(3, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(3, "rspeaker", 0.50)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
@@ -599,17 +599,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vigilant_state::kikcubic)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
- MCFG_CPU_PROGRAM_MAP(kikcubic_map)
- MCFG_CPU_IO_MAP(kikcubic_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold)
-
- MCFG_CPU_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */
+ MCFG_DEVICE_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(kikcubic_map)
+ MCFG_DEVICE_IO_MAP(kikcubic_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vigilant_state, irq0_line_hold)
+
+ MCFG_DEVICE_ADD("soundcpu", Z80, 3579645) /* 3.579645 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */
/* IRQs are generated by main Z80 and YM2151 */
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -628,20 +628,20 @@ MACHINE_CONFIG_START(vigilant_state::kikcubic)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
+ MCFG_GENERIC_LATCH_DATA_PENDING_CB(WRITELINE("soundirq", rst_neg_buffer_device, rst18_w))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0)
MCFG_RST_BUFFER_INT_CALLBACK(INPUTLINE("soundcpu", 0))
- MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
+ MCFG_DEVICE_ADD("m72", IREM_M72_AUDIO)
MCFG_YM2151_ADD("ymsnd", 3579645)
- MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE("soundirq", rst_neg_buffer_device, rst28_w))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.55)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.55)
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp
index 3084af4c260..ad1df032da5 100644
--- a/src/mame/drivers/vii.cpp
+++ b/src/mame/drivers/vii.cpp
@@ -1412,9 +1412,9 @@ DEVICE_IMAGE_LOAD_MEMBER(spg2xx_cart_state, vsmile_cart)
}
MACHINE_CONFIG_START(spg2xx_game_state::spg2xx_base)
- MCFG_CPU_ADD( "maincpu", UNSP, XTAL(27'000'000))
- MCFG_CPU_PROGRAM_MAP( vii_mem )
- MCFG_CPU_VBLANK_INT_DRIVER("screen", spg2xx_game_state, vii_vblank)
+ MCFG_DEVICE_ADD( "maincpu", UNSP, XTAL(27'000'000))
+ MCFG_DEVICE_PROGRAM_MAP( vii_mem )
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", spg2xx_game_state, vii_vblank)
MCFG_SCREEN_ADD( "screen", RASTER )
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp
index 6a501e34598..1b5db861260 100644
--- a/src/mame/drivers/vindictr.cpp
+++ b/src/mame/drivers/vindictr.cpp
@@ -185,8 +185,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(vindictr_state::vindictr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_EEPROM_2804_ADD("eeprom")
MCFG_EEPROM_28XX_LOCK_AFTER_WRITE(true)
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp
index e2e1fde661e..8e1f9b9e062 100644
--- a/src/mame/drivers/vip.cpp
+++ b/src/mame/drivers/vip.cpp
@@ -714,40 +714,40 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip )
MACHINE_CONFIG_START(vip_state::vip)
// basic machine hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL(3'521'280)/2)
- MCFG_CPU_PROGRAM_MAP(vip_mem)
- MCFG_CPU_IO_MAP(vip_io)
+ MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, XTAL(3'521'280)/2)
+ MCFG_DEVICE_PROGRAM_MAP(vip_mem)
+ MCFG_DEVICE_IO_MAP(vip_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
- MCFG_COSMAC_CLEAR_CALLBACK(READLINE(vip_state, clear_r))
- MCFG_COSMAC_EF1_CALLBACK(READLINE(vip_state, ef1_r))
- MCFG_COSMAC_EF2_CALLBACK(READLINE(vip_state, ef2_r))
- MCFG_COSMAC_EF3_CALLBACK(READLINE(vip_state, ef3_r))
- MCFG_COSMAC_EF4_CALLBACK(READLINE(vip_state, ef4_r))
- MCFG_COSMAC_Q_CALLBACK(WRITELINE(vip_state, q_w))
- MCFG_COSMAC_DMAR_CALLBACK(READ8(vip_state, dma_r))
- MCFG_COSMAC_DMAW_CALLBACK(WRITE8(vip_state, dma_w))
- MCFG_COSMAC_SC_CALLBACK(WRITE8(vip_state, sc_w))
+ MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, vip_state, clear_r))
+ MCFG_COSMAC_EF1_CALLBACK(READLINE(*this, vip_state, ef1_r))
+ MCFG_COSMAC_EF2_CALLBACK(READLINE(*this, vip_state, ef2_r))
+ MCFG_COSMAC_EF3_CALLBACK(READLINE(*this, vip_state, ef3_r))
+ MCFG_COSMAC_EF4_CALLBACK(READLINE(*this, vip_state, ef4_r))
+ MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, vip_state, q_w))
+ MCFG_COSMAC_DMAR_CALLBACK(READ8(*this, vip_state, dma_r))
+ MCFG_COSMAC_DMAW_CALLBACK(WRITE8(*this, vip_state, dma_w))
+ MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, vip_state, sc_w))
// video hardware
MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'521'280)/2)
- MCFG_CDP1861_IRQ_CALLBACK(WRITELINE(vip_state, vdc_int_w))
- MCFG_CDP1861_DMA_OUT_CALLBACK(WRITELINE(vip_state, vdc_dma_out_w))
- MCFG_CDP1861_EFX_CALLBACK(WRITELINE(vip_state, vdc_ef1_w))
+ MCFG_CDP1861_IRQ_CALLBACK(WRITELINE(*this, vip_state, vdc_int_w))
+ MCFG_CDP1861_DMA_OUT_CALLBACK(WRITELINE(*this, vip_state, vdc_dma_out_w))
+ MCFG_CDP1861_EFX_CALLBACK(WRITELINE(*this, vip_state, vdc_ef1_w))
MCFG_CDP1861_SCREEN_ADD(CDP1861_TAG, SCREEN_TAG, XTAL(3'521'280)/2)
MCFG_SCREEN_UPDATE_DRIVER(vip_state, screen_update)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(vip)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, nullptr, WRITELINE(vip_state, byteio_inst_w))
+ MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, nullptr, WRITELINE(*this, vip_state, byteio_inst_w))
MCFG_VIP_EXPANSION_SLOT_ADD(VIP_EXPANSION_SLOT_TAG, XTAL(3'521'280)/2, vip_expansion_cards, nullptr)
- MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vip_state, exp_int_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vip_state, exp_dma_out_w))
- MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(vip_state, exp_dma_in_w))
+ MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(*this, vip_state, exp_int_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(*this, vip_state, exp_dma_out_w))
+ MCFG_VIP_EXPANSION_SLOT_DMA_IN_CALLBACK(WRITELINE(*this, vip_state, exp_dma_in_w))
// devices
MCFG_QUICKLOAD_ADD("quickload", vip_state, vip, "bin,c8,c8x", 0)
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index dd66728ec56..147b7c7e8bb 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -2383,10 +2383,10 @@ void viper_state::machine_reset()
MACHINE_CONFIG_START(viper_state::viper)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MPC8240, 166666666) // Unknown
+ MCFG_DEVICE_ADD("maincpu", MPC8240, 166666666) // Unknown
MCFG_PPC_BUS_FREQUENCY(100000000)
- MCFG_CPU_PROGRAM_MAP(viper_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", viper_state, viper_vblank)
+ MCFG_DEVICE_PROGRAM_MAP(viper_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", viper_state, viper_vblank)
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, DEVICE_SELF, viper_state, mpc8240_pci_r, mpc8240_pci_w)
@@ -2398,8 +2398,8 @@ MACHINE_CONFIG_START(viper_state::viper)
MCFG_VOODOO_FBMEM(8)
MCFG_VOODOO_SCREEN_TAG("screen")
MCFG_VOODOO_CPU_TAG("maincpu")
- MCFG_VOODOO_VBLANK_CB(WRITELINE(viper_state,voodoo_vblank))
- MCFG_VOODOO_PCIINT_CB(WRITELINE(viper_state, voodoo_pciint))
+ MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, viper_state,voodoo_vblank))
+ MCFG_VOODOO_PCIINT_CB(WRITELINE(*this, viper_state, voodoo_pciint))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp
index 9ec7fad238a..8dd38ea6b9b 100644
--- a/src/mame/drivers/vis.cpp
+++ b/src/mame/drivers/vis.cpp
@@ -132,13 +132,13 @@ void vis_audio_device::device_timer(emu_timer &timer, device_timer_id id, int pa
MACHINE_CONFIG_START(vis_audio_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymf262", YMF262, XTAL(14'318'181))
+ MCFG_DEVICE_ADD("ymf262", YMF262, XTAL(14'318'181))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -886,11 +886,11 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vis_state::vis)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80286, XTAL(12'000'000) )
- MCFG_CPU_PROGRAM_MAP(at16_map)
- MCFG_CPU_IO_MAP(at16_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
- MCFG_80286_SHUTDOWN(DEVWRITELINE("mb", at_mb_device, shutdown))
+ MCFG_DEVICE_ADD("maincpu", I80286, XTAL(12'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(at16_map)
+ MCFG_DEVICE_IO_MAP(at16_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259_master", pic8259_device, inta_cb)
+ MCFG_80286_SHUTDOWN(WRITELINE("mb", at_mb_device, shutdown))
MCFG_DEVICE_ADD("mb", AT_MB, 0)
// this doesn't have a real keyboard controller
@@ -901,11 +901,12 @@ MACHINE_CONFIG_START(vis_state::vis)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_AT386)
MCFG_KBDC8042_SYSTEM_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_KBDC8042_GATE_A20_CB(INPUTLINE("maincpu", INPUT_LINE_A20))
- MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(DEVWRITELINE("mb:pic8259_master", pic8259_device, ir1_w))
+ MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE("mb:pic8259_master", pic8259_device, ir1_w))
- MCFG_ISA16_SLOT_ADD("mb:isabus", "mcd", pc_isa16_cards, "mcd", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus", "visaudio", vis_cards, "visaudio", true)
- MCFG_ISA16_SLOT_ADD("mb:isabus", "visvga", vis_cards, "visvga", true)
+ // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("mcd", ISA16_SLOT, 0, "mb:isabus", pc_isa16_cards, "mcd", true)
+ MCFG_DEVICE_ADD("visaudio", ISA16_SLOT, 0, "mb:isabus", vis_cards, "visaudio", true)
+ MCFG_DEVICE_ADD("visvga", ISA16_SLOT, 0, "mb:isabus", vis_cards, "visvga", true)
MACHINE_CONFIG_END
ROM_START(vis)
diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp
index 5289c6ce3dc..af59f0a00d3 100644
--- a/src/mame/drivers/vixen.cpp
+++ b/src/mame/drivers/vixen.cpp
@@ -743,11 +743,11 @@ void vixen_state::machine_reset()
MACHINE_CONFIG_START(vixen_state::vixen)
// basic machine hardware
- MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL(23'961'600)/6)
- MCFG_CPU_PROGRAM_MAP(vixen_mem)
- MCFG_CPU_OPCODES_MAP(bios_mem)
- MCFG_CPU_IO_MAP(vixen_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vixen_state,vixen_int_ack)
+ MCFG_DEVICE_ADD(Z8400A_TAG, Z80, XTAL(23'961'600)/6)
+ MCFG_DEVICE_PROGRAM_MAP(vixen_mem)
+ MCFG_DEVICE_OPCODES_MAP(bios_mem)
+ MCFG_DEVICE_IO_MAP(vixen_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vixen_state,vixen_int_ack)
// video hardware
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
@@ -760,42 +760,42 @@ MACHINE_CONFIG_START(vixen_state::vixen)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(vixen)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
// devices
MCFG_DEVICE_ADD(P8155H_TAG, I8155, XTAL(23'961'600)/6)
- MCFG_I8155_IN_PORTA_CB(READ8(vixen_state, i8155_pa_r))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(vixen_state, i8155_pb_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(vixen_state, i8155_pc_w))
+ MCFG_I8155_IN_PORTA_CB(READ8(*this, vixen_state, i8155_pa_r))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, i8155_pb_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, i8155_pc_w))
MCFG_DEVICE_ADD(P8155H_IO_TAG, I8155, XTAL(23'961'600)/6)
- MCFG_I8155_OUT_PORTA_CB(DEVWRITE8(IEEE488_TAG, ieee488_device, dio_w))
- MCFG_I8155_OUT_PORTB_CB(WRITE8(vixen_state, io_i8155_pb_w))
- MCFG_I8155_OUT_PORTC_CB(WRITE8(vixen_state, io_i8155_pc_w))
- MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(vixen_state, io_i8155_to_w))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(IEEE488_TAG, ieee488_device, dio_w))
+ MCFG_I8155_OUT_PORTB_CB(WRITE8(*this, vixen_state, io_i8155_pb_w))
+ MCFG_I8155_OUT_PORTC_CB(WRITE8(*this, vixen_state, io_i8155_pc_w))
+ MCFG_I8155_OUT_TIMEROUT_CB(WRITELINE(*this, vixen_state, io_i8155_to_w))
MCFG_DEVICE_ADD(P8251A_TAG, I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(vixen_state, rxrdy_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(vixen_state, txrdy_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, vixen_state, rxrdy_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, vixen_state, txrdy_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(P8251A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(P8251A_TAG, i8251_device, write_dsr))
MCFG_FD1797_ADD(FDC1797_TAG, XTAL(23'961'600)/24)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(vixen_state, fdc_intrq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, vixen_state, fdc_intrq_w))
MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":1", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(vixen_state, srq_w))
- MCFG_IEEE488_ATN_CALLBACK(WRITELINE(vixen_state, atn_w))
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(*this, vixen_state, srq_w))
+ MCFG_IEEE488_ATN_CALLBACK(WRITELINE(*this, vixen_state, atn_w))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("disk_list", "vixen")
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index ee95c27928f..1ac53cfedd8 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -1039,9 +1039,9 @@ MC6845_UPDATE_ROW( vk100_state::crtc_update_row )
MACHINE_CONFIG_START(vk100_state::vk100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(5'068'800))
- MCFG_CPU_PROGRAM_MAP(vk100_mem)
- MCFG_CPU_IO_MAP(vk100_io)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(5'068'800))
+ MCFG_DEVICE_PROGRAM_MAP(vk100_mem)
+ MCFG_DEVICE_IO_MAP(vk100_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1052,28 +1052,28 @@ MACHINE_CONFIG_START(vk100_state::vk100)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(12)
MCFG_MC6845_UPDATE_ROW_CB(vk100_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(vk100_state, crtc_vsync))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, vk100_state, crtc_vsync))
/* i8251 uart */
MCFG_DEVICE_ADD("i8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(vk100_state, i8251_rxrdy_int))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(vk100_state, i8251_txrdy_int))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, vk100_state, i8251_rxrdy_int))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, vk100_state, i8251_txrdy_int))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("i8251", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("i8251", i8251_device, write_dsr))
MCFG_DEVICE_ADD(COM5016T_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("i8251", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("i8251", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("i8251", i8251_device, write_txc))
MCFG_DEFAULT_LAYOUT( layout_vk100 )
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 116 ) // 116 hz (page 172 of TM), but duty cycle is wrong here!
+ MCFG_DEVICE_ADD( "beeper", BEEP, 116 ) // 116 hz (page 172 of TM), but duty cycle is wrong here!
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.25 )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index 576c038471e..d428cc2f2c7 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -583,8 +583,8 @@ MACHINE_START_MEMBER(nevada_state, nevada)
MACHINE_CONFIG_START(nevada_state::nevada)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CPU)
- MCFG_CPU_PROGRAM_MAP(nevada_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CPU)
+ MCFG_DEVICE_PROGRAM_MAP(nevada_map)
MCFG_WATCHDOG_ADD("watchdog")
MCFG_WATCHDOG_TIME_INIT(attotime::from_msec(150)) /* 150ms Ds1232 TD to Ground */
@@ -613,7 +613,7 @@ MACHINE_CONFIG_START(nevada_state::nevada)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, SOUND_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8912, SOUND_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_DEVICE_ADD("duart18", MC68681, XTAL(3'686'400)) // UARTA = Modem 1200Baud
@@ -626,10 +626,10 @@ MACHINE_CONFIG_START(nevada_state::nevada)
MCFG_DEVICE_ADD("duart40", MC68681, XTAL(3'686'400)) // UARTA = Touch , UARTB = Bill Acceptor
MCFG_MC68681_IRQ_CALLBACK(INPUTLINE("maincpu", M68K_IRQ_5))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("microtouch", microtouch_device, rx))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("microtouch", microtouch_device, rx))
MCFG_MC68681_INPORT_CALLBACK(IOPORT("DSW3"))
- MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("duart40", mc68681_device, rx_a_w) )
+ MCFG_MICROTOUCH_ADD( "microtouch", 9600, WRITELINE("duart40", mc68681_device, rx_a_w) )
/* devices */
MCFG_DEVICE_ADD("rtc", MSM6242, XTAL(32'768))
diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp
index 63c0fca03ce..5bcbc0bfe33 100644
--- a/src/mame/drivers/volfied.cpp
+++ b/src/mame/drivers/volfied.cpp
@@ -242,19 +242,19 @@ TIMER_DEVICE_CALLBACK_MEMBER(volfied_state::cchip_irq_clear_cb)
MACHINE_CONFIG_START(volfied_state::volfied)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", volfied_state, interrupt)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", volfied_state, interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 4MHz sound CPU, required to run the game */
- MCFG_CPU_PROGRAM_MAP(z80_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 4MHz sound CPU, required to run the game */
+ MCFG_DEVICE_PROGRAM_MAP(z80_map)
MCFG_TAITO_CCHIP_ADD("cchip", XTAL(20'000'000)/2) /* 20MHz OSC next to C-Chip */
MCFG_CCHIP_IN_PORTA_CB(IOPORT("F00007"))
MCFG_CCHIP_IN_PORTB_CB(IOPORT("F00009"))
MCFG_CCHIP_IN_PORTC_CB(IOPORT("F0000B"))
MCFG_CCHIP_IN_PORTAD_CB(IOPORT("F0000D"))
- MCFG_CCHIP_OUT_PORTB_CB(WRITE8(volfied_state, counters_w))
+ MCFG_CCHIP_OUT_PORTB_CB(WRITE8(*this, volfied_state, counters_w))
MCFG_QUANTUM_TIME(attotime::from_hz(1200))
@@ -280,7 +280,7 @@ MACHINE_CONFIG_START(volfied_state::volfied)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2203, 4000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2203, 4000000)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index afab1535aa0..872c369ed15 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -243,19 +243,19 @@ void votrpss_state::kbd_put(u8 data)
MACHINE_CONFIG_START(votrpss_state::votrpss)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4.000 MHz, verified */
- MCFG_CPU_PROGRAM_MAP(votrpss_mem)
- MCFG_CPU_IO_MAP(votrpss_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(votrpss_state,irq_ack)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)/2) /* 4.000 MHz, verified */
+ MCFG_DEVICE_PROGRAM_MAP(votrpss_mem)
+ MCFG_DEVICE_IO_MAP(votrpss_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(votrpss_state,irq_ack)
/* video hardware */
//MCFG_DEFAULT_LAYOUT(layout_votrpss)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ay", AY8910, XTAL(8'000'000)/4) /* 2.000 MHz, verified */
+ MCFG_DEVICE_ADD("ay", AY8910, XTAL(8'000'000)/4) /* 2.000 MHz, verified */
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW1")) // port B read
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("votrax", votrax_sc01_device, write)) // port A write
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8("votrax", votrax_sc01_device, write)) // port A write
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("votrax", VOTRAX_SC01, 720000) /* 720 kHz? needs verify */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -265,30 +265,30 @@ MACHINE_CONFIG_START(votrpss_state::votrpss)
MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(votrpss_state, kbd_put))
MCFG_DEVICE_ADD("uart", I8251, 0)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
// when serial is chosen, and you select terminal, nothing shows (by design). You can only type commands in.
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart", i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart", i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart", i8251_device, write_cts))
MCFG_DEVICE_ADD("pit", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(8'000'000)) /* Timer 0: baud rate gen for 8251 */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("uart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("uart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("uart", i8251_device, write_rxc))
MCFG_PIT8253_CLK1(XTAL(8'000'000) / 256) /* Timer 1: Pitch */
MCFG_PIT8253_CLK2(XTAL(8'000'000) / 4096) /* Timer 2: Volume */
MCFG_DEVICE_ADD("ppi", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(votrpss_state, ppi_pa_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(votrpss_state, ppi_pa_w))
- MCFG_I8255_IN_PORTB_CB(READ8(votrpss_state, ppi_pb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(votrpss_state, ppi_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(votrpss_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(votrpss_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, votrpss_state, ppi_pa_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, votrpss_state, ppi_pa_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, votrpss_state, ppi_pb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, votrpss_state, ppi_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, votrpss_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, votrpss_state, ppi_pc_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_timer", votrpss_state, irq_timer, attotime::from_msec(10))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp
index fc091edc8e4..0af59a2ea52 100644
--- a/src/mame/drivers/votrtnt.cpp
+++ b/src/mame/drivers/votrtnt.cpp
@@ -137,8 +137,8 @@ MACHINE_RESET_MEMBER( votrtnt_state, votrtnt )
MACHINE_CONFIG_START(votrtnt_state::votrtnt)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6802, XTAL(2'457'600)) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/
- MCFG_CPU_PROGRAM_MAP(_6802_mem)
+ MCFG_DEVICE_ADD("maincpu", M6802, XTAL(2'457'600)) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/
+ MCFG_DEVICE_PROGRAM_MAP(_6802_mem)
MCFG_MACHINE_RESET_OVERRIDE(votrtnt_state, votrtnt)
@@ -147,16 +147,16 @@ MACHINE_CONFIG_START(votrtnt_state::votrtnt)
/* serial hardware */
MCFG_DEVICE_ADD("acia", ACIA6850, 0)
- MCFG_ACIA6850_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_ACIA6850_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_ACIA6850_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_ACIA6850_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("acia", acia6850_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("acia", acia6850_device, write_cts))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("acia", acia6850_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("acia", acia6850_device, write_cts))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("acia", acia6850_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("acia", acia6850_device, write_rxc))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("acia", acia6850_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("acia", acia6850_device, write_rxc))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp
index 21423bfc76b..6eb8137131f 100644
--- a/src/mame/drivers/voyager.cpp
+++ b/src/mame/drivers/voyager.cpp
@@ -500,15 +500,15 @@ void voyager_state::machine_reset()
}
MACHINE_CONFIG_START(voyager_state::voyager)
- MCFG_CPU_ADD("maincpu", PENTIUM3, 133000000) // actually AMD Duron CPU of unknown clock
- MCFG_CPU_PROGRAM_MAP(voyager_map)
- MCFG_CPU_IO_MAP(voyager_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 133000000) // actually AMD Duron CPU of unknown clock
+ MCFG_DEVICE_PROGRAM_MAP(voyager_map)
+ MCFG_DEVICE_IO_MAP(voyager_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir6_w))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
MCFG_PCI_BUS_LEGACY_DEVICE(0, DEVICE_SELF, voyager_state, intel82439tx_pci_r, intel82439tx_pci_w)
diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp
index 919ebff2591..08a6b1f776a 100644
--- a/src/mame/drivers/vp101.cpp
+++ b/src/mame/drivers/vp101.cpp
@@ -368,10 +368,10 @@ static INPUT_PORTS_START( vp50 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vp10x_state::vp101)
- MCFG_CPU_ADD("maincpu", VR5500LE, 400000000)
+ MCFG_DEVICE_ADD("maincpu", VR5500LE, 400000000)
MCFG_MIPS3_DCACHE_SIZE(32768)
MCFG_MIPS3_SYSTEM_CLOCK(100000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -381,16 +381,16 @@ MACHINE_CONFIG_START(vp10x_state::vp101)
MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239)
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, false)
- MCFG_ATA_INTERFACE_DMARQ_HANDLER(WRITELINE(vp10x_state, dmarq_w))
+ MCFG_ATA_INTERFACE_DMARQ_HANDLER(WRITELINE(*this, vp10x_state, dmarq_w))
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vp10x_state::vp50)
- MCFG_CPU_ADD("maincpu", TX4925LE, 200000000)
+ MCFG_DEVICE_ADD("maincpu", TX4925LE, 200000000)
MCFG_MIPS3_DCACHE_SIZE(32768)
MCFG_MIPS3_SYSTEM_CLOCK(100000000)
- MCFG_CPU_PROGRAM_MAP(vp50_map)
+ MCFG_DEVICE_PROGRAM_MAP(vp50_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/vp122.cpp b/src/mame/drivers/vp122.cpp
index 20c7884ff36..95cd57a5172 100644
--- a/src/mame/drivers/vp122.cpp
+++ b/src/mame/drivers/vp122.cpp
@@ -71,9 +71,9 @@ static INPUT_PORTS_START( vp122 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vp122_state::vp122)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_NVRAM_ADD_0FILL("nvram") // MK48Z02
diff --git a/src/mame/drivers/vp415.cpp b/src/mame/drivers/vp415.cpp
index e05eb68c0ba..dba88b8111d 100644
--- a/src/mame/drivers/vp415.cpp
+++ b/src/mame/drivers/vp415.cpp
@@ -491,57 +491,57 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vp415_state::vp415)
// Module W: CPU Datagrabber
- MCFG_CPU_ADD(DATACPU_TAG, Z80, XTAL(8'000'000)/2) // 8MHz through a /2 flip-flop divider, per schematic
- MCFG_CPU_PROGRAM_MAP(z80_program_map)
- MCFG_CPU_IO_MAP(z80_io_map)
+ MCFG_DEVICE_ADD(DATACPU_TAG, Z80, XTAL(8'000'000)/2) // 8MHz through a /2 flip-flop divider, per schematic
+ MCFG_DEVICE_PROGRAM_MAP(z80_program_map)
+ MCFG_DEVICE_IO_MAP(z80_io_map)
- MCFG_CPU_ADD(DATAMCU_TAG, I8041, XTAL(4'000'000)) // Verified on schematic
- MCFG_MCS48_PORT_P1_IN_CB(READ8(vp415_state, data_mcu_port1_r));
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(vp415_state, data_mcu_port1_w));
- MCFG_MCS48_PORT_P2_IN_CB(READ8(vp415_state, data_mcu_port2_r));
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(vp415_state, data_mcu_port2_w));
- MCFG_CPU_PROGRAM_MAP(datamcu_program_map)
+ MCFG_DEVICE_ADD(DATAMCU_TAG, I8041, XTAL(4'000'000)) // Verified on schematic
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, vp415_state, data_mcu_port1_r));
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, vp415_state, data_mcu_port1_w));
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, vp415_state, data_mcu_port2_r));
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, vp415_state, data_mcu_port2_w));
+ MCFG_DEVICE_PROGRAM_MAP(datamcu_program_map)
MCFG_DEVICE_ADD(SCSI_TAG, NCR5385, XTAL(8'000'000)/2) // Same clock signal as above, per schematic
- MCFG_NCR5385_INT_CB(WRITELINE(vp415_state, cpu_int1_w))
+ MCFG_NCR5385_INT_CB(WRITELINE(*this, vp415_state, cpu_int1_w))
// Module S: Control
- MCFG_CPU_ADD(CTRLCPU_TAG, I8031, XTAL(11'059'200)) // 11.059MHz, per schematic
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(vp415_state, ctrl_cpu_port1_w));
- MCFG_MCS51_PORT_P1_IN_CB(READ8(vp415_state, ctrl_cpu_port1_r));
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(vp415_state, ctrl_cpu_port3_w));
- MCFG_MCS51_PORT_P3_IN_CB(READ8(vp415_state, ctrl_cpu_port3_r));
- MCFG_CPU_PROGRAM_MAP(ctrl_program_map)
- MCFG_CPU_IO_MAP(ctrl_io_map)
-
- MCFG_CPU_ADD(CTRLMCU_TAG, I8041, XTAL(4'000'000)) // Verified on schematic
- MCFG_MCS48_PORT_P1_IN_CB(READ8(vp415_state, ctrl_mcu_port1_r));
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(vp415_state, ctrl_mcu_port1_w));
- MCFG_MCS48_PORT_P2_IN_CB(READ8(vp415_state, ctrl_mcu_port2_r));
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(vp415_state, ctrl_mcu_port2_w));
- MCFG_CPU_PROGRAM_MAP(ctrlmcu_program_map)
+ MCFG_DEVICE_ADD(CTRLCPU_TAG, I8031, XTAL(11'059'200)) // 11.059MHz, per schematic
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, vp415_state, ctrl_cpu_port1_w));
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, vp415_state, ctrl_cpu_port1_r));
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, vp415_state, ctrl_cpu_port3_w));
+ MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, vp415_state, ctrl_cpu_port3_r));
+ MCFG_DEVICE_PROGRAM_MAP(ctrl_program_map)
+ MCFG_DEVICE_IO_MAP(ctrl_io_map)
+
+ MCFG_DEVICE_ADD(CTRLMCU_TAG, I8041, XTAL(4'000'000)) // Verified on schematic
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, vp415_state, ctrl_mcu_port1_r));
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, vp415_state, ctrl_mcu_port1_w));
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, vp415_state, ctrl_mcu_port2_r));
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, vp415_state, ctrl_mcu_port2_w));
+ MCFG_DEVICE_PROGRAM_MAP(ctrlmcu_program_map)
// Module R: Drive
- MCFG_CPU_ADD(DRIVECPU_TAG, I8031, XTAL(12'000'000)) // 12MHz, per schematic
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(vp415_state, drive_cpu_port1_w));
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(vp415_state, drive_cpu_port3_w));
- MCFG_CPU_PROGRAM_MAP(drive_program_map)
- MCFG_CPU_IO_MAP(drive_io_map)
+ MCFG_DEVICE_ADD(DRIVECPU_TAG, I8031, XTAL(12'000'000)) // 12MHz, per schematic
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, vp415_state, drive_cpu_port1_w));
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, vp415_state, drive_cpu_port3_w));
+ MCFG_DEVICE_PROGRAM_MAP(drive_program_map)
+ MCFG_DEVICE_IO_MAP(drive_io_map)
MCFG_DEVICE_ADD(I8155_TAG, I8155, 0)
- MCFG_I8155_OUT_PORTA_CB(DEVWRITE8(CHARGEN_TAG, mb88303_device, da_w))
- MCFG_I8155_IN_PORTB_CB(READ8(vp415_state, drive_i8155_pb_r))
- MCFG_I8155_IN_PORTC_CB(READ8(vp415_state, drive_i8155_pc_r))
+ MCFG_I8155_OUT_PORTA_CB(WRITE8(CHARGEN_TAG, mb88303_device, da_w))
+ MCFG_I8155_IN_PORTB_CB(READ8(*this, vp415_state, drive_i8155_pb_r))
+ MCFG_I8155_IN_PORTC_CB(READ8(*this, vp415_state, drive_i8155_pc_r))
MCFG_DEVICE_ADD(I8255_TAG, I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(vp415_state, drive_i8255_pa_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(vp415_state, drive_i8255_pb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(vp415_state, drive_i8255_pc_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, vp415_state, drive_i8255_pa_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, vp415_state, drive_i8255_pb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, vp415_state, drive_i8255_pc_r))
MCFG_DEVICE_ADD(CHARGEN_TAG, MB88303, 0)
MCFG_DEVICE_ADD(SYNCGEN_TAG, SAA1043, XTAL(5'000'000))
- MCFG_SAA1043_V2_CALLBACK(WRITELINE(vp415_state, refv_w))
+ MCFG_SAA1043_V2_CALLBACK(WRITELINE(*this, vp415_state, refv_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
diff --git a/src/mame/drivers/vp60.cpp b/src/mame/drivers/vp60.cpp
index 14345928c55..7f904b5f7b6 100644
--- a/src/mame/drivers/vp60.cpp
+++ b/src/mame/drivers/vp60.cpp
@@ -58,16 +58,16 @@ static INPUT_PORTS_START( vp60 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vp60_state::vp60)
- MCFG_CPU_ADD("maincpu", I8051, XTAL(10'920'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8051, XTAL(10'920'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(25'920'000), 1350, 0, 1056, 320, 0, 300) // dimensions guessed
MCFG_SCREEN_UPDATE_DRIVER(vp60_state, screen_update)
- MCFG_CPU_ADD("kbdcpu", I8035, XTAL(3'579'545)) // 48-300-010 XTAL
- MCFG_CPU_PROGRAM_MAP(kbd_map)
+ MCFG_DEVICE_ADD("kbdcpu", I8035, XTAL(3'579'545)) // 48-300-010 XTAL
+ MCFG_DEVICE_PROGRAM_MAP(kbd_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp
index 938bca83805..04deea8e314 100644
--- a/src/mame/drivers/vpoker.cpp
+++ b/src/mame/drivers/vpoker.cpp
@@ -633,9 +633,9 @@ WRITE_LINE_MEMBER(vpoker_state::ptm_irq)
MACHINE_CONFIG_START(vpoker_state::vpoker)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M6809,XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vpoker_state, irq0_line_hold) //irq0 valid too
+ MCFG_DEVICE_ADD("maincpu",M6809,XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vpoker_state, irq0_line_hold) //irq0 valid too
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -654,11 +654,11 @@ MACHINE_CONFIG_START(vpoker_state::vpoker)
/* 6840 PTM */
MCFG_DEVICE_ADD("6840ptm", PTM6840, XTAL(4'000'000))
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_IRQ_CB(WRITELINE(vpoker_state, ptm_irq))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, vpoker_state, ptm_irq))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */)
+// MCFG_DEVICE_ADD("aysnd", AY8910, 8000000/4 /* guess */)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp
index e045df879ee..f7beb50b3de 100644
--- a/src/mame/drivers/vroulet.cpp
+++ b/src/mame/drivers/vroulet.cpp
@@ -278,10 +278,10 @@ WRITE8_MEMBER(vroulet_state::ppi8255_c_w){}
MACHINE_CONFIG_START(vroulet_state::vroulet)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 4000000) //???
- MCFG_CPU_PROGRAM_MAP(vroulet_map)
- MCFG_CPU_IO_MAP(vroulet_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vroulet_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4000000) //???
+ MCFG_DEVICE_PROGRAM_MAP(vroulet_map)
+ MCFG_DEVICE_IO_MAP(vroulet_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vroulet_state, irq0_line_hold)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -291,9 +291,9 @@ MACHINE_CONFIG_START(vroulet_state::vroulet)
MCFG_I8255_IN_PORTC_CB(IOPORT("IN2"))
MCFG_DEVICE_ADD("ppi8255_1", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(vroulet_state, ppi8255_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(vroulet_state, ppi8255_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(vroulet_state, ppi8255_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, vroulet_state, ppi8255_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, vroulet_state, ppi8255_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, vroulet_state, ppi8255_c_w))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -310,7 +310,7 @@ MACHINE_CONFIG_START(vroulet_state::vroulet)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_DEVICE_ADD("aysnd", AY8910, 2000000)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSWA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSWB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/vsmilepro.cpp b/src/mame/drivers/vsmilepro.cpp
index 1e7e39e50d0..955330390d9 100644
--- a/src/mame/drivers/vsmilepro.cpp
+++ b/src/mame/drivers/vsmilepro.cpp
@@ -52,8 +52,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vsmilpro_state::vsmilpro)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", ARM9, 150000000)
- MCFG_CPU_PROGRAM_MAP(vsmilpro_map)
+ MCFG_DEVICE_ADD("maincpu", ARM9, 150000000)
+ MCFG_DEVICE_PROGRAM_MAP(vsmilpro_map)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("vsmile_vdisk")
diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp
index 344df496a26..ad9930584fa 100644
--- a/src/mame/drivers/vsnes.cpp
+++ b/src/mame/drivers/vsnes.cpp
@@ -1703,8 +1703,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vsnes_state::vsnes)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(vsnes_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu1_map)
/* some carts also trigger IRQs */
MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsnes)
MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsnes)
@@ -1774,11 +1774,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vsnes_state::vsdual)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(vsnes_cpu1_map)
+ MCFG_DEVICE_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu1_map)
- MCFG_CPU_ADD("sub", N2A03, NTSC_APU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(vsnes_cpu2_map)
+ MCFG_DEVICE_ADD("sub", N2A03, NTSC_APU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu2_map)
MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsdual)
MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsdual)
@@ -1833,16 +1833,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vsnes_state::vsnes_bootleg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502,XTAL(16'000'000)/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere?
- MCFG_CPU_PROGRAM_MAP(vsnes_cpu1_bootleg_map)
+ MCFG_DEVICE_ADD("maincpu", M6502,XTAL(16'000'000)/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere?
+ MCFG_DEVICE_PROGRAM_MAP(vsnes_cpu1_bootleg_map)
/* some carts also trigger IRQs */
MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsnes)
MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsnes)
- MCFG_CPU_ADD("sub", Z80,XTAL(16'000'000)/4) /* ? MHz */ // Z8400APS-Z80CPU
- MCFG_CPU_PROGRAM_MAP(vsnes_bootleg_z80_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen1", vsnes_state, irq0_line_hold)
-// MCFG_CPU_PERIODIC_INT_DRIVER(vsnes_state, nmi_line_pulse)
+ MCFG_DEVICE_ADD("sub", Z80,XTAL(16'000'000)/4) /* ? MHz */ // Z8400APS-Z80CPU
+ MCFG_DEVICE_PROGRAM_MAP(vsnes_bootleg_z80_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen1", vsnes_state, irq0_line_hold)
+// MCFG_DEVICE_PERIODIC_INT_DRIVER(vsnes_state, nmi_line_pulse)
/* video hardware */
MCFG_SCREEN_ADD("screen1", RASTER)
@@ -1867,13 +1867,13 @@ MACHINE_CONFIG_START(vsnes_state::vsnes_bootleg)
MCFG_SPEAKER_STANDARD_MONO("mono")
// PCB has 2, code accesses 3? which 2 really exist?
- MCFG_SOUND_ADD("sn1", SN76489, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("sn1", SN76489, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn2", SN76489, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("sn2", SN76489, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_SOUND_ADD("sn3", SN76489, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("sn3", SN76489, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index 2310965b4bb..b76c52882db 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -322,10 +322,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(vt100_state::vt100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, XTAL(24'883'200) / 9)
- MCFG_CPU_PROGRAM_MAP(vt100_mem)
- MCFG_CPU_IO_MAP(vt100_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("rstbuf", rst_pos_buffer_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", I8080, XTAL(24'883'200) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(vt100_mem)
+ MCFG_DEVICE_IO_MAP(vt100_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("rstbuf", rst_pos_buffer_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -342,32 +342,32 @@ MACHINE_CONFIG_START(vt100_state::vt100)
MCFG_DEVICE_ADD("vt100_video", VT100_VIDEO, XTAL(24'073'400))
MCFG_VT_SET_SCREEN("screen")
MCFG_VT_CHARGEN("chargen")
- MCFG_VT_VIDEO_RAM_CALLBACK(READ8(vt100_state, video_ram_r))
- MCFG_VT_VIDEO_VERT_FREQ_INTR_CALLBACK(DEVWRITELINE("rstbuf", rst_pos_buffer_device, rst4_w))
- MCFG_VT_VIDEO_LBA3_LBA4_CALLBACK(WRITE8(vt100_state, uart_clock_w))
- MCFG_VT_VIDEO_LBA7_CALLBACK(DEVWRITELINE("nvr", er1400_device, clock_w))
+ MCFG_VT_VIDEO_RAM_CALLBACK(READ8(*this, vt100_state, video_ram_r))
+ MCFG_VT_VIDEO_VERT_FREQ_INTR_CALLBACK(WRITELINE("rstbuf", rst_pos_buffer_device, rst4_w))
+ MCFG_VT_VIDEO_LBA3_LBA4_CALLBACK(WRITE8(*this, vt100_state, uart_clock_w))
+ MCFG_VT_VIDEO_LBA7_CALLBACK(WRITELINE("nvr", er1400_device, clock_w))
MCFG_DEVICE_ADD("pusart", I8251, XTAL(24'883'200) / 9)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("rstbuf", rst_pos_buffer_device, rst2_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("rstbuf", rst_pos_buffer_device, rst2_w))
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("pusart", i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("pusart", i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("pusart", i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("pusart", i8251_device, write_dsr))
MCFG_DEVICE_ADD("dbrg", COM5016_013, XTAL(24'883'200) / 9) // COM5016T-013 (or WD1943CD-02), 2.7648Mhz Clock
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("pusart", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("pusart", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("pusart", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("pusart", i8251_device, write_txc))
MCFG_DEVICE_ADD("nvr", ER1400, 0)
MCFG_DEVICE_ADD("keyboard", VT100_KEYBOARD, 0)
- MCFG_VT100_KEYBOARD_SIGNAL_OUT_CALLBACK(DEVWRITELINE("kbduart", ay31015_device, write_si))
+ MCFG_VT100_KEYBOARD_SIGNAL_OUT_CALLBACK(WRITELINE("kbduart", ay31015_device, write_si))
MCFG_DEVICE_ADD("kbduart", AY31015, 0)
- MCFG_AY31015_WRITE_DAV_CB(DEVWRITELINE("rstbuf", rst_pos_buffer_device, rst1_w))
+ MCFG_AY31015_WRITE_DAV_CB(WRITELINE("rstbuf", rst_pos_buffer_device, rst1_w))
MCFG_AY31015_AUTO_RDAV(true)
MCFG_DEVICE_ADD("rstbuf", RST_POS_BUFFER, 0)
@@ -393,21 +393,21 @@ void vt100_state::stp_io(address_map &map)
MACHINE_CONFIG_START(vt100_state::vt100ac)
vt100(config);
- MCFG_CPU_ADD("stpcpu", I8085A, 4915200)
- MCFG_CPU_PROGRAM_MAP(stp_mem)
- MCFG_CPU_IO_MAP(stp_io)
+ MCFG_DEVICE_ADD("stpcpu", I8085A, 4915200)
+ MCFG_DEVICE_PROGRAM_MAP(stp_mem)
+ MCFG_DEVICE_IO_MAP(stp_io)
MCFG_DEVICE_ADD("stpusart0", I8251, 2457600)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("stprxint", input_merger_device, in_w<0>))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("stptxint", input_merger_device, in_w<0>))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("stprxint", input_merger_device, in_w<0>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("stptxint", input_merger_device, in_w<0>))
MCFG_DEVICE_ADD("stpusart1", I8251, 2457600)
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("stprxint", input_merger_device, in_w<1>))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("stptxint", input_merger_device, in_w<1>))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("stprxint", input_merger_device, in_w<1>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("stptxint", input_merger_device, in_w<1>))
MCFG_DEVICE_ADD("stpusart2", I8251, 2457600) // for printer?
- MCFG_I8251_RXRDY_HANDLER(DEVWRITELINE("stprxint", input_merger_device, in_w<2>))
- MCFG_I8251_TXRDY_HANDLER(DEVWRITELINE("stptxint", input_merger_device, in_w<2>))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE("stprxint", input_merger_device, in_w<2>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE("stptxint", input_merger_device, in_w<2>))
MCFG_INPUT_MERGER_ANY_HIGH("stptxint")
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("stpcpu", I8085_RST55_LINE))
@@ -416,37 +416,37 @@ MACHINE_CONFIG_START(vt100_state::vt100ac)
MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("stpcpu", I8085_RST65_LINE))
MCFG_DEVICE_MODIFY("dbrg")
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("pusart", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("stpusart0", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("stpusart1", i8251_device, write_rxc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("stpusart2", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("pusart", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("stpusart0", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("stpusart1", i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("stpusart2", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("pusart", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("stpusart0", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("stpusart1", i8251_device, write_rxc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("stpusart2", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("pusart", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("stpusart0", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("stpusart1", i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("stpusart2", i8251_device, write_txc))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vt100_state::vt180)
vt100(config);
- MCFG_CPU_ADD("z80cpu", Z80, XTAL(24'883'200) / 9)
- MCFG_CPU_PROGRAM_MAP(vt180_mem)
- MCFG_CPU_IO_MAP(vt180_io)
+ MCFG_DEVICE_ADD("z80cpu", Z80, XTAL(24'883'200) / 9)
+ MCFG_DEVICE_PROGRAM_MAP(vt180_mem)
+ MCFG_DEVICE_IO_MAP(vt180_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vt100_state::vt101)
vt100(config);
- MCFG_CPU_REPLACE("maincpu", I8085A, XTAL(24'073'400) / 4)
- MCFG_CPU_PROGRAM_MAP(vt100_mem)
- MCFG_CPU_IO_MAP(vt100_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(vt100_state, vt102_irq_callback)
+ MCFG_DEVICE_REPLACE("maincpu", I8085A, XTAL(24'073'400) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(vt100_mem)
+ MCFG_DEVICE_IO_MAP(vt100_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vt100_state, vt102_irq_callback)
MCFG_DEVICE_MODIFY("pusart")
MCFG_DEVICE_CLOCK(XTAL(24'073'400) / 8)
MCFG_I8251_TXRDY_HANDLER(INPUTLINE("maincpu", I8085_RST55_LINE)) // 8085 pin 9, mislabeled RST 7.5 on schematics
MCFG_DEVICE_REPLACE("dbrg", COM8116_003, XTAL(24'073'400) / 4)
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE("pusart", i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE("pusart", i8251_device, write_txc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE("pusart", i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE("pusart", i8251_device, write_txc))
MCFG_DEVICE_MODIFY("kbduart")
MCFG_AY31015_WRITE_TBMT_CB(INPUTLINE("maincpu", I8085_RST65_LINE))
@@ -454,16 +454,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vt100_state::vt102)
vt101(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(vt102_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(vt102_io)
MCFG_DEVICE_ADD("printuart", INS8250, XTAL(24'073'400) / 16)
- MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("printer", rs232_port_device, write_txd))
+ MCFG_INS8250_OUT_TX_CB(WRITELINE("printer", rs232_port_device, write_txd))
MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", I8085_RST75_LINE)) // 8085 pin 7, mislabeled RST 5.5 on schematics
- MCFG_RS232_PORT_ADD("printer", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("printuart", ins8250_device, rx_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("printuart", ins8250_device, dsr_w))
+ MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("printuart", ins8250_device, rx_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("printuart", ins8250_device, dsr_w))
MACHINE_CONFIG_END
/* VT1xx models:
diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp
index ad747814797..4151059211e 100644
--- a/src/mame/drivers/vt220.cpp
+++ b/src/mame/drivers/vt220.cpp
@@ -106,9 +106,9 @@ uint32_t vt220_state::screen_update_vt220(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vt220_state::vt220)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, XTAL(11'059'200)) // from schematic for earlier version
- MCFG_CPU_PROGRAM_MAP(vt220_mem)
- MCFG_CPU_IO_MAP(vt220_io)
+ MCFG_DEVICE_ADD("maincpu", I8051, XTAL(11'059'200)) // from schematic for earlier version
+ MCFG_DEVICE_PROGRAM_MAP(vt220_mem)
+ MCFG_DEVICE_IO_MAP(vt220_io)
MCFG_MCS51_PORT_P1_IN_CB(NOOP) // ???
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(3'686'400))
@@ -132,9 +132,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vt220_state::vt220a)
vt220(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(vt220a_mem)
- MCFG_CPU_IO_MAP(vt220a_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(vt220a_mem)
+ MCFG_DEVICE_IO_MAP(vt220a_io)
MACHINE_CONFIG_END
/* ROM definitions */
diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp
index d576850a41c..b5b72927fed 100644
--- a/src/mame/drivers/vt240.cpp
+++ b/src/mame/drivers/vt240.cpp
@@ -651,16 +651,16 @@ static INPUT_PORTS_START( vt240 )
INPUT_PORTS_END
MACHINE_CONFIG_START(vt240_state::vt240)
- MCFG_CPU_ADD("maincpu", T11, XTAL(7'372'800)) // confirm
- MCFG_CPU_PROGRAM_MAP(vt240_mem)
+ MCFG_DEVICE_ADD("maincpu", T11, XTAL(7'372'800)) // confirm
+ MCFG_DEVICE_PROGRAM_MAP(vt240_mem)
MCFG_T11_INITIAL_MODE(5 << 13)
- MCFG_T11_RESET(WRITELINE(vt240_state, t11_reset_w))
+ MCFG_T11_RESET(WRITELINE(*this, vt240_state, t11_reset_w))
- MCFG_CPU_ADD("charcpu", I8085A, XTAL(16'097'280) / 2)
- MCFG_CPU_PROGRAM_MAP(vt240_char_mem)
- MCFG_CPU_IO_MAP(vt240_char_io)
- MCFG_I8085A_SOD(WRITELINE(vt240_state, i8085_rdy_w))
- MCFG_I8085A_SID(READLINE(vt240_state, i8085_sid_r))
+ MCFG_DEVICE_ADD("charcpu", I8085A, XTAL(16'097'280) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(vt240_char_mem)
+ MCFG_DEVICE_IO_MAP(vt240_char_io)
+ MCFG_I8085A_SOD(WRITELINE(*this, vt240_state, i8085_rdy_w))
+ MCFG_I8085A_SID(READLINE(*this, vt240_state, i8085_sid_r))
MCFG_DEVICE_ADD("bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(bank_map)
@@ -683,31 +683,31 @@ MACHINE_CONFIG_START(vt240_state::vt240)
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEVICE_ADD("duart", SCN2681, XTAL(7'372'800) / 2)
- MCFG_MC68681_IRQ_CALLBACK(WRITELINE(vt240_state, irq13_w))
- MCFG_MC68681_A_TX_CALLBACK(DEVWRITELINE("host", rs232_port_device, write_txd))
- MCFG_MC68681_B_TX_CALLBACK(DEVWRITELINE("printer", rs232_port_device, write_txd))
- MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(vt240_state, duartout_w))
+ MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, vt240_state, irq13_w))
+ MCFG_MC68681_A_TX_CALLBACK(WRITELINE("host", rs232_port_device, write_txd))
+ MCFG_MC68681_B_TX_CALLBACK(WRITELINE("printer", rs232_port_device, write_txd))
+ MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(*this, vt240_state, duartout_w))
MCFG_DEVICE_ADD("i8251", I8251, 0)
- MCFG_I8251_TXD_HANDLER(WRITELINE(vt240_state, tx_w))
- MCFG_I8251_DTR_HANDLER(WRITELINE(vt240_state, lben_w))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(vt240_state, irq9_w))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(vt240_state, irq7_w))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(*this, vt240_state, tx_w))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(*this, vt240_state, lben_w))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, vt240_state, irq9_w))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, vt240_state, irq7_w))
MCFG_DEVICE_ADD("lk201", LK201, 0)
- MCFG_LK201_TX_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
+ MCFG_LK201_TX_HANDLER(WRITELINE("i8251", i8251_device, write_rxd))
MCFG_DEVICE_ADD("keyboard_clock", CLOCK, 4800 * 64) // 8251 is set to /64 on the clock input
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(vt240_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, vt240_state, write_keyboard_clock))
- MCFG_RS232_PORT_ADD("host", default_rs232_devices, "null_modem")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_a_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("duart", scn2681_device, ip5_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("duart", scn2681_device, ip0_w))
+ MCFG_DEVICE_ADD("host", RS232_PORT, default_rs232_devices, "null_modem")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_a_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("duart", scn2681_device, ip5_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("duart", scn2681_device, ip0_w))
- MCFG_RS232_PORT_ADD("printer", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart", scn2681_device, rx_b_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("duart", scn2681_device, ip1_w))
+ MCFG_DEVICE_ADD("printer", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("duart", scn2681_device, rx_b_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("duart", scn2681_device, ip1_w))
MCFG_X2212_ADD("x2212")
MACHINE_CONFIG_END
@@ -717,16 +717,16 @@ MACHINE_CONFIG_START(vt240_state::mc7105)
MCFG_DEVICE_REMOVE("lk201")
MCFG_DEVICE_ADD("ms7004", MS7004, 0)
- MCFG_MS7004_TX_HANDLER(DEVWRITELINE("i8251", i8251_device, write_rxd))
+ MCFG_MS7004_TX_HANDLER(WRITELINE("i8251", i8251_device, write_rxd))
MCFG_DEVICE_MODIFY("i8251")
MCFG_I8251_TXD_HANDLER(NOOP)
- //MCFG_I8251_TXD_HANDLER(DEVWRITELINE("ms7004", ms7004_device, rx_w))
+ //MCFG_I8251_TXD_HANDLER(WRITELINE("ms7004", ms7004_device, rx_w))
// baud rate is supposed to be 4800 but keyboard is slightly faster
MCFG_DEVICE_REMOVE("keyboard_clock")
MCFG_DEVICE_ADD("keyboard_clock", CLOCK, 4960*64)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(vt240_state, write_keyboard_clock))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, vt240_state, write_keyboard_clock))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp
index 5a67c43d198..debd4069f2b 100644
--- a/src/mame/drivers/vt320.cpp
+++ b/src/mame/drivers/vt320.cpp
@@ -91,9 +91,9 @@ uint32_t vt320_state::screen_update_vt320(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vt320_state::vt320)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8051, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(vt320_mem)
- MCFG_CPU_IO_MAP(vt320_io)
+ MCFG_DEVICE_ADD("maincpu", I8051, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(vt320_mem)
+ MCFG_DEVICE_IO_MAP(vt320_io)
/* video hardware */
diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp
index 8a3c96842ad..f674c637a3e 100644
--- a/src/mame/drivers/vt520.cpp
+++ b/src/mame/drivers/vt520.cpp
@@ -83,9 +83,9 @@ uint32_t vt520_state::screen_update_vt520(screen_device &screen, bitmap_ind16 &b
MACHINE_CONFIG_START(vt520_state::vt420)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C31, XTAL(43'320'000) / 3) // SCN8031HCFN40 (divider not verified)
- MCFG_CPU_PROGRAM_MAP(vt520_mem)
- MCFG_CPU_IO_MAP(vt520_io)
+ MCFG_DEVICE_ADD("maincpu", I80C31, XTAL(43'320'000) / 3) // SCN8031HCFN40 (divider not verified)
+ MCFG_DEVICE_PROGRAM_MAP(vt520_mem)
+ MCFG_DEVICE_IO_MAP(vt520_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -101,9 +101,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vt520_state::vt520)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80C32, XTAL(20'000'000)) // Philips P80C32IBPN
- MCFG_CPU_PROGRAM_MAP(vt520_mem)
- MCFG_CPU_IO_MAP(vt520_io)
+ MCFG_DEVICE_ADD("maincpu", I80C32, XTAL(20'000'000)) // Philips P80C32IBPN
+ MCFG_DEVICE_PROGRAM_MAP(vt520_mem)
+ MCFG_DEVICE_IO_MAP(vt520_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp
index dfad5117d14..81da244efe9 100644
--- a/src/mame/drivers/vta2000.cpp
+++ b/src/mame/drivers/vta2000.cpp
@@ -161,9 +161,9 @@ PALETTE_INIT_MEMBER(vta2000_state, vta2000)
MACHINE_CONFIG_START(vta2000_state::vta2000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8080, XTAL(4'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",I8080, XTAL(4'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp
index 8f08c7dae40..c9f5d534c08 100644
--- a/src/mame/drivers/vtech1.cpp
+++ b/src/mame/drivers/vtech1.cpp
@@ -437,16 +437,16 @@ static const int16_t speaker_levels[] = {-32768, 0, 32767, 0};
MACHINE_CONFIG_START(vtech1_state::laser110)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, VTECH1_CLK) /* 3.57950 MHz */
- MCFG_CPU_PROGRAM_MAP(laser110_mem)
- MCFG_CPU_IO_MAP(vtech1_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, VTECH1_CLK) /* 3.57950 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(laser110_mem)
+ MCFG_DEVICE_IO_MAP(vtech1_io)
// video hardware
MCFG_SCREEN_MC6847_PAL_ADD("screen", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
- MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, vtech1_state, mc6847_videoram_r))
MCFG_MC6847_BW(true)
MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
// GM2 = GND, GM0 = GND, INTEXT = GND
@@ -456,7 +456,7 @@ MACHINE_CONFIG_START(vtech1_state::laser110)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SPEAKER_LEVELS(4, speaker_levels)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
@@ -480,7 +480,7 @@ MACHINE_CONFIG_START(vtech1_state::laser200)
MCFG_DEVICE_REMOVE("mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
- MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, vtech1_state, mc6847_videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
// GM2 = GND, GM0 = GND, INTEXT = GND
// other lines not connected
@@ -488,26 +488,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(vtech1_state::laser210)
laser200(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(laser210_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(laser210_mem)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vtech1_state::laser310)
laser200(config);
- MCFG_CPU_REPLACE("maincpu", Z80, VZ300_XTAL1_CLK / 5) /* 3.546894 MHz */
- MCFG_CPU_PROGRAM_MAP(laser310_mem)
- MCFG_CPU_IO_MAP(vtech1_io)
+ MCFG_DEVICE_REPLACE("maincpu", Z80, VZ300_XTAL1_CLK / 5) /* 3.546894 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(laser310_mem)
+ MCFG_DEVICE_IO_MAP(vtech1_io)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(vtech1_state::laser310h)
laser310(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(vtech1_shrg_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(vtech1_shrg_io)
MCFG_DEVICE_REMOVE("mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
- MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, vtech1_state, mc6847_videoram_r))
MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
// INTEXT = GND
// other lines not connected
diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp
index 51641e8dfcc..21e11540ae8 100644
--- a/src/mame/drivers/vtech2.cpp
+++ b/src/mame/drivers/vtech2.cpp
@@ -417,10 +417,10 @@ static const floppy_interface vtech2_floppy_interface =
MACHINE_CONFIG_START(vtech2_state::laser350)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 3694700) /* 3.694700 MHz */
- MCFG_CPU_PROGRAM_MAP(vtech2_mem)
- MCFG_CPU_IO_MAP(vtech2_io)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vtech2_state, vtech2_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 3694700) /* 3.694700 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(vtech2_mem)
+ MCFG_DEVICE_IO_MAP(vtech2_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vtech2_state, vtech2_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
/* video hardware */
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(vtech2_state::laser350)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_CASSETTE_ADD( "cassette" )
diff --git a/src/mame/drivers/vtech_eu3a12.cpp b/src/mame/drivers/vtech_eu3a12.cpp
index e917b9fc1b1..0ad528ce904 100644
--- a/src/mame/drivers/vtech_eu3a12.cpp
+++ b/src/mame/drivers/vtech_eu3a12.cpp
@@ -27,7 +27,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(vreadere_state::vreadere)
/* basic machine hardware */
- // MCFG_CPU_ADD("maincpu", unknown, unknown) // CPU type is unknown, epoxy blob
+ // MCFG_DEVICE_ADD("maincpu", unknown, unknown) // CPU type is unknown, epoxy blob
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vtech_unk1.cpp b/src/mame/drivers/vtech_unk1.cpp
index 07c9e8b4593..d1d32ff11c0 100644
--- a/src/mame/drivers/vtech_unk1.cpp
+++ b/src/mame/drivers/vtech_unk1.cpp
@@ -66,7 +66,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(gl8008cx_state::gl8008cx)
/* basic machine hardware */
- // MCFG_CPU_ADD("maincpu", unknown, unknown) // CPU type is unknown, epoxy blob
+ // MCFG_DEVICE_ADD("maincpu", unknown, unknown) // CPU type is unknown, epoxy blob
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vtech_unk2.cpp b/src/mame/drivers/vtech_unk2.cpp
index a14db1abdf0..197505c7b19 100644
--- a/src/mame/drivers/vtech_unk2.cpp
+++ b/src/mame/drivers/vtech_unk2.cpp
@@ -27,7 +27,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(glmmc_state::glmmc)
/* basic machine hardware */
- // MCFG_CPU_ADD("maincpu", unknown, unknown) // CPU type is unknown, epoxy blob
+ // MCFG_DEVICE_ADD("maincpu", unknown, unknown) // CPU type is unknown, epoxy blob
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp
index 2d0447cfbe5..b762f5126e3 100644
--- a/src/mame/drivers/vulgus.cpp
+++ b/src/mame/drivers/vulgus.cpp
@@ -219,13 +219,13 @@ GFXDECODE_END
MACHINE_CONFIG_START(vulgus_state::vulgus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", vulgus_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", vulgus_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(vulgus_state, irq0_line_hold, 8*60)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(12'000'000)/4) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(vulgus_state, irq0_line_hold, 8*60)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -247,10 +247,10 @@ MACHINE_CONFIG_START(vulgus_state::vulgus)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
+ MCFG_DEVICE_ADD("ay1", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
+ MCFG_DEVICE_ADD("ay2", AY8910, XTAL(12'000'000)/8) /* 1.5 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp
index 834ddcd927d..c055fb5c635 100644
--- a/src/mame/drivers/wacky_gator.cpp
+++ b/src/mame/drivers/wacky_gator.cpp
@@ -286,9 +286,9 @@ void wackygtr_state::program_map(address_map &map)
MACHINE_CONFIG_START(wackygtr_state::wackygtr)
- MCFG_CPU_ADD("maincpu", MC6809, XTAL(3'579'545)) // HD68B09P
- MCFG_CPU_PROGRAM_MAP(program_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wackygtr_state, irq0_line_assert, 50) // FIXME
+ MCFG_DEVICE_ADD("maincpu", MC6809, XTAL(3'579'545)) // HD68B09P
+ MCFG_DEVICE_PROGRAM_MAP(program_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wackygtr_state, irq0_line_assert, 50) // FIXME
MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", wackygtr_state, nmi_timer, attotime::from_hz(100)) // FIXME
@@ -297,23 +297,23 @@ MACHINE_CONFIG_START(wackygtr_state::wackygtr)
/* Sound */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000) )
- MCFG_MSM5205_VCLK_CB(WRITELINE(wackygtr_state, adpcm_int)) /* IRQ handler */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(384'000) )
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, wackygtr_state, adpcm_int)) /* IRQ handler */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ymsnd", YM2413, XTAL(3'579'545) )
+ MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("i8255_0", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(wackygtr_state, status_lamps_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(wackygtr_state, alligators_ctrl1_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wackygtr_state, alligators_ctrl2_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, wackygtr_state, status_lamps_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, wackygtr_state, alligators_ctrl1_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wackygtr_state, alligators_ctrl2_w))
MCFG_DEVICE_ADD("i8255_1", I8255, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(wackygtr_state, timing_lamps_w<0>))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(wackygtr_state, timing_lamps_w<1>))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wackygtr_state, timing_lamps_w<2>))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, wackygtr_state, timing_lamps_w<0>))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, wackygtr_state, timing_lamps_w<1>))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wackygtr_state, timing_lamps_w<2>))
MCFG_DEVICE_ADD("i8255_2", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("IN0"))
@@ -322,19 +322,19 @@ MACHINE_CONFIG_START(wackygtr_state::wackygtr)
MCFG_DEVICE_ADD("pit8253_0", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(3'579'545)/16) // this is a guess
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(wackygtr_state, alligator_ck<0>))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, wackygtr_state, alligator_ck<0>))
MCFG_PIT8253_CLK1(XTAL(3'579'545)/16) // this is a guess
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(wackygtr_state, alligator_ck<1>))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, wackygtr_state, alligator_ck<1>))
MCFG_PIT8253_CLK2(XTAL(3'579'545)/16) // this is a guess
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wackygtr_state, alligator_ck<2>))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, wackygtr_state, alligator_ck<2>))
MCFG_DEVICE_ADD("pit8253_1", PIT8253, 0)
MCFG_PIT8253_CLK0(XTAL(3'579'545)/16) // this is a guess
MCFG_PIT8253_OUT0_HANDLER(INPUTLINE("maincpu", M6809_FIRQ_LINE))
MCFG_PIT8253_CLK1(XTAL(3'579'545)/16) // this is a guess
- MCFG_PIT8253_OUT1_HANDLER(WRITELINE(wackygtr_state, alligator_ck<3>))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, wackygtr_state, alligator_ck<3>))
MCFG_PIT8253_CLK2(XTAL(3'579'545)/16) // this is a guess
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wackygtr_state, alligator_ck<4>))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, wackygtr_state, alligator_ck<4>))
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp
index 41eb3dc21ab..9504613b6c6 100644
--- a/src/mame/drivers/wallc.cpp
+++ b/src/mame/drivers/wallc.cpp
@@ -486,9 +486,9 @@ DRIVER_INIT_MEMBER(wallc_state, wallca)
MACHINE_CONFIG_START(wallc_state::wallc)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 12.288_MHz_XTAL / 4) /* 3.072 MHz ? */
- MCFG_CPU_PROGRAM_MAP(wallc_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wallc_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12.288_MHz_XTAL / 4) /* 3.072 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(wallc_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wallc_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -505,28 +505,28 @@ MACHINE_CONFIG_START(wallc_state::wallc)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8912, 12288000 / 8)
+ MCFG_DEVICE_ADD("aysnd", AY8912, 12288000 / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(wallc_state::wallca)
wallc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(12_MHz_XTAL / 4)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(12_MHz_XTAL / 4)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(wallc_state::unkitpkr)
wallc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(unkitpkr_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(unkitpkr_map)
MCFG_VIDEO_START_OVERRIDE(wallc_state, unkitpkr)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(wallc_state, unkitpkr)
/* sound hardware */
- MCFG_SOUND_MODIFY("aysnd")
+ MCFG_DEVICE_MODIFY("aysnd")
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp
index 27971f14339..eaa5dd283ef 100644
--- a/src/mame/drivers/wangpc.cpp
+++ b/src/mame/drivers/wangpc.cpp
@@ -1275,90 +1275,90 @@ void wangpc_state::on_disk1_unload(floppy_image_device *image)
//-------------------------------------------------
MACHINE_CONFIG_START(wangpc_state::wangpc)
- MCFG_CPU_ADD(I8086_TAG, I8086, 8000000)
- MCFG_CPU_PROGRAM_MAP(wangpc_mem)
- MCFG_CPU_IO_MAP(wangpc_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, 8000000)
+ MCFG_DEVICE_PROGRAM_MAP(wangpc_mem)
+ MCFG_DEVICE_IO_MAP(wangpc_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(I8259A_TAG, pic8259_device, inta_cb)
//MCFG_QUANTUM_PERFECT_CPU(I8086_TAG)
// devices
MCFG_DEVICE_ADD(AM9517A_TAG, AM9517A, 4000000)
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(wangpc_state, hrq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(wangpc_state, eop_w))
- MCFG_AM9517A_IN_MEMR_CB(READ8(wangpc_state, memr_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(wangpc_state, memw_w))
- MCFG_AM9517A_IN_IOR_1_CB(DEVREAD8(WANGPC_BUS_TAG, wangpcbus_device, dack1_r))
- MCFG_AM9517A_IN_IOR_2_CB(READ8(wangpc_state, ior2_r))
- MCFG_AM9517A_IN_IOR_3_CB(DEVREAD8(WANGPC_BUS_TAG, wangpcbus_device, dack3_r))
- MCFG_AM9517A_OUT_IOW_1_CB(DEVWRITE8(WANGPC_BUS_TAG, wangpcbus_device, dack1_w))
- MCFG_AM9517A_OUT_IOW_2_CB(WRITE8(wangpc_state, iow2_w))
- MCFG_AM9517A_OUT_IOW_3_CB(DEVWRITE8(WANGPC_BUS_TAG, wangpcbus_device, dack3_w))
- MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(wangpc_state, dack0_w))
- MCFG_AM9517A_OUT_DACK_1_CB(WRITELINE(wangpc_state, dack1_w))
- MCFG_AM9517A_OUT_DACK_2_CB(WRITELINE(wangpc_state, dack2_w))
- MCFG_AM9517A_OUT_DACK_3_CB(WRITELINE(wangpc_state, dack3_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, wangpc_state, hrq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, wangpc_state, eop_w))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, wangpc_state, memr_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, wangpc_state, memw_w))
+ MCFG_AM9517A_IN_IOR_1_CB(READ8(WANGPC_BUS_TAG, wangpcbus_device, dack1_r))
+ MCFG_AM9517A_IN_IOR_2_CB(READ8(*this, wangpc_state, ior2_r))
+ MCFG_AM9517A_IN_IOR_3_CB(READ8(WANGPC_BUS_TAG, wangpcbus_device, dack3_r))
+ MCFG_AM9517A_OUT_IOW_1_CB(WRITE8(WANGPC_BUS_TAG, wangpcbus_device, dack1_w))
+ MCFG_AM9517A_OUT_IOW_2_CB(WRITE8(*this, wangpc_state, iow2_w))
+ MCFG_AM9517A_OUT_IOW_3_CB(WRITE8(WANGPC_BUS_TAG, wangpcbus_device, dack3_w))
+ MCFG_AM9517A_OUT_DACK_0_CB(WRITELINE(*this, wangpc_state, dack0_w))
+ MCFG_AM9517A_OUT_DACK_1_CB(WRITELINE(*this, wangpc_state, dack1_w))
+ MCFG_AM9517A_OUT_DACK_2_CB(WRITELINE(*this, wangpc_state, dack2_w))
+ MCFG_AM9517A_OUT_DACK_3_CB(WRITELINE(*this, wangpc_state, dack3_w))
MCFG_DEVICE_ADD(I8259A_TAG, PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(wangpc_state, ppi_pa_r))
- MCFG_I8255_IN_PORTB_CB(READ8(wangpc_state, ppi_pb_r))
- MCFG_I8255_IN_PORTC_CB(READ8(wangpc_state, ppi_pc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(wangpc_state, ppi_pc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, wangpc_state, ppi_pa_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, wangpc_state, ppi_pb_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, wangpc_state, ppi_pc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, wangpc_state, ppi_pc_w))
MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0)
MCFG_PIT8253_CLK0(500000)
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8259A_TAG, pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(I8259A_TAG, pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(2000000)
MCFG_PIT8253_CLK2(500000)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wangpc_state, pit2_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, wangpc_state, pit2_w))
MCFG_IM6402_ADD(IM6402_TAG, 62500*16, 62500*16)
- MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(WANGPC_KEYBOARD_TAG, wangpc_keyboard_device, write_rxd))
- MCFG_IM6402_DR_CALLBACK(WRITELINE(wangpc_state, uart_dr_w))
- MCFG_IM6402_TBRE_CALLBACK(WRITELINE(wangpc_state, uart_tbre_w))
+ MCFG_IM6402_TRO_CALLBACK(WRITELINE(WANGPC_KEYBOARD_TAG, wangpc_keyboard_device, write_rxd))
+ MCFG_IM6402_DR_CALLBACK(WRITELINE(*this, wangpc_state, uart_dr_w))
+ MCFG_IM6402_TBRE_CALLBACK(WRITELINE(*this, wangpc_state, uart_tbre_w))
MCFG_DEVICE_ADD(SCN2661_TAG, MC2661, 0)
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd))
- MCFG_MC2661_RXRDY_HANDLER(WRITELINE(wangpc_state, epci_irq_w))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr))
- MCFG_MC2661_TXEMT_DSCHG_HANDLER(WRITELINE(wangpc_state, epci_irq_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_txd))
+ MCFG_MC2661_RXRDY_HANDLER(WRITELINE(*this, wangpc_state, epci_irq_w))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE(RS232_TAG, rs232_port_device, write_dtr))
+ MCFG_MC2661_TXEMT_DSCHG_HANDLER(WRITELINE(*this, wangpc_state, epci_irq_w))
MCFG_UPD765A_ADD(UPD765_TAG, false, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(wangpc_state, fdc_irq))
- MCFG_UPD765_DRQ_CALLBACK(WRITELINE(wangpc_state, fdc_drq))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, wangpc_state, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE(*this, wangpc_state, fdc_drq))
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats)
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
MCFG_CENTRONICS_DATA_INPUT_BUFFER("cent_data_in")
- MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(wangpc_state, write_centronics_ack))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(wangpc_state, write_centronics_busy))
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(wangpc_state, write_centronics_fault))
- MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(wangpc_state, write_centronics_perror))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(*this, wangpc_state, write_centronics_ack))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, wangpc_state, write_centronics_busy))
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, wangpc_state, write_centronics_fault))
+ MCFG_CENTRONICS_PERROR_HANDLER(WRITELINE(*this, wangpc_state, write_centronics_perror))
MCFG_DEVICE_ADD("cent_data_in", INPUT_BUFFER, 0)
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG)
- MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCN2661_TAG, mc2661_device, rx_w))
+ MCFG_DEVICE_ADD(RS232_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCN2661_TAG, mc2661_device, rx_w))
MCFG_DEVICE_ADD(WANGPC_KEYBOARD_TAG, WANGPC_KEYBOARD, 0)
- MCFG_WANGPCKB_TXD_HANDLER(DEVWRITELINE(IM6402_TAG, im6402_device, write_rri))
+ MCFG_WANGPCKB_TXD_HANDLER(WRITELINE(IM6402_TAG, im6402_device, write_rri))
// bus
MCFG_WANGPC_BUS_ADD()
- MCFG_WANGPC_BUS_IRQ2_CALLBACK(WRITELINE(wangpc_state, bus_irq2_w))
- MCFG_WANGPC_BUS_IRQ3_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir3_w))
- MCFG_WANGPC_BUS_IRQ4_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w))
- MCFG_WANGPC_BUS_IRQ5_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir5_w))
- MCFG_WANGPC_BUS_IRQ6_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir6_w))
- MCFG_WANGPC_BUS_IRQ7_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir7_w))
- MCFG_WANGPC_BUS_DRQ1_CALLBACK(DEVWRITELINE(AM9517A_TAG, am9517a_device, dreq1_w))
- MCFG_WANGPC_BUS_DRQ2_CALLBACK(DEVWRITELINE(AM9517A_TAG, am9517a_device, dreq2_w))
- MCFG_WANGPC_BUS_DRQ3_CALLBACK(DEVWRITELINE(AM9517A_TAG, am9517a_device, dreq3_w))
+ MCFG_WANGPC_BUS_IRQ2_CALLBACK(WRITELINE(*this, wangpc_state, bus_irq2_w))
+ MCFG_WANGPC_BUS_IRQ3_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir3_w))
+ MCFG_WANGPC_BUS_IRQ4_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir4_w))
+ MCFG_WANGPC_BUS_IRQ5_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir5_w))
+ MCFG_WANGPC_BUS_IRQ6_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir6_w))
+ MCFG_WANGPC_BUS_IRQ7_CALLBACK(WRITELINE(I8259A_TAG, pic8259_device, ir7_w))
+ MCFG_WANGPC_BUS_DRQ1_CALLBACK(WRITELINE(AM9517A_TAG, am9517a_device, dreq1_w))
+ MCFG_WANGPC_BUS_DRQ2_CALLBACK(WRITELINE(AM9517A_TAG, am9517a_device, dreq2_w))
+ MCFG_WANGPC_BUS_DRQ3_CALLBACK(WRITELINE(AM9517A_TAG, am9517a_device, dreq3_w))
MCFG_WANGPC_BUS_IOERROR_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_NMI))
MCFG_WANGPC_BUS_SLOT_ADD("slot1", 1, wangpc_cards, nullptr)
MCFG_WANGPC_BUS_SLOT_ADD("slot2", 2, wangpc_cards, "mvc")
diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp
index 8dc890f1d07..f1c9c24bde3 100644
--- a/src/mame/drivers/wardner.cpp
+++ b/src/mame/drivers/wardner.cpp
@@ -378,9 +378,9 @@ void wardner_state::machine_reset()
MACHINE_CONFIG_START(wardner_state::wardner)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
- MCFG_CPU_PROGRAM_MAP(main_program_map)
- MCFG_CPU_IO_MAP(main_io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/4) /* 6MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_program_map)
+ MCFG_DEVICE_IO_MAP(main_io_map)
MCFG_DEVICE_ADD("membank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(main_bank_map)
@@ -389,31 +389,31 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(18)
MCFG_ADDRESS_MAP_BANK_STRIDE(0x8000)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(14'000'000)/4) /* 3.5MHz */
- MCFG_CPU_PROGRAM_MAP(sound_program_map)
- MCFG_CPU_IO_MAP(sound_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(14'000'000)/4) /* 3.5MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_program_map)
+ MCFG_DEVICE_IO_MAP(sound_io_map)
- MCFG_CPU_ADD("dsp", TMS32010, XTAL(14'000'000)) /* 14MHz Crystal CLKin */
- MCFG_CPU_PROGRAM_MAP(DSP_program_map)
+ MCFG_DEVICE_ADD("dsp", TMS32010, XTAL(14'000'000)) /* 14MHz Crystal CLKin */
+ MCFG_DEVICE_PROGRAM_MAP(DSP_program_map)
/* Data Map is internal to the CPU */
- MCFG_CPU_IO_MAP(DSP_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(wardner_state, twincobr_BIO_r))
+ MCFG_DEVICE_IO_MAP(DSP_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, wardner_state, twincobr_BIO_r))
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(wardner_state, int_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(wardner_state, flipscreen_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(wardner_state, bg_ram_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wardner_state, fg_rom_bank_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(wardner_state, display_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, wardner_state, int_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, wardner_state, flipscreen_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, wardner_state, bg_ram_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wardner_state, fg_rom_bank_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wardner_state, display_on_w))
MCFG_DEVICE_ADD("coinlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(wardner_state, dsp_int_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(wardner_state, coin_counter_1_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wardner_state, coin_counter_2_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(wardner_state, coin_lockout_1_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(wardner_state, coin_lockout_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, wardner_state, dsp_int_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, wardner_state, coin_counter_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wardner_state, coin_counter_2_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wardner_state, coin_lockout_1_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, wardner_state, coin_lockout_2_w))
/* video hardware */
MCFG_MC6845_ADD("crtc", HD6845, "screen", XTAL(14'000'000)/4) /* 3.5MHz measured on CLKin */
@@ -428,8 +428,8 @@ MACHINE_CONFIG_START(wardner_state::wardner)
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_RAW_PARAMS(XTAL(14'000'000)/2, 446, 0, 320, 286, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(wardner_state, screen_update_toaplan0)
- MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram8", buffered_spriteram8_device, vblank_copy_rising))
- MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(wardner_state, wardner_vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("spriteram8", buffered_spriteram8_device, vblank_copy_rising))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, wardner_state, wardner_vblank_irq))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", wardner)
@@ -441,7 +441,7 @@ MACHINE_CONFIG_START(wardner_state::wardner)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(14'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(14'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp
index 5bb75367d5f..bebdd9d96af 100644
--- a/src/mame/drivers/warpsped.cpp
+++ b/src/mame/drivers/warpsped.cpp
@@ -323,10 +323,10 @@ PALETTE_INIT_MEMBER(warpspeed_state, warpspeed)
MACHINE_CONFIG_START(warpspeed_state::warpspeed)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(5'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(warpspeed_map)
- MCFG_CPU_IO_MAP(warpspeed_io_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", warpspeed_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(5'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(warpspeed_map)
+ MCFG_DEVICE_IO_MAP(warpspeed_io_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", warpspeed_state, irq0_line_hold)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp
index 4c97af1834c..ae2db5f16a8 100644
--- a/src/mame/drivers/warpwarp.cpp
+++ b/src/mame/drivers/warpwarp.cpp
@@ -716,26 +716,26 @@ GFXDECODE_END
MACHINE_CONFIG_START(warpwarp_state::geebee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(geebee_map)
- MCFG_CPU_IO_MAP(geebee_port_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(geebee_map)
+ MCFG_DEVICE_IO_MAP(geebee_port_map)
MCFG_DEVICE_ADD("latch", LS259, 0) // 5N
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0")) // LAMP 1
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1")) // LAMP 2
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led2")) // LAMP 3
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(warpwarp_state, counter_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(warpwarp_state, lock_out_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(warpwarp_state, geebee_bgw_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(warpwarp_state, ball_on_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(warpwarp_state, inv_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, warpwarp_state, counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, warpwarp_state, lock_out_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, warpwarp_state, geebee_bgw_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, warpwarp_state, ball_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, warpwarp_state, inv_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(warpwarp_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(warpwarp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, warpwarp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", 1k)
MCFG_PALETTE_ADD("palette", 4*2)
@@ -746,7 +746,7 @@ MACHINE_CONFIG_START(warpwarp_state::geebee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("geebee_custom", GEEBEE, 0)
+ MCFG_DEVICE_ADD("geebee_custom", GEEBEE_SOUND, MASTER_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -783,18 +783,18 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(warpwarp_state::bombbee)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9)
- MCFG_CPU_PROGRAM_MAP(bombbee_map)
+ MCFG_DEVICE_ADD("maincpu", I8080, MASTER_CLOCK/9)
+ MCFG_DEVICE_PROGRAM_MAP(bombbee_map)
MCFG_DEVICE_ADD("latch", LS259, 0) // 6L on Warp Warp
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(OUTPUT("led0")) // LAMP 1
MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(OUTPUT("led1")) // LAMP 2
MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(OUTPUT("led2")) // LAMP 3
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) // n.c.
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(warpwarp_state, lock_out_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(warpwarp_state, counter_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(warpwarp_state, ball_on_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(warpwarp_state, inv_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, warpwarp_state, lock_out_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, warpwarp_state, counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, warpwarp_state, ball_on_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, warpwarp_state, inv_w))
MCFG_WATCHDOG_ADD("watchdog")
@@ -803,7 +803,7 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee)
MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK/3, 384, 0, 272, 264, 0, 224)
MCFG_SCREEN_UPDATE_DRIVER(warpwarp_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(warpwarp_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, warpwarp_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", color)
@@ -814,7 +814,7 @@ MACHINE_CONFIG_START(warpwarp_state::bombbee)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("warpwarp_custom", WARPWARP, 0)
+ MCFG_DEVICE_ADD("warpwarp_custom", WARPWARP_SOUND, MASTER_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -822,8 +822,8 @@ MACHINE_CONFIG_START(warpwarp_state::warpwarp)
bombbee(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(warpwarp_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(warpwarp_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp
index f065cfbe817..d1492ff238b 100644
--- a/src/mame/drivers/warriorb.cpp
+++ b/src/mame/drivers/warriorb.cpp
@@ -438,19 +438,19 @@ void warriorb_state::machine_reset()
MACHINE_CONFIG_START(warriorb_state::darius2d)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
- MCFG_CPU_PROGRAM_MAP(darius2d_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", warriorb_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
+ MCFG_DEVICE_PROGRAM_MAP(darius2d_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", warriorb_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
MCFG_DEVICE_ADD("tc0220ioc", TC0220IOC, 0)
MCFG_TC0220IOC_READ_0_CB(IOPORT("DSWA"))
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(warriorb_state, coin_control_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, warriorb_state, coin_control_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -500,7 +500,7 @@ MACHINE_CONFIG_START(warriorb_state::darius2d)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -527,19 +527,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(warriorb_state::warriorb)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */
- MCFG_CPU_PROGRAM_MAP(warriorb_map)
- MCFG_CPU_VBLANK_INT_DRIVER("lscreen", warriorb_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(warriorb_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("lscreen", warriorb_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
MCFG_DEVICE_ADD("tc0510nio", TC0510NIO, 0)
MCFG_TC0510NIO_READ_0_CB(IOPORT("DSWA"))
MCFG_TC0510NIO_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0510NIO_READ_2_CB(IOPORT("IN0"))
MCFG_TC0510NIO_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0510NIO_WRITE_4_CB(WRITE8(warriorb_state, coin_control_w))
+ MCFG_TC0510NIO_WRITE_4_CB(WRITE8(*this, warriorb_state, coin_control_w))
MCFG_TC0510NIO_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -590,7 +590,7 @@ MACHINE_CONFIG_START(warriorb_state::warriorb)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610B, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp
index 95f342e5052..3426be9e4ea 100644
--- a/src/mame/drivers/wc90.cpp
+++ b/src/mame/drivers/wc90.cpp
@@ -349,16 +349,16 @@ void wc90_state::machine_start()
MACHINE_CONFIG_START(wc90_state::wc90)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(wc90_map_1)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wc90_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(wc90_map_1)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wc90_state, irq0_line_hold)
- MCFG_CPU_ADD("sub", Z80, XTAL(8'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(wc90_map_2)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wc90_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("sub", Z80, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(wc90_map_2)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wc90_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* NMIs are triggered by the main CPU */
MCFG_WATCHDOG_ADD("watchdog")
@@ -385,7 +385,7 @@ MACHINE_CONFIG_START(wc90_state::wc90)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
- MCFG_SOUND_ADD("ymsnd", YM2608, XTAL(8'000'000)) /* verified on pcb */
+ MCFG_DEVICE_ADD("ymsnd", YM2608, XTAL(8'000'000)) /* verified on pcb */
MCFG_YM2608_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp
index 504f466f2c8..35e8c7caa73 100644
--- a/src/mame/drivers/wc90b.cpp
+++ b/src/mame/drivers/wc90b.cpp
@@ -356,16 +356,16 @@ void wc90b_state::machine_start()
MACHINE_CONFIG_START(wc90b_state::wc90b)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(wc90b_map1)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wc90b_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(wc90b_map1)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wc90b_state, irq0_line_assert)
- MCFG_CPU_ADD("sub", Z80, MASTER_CLOCK)
- MCFG_CPU_PROGRAM_MAP(wc90b_map2)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wc90b_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("sub", Z80, MASTER_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(wc90b_map2)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wc90b_state, irq0_line_assert)
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(sound_cpu)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(sound_cpu)
/* IRQs are triggered by the main CPU */
/* video hardware */
@@ -387,14 +387,14 @@ MACHINE_CONFIG_START(wc90b_state::wc90b)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd1", YM2203, YM2203_CLOCK)
+ MCFG_DEVICE_ADD("ymsnd1", YM2203, YM2203_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("ymsnd2", YM2203, YM2203_CLOCK)
+ MCFG_DEVICE_ADD("ymsnd2", YM2203, YM2203_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_SOUND_ADD("msm", MSM5205, MSM5205_CLOCK)
- MCFG_MSM5205_VCLK_CB(WRITELINE(wc90b_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, MSM5205_CLOCK)
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, wc90b_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp
index 0c383df7070..817d6173aad 100644
--- a/src/mame/drivers/wecleman.cpp
+++ b/src/mame/drivers/wecleman.cpp
@@ -1043,16 +1043,16 @@ MACHINE_START_MEMBER(wecleman_state, wecleman)
MACHINE_CONFIG_START(wecleman_state::wecleman)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */
- MCFG_CPU_PROGRAM_MAP(wecleman_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wecleman_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", wecleman_state, wecleman_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000, 10000000) /* Schems show 10MHz */
- MCFG_CPU_PROGRAM_MAP(wecleman_sub_map)
+ MCFG_DEVICE_ADD("sub", M68000, 10000000) /* Schems show 10MHz */
+ MCFG_DEVICE_PROGRAM_MAP(wecleman_sub_map)
/* Schems: can be reset, no nmi, soundlatch, 3.58MHz */
- MCFG_CPU_ADD("audiocpu", Z80, 3579545)
- MCFG_CPU_PROGRAM_MAP(wecleman_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 3579545)
+ MCFG_DEVICE_PROGRAM_MAP(wecleman_sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1082,8 +1082,8 @@ MACHINE_CONFIG_START(wecleman_state::wecleman)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.85)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.85)
- MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
- MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(wecleman_state, wecleman_volume_callback))
+ MCFG_DEVICE_ADD("k007232_1", K007232, 3579545)
+ MCFG_K007232_PORT_WRITE_HANDLER(WRITE8(*this, wecleman_state, wecleman_volume_callback))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
@@ -1120,16 +1120,16 @@ MACHINE_RESET_MEMBER(wecleman_state, hotchase)
MACHINE_CONFIG_START(wecleman_state::hotchase)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
- MCFG_CPU_PROGRAM_MAP(hotchase_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
+ MCFG_DEVICE_PROGRAM_MAP(hotchase_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", wecleman_state, hotchase_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
- MCFG_CPU_PROGRAM_MAP(hotchase_sub_map)
+ MCFG_DEVICE_ADD("sub", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
+ MCFG_DEVICE_PROGRAM_MAP(hotchase_sub_map)
- MCFG_CPU_ADD("audiocpu", MC6809E, 3579545 / 2) /* 3.579/2 MHz - PCB is drawn in one set's readme */
- MCFG_CPU_PROGRAM_MAP(hotchase_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wecleman_state, hotchase_sound_timer, 496)
+ MCFG_DEVICE_ADD("audiocpu", MC6809E, 3579545 / 2) /* 3.579/2 MHz - PCB is drawn in one set's readme */
+ MCFG_DEVICE_PROGRAM_MAP(hotchase_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wecleman_state, hotchase_sound_timer, 496)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -1166,17 +1166,17 @@ MACHINE_CONFIG_START(wecleman_state::hotchase)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
+ MCFG_DEVICE_ADD("k007232_1", K007232, 3579545)
// SLEV not used, volume control is elsewhere
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
+ MCFG_DEVICE_ADD("k007232_2", K007232, 3579545)
// SLEV not used, volume control is elsewhere
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
- MCFG_SOUND_ADD("k007232_3", K007232, 3579545)
+ MCFG_DEVICE_ADD("k007232_3", K007232, 3579545)
// SLEV not used, volume control is elsewhere
MCFG_SOUND_ROUTE(0, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.20)
diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp
index ecbfcb2b690..67a4793bcb4 100644
--- a/src/mame/drivers/welltris.cpp
+++ b/src/mame/drivers/welltris.cpp
@@ -673,13 +673,13 @@ void welltris_state::machine_start()
MACHINE_CONFIG_START(welltris_state::welltris)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", welltris_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,20000000/2) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", welltris_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_port_map) /* IRQs are triggered by the YM2610 */
+ MCFG_DEVICE_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_port_map) /* IRQs are triggered by the YM2610 */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -708,7 +708,7 @@ MACHINE_CONFIG_START(welltris_state::welltris)
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true)
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 0.75)
diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp
index be0e4f3d272..bf36a56454d 100644
--- a/src/mame/drivers/wgp.cpp
+++ b/src/mame/drivers/wgp.cpp
@@ -908,16 +908,16 @@ void wgp_state::machine_start()
MACHINE_CONFIG_START(wgp_state::wgp)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wgp_state, irq4_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wgp_state, irq4_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(z80_sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 16000000/4) /* 4 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(z80_sound_map)
- MCFG_CPU_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(cpu2_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wgp_state, cpub_interrupt)
+ MCFG_DEVICE_ADD("sub", M68000, 12000000) /* 12 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(cpu2_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wgp_state, cpub_interrupt)
MCFG_QUANTUM_TIME(attotime::from_hz(30000))
@@ -927,7 +927,7 @@ MACHINE_CONFIG_START(wgp_state::wgp)
MCFG_TC0220IOC_READ_1_CB(IOPORT("DSWB"))
MCFG_TC0220IOC_READ_2_CB(IOPORT("IN0"))
MCFG_TC0220IOC_READ_3_CB(IOPORT("IN1"))
- MCFG_TC0220IOC_WRITE_4_CB(WRITE8(wgp_state, coins_w))
+ MCFG_TC0220IOC_WRITE_4_CB(WRITE8(*this, wgp_state, coins_w))
MCFG_TC0220IOC_READ_7_CB(IOPORT("IN2"))
/* video hardware */
@@ -952,7 +952,7 @@ MACHINE_CONFIG_START(wgp_state::wgp)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 16000000/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) // assumes Z80 sandwiched between 68Ks
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp
index 1538001e7a1..3c4f699939f 100644
--- a/src/mame/drivers/wheelfir.cpp
+++ b/src/mame/drivers/wheelfir.cpp
@@ -733,16 +733,16 @@ void wheelfir_state::ramdac_map(address_map &map)
MACHINE_CONFIG_START(wheelfir_state::wheelfir)
- MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
- MCFG_CPU_PROGRAM_MAP(wheelfir_main)
+ MCFG_DEVICE_ADD("maincpu", M68000, 32000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(wheelfir_main)
- MCFG_CPU_ADD("subcpu", M68000, 32000000/2)
- MCFG_CPU_PROGRAM_MAP(wheelfir_sub)
+ MCFG_DEVICE_ADD("subcpu", M68000, 32000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(wheelfir_sub)
//MCFG_QUANTUM_TIME(attotime::from_hz(12000))
MCFG_DEVICE_ADD("adc", ADC0808, 500000) // unknown clock
- MCFG_ADC0808_EOC_FF_CB(WRITELINE(wheelfir_state, adc_eoc_w))
+ MCFG_ADC0808_EOC_FF_CB(WRITELINE(*this, wheelfir_state, adc_eoc_w))
MCFG_ADC0808_IN0_CB(IOPORT("STEERING"))
MCFG_ADC0808_IN1_CB(IOPORT("ACCELERATOR"))
MCFG_ADC0808_IN2_CB(IOPORT("BRAKE"))
@@ -754,7 +754,7 @@ MACHINE_CONFIG_START(wheelfir_state::wheelfir)
MCFG_SCREEN_SIZE(336, NUM_SCANLINES+NUM_VBLANK_LINES)
MCFG_SCREEN_VISIBLE_AREA(0,335, 0, NUM_SCANLINES-1)
MCFG_SCREEN_UPDATE_DRIVER(wheelfir_state, screen_update_wheelfir)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(wheelfir_state, screen_vblank_wheelfir))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wheelfir_state, screen_vblank_wheelfir))
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", NUM_COLORS)
@@ -766,8 +766,8 @@ MACHINE_CONFIG_START(wheelfir_state::wheelfir)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_10BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/white_mod.cpp b/src/mame/drivers/white_mod.cpp
index be641c81839..62214cdb590 100644
--- a/src/mame/drivers/white_mod.cpp
+++ b/src/mame/drivers/white_mod.cpp
@@ -48,8 +48,8 @@ DRIVER_INIT_MEMBER(whitestar_mod_state,whitestar_mod)
MACHINE_CONFIG_START(whitestar_mod_state::whitestar_mod)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(whitestar_mod_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(whitestar_mod_map)
MACHINE_CONFIG_END
/*-------------------------------------------------------------------
diff --git a/src/mame/drivers/whitestar.cpp b/src/mame/drivers/whitestar.cpp
index babdd01fcd5..886b97b794a 100644
--- a/src/mame/drivers/whitestar.cpp
+++ b/src/mame/drivers/whitestar.cpp
@@ -118,9 +118,9 @@ INTERRUPT_GEN_MEMBER(whitestar_state::whitestar_firq_interrupt)
MACHINE_CONFIG_START(whitestar_state::whitestar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, 2000000)
- MCFG_CPU_PROGRAM_MAP(whitestar_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(whitestar_state, whitestar_firq_interrupt, 976) // value taken from PinMAME
+ MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(whitestar_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(whitestar_state, whitestar_firq_interrupt, 976) // value taken from PinMAME
/* sound hardware */
MCFG_DECOBSMT_ADD(DECOBSMT_TAG)
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index b5936c94cb0..6b0cd7ae12b 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -777,12 +777,12 @@ I8275_DRAW_CHARACTER_MEMBER(wicat_state::wicat_display_pixels)
MACHINE_CONFIG_START(wicat_state::wicat)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(wicat_mem)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(wicat_mem)
MCFG_DEVICE_ADD("via", VIA6522, XTAL(8'000'000))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(wicat_state, via_a_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(wicat_state, via_b_w))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, wicat_state, via_a_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, wicat_state, via_b_w))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M68K_IRQ_1))
MCFG_DEVICE_ADD("rtc", MM58274C, 0) // actually an MM58174AN, but should be compatible
@@ -791,44 +791,44 @@ MACHINE_CONFIG_START(wicat_state::wicat)
// internal terminal
MCFG_DEVICE_ADD("uart0", MC2661, XTAL(5'068'800)) // connected to terminal board
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("videouart0", mc2661_device, rx_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("videouart0", mc2661_device, rx_w))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("videouart0", mc2661_device, cts_w))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("videouart0", mc2661_device, dsr_w))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("videouart0", mc2661_device, cts_w))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("videouart0", mc2661_device, dsr_w))
// RS232C ports (x5)
MCFG_DEVICE_ADD("uart1", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial1", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial1", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial1", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial1", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_DEVICE_ADD("uart2", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial2", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial2", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial2", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial2", rs232_port_device, write_dtr))
MCFG_DEVICE_ADD("uart3", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial3", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial3", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial3", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial3", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_DEVICE_ADD("uart4", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial4", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial4", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial4", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial4", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_DEVICE_ADD("uart5", MC2661, XTAL(5'068'800))
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_txd))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("serial5", rs232_port_device, write_txd))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_rts))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("serial5", rs232_port_device, write_dtr))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("serial5", rs232_port_device, write_rts))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("serial5", rs232_port_device, write_dtr))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
// modem
@@ -836,56 +836,56 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
MCFG_MC2661_TXEMT_DSCHG_HANDLER(INPUTLINE("maincpu", M68K_IRQ_2))
- MCFG_RS232_PORT_ADD("serial1",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart1",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart1",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart1",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart1",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial2",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart2",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart2",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart2",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart2",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial3",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart3",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart3",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart3",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart3",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial4",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart4",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart4",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart4",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart4",mc2661_device,cts_w))
-
- MCFG_RS232_PORT_ADD("serial5",default_rs232_devices,nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart5",mc2661_device,rx_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart5",mc2661_device,dcd_w))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE("uart5",mc2661_device,dsr_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart5",mc2661_device,cts_w))
+ MCFG_DEVICE_ADD("serial1",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart1",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart1",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart1",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart1",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial2",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart2",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart2",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart2",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart2",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial3",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart3",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart3",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart3",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart3",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial4",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart4",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart4",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart4",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart4",mc2661_device,cts_w))
+
+ MCFG_DEVICE_ADD("serial5",RS232_PORT, default_rs232_devices,nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("uart5",mc2661_device,rx_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("uart5",mc2661_device,dcd_w))
+ MCFG_RS232_DSR_HANDLER(WRITELINE("uart5",mc2661_device,dsr_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("uart5",mc2661_device,cts_w))
/* video hardware */
- MCFG_CPU_ADD("videocpu",Z8002,XTAL(8'000'000)/2) // AMD AMZ8002DC
- MCFG_CPU_PROGRAM_MAP(wicat_video_mem)
- MCFG_CPU_IO_MAP(wicat_video_io)
+ MCFG_DEVICE_ADD("videocpu",Z8002,XTAL(8'000'000)/2) // AMD AMZ8002DC
+ MCFG_DEVICE_PROGRAM_MAP(wicat_video_mem)
+ MCFG_DEVICE_IO_MAP(wicat_video_io)
MCFG_DEVICE_ADD("videodma", AM9517A, XTAL(8'000'000)) // clock is a bit of guess
- MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(wicat_state, dma_hrq_w))
- MCFG_AM9517A_OUT_EOP_CB(WRITELINE(wicat_state, dma_nmi_cb))
- MCFG_AM9517A_IN_MEMR_CB(READ8(wicat_state, vram_r))
- MCFG_AM9517A_OUT_MEMW_CB(WRITE8(wicat_state, vram_w))
- MCFG_AM9517A_OUT_IOW_0_CB(DEVWRITE8("video", i8275_device, dack_w))
+ MCFG_AM9517A_OUT_HREQ_CB(WRITELINE(*this, wicat_state, dma_hrq_w))
+ MCFG_AM9517A_OUT_EOP_CB(WRITELINE(*this, wicat_state, dma_nmi_cb))
+ MCFG_AM9517A_IN_MEMR_CB(READ8(*this, wicat_state, vram_r))
+ MCFG_AM9517A_OUT_MEMW_CB(WRITE8(*this, wicat_state, vram_w))
+ MCFG_AM9517A_OUT_IOW_0_CB(WRITE8("video", i8275_device, dack_w))
MCFG_IM6402_ADD("videouart", 0, 0)
- MCFG_IM6402_DR_CALLBACK(WRITELINE(wicat_state, kb_data_ready))
+ MCFG_IM6402_DR_CALLBACK(WRITELINE(*this, wicat_state, kb_data_ready))
// terminal (2x INS2651, 1x IM6042 - one of these is for the keyboard, another communicates with the main board, the third is unknown)
MCFG_DEVICE_ADD("videouart0", MC2661, XTAL(5'068'800)) // the INS2651 looks similar enough to the MC2661...
- MCFG_MC2661_TXD_HANDLER(DEVWRITELINE("uart0", mc2661_device, rx_w))
+ MCFG_MC2661_TXD_HANDLER(WRITELINE("uart0", mc2661_device, rx_w))
MCFG_MC2661_RXRDY_HANDLER(INPUTLINE("videocpu", INPUT_LINE_IRQ0))
- MCFG_MC2661_RTS_HANDLER(DEVWRITELINE("uart0", mc2661_device, cts_w))
- MCFG_MC2661_DTR_HANDLER(DEVWRITELINE("uart0", mc2661_device, dsr_w))
+ MCFG_MC2661_RTS_HANDLER(WRITELINE("uart0", mc2661_device, cts_w))
+ MCFG_MC2661_DTR_HANDLER(WRITELINE("uart0", mc2661_device, dsr_w))
MCFG_DEVICE_ADD("videouart1", MC2661, XTAL(5'068'800))
MCFG_MC2661_RXC(19200)
@@ -905,16 +905,16 @@ MACHINE_CONFIG_START(wicat_state::wicat)
MCFG_DEVICE_ADD("video", I8275, XTAL(19'660'800)/8)
MCFG_I8275_CHARACTER_WIDTH(9)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(wicat_state, wicat_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("videodma",am9517a_device, dreq0_w))
- MCFG_I8275_IRQ_CALLBACK(WRITELINE(wicat_state,crtc_cb))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE("videodma",am9517a_device, dreq0_w))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE(*this, wicat_state,crtc_cb))
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_DEFAULT_LAYOUT(layout_wicat)
/* Winchester Disk Controller (WD1000 + FD1795) */
- MCFG_CPU_ADD("wd1kcpu",N8X300,XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(wicat_wd1000_mem)
- MCFG_CPU_IO_MAP(wicat_wd1000_io)
+ MCFG_DEVICE_ADD("wd1kcpu",N8X300,XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(wicat_wd1000_mem)
+ MCFG_DEVICE_IO_MAP(wicat_wd1000_io)
MCFG_FD1795_ADD("fdc",XTAL(8'000'000))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", wicat_floppies, "525qd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp
index de5d83c09ec..7b6f4dd2f35 100644
--- a/src/mame/drivers/wico.cpp
+++ b/src/mame/drivers/wico.cpp
@@ -440,10 +440,10 @@ void wico_state::machine_reset()
MACHINE_CONFIG_START(wico_state::wico)
/* basic machine hardware */
- MCFG_CPU_ADD("ccpu", MC6809E, XTAL(10'000'000) / 8) // MC68A09EP @ U51
- MCFG_CPU_PROGRAM_MAP(ccpu_map)
- MCFG_CPU_ADD("hcpu", MC6809E, XTAL(10'000'000) / 8) // MC68A09EP @ U24
- MCFG_CPU_PROGRAM_MAP(hcpu_map)
+ MCFG_DEVICE_ADD("ccpu", MC6809E, XTAL(10'000'000) / 8) // MC68A09EP @ U51
+ MCFG_DEVICE_PROGRAM_MAP(ccpu_map)
+ MCFG_DEVICE_ADD("hcpu", MC6809E, XTAL(10'000'000) / 8) // MC68A09EP @ U24
+ MCFG_DEVICE_PROGRAM_MAP(hcpu_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", wico_state, irq_housekeeping, attotime::from_hz(120)) // zero crossing
MCFG_TIMER_DRIVER_ADD_PERIODIC("firq", wico_state, firq_housekeeping, attotime::from_hz(750)) // time generator
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -454,7 +454,7 @@ MACHINE_CONFIG_START(wico_state::wico)
/* Sound */
genpin_audio(config);
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn76494", SN76494, XTAL(10'000'000) / 64)
+ MCFG_DEVICE_ADD("sn76494", SN76494, XTAL(10'000'000) / 64)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp
index 96e2ae65890..cf6c36391eb 100644
--- a/src/mame/drivers/wildpkr.cpp
+++ b/src/mame/drivers/wildpkr.cpp
@@ -462,9 +462,9 @@ IRQ_CALLBACK_MEMBER(wildpkr_state::tabpkr_irq_ack)
MACHINE_CONFIG_START(wildpkr_state::wildpkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(wildpkr_map)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", wildpkr_state, irq2_line_hold) // guess
+ MCFG_DEVICE_ADD("maincpu", M68000, MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(wildpkr_map)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wildpkr_state, irq2_line_hold) // guess
MCFG_DEVICE_ADD("duart", MC68681, SEC_CLOCK)
@@ -485,7 +485,7 @@ MACHINE_CONFIG_START(wildpkr_state::wildpkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("aysnd", AY8930, AY_CLOCK)
+ MCFG_DEVICE_ADD("aysnd", AY8930, AY_CLOCK)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -493,10 +493,10 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wildpkr_state::tabpkr)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(tabpkr_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wildpkr_state, irq3_line_assert, 60*256)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(wildpkr_state, tabpkr_irq_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(24'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(tabpkr_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wildpkr_state, irq3_line_assert, 60*256)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(wildpkr_state, tabpkr_irq_ack)
MCFG_NVRAM_ADD_1FILL("nvram") // DS1220Y
@@ -526,7 +526,7 @@ MACHINE_CONFIG_START(wildpkr_state::tabpkr)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("dac", AD557, 0)
+ MCFG_DEVICE_ADD("dac", AD557, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp
index 27e48479ed4..c234a45b987 100644
--- a/src/mame/drivers/williams.cpp
+++ b/src/mame/drivers/williams.cpp
@@ -1465,11 +1465,11 @@ GFXDECODE_END
MACHINE_CONFIG_START(williams_state::williams)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4)
- MCFG_CPU_PROGRAM_MAP(williams_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4)
+ MCFG_DEVICE_PROGRAM_MAP(williams_map)
- MCFG_CPU_ADD("soundcpu", M6808, SOUND_CLOCK) // internal clock divider of 4, effective frequency is 894.886kHz
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("soundcpu", M6808, SOUND_CLOCK) // internal clock divider of 4, effective frequency is 894.886kHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_MACHINE_START_OVERRIDE(williams_state,williams)
MCFG_MACHINE_RESET_OVERRIDE(williams_state,williams)
@@ -1490,7 +1490,7 @@ MACHINE_CONFIG_START(williams_state::williams)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // mc1408.ic6
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // mc1408.ic6
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1501,14 +1501,14 @@ MACHINE_CONFIG_START(williams_state::williams)
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, williams_snd_cmd_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state, williams_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state, williams_main_irq))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_state, williams_snd_cmd_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state, williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state, williams_main_irq))
MCFG_DEVICE_ADD("pia_2", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq))
MACHINE_CONFIG_END
@@ -1517,11 +1517,11 @@ MACHINE_CONFIG_START(williams_state::defender)
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(defender_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(defender_map)
- MCFG_CPU_MODIFY("soundcpu")
- MCFG_CPU_PROGRAM_MAP(defender_sound_map)
+ MCFG_DEVICE_MODIFY("soundcpu")
+ MCFG_DEVICE_PROGRAM_MAP(defender_sound_map)
MCFG_DEVICE_ADD("bankc000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(defender_bankc000_map)
@@ -1554,12 +1554,12 @@ MACHINE_CONFIG_START(williams_state::williams_muxed)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
MCFG_PIA_READPA_HANDLER(IOPORT("IN0")) MCFG_DEVCB_MASK(0x30)
- MCFG_DEVCB_CHAIN_INPUT(DEVREAD8("mux_0", ls157_device, output_r)) MCFG_DEVCB_MASK(0x0f)
- MCFG_DEVCB_CHAIN_INPUT(DEVREAD8("mux_1", ls157_device, output_r)) MCFG_DEVCB_RSHIFT(-6) MCFG_DEVCB_MASK(0xc0)
+ MCFG_DEVCB_CHAIN_INPUT(READ8("mux_0", ls157_device, output_r)) MCFG_DEVCB_MASK(0x0f)
+ MCFG_DEVCB_CHAIN_INPUT(READ8("mux_1", ls157_device, output_r)) MCFG_DEVCB_RSHIFT(-6) MCFG_DEVCB_MASK(0xc0)
MCFG_PIA_READPB_HANDLER(IOPORT("IN1")) MCFG_DEVCB_MASK(0xfc)
- MCFG_DEVCB_CHAIN_INPUT(DEVREAD8("mux_1", ls157_device, output_r)) MCFG_DEVCB_RSHIFT(2) MCFG_DEVCB_MASK(0x03)
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("mux_0", ls157_device, select_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mux_1", ls157_device, select_w))
+ MCFG_DEVCB_CHAIN_INPUT(READ8("mux_1", ls157_device, output_r)) MCFG_DEVCB_RSHIFT(2) MCFG_DEVCB_MASK(0x03)
+ MCFG_PIA_CB2_HANDLER(WRITELINE("mux_0", ls157_device, select_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mux_1", ls157_device, select_w))
MCFG_DEVICE_ADD("mux_0", LS157, 0) // IC3 on interface board (actually LS257 with OC tied low)
MCFG_74157_A_IN_CB(IOPORT("INP2"))
@@ -1590,8 +1590,8 @@ MACHINE_CONFIG_START(williams_state::lottofun)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITELINE("ticket", ticket_dispenser_device, motor_w)) MCFG_DEVCB_BIT(7)
- MCFG_PIA_CA2_HANDLER(WRITELINE(williams_state, lottofun_coin_lock_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITELINE("ticket", ticket_dispenser_device, motor_w)) MCFG_DEVCB_BIT(7)
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, williams_state, lottofun_coin_lock_w))
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(70), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH)
MACHINE_CONFIG_END
@@ -1601,20 +1601,20 @@ MACHINE_CONFIG_START(williams_state::sinistar)
williams(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(sinistar_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(sinistar_map)
/* sound hardware */
- MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_DEVICE_ADD("cvsd", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_READPA_HANDLER(READ8(williams_state, williams_49way_port_0_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, williams_state, williams_49way_port_0_r))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, digit_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, clock_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("cvsd", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("cvsd", hc55516_device, clock_w))
MACHINE_CONFIG_END
@@ -1628,16 +1628,16 @@ MACHINE_CONFIG_START(williams_state::playball)
MCFG_SCREEN_VISIBLE_AREA(6, 298-1, 8, 240-1)
/* sound hardware */
- MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_DEVICE_ADD("cvsd", HC55516, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.8)
/* pia */
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, playball_snd_cmd_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_state, playball_snd_cmd_w))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, digit_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("cvsd", hc55516_device, clock_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("cvsd", hc55516_device, digit_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("cvsd", hc55516_device, clock_w))
MACHINE_CONFIG_END
@@ -1645,8 +1645,8 @@ MACHINE_CONFIG_START(blaster_state::blastkit)
williams(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(blaster_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(blaster_map)
MCFG_MACHINE_START_OVERRIDE(blaster_state,blaster)
MCFG_MACHINE_RESET_OVERRIDE(blaster_state,blaster)
@@ -1658,14 +1658,14 @@ MACHINE_CONFIG_START(blaster_state::blastkit)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_READPA_HANDLER(DEVREAD8("mux_a", ls157_x2_device, output_r))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("mux_a", ls157_x2_device, select_w))
+ MCFG_PIA_READPA_HANDLER(READ8("mux_a", ls157_x2_device, output_r))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("mux_a", ls157_x2_device, select_w))
// All multiplexers on Blaster interface board are really LS257 with OC tied to GND (which is equivalent to LS157)
MCFG_DEVICE_ADD("mux_a", LS157_X2, 0)
MCFG_74157_A_IN_CB(IOPORT("IN3"))
- MCFG_74157_B_IN_CB(READ8(williams_state, williams_49way_port_0_r))
+ MCFG_74157_B_IN_CB(READ8(*this, williams_state, williams_49way_port_0_r))
MACHINE_CONFIG_END
@@ -1673,18 +1673,18 @@ MACHINE_CONFIG_START(blaster_state::blaster)
blastkit(config);
/* basic machine hardware */
- MCFG_CPU_ADD("soundcpu_b", M6808, SOUND_CLOCK) // internal clock divider of 4, effective frequency is 894.886kHz
- MCFG_CPU_PROGRAM_MAP(sound_map_b)
+ MCFG_DEVICE_ADD("soundcpu_b", M6808, SOUND_CLOCK) // internal clock divider of 4, effective frequency is 894.886kHz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map_b)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_READPB_HANDLER(DEVREAD8("mux_b", ls157_device, output_r)) MCFG_DEVCB_MASK(0x0f)
+ MCFG_PIA_READPB_HANDLER(READ8("mux_b", ls157_device, output_r)) MCFG_DEVCB_MASK(0x0f)
MCFG_DEVCB_CHAIN_INPUT(IOPORT("IN1")) MCFG_DEVCB_MASK(0xf0)
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("mux_a", ls157_x2_device, select_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("mux_b", ls157_device, select_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("mux_a", ls157_x2_device, select_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("mux_b", ls157_device, select_w))
MCFG_DEVICE_MODIFY("mux_a") // IC7 (for PA0-PA3) + IC5 (for PA4-PA7)
- MCFG_74157_A_IN_CB(READ8(williams_state, williams_49way_port_0_r))
+ MCFG_74157_A_IN_CB(READ8(*this, williams_state, williams_49way_port_0_r))
MCFG_74157_B_IN_CB(IOPORT("IN3"))
MCFG_DEVICE_ADD("mux_b", LS157, 0) // IC3
@@ -1692,15 +1692,15 @@ MACHINE_CONFIG_START(blaster_state::blaster)
MCFG_74157_B_IN_CB(IOPORT("INP2"))
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(blaster_state, blaster_snd_cmd_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, blaster_state, blaster_snd_cmd_w))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("ldac", dac_byte_interface, write))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("ldac", dac_byte_interface, write))
MCFG_DEVICE_ADD("pia_2b", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("rdac", dac_byte_interface, write))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(blaster_state,williams_snd_irq_b))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(blaster_state,williams_snd_irq_b))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("rdac", dac_byte_interface, write))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, blaster_state,williams_snd_irq_b))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, blaster_state,williams_snd_irq_b))
/* sound hardware */
MCFG_DEVICE_REMOVE("speaker")
@@ -1708,8 +1708,8 @@ MACHINE_CONFIG_START(blaster_state::blaster)
MCFG_DEVICE_REMOVE("vref")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ldac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
- MCFG_SOUND_ADD("rdac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1719,11 +1719,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(williams2_state::williams2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4)
- MCFG_CPU_PROGRAM_MAP(williams2_d000_ram_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4)
+ MCFG_DEVICE_PROGRAM_MAP(williams2_d000_ram_map)
- MCFG_CPU_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */
- MCFG_CPU_PROGRAM_MAP(williams2_sound_map)
+ MCFG_DEVICE_ADD("soundcpu", M6808, MASTER_CLOCK/3) /* yes, this is different from the older games */
+ MCFG_DEVICE_PROGRAM_MAP(williams2_sound_map)
MCFG_DEVICE_ADD("bank8000", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(williams2_bank8000_map)
@@ -1754,7 +1754,7 @@ MACHINE_CONFIG_START(williams2_state::williams2)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1765,25 +1765,25 @@ MACHINE_CONFIG_START(williams2_state::williams2)
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams2_state,williams2_snd_cmd_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia_2", pia6821_device, ca1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_main_irq))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams2_state,williams2_snd_cmd_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("pia_2", pia6821_device, ca1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_main_irq))
MCFG_DEVICE_ADD("pia_2", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("pia_1", pia6821_device, portb_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("pia_1", pia6821_device, cb1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("pia_1", pia6821_device, portb_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("pia_1", pia6821_device, cb1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(williams2_state::inferno)
williams2(config);
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_READPA_HANDLER(DEVREAD8("mux", ls157_x2_device, output_r))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("mux", ls157_x2_device, select_w))
+ MCFG_PIA_READPA_HANDLER(READ8("mux", ls157_x2_device, output_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("mux", ls157_x2_device, select_w))
MCFG_DEVICE_ADD("mux", LS157_X2, 0) // IC45 (for PA4-PA7) + IC46 (for PA0-PA3) on CPU board
MCFG_74157_A_IN_CB(IOPORT("INP1"))
@@ -1798,12 +1798,12 @@ MACHINE_CONFIG_START(williams2_state::mysticm)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_main_firq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams2_state,mysticm_main_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_main_firq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams2_state,mysticm_main_irq))
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams2_state,mysticm_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams2_state,mysticm_main_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams2_state,mysticm_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams2_state,mysticm_main_irq))
MACHINE_CONFIG_END
@@ -1811,23 +1811,23 @@ MACHINE_CONFIG_START(tshoot_state::tshoot)
williams2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(williams2_d000_rom_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(williams2_d000_rom_map)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
- MCFG_PIA_READPA_HANDLER(DEVREAD8("mux", ls157_x2_device, output_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(tshoot_state, lamp_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("mux", ls157_x2_device, select_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams2_state,tshoot_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams2_state,tshoot_main_irq))
+ MCFG_PIA_READPA_HANDLER(READ8("mux", ls157_x2_device, output_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, tshoot_state, lamp_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("mux", ls157_x2_device, select_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams2_state,tshoot_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams2_state,tshoot_main_irq))
MCFG_DEVICE_MODIFY("pia_1")
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams2_state,tshoot_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams2_state,tshoot_main_irq))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams2_state,tshoot_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams2_state,tshoot_main_irq))
MCFG_DEVICE_MODIFY("pia_2")
- MCFG_PIA_CB2_HANDLER(WRITELINE(tshoot_state, maxvol_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, tshoot_state, maxvol_w))
MCFG_DEVICE_ADD("mux", LS157_X2, 0) // U2 + U3 on interface board
MCFG_74157_A_IN_CB(IOPORT("INP1"))
@@ -1839,10 +1839,10 @@ MACHINE_CONFIG_START(joust2_state::joust2)
williams2(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(williams2_d000_rom_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(williams2_d000_rom_map)
- MCFG_SOUND_ADD("cvsd", WILLIAMS_CVSD_SOUND, 0)
+ MCFG_DEVICE_ADD("cvsd", WILLIAMS_CVSD_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_MACHINE_START_OVERRIDE(joust2_state,joust2)
@@ -1851,16 +1851,16 @@ MACHINE_CONFIG_START(joust2_state::joust2)
/* pia */
MCFG_DEVICE_MODIFY("pia_0")
MCFG_PIA_READPA_HANDLER(IOPORT("IN0")) MCFG_DEVCB_MASK(0xf0)
- MCFG_DEVCB_CHAIN_INPUT(DEVREAD8("mux", ls157_device, output_r)) MCFG_DEVCB_MASK(0x0f)
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("mux", ls157_device, select_w))
+ MCFG_DEVCB_CHAIN_INPUT(READ8("mux", ls157_device, output_r)) MCFG_DEVCB_MASK(0x0f)
+ MCFG_PIA_CA2_HANDLER(WRITELINE("mux", ls157_device, select_w))
MCFG_DEVICE_MODIFY("pia_1")
MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(joust2_state,joust2_snd_cmd_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(joust2_state,joust2_pia_3_cb1_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("pia_2", pia6821_device, ca1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_main_irq))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, joust2_state,joust2_snd_cmd_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, joust2_state,joust2_pia_3_cb1_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("pia_2", pia6821_device, ca1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_main_irq))
MCFG_DEVICE_ADD("mux", LS157, 0)
MCFG_74157_A_IN_CB(IOPORT("INP1"))
diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp
index 9dc07887229..c7ed6c58c8c 100644
--- a/src/mame/drivers/wink.cpp
+++ b/src/mame/drivers/wink.cpp
@@ -380,24 +380,24 @@ void wink_state::machine_reset()
MACHINE_CONFIG_START(wink_state::wink)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 12000000 / 4)
- MCFG_CPU_PROGRAM_MAP(wink_map)
- MCFG_CPU_IO_MAP(wink_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, 12000000 / 4)
+ MCFG_DEVICE_PROGRAM_MAP(wink_map)
+ MCFG_DEVICE_IO_MAP(wink_io)
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(wink_state, nmi_enable_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(wink_state, player_mux_w)) //??? no mux on the pcb.
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(wink_state, tile_banking_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, wink_state, nmi_enable_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, wink_state, player_mux_w)) //??? no mux on the pcb.
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, wink_state, tile_banking_w))
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(NOOP) //?
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) //cab Knocker like in q-bert!
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wink_state, coin_counter_w<0>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(wink_state, coin_counter_w<1>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(wink_state, coin_counter_w<2>))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wink_state, coin_counter_w<0>))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, wink_state, coin_counter_w<1>))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, wink_state, coin_counter_w<2>))
- MCFG_CPU_ADD("audiocpu", Z80, 12000000 / 8)
- MCFG_CPU_PROGRAM_MAP(wink_sound_map)
- MCFG_CPU_IO_MAP(wink_sound_io)
- MCFG_CPU_PERIODIC_INT_DRIVER(wink_state, wink_sound, 15625)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 12000000 / 8)
+ MCFG_DEVICE_PROGRAM_MAP(wink_sound_map)
+ MCFG_DEVICE_IO_MAP(wink_sound_io)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wink_state, wink_sound, 15625)
MCFG_NVRAM_ADD_1FILL("nvram")
@@ -409,7 +409,7 @@ MACHINE_CONFIG_START(wink_state::wink)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
MCFG_SCREEN_UPDATE_DRIVER(wink_state, screen_update_wink)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(wink_state, nmi_clock_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wink_state, nmi_clock_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", wink)
MCFG_PALETTE_ADD("palette", 16)
@@ -421,8 +421,8 @@ MACHINE_CONFIG_START(wink_state::wink)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8912, 12000000 / 8)
- MCFG_AY8910_PORT_A_READ_CB(READ8(wink_state, sound_r))
+ MCFG_DEVICE_ADD("aysnd", AY8912, 12000000 / 8)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(*this, wink_state, sound_r))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp
index cdb48258630..ad01d013325 100644
--- a/src/mame/drivers/wiping.cpp
+++ b/src/mame/drivers/wiping.cpp
@@ -288,18 +288,18 @@ INTERRUPT_GEN_MEMBER(wiping_state::sound_timer_irq)
MACHINE_CONFIG_START(wiping_state::wiping)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wiping_state, vblank_irq)
+ MCFG_DEVICE_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wiping_state, vblank_irq)
- MCFG_CPU_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wiping_state, sound_timer_irq, 120) /* periodic interrupt, don't know about the frequency */
+ MCFG_DEVICE_ADD("audiocpu", Z80,18432000/6) /* 3.072 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wiping_state, sound_timer_irq, 120) /* periodic interrupt, don't know about the frequency */
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 5A
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(wiping_state, main_irq_mask_w)) // INT1
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(wiping_state, sound_irq_mask_w)) // INT2
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(wiping_state, flipscreen_w)) // INV
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, wiping_state, main_irq_mask_w)) // INT1
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, wiping_state, sound_irq_mask_w)) // INT2
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, wiping_state, flipscreen_w)) // INV
MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(INPUTLINE("audiocpu", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // CP2RE
MCFG_WATCHDOG_ADD("watchdog")
@@ -321,7 +321,7 @@ MACHINE_CONFIG_START(wiping_state::wiping)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("wiping", WIPING_CUSTOM, 96000)
+ MCFG_DEVICE_ADD("wiping", WIPING_CUSTOM, 96000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp
index 5a1315ba4f4..4a9b2f08f30 100644
--- a/src/mame/drivers/witch.cpp
+++ b/src/mame/drivers/witch.cpp
@@ -776,14 +776,14 @@ void witch_state::machine_reset()
MACHINE_CONFIG_START(witch_state::witch)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(map_main)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", witch_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(map_main)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", witch_state, irq0_line_assert)
/* 2nd z80 */
- MCFG_CPU_ADD("sub", Z80, CPU_CLOCK) /* 3 MHz */
- MCFG_CPU_PROGRAM_MAP(map_sub)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", witch_state, irq0_line_assert)
+ MCFG_DEVICE_ADD("sub", Z80, CPU_CLOCK) /* 3 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(map_sub)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", witch_state, irq0_line_assert)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -793,14 +793,14 @@ MACHINE_CONFIG_START(witch_state::witch)
// 82C255 (actual chip on PCB) is equivalent to two 8255s
MCFG_DEVICE_ADD("ppi1", I8255, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(witch_state, read_a000))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, witch_state, read_a000))
MCFG_I8255_IN_PORTB_CB(IOPORT("UNK"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(witch_state, write_a002))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, witch_state, write_a002))
MCFG_DEVICE_ADD("ppi2", I8255, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("A004"))
MCFG_I8255_IN_PORTB_CB(IOPORT("A005"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(witch_state, write_a006))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, witch_state, write_a006))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -819,22 +819,22 @@ MACHINE_CONFIG_START(witch_state::witch)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_ES8712_ADD("essnd", 0)
- MCFG_ES8712_MSM_WRITE_CALLBACK(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_ES8712_MSM_WRITE_CALLBACK(WRITE8("msm", msm5205_device, data_w))
MCFG_ES8712_MSM_TAG("msm")
- MCFG_SOUND_ADD("msm", MSM5205, MSM5202_CLOCK) /* actually MSM5202 */
- MCFG_MSM6585_VCK_CALLBACK(DEVWRITELINE("essnd", es8712_device, msm_int))
+ MCFG_DEVICE_ADD("msm", MSM5205, MSM5202_CLOCK) /* actually MSM5202 */
+ MCFG_MSM6585_VCK_CALLBACK(WRITELINE("essnd", es8712_device, msm_int))
MCFG_MSM6585_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("ym1", YM2203, YM2203_CLOCK) /* 3 MHz */
+ MCFG_DEVICE_ADD("ym1", YM2203, YM2203_CLOCK) /* 3 MHz */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("YM_PortA"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("YM_PortB"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_SOUND_ADD("ym2", YM2203, YM2203_CLOCK) /* 3 MHz */
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(witch_state, xscroll_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(witch_state, yscroll_w))
+ MCFG_DEVICE_ADD("ym2", YM2203, YM2203_CLOCK) /* 3 MHz */
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, witch_state, xscroll_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, witch_state, yscroll_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp
index e13e546f340..9019734f19b 100644
--- a/src/mame/drivers/wiz.cpp
+++ b/src/mame/drivers/wiz.cpp
@@ -793,13 +793,13 @@ INTERRUPT_GEN_MEMBER(wiz_state::wiz_sound_interrupt)
MACHINE_CONFIG_START(wiz_state::kungfut)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(kungfut_main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wiz_state, wiz_vblank_interrupt)
+ MCFG_DEVICE_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(kungfut_main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wiz_state, wiz_vblank_interrupt)
- MCFG_CPU_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(kungfut_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wiz_state, wiz_sound_interrupt, 4*60) /* ??? */
+ MCFG_DEVICE_ADD("audiocpu", Z80, 18432000/6) /* 3.072 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(kungfut_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wiz_state, wiz_sound_interrupt, 4*60) /* ??? */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -819,13 +819,13 @@ MACHINE_CONFIG_START(wiz_state::kungfut)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("8910.1", AY8910, 18432000/12)
+ MCFG_DEVICE_ADD("8910.1", AY8910, 18432000/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("8910.2", AY8910, 18432000/12)
+ MCFG_DEVICE_ADD("8910.2", AY8910, 18432000/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_SOUND_ADD("8910.3", AY8910, 18432000/12)
+ MCFG_DEVICE_ADD("8910.3", AY8910, 18432000/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -833,8 +833,8 @@ MACHINE_CONFIG_START(wiz_state::wiz)
kungfut(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wiz_main_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wiz_main_map)
/* video hardware */
MCFG_GFXDECODE_MODIFY("gfxdecode", wiz)
@@ -847,13 +847,13 @@ MACHINE_CONFIG_START(wiz_state::stinger)
kungfut(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(stinger_main_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(stinger_main_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
/* basic machine hardware */
- MCFG_CPU_MODIFY("audiocpu")
- MCFG_CPU_PROGRAM_MAP(stinger_sound_map)
+ MCFG_DEVICE_MODIFY("audiocpu")
+ MCFG_DEVICE_PROGRAM_MAP(stinger_sound_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -864,7 +864,7 @@ MACHINE_CONFIG_START(wiz_state::stinger)
/* sound hardware */
MCFG_DEVICE_REMOVE("8910.3")
- MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_DEVICE_ADD("discrete", DISCRETE)
MCFG_DISCRETE_INTF(stinger)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -872,7 +872,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wiz_state::scion)
stinger(config);
- MCFG_CPU_MODIFY("maincpu")
+ MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_REMOVE_ADDRESS_MAP(AS_OPCODES)
/* video hardware */
diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp
index fa55c7a6af4..33cfc5c3600 100644
--- a/src/mame/drivers/wmg.cpp
+++ b/src/mame/drivers/wmg.cpp
@@ -493,11 +493,11 @@ DRIVER_INIT_MEMBER( wmg_state, wmg )
MACHINE_CONFIG_START(wmg_state::wmg)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4)
- MCFG_CPU_PROGRAM_MAP(wmg_cpu1)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, MASTER_CLOCK/3/4)
+ MCFG_DEVICE_PROGRAM_MAP(wmg_cpu1)
- MCFG_CPU_ADD("soundcpu", M6808, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(wmg_cpu2)
+ MCFG_DEVICE_ADD("soundcpu", M6808, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(wmg_cpu2)
MCFG_MACHINE_START_OVERRIDE(williams_state,williams)
MCFG_MACHINE_RESET_OVERRIDE(wmg_state, wmg)
@@ -519,7 +519,7 @@ MACHINE_CONFIG_START(wmg_state::wmg)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", MC1408, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
@@ -527,18 +527,18 @@ MACHINE_CONFIG_START(wmg_state::wmg)
MCFG_DEVICE_ADD("pia_0", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN0"))
MCFG_PIA_READPB_HANDLER(IOPORT("IN1"))
- MCFG_PIA_CB2_HANDLER(WRITELINE(wmg_state, wmg_port_select_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, wmg_state, wmg_port_select_w))
MCFG_DEVICE_ADD("pia_1", PIA6821, 0)
MCFG_PIA_READPA_HANDLER(IOPORT("IN2"))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(williams_state, williams_snd_cmd_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state, williams_main_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state, williams_main_irq))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_state, williams_snd_cmd_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state, williams_main_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state, williams_main_irq))
MCFG_DEVICE_ADD("pia_2", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8("dac", dac_byte_interface, write))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(williams_state,williams_snd_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(williams_state,williams_snd_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, write))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq))
MACHINE_CONFIG_END
/*************************************
diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp
index fcec70ef88b..4057b2d7dc0 100644
--- a/src/mame/drivers/wms.cpp
+++ b/src/mame/drivers/wms.cpp
@@ -179,14 +179,14 @@ GFXDECODE_END
MACHINE_CONFIG_START(wms_state::wms)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", I80188, MAIN_CLOCK ) // AMD N80C188-20, ( 40 MHz. internally divided by 2)
- MCFG_CPU_PROGRAM_MAP(wms_map)
- MCFG_CPU_IO_MAP(wms_io)
+ MCFG_DEVICE_ADD("maincpu", I80188, MAIN_CLOCK ) // AMD N80C188-20, ( 40 MHz. internally divided by 2)
+ MCFG_DEVICE_PROGRAM_MAP(wms_map)
+ MCFG_DEVICE_IO_MAP(wms_io)
- MCFG_CPU_ADD("adsp", ADSP2105, MAIN_CLOCK / 2) // ADSP-2105 could run either at 13.824 or 20 MHz...
+ MCFG_DEVICE_ADD("adsp", ADSP2105, MAIN_CLOCK / 2) // ADSP-2105 could run either at 13.824 or 20 MHz...
MCFG_DEVICE_DISABLE()
- MCFG_CPU_PROGRAM_MAP(adsp_program_map)
- MCFG_CPU_DATA_MAP(adsp_data_map)
+ MCFG_DEVICE_PROGRAM_MAP(adsp_program_map)
+ MCFG_DEVICE_DATA_MAP(adsp_data_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp
index e4d0d1f038c..4e27be882c2 100644
--- a/src/mame/drivers/wolfpack.cpp
+++ b/src/mame/drivers/wolfpack.cpp
@@ -308,8 +308,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(wolfpack_state::wolfpack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M6502, 12096000 / 16)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -319,7 +319,7 @@ MACHINE_CONFIG_START(wolfpack_state::wolfpack)
MCFG_SCREEN_SIZE(512, 262)
MCFG_SCREEN_VISIBLE_AREA(0, 511, 16, 239)
MCFG_SCREEN_UPDATE_DRIVER(wolfpack_state, screen_update)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(wolfpack_state, screen_vblank))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, wolfpack_state, screen_vblank))
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", wolfpack)
@@ -329,7 +329,7 @@ MACHINE_CONFIG_START(wolfpack_state::wolfpack)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
+ MCFG_DEVICE_ADD("speech", S14001A, 20000) /* RC Clock (C=100pf, R=470K-670K ohms, adjustable) ranging from 14925.37313hz to 21276.59574hz, likely factory set to 20000hz since anything below 19500 is too slow */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp
index d8325ac856d..31a71324da8 100644
--- a/src/mame/drivers/wpc_95.cpp
+++ b/src/mame/drivers/wpc_95.cpp
@@ -2249,16 +2249,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wpc_95_state::wpc_95)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(8'000'000)/4) // 68B09E
- MCFG_CPU_PROGRAM_MAP(wpc_95_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wpc_95_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(8'000'000)/4) // 68B09E
+ MCFG_DEVICE_PROGRAM_MAP(wpc_95_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wpc_95_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_95_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
MCFG_WPC_PIC_ADD("pic")
MCFG_WPC_LAMP_ADD("lamp")
MCFG_WPC_OUT_ADD("out", 3)
MCFG_WPC_SHIFT_ADD("shift")
- MCFG_WPC_DMD_ADD("dmd", WRITELINE(wpc_95_state, scanline_irq))
+ MCFG_WPC_DMD_ADD("dmd", WRITELINE(*this, wpc_95_state, scanline_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("dcs", DCS_AUDIO_WPC, 0)
diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp
index 3abe7ba7763..b27dc6cc6d0 100644
--- a/src/mame/drivers/wpc_an.cpp
+++ b/src/mame/drivers/wpc_an.cpp
@@ -325,16 +325,16 @@ DRIVER_INIT_MEMBER(wpc_an_state,wpc_an)
MACHINE_CONFIG_START(wpc_an_state::wpc_an_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(8'000'000) / 4) // 68B09E
- MCFG_CPU_PROGRAM_MAP(wpc_an_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(8'000'000) / 4) // 68B09E
+ MCFG_DEVICE_PROGRAM_MAP(wpc_an_map)
MCFG_WMS_WPC_ADD("wpc")
- MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(wpc_an_state,wpc_irq_w))
- MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(wpc_an_state,wpc_firq_w))
- MCFG_WPC_ROMBANK(WRITE8(wpc_an_state,wpc_rombank_w))
- MCFG_WPC_SOUND_CTRL(READ8(wpc_an_state,wpc_sound_ctrl_r),WRITE8(wpc_an_state,wpc_sound_ctrl_w))
- MCFG_WPC_SOUND_DATA(READ8(wpc_an_state,wpc_sound_data_r),WRITE8(wpc_an_state,wpc_sound_data_w))
- MCFG_WPC_SOUND_S11C(WRITE8(wpc_an_state,wpc_sound_s11_w))
+ MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_an_state,wpc_irq_w))
+ MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_an_state,wpc_firq_w))
+ MCFG_WPC_ROMBANK(WRITE8(*this, wpc_an_state,wpc_rombank_w))
+ MCFG_WPC_SOUND_CTRL(READ8(*this, wpc_an_state,wpc_sound_ctrl_r),WRITE8(*this, wpc_an_state,wpc_sound_ctrl_w))
+ MCFG_WPC_SOUND_DATA(READ8(*this, wpc_an_state,wpc_sound_data_r),WRITE8(*this, wpc_an_state,wpc_sound_data_w))
+ MCFG_WPC_SOUND_S11C(WRITE8(*this, wpc_an_state,wpc_sound_s11_w))
MCFG_DEFAULT_LAYOUT(layout_wpc_an)
MACHINE_CONFIG_END
@@ -343,9 +343,9 @@ MACHINE_CONFIG_START(wpc_an_state::wpc_an)
wpc_an_base(config);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("wpcsnd", WPCSND, 0)
+ MCFG_DEVICE_ADD("wpcsnd", WPCSND)
MCFG_WPC_ROM_REGION("sound1")
- MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(wpc_an_state,wpcsnd_reply_w))
+ MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_an_state,wpcsnd_reply_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -353,7 +353,7 @@ MACHINE_CONFIG_START(wpc_an_state::wpc_an_dd)
wpc_an_base(config);
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("bg", S11C_BG, 0)
+ MCFG_DEVICE_ADD("bg", S11C_BG)
MCFG_S11C_BG_ROM_REGION(":sound1")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp
index 63073bd7fda..f48789d9b6e 100644
--- a/src/mame/drivers/wpc_dcs.cpp
+++ b/src/mame/drivers/wpc_dcs.cpp
@@ -425,16 +425,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wpc_dcs_state::wpc_dcs)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, XTAL(8'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(wpc_dcs_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, XTAL(8'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(wpc_dcs_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wpc_dcs_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wpc_dcs_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_dcs_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
MCFG_WPC_LAMP_ADD("lamp")
MCFG_WPC_OUT_ADD("out", 3)
MCFG_WPC_SHIFT_ADD("shift")
- MCFG_WPC_DMD_ADD("dmd", WRITELINE(wpc_dcs_state, scanline_irq))
+ MCFG_WPC_DMD_ADD("dmd", WRITELINE(*this, wpc_dcs_state, scanline_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("dcs", DCS_AUDIO_8K, 0)
diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp
index b6717407e95..3dd9b13798b 100644
--- a/src/mame/drivers/wpc_dot.cpp
+++ b/src/mame/drivers/wpc_dot.cpp
@@ -304,21 +304,21 @@ uint32_t wpc_dot_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
MACHINE_CONFIG_START(wpc_dot_state::wpc_dot)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 2000000)
- MCFG_CPU_PROGRAM_MAP(wpc_dot_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(wpc_dot_map)
MCFG_WMS_WPC_ADD("wpc")
- MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(wpc_dot_state,wpc_irq_w))
- MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(wpc_dot_state,wpc_firq_w))
- MCFG_WPC_ROMBANK(WRITE8(wpc_dot_state,wpc_rombank_w))
- MCFG_WPC_SOUND_CTRL(READ8(wpc_dot_state,wpc_sound_ctrl_r),WRITE8(wpc_dot_state,wpc_sound_ctrl_w))
- MCFG_WPC_SOUND_DATA(READ8(wpc_dot_state,wpc_sound_data_r),WRITE8(wpc_dot_state,wpc_sound_data_w))
- MCFG_WPC_DMDBANK(WRITE8(wpc_dot_state,wpc_dmdbank_w))
+ MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_dot_state,wpc_irq_w))
+ MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_dot_state,wpc_firq_w))
+ MCFG_WPC_ROMBANK(WRITE8(*this, wpc_dot_state,wpc_rombank_w))
+ MCFG_WPC_SOUND_CTRL(READ8(*this, wpc_dot_state,wpc_sound_ctrl_r),WRITE8(*this, wpc_dot_state,wpc_sound_ctrl_w))
+ MCFG_WPC_SOUND_DATA(READ8(*this, wpc_dot_state,wpc_sound_data_r),WRITE8(*this, wpc_dot_state,wpc_sound_data_w))
+ MCFG_WPC_DMDBANK(WRITE8(*this, wpc_dot_state,wpc_dmdbank_w))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("wpcsnd", WPCSND, 0)
+ MCFG_DEVICE_ADD("wpcsnd", WPCSND)
MCFG_WPC_ROM_REGION("sound1")
- MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(wpc_dot_state,wpcsnd_reply_w))
+ MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_dot_state,wpcsnd_reply_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_DEFAULT_LAYOUT(layout_lcd)
diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp
index c86b7445ab7..c01b65f5ae0 100644
--- a/src/mame/drivers/wpc_flip1.cpp
+++ b/src/mame/drivers/wpc_flip1.cpp
@@ -160,21 +160,21 @@ DRIVER_INIT_MEMBER(wpc_flip1_state,wpc_flip1)
MACHINE_CONFIG_START(wpc_flip1_state::wpc_flip1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 2000000)
- MCFG_CPU_PROGRAM_MAP(wpc_flip1_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(wpc_flip1_map)
MCFG_WMS_WPC_ADD("wpc")
- MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(wpc_dot_state,wpc_irq_w))
- MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(wpc_dot_state,wpc_firq_w))
- MCFG_WPC_ROMBANK(WRITE8(wpc_dot_state,wpc_rombank_w))
- MCFG_WPC_SOUND_CTRL(READ8(wpc_dot_state,wpc_sound_ctrl_r),WRITE8(wpc_dot_state,wpc_sound_ctrl_w))
- MCFG_WPC_SOUND_DATA(READ8(wpc_dot_state,wpc_sound_data_r),WRITE8(wpc_dot_state,wpc_sound_data_w))
- MCFG_WPC_DMDBANK(WRITE8(wpc_dot_state,wpc_dmdbank_w))
+ MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_dot_state,wpc_irq_w))
+ MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_dot_state,wpc_firq_w))
+ MCFG_WPC_ROMBANK(WRITE8(*this, wpc_dot_state,wpc_rombank_w))
+ MCFG_WPC_SOUND_CTRL(READ8(*this, wpc_dot_state,wpc_sound_ctrl_r),WRITE8(*this, wpc_dot_state,wpc_sound_ctrl_w))
+ MCFG_WPC_SOUND_DATA(READ8(*this, wpc_dot_state,wpc_sound_data_r),WRITE8(*this, wpc_dot_state,wpc_sound_data_w))
+ MCFG_WPC_DMDBANK(WRITE8(*this, wpc_dot_state,wpc_dmdbank_w))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("wpcsnd", WPCSND, 0)
+ MCFG_DEVICE_ADD("wpcsnd", WPCSND)
MCFG_WPC_ROM_REGION("sound1")
- MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(wpc_dot_state,wpcsnd_reply_w))
+ MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_dot_state,wpcsnd_reply_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_DEFAULT_LAYOUT(layout_lcd)
diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp
index 5e8edefbe12..2be57442110 100644
--- a/src/mame/drivers/wpc_flip2.cpp
+++ b/src/mame/drivers/wpc_flip2.cpp
@@ -189,21 +189,21 @@ DRIVER_INIT_MEMBER(wpc_flip2_state,wpc_flip2)
MACHINE_CONFIG_START(wpc_flip2_state::wpc_flip2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6809, 2000000)
- MCFG_CPU_PROGRAM_MAP(wpc_flip2_map)
+ MCFG_DEVICE_ADD("maincpu", M6809, 2000000)
+ MCFG_DEVICE_PROGRAM_MAP(wpc_flip2_map)
MCFG_WMS_WPC_ADD("wpc")
- MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(wpc_dot_state,wpc_irq_w))
- MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(wpc_dot_state,wpc_firq_w))
- MCFG_WPC_ROMBANK(WRITE8(wpc_dot_state,wpc_rombank_w))
- MCFG_WPC_SOUND_CTRL(READ8(wpc_dot_state,wpc_sound_ctrl_r),WRITE8(wpc_dot_state,wpc_sound_ctrl_w))
- MCFG_WPC_SOUND_DATA(READ8(wpc_dot_state,wpc_sound_data_r),WRITE8(wpc_dot_state,wpc_sound_data_w))
- MCFG_WPC_DMDBANK(WRITE8(wpc_dot_state,wpc_dmdbank_w))
+ MCFG_WPC_IRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_dot_state,wpc_irq_w))
+ MCFG_WPC_FIRQ_ACKNOWLEDGE(WRITELINE(*this, wpc_dot_state,wpc_firq_w))
+ MCFG_WPC_ROMBANK(WRITE8(*this, wpc_dot_state,wpc_rombank_w))
+ MCFG_WPC_SOUND_CTRL(READ8(*this, wpc_dot_state,wpc_sound_ctrl_r),WRITE8(*this, wpc_dot_state,wpc_sound_ctrl_w))
+ MCFG_WPC_SOUND_DATA(READ8(*this, wpc_dot_state,wpc_sound_data_r),WRITE8(*this, wpc_dot_state,wpc_sound_data_w))
+ MCFG_WPC_DMDBANK(WRITE8(*this, wpc_dot_state,wpc_dmdbank_w))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("wpcsnd", WPCSND, 0)
+ MCFG_DEVICE_ADD("wpcsnd", WPCSND)
MCFG_WPC_ROM_REGION("sound1")
- MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(wpc_dot_state,wpcsnd_reply_w))
+ MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_dot_state,wpcsnd_reply_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_DEFAULT_LAYOUT(layout_lcd)
diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp
index f0bea8e25e6..bc372274aaa 100644
--- a/src/mame/drivers/wpc_s.cpp
+++ b/src/mame/drivers/wpc_s.cpp
@@ -1972,16 +1972,16 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(wpc_s_state::wpc_s)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(8'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(wpc_s_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wpc_s_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(8'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(wpc_s_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wpc_s_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_s_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
MCFG_WPC_SHIFT_ADD("shift")
MCFG_WPC_PIC_ADD("pic")
MCFG_WPC_LAMP_ADD("lamp")
MCFG_WPC_OUT_ADD("out", 5)
- MCFG_WPC_DMD_ADD("dmd", WRITELINE(wpc_s_state, scanline_irq))
+ MCFG_WPC_DMD_ADD("dmd", WRITELINE(*this, wpc_s_state, scanline_irq))
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_DEVICE_ADD("dcs", DCS_AUDIO_8K, 0)
diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp
index b9773a1f6da..b088c9967c3 100644
--- a/src/mame/drivers/wrally.cpp
+++ b/src/mame/drivers/wrally.cpp
@@ -267,9 +267,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(wrally_state::wrally)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000,XTAL(24'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(wrally_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wrally_state, irq6_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000,XTAL(24'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(wrally_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wrally_state, irq6_line_hold)
MCFG_DEVICE_ADD("gaelco_ds5002fp", GAELCO_DS5002FP, XTAL(24'000'000) / 2) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, mcu_hostmem_map)
@@ -288,12 +288,12 @@ MACHINE_CONFIG_START(wrally_state::wrally)
MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG)
MCFG_DEVICE_ADD("outlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(wrally_state, coin1_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(wrally_state, coin2_lockout_w))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(wrally_state, coin1_counter_w))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(wrally_state, coin2_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, wrally_state, coin1_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, wrally_state, coin2_lockout_w))
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, wrally_state, coin1_counter_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, wrally_state, coin2_counter_w))
MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(NOOP) /* Sound muting */
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(wrally_state, flipscreen_w)) /* Flip screen */
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, wrally_state, flipscreen_w)) /* Flip screen */
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(NOOP) /* ??? */
MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(NOOP) /* ??? */
diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp
index c0e17ac94b8..0468a741da2 100644
--- a/src/mame/drivers/wswan.cpp
+++ b/src/mame/drivers/wswan.cpp
@@ -114,9 +114,9 @@ static void wswan_cart(device_slot_interface &device)
MACHINE_CONFIG_START(wswan_state::wswan)
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30MZ, XTAL(3'072'000))
- MCFG_CPU_PROGRAM_MAP(wswan_mem)
- MCFG_CPU_IO_MAP(wswan_io)
+ MCFG_DEVICE_ADD("maincpu", V30MZ, XTAL(3'072'000))
+ MCFG_DEVICE_PROGRAM_MAP(wswan_mem)
+ MCFG_DEVICE_IO_MAP(wswan_io)
MCFG_DEVICE_ADD("vdp", WSWAN_VIDEO, 0)
MCFG_WSWAN_VIDEO_TYPE(VDP_TYPE_WSWAN)
@@ -144,7 +144,7 @@ MACHINE_CONFIG_START(wswan_state::wswan)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("custom", WSWAN_SND, 0)
+ MCFG_DEVICE_ADD("custom", WSWAN_SND, 0)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -161,8 +161,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(wscolor_state::wscolor)
wswan(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(wscolor_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(wscolor_mem)
MCFG_DEVICE_MODIFY("vdp")
MCFG_WSWAN_VIDEO_TYPE(VDP_TYPE_WSC)
diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp
index 597c7e10ec7..ea7b1c60bf0 100644
--- a/src/mame/drivers/wwfsstar.cpp
+++ b/src/mame/drivers/wwfsstar.cpp
@@ -416,12 +416,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(wwfsstar_state::wwfsstar)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, CPU_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", wwfsstar_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/wyse.cpp b/src/mame/drivers/wyse.cpp
index 67b78e923d3..b92e34f19f5 100644
--- a/src/mame/drivers/wyse.cpp
+++ b/src/mame/drivers/wyse.cpp
@@ -60,9 +60,9 @@ static INPUT_PORTS_START( wyse )
INPUT_PORTS_END
MACHINE_CONFIG_START(wyse_state::wyse)
- MCFG_CPU_ADD("maincpu", I8031, 11'000'000) // confirmed for WY-50
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8031, 11'000'000) // confirmed for WY-50
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MACHINE_CONFIG_END
ROM_START( wy50 )
diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp
index f5a86652a14..3eefb0f1fb0 100644
--- a/src/mame/drivers/wyvernf0.cpp
+++ b/src/mame/drivers/wyvernf0.cpp
@@ -644,15 +644,15 @@ MACHINE_RESET_MEMBER(wyvernf0_state,wyvernf0)
MACHINE_CONFIG_START(wyvernf0_state::wyvernf0)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, 6000000) // ?
- MCFG_CPU_PROGRAM_MAP(wyvernf0_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", wyvernf0_state, irq0_line_hold)
+ MCFG_DEVICE_ADD("maincpu", Z80, 6000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(wyvernf0_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", wyvernf0_state, irq0_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 4000000) // ?
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(wyvernf0_state, irq0_line_hold, 60*2) // IRQ generated by ??? (drives music tempo), NMI by main cpu
+ MCFG_DEVICE_ADD("audiocpu", Z80, 4000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(wyvernf0_state, irq0_line_hold, 60*2) // IRQ generated by ??? (drives music tempo), NMI by main cpu
-// MCFG_CPU_ADD("mcu", M68705P5, 4000000) // ?
+// MCFG_DEVICE_ADD("mcu", M68705P5, 4000000) // ?
// MCFG_QUANTUM_TIME(attotime::from_hz(6000)) // 100 CPU slices per second to synchronize between the MCU and the main CPU
@@ -681,15 +681,15 @@ MACHINE_CONFIG_START(wyvernf0_state::wyvernf0)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
// coin, fire, lift-off
- MCFG_SOUND_ADD("ay1", YM2149, 3000000) // YM2149 clock ??, pin 26 ??
+ MCFG_DEVICE_ADD("ay1", YM2149, 3000000) // YM2149 clock ??, pin 26 ??
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// lift-off, explosion (saucers), boss alarm
- MCFG_SOUND_ADD("ay2", YM2149, 3000000) // YM2149 clock ??, pin 26 ??
+ MCFG_DEVICE_ADD("ay2", YM2149, 3000000) // YM2149 clock ??, pin 26 ??
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
// music
- MCFG_SOUND_ADD("msm", MSM5232, 2000000) // ?
+ MCFG_DEVICE_ADD("msm", MSM5232, 2000000) // ?
MCFG_MSM5232_SET_CAPACITORS(0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6) /* default 0.39 uF capacitors (not verified) */
MCFG_SOUND_ROUTE(0, "mono", 0.5) // pin 28 2'-1
MCFG_SOUND_ROUTE(1, "mono", 0.5) // pin 29 4'-1
@@ -703,7 +703,7 @@ MACHINE_CONFIG_START(wyvernf0_state::wyvernf0)
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MCFG_SOUND_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC
+ MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp
index 9e0e512f8d0..c1a0261b8e6 100644
--- a/src/mame/drivers/x07.cpp
+++ b/src/mame/drivers/x07.cpp
@@ -1482,9 +1482,9 @@ void x07_state::machine_reset()
MACHINE_CONFIG_START(x07_state::x07)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", NSC800, 15.36_MHz_XTAL / 4)
- MCFG_CPU_PROGRAM_MAP(x07_mem)
- MCFG_CPU_IO_MAP(x07_io)
+ MCFG_DEVICE_ADD("maincpu", NSC800, 15.36_MHz_XTAL / 4)
+ MCFG_DEVICE_PROGRAM_MAP(x07_mem)
+ MCFG_DEVICE_IO_MAP(x07_io)
/* video hardware */
MCFG_SCREEN_ADD("lcd", LCD)
@@ -1502,7 +1502,7 @@ MACHINE_CONFIG_START(x07_state::x07)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO( "mono" )
- MCFG_SOUND_ADD( "beeper", BEEP, 0 )
+ MCFG_DEVICE_ADD( "beeper", BEEP, 0 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index 15ebfde6b17..abb676613fb 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -2201,9 +2201,9 @@ static void x1_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(x1_state::x1)
/* basic machine hardware */
- MCFG_CPU_ADD("x1_cpu", Z80, MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(x1_mem)
- MCFG_CPU_IO_MAP(x1_io)
+ MCFG_DEVICE_ADD("x1_cpu", Z80, MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(x1_mem)
+ MCFG_DEVICE_IO_MAP(x1_io)
MCFG_Z80_DAISY_CHAIN(x1_daisy)
MCFG_DEVICE_ADD("iobank", ADDRESS_MAP_BANK, 0)
@@ -2215,19 +2215,19 @@ MACHINE_CONFIG_START(x1_state::x1)
MCFG_DEVICE_ADD("ctc", Z80CTC, MAIN_CLOCK/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("x1_cpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("x1kb", X1_KEYBOARD, 0)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(x1_state, x1_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(x1_state, x1_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(x1_state, x1_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(x1_state, x1_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(x1_state, x1_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(x1_state, x1_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, x1_state, x1_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, x1_state, x1_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, x1_state, x1_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, x1_state, x1_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, x1_state, x1_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, x1_state, x1_portc_w))
MCFG_MACHINE_START_OVERRIDE(x1_state,x1)
MCFG_MACHINE_RESET_OVERRIDE(x1_state,x1)
@@ -2253,7 +2253,7 @@ MACHINE_CONFIG_START(x1_state::x1)
MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16)
// TODO: guesswork, try to implicitily start the motor
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(x1_state, hdl_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, x1_state, hdl_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", x1_floppies, "dd", x1_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", x1_floppies, "dd", x1_state::floppy_formats)
@@ -2268,7 +2268,7 @@ MACHINE_CONFIG_START(x1_state::x1)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
/* TODO:is the AY mono or stereo? Also volume balance isn't right. */
- MCFG_SOUND_ADD("ay", AY8910, MAIN_CLOCK/8)
+ MCFG_DEVICE_ADD("ay", AY8910, MAIN_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
@@ -2292,8 +2292,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(x1_state::x1turbo)
x1(config);
- MCFG_CPU_MODIFY("x1_cpu")
- MCFG_CPU_PROGRAM_MAP(x1turbo_mem)
+ MCFG_DEVICE_MODIFY("x1_cpu")
+ MCFG_DEVICE_PROGRAM_MAP(x1turbo_mem)
MCFG_Z80_DAISY_CHAIN(x1turbo_daisy)
MCFG_MACHINE_RESET_OVERRIDE(x1_state,x1turbo)
@@ -2306,13 +2306,13 @@ MACHINE_CONFIG_START(x1_state::x1turbo)
MCFG_DEVICE_ADD("dma", Z80DMA, MAIN_CLOCK/4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("x1_cpu", INPUT_LINE_HALT))
MCFG_Z80DMA_OUT_INT_CB(INPUTLINE("x1_cpu", INPUT_LINE_IRQ0))
- MCFG_Z80DMA_IN_MREQ_CB(READ8(x1_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(x1_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(x1_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(x1_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, x1_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, x1_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, x1_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, x1_state, io_write_byte))
MCFG_DEVICE_MODIFY("fdc")
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(x1_state, fdc_drq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, x1_state, fdc_drq_w))
MCFG_YM2151_ADD("ym", MAIN_CLOCK/8) //option board
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp
index e0ed353dcc6..bde3d971d9f 100644
--- a/src/mame/drivers/x1twin.cpp
+++ b/src/mame/drivers/x1twin.cpp
@@ -413,9 +413,9 @@ static void x1_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(x1twin_state::x1twin)
/* basic machine hardware */
- MCFG_CPU_ADD("x1_cpu", Z80, X1_MAIN_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(x1_mem)
- MCFG_CPU_IO_MAP(x1_io)
+ MCFG_DEVICE_ADD("x1_cpu", Z80, X1_MAIN_CLOCK/4)
+ MCFG_DEVICE_PROGRAM_MAP(x1_mem)
+ MCFG_DEVICE_IO_MAP(x1_io)
MCFG_Z80_DAISY_CHAIN(x1_daisy)
MCFG_DEVICE_ADD("iobank", ADDRESS_MAP_BANK, 0)
@@ -427,27 +427,27 @@ MACHINE_CONFIG_START(x1twin_state::x1twin)
MCFG_DEVICE_ADD("ctc", Z80CTC, MAIN_CLOCK/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("x1_cpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg3))
- MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc", z80ctc_device, trg2))
MCFG_DEVICE_ADD("x1kb", X1_KEYBOARD, 0)
MCFG_DEVICE_ADD("ppi8255_0", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(x1_state, x1_porta_r))
- MCFG_I8255_OUT_PORTA_CB(WRITE8(x1_state, x1_porta_w))
- MCFG_I8255_IN_PORTB_CB(READ8(x1_state, x1_portb_r))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(x1_state, x1_portb_w))
- MCFG_I8255_IN_PORTC_CB(READ8(x1_state, x1_portc_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(x1_state, x1_portc_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, x1_state, x1_porta_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, x1_state, x1_porta_w))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, x1_state, x1_portb_r))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, x1_state, x1_portb_w))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, x1_state, x1_portc_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, x1_state, x1_portc_w))
MCFG_MACHINE_START_OVERRIDE(x1twin_state,x1)
MCFG_MACHINE_RESET_OVERRIDE(x1twin_state,x1)
#if 0
- MCFG_CPU_ADD("pce_cpu", H6280, PCE_MAIN_CLOCK/3)
- MCFG_CPU_PROGRAM_MAP(pce_mem)
- MCFG_CPU_IO_MAP(pce_io)
+ MCFG_DEVICE_ADD("pce_cpu", H6280, PCE_MAIN_CLOCK/3)
+ MCFG_DEVICE_PROGRAM_MAP(pce_mem)
+ MCFG_DEVICE_IO_MAP(pce_io)
MCFG_TIMER_ADD_SCANLINE("scantimer", pce_interrupt, "pce_screen", 0, 1)
#endif
@@ -479,7 +479,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin)
MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16)
// TODO: guesswork, try to implicitily start the motor
- MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(x1_state, hdl_w))
+ MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(*this, x1_state, hdl_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", x1_floppies, "dd", x1_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", x1_floppies, "dd", x1_state::floppy_formats)
@@ -499,7 +499,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin)
// MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
/* TODO:is the AY mono or stereo? Also volume balance isn't right. */
- MCFG_SOUND_ADD("ay", AY8910, MAIN_CLOCK/8)
+ MCFG_DEVICE_ADD("ay", AY8910, MAIN_CLOCK/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("P1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("P2"))
MCFG_SOUND_ROUTE(0, "x1_l", 0.25)
@@ -518,7 +518,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin)
MCFG_SOFTWARE_LIST_ADD("cass_list","x1_cass")
#if 0
- MCFG_SOUND_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
+ MCFG_DEVICE_ADD("c6280", C6280, PCE_MAIN_CLOCK/6)
MCFG_C6280_CPU("pce_cpu")
MCFG_SOUND_ROUTE(0, "pce_l", 0.5)
MCFG_SOUND_ROUTE(1, "pce_r", 0.5)
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index 976d4c031e8..504edfee48d 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -1637,9 +1637,9 @@ static void keyboard(device_slot_interface &device)
MACHINE_CONFIG_START(x68k_state::x68000)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(x68k_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(x68k_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1648,32 +1648,32 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_MC68901_TIMER_CLOCK(4000000)
MCFG_MC68901_RX_CLOCK(0)
MCFG_MC68901_TX_CLOCK(0)
- MCFG_MC68901_OUT_IRQ_CB(WRITELINE(x68k_state, mfp_irq_callback))
- MCFG_MC68901_OUT_TBO_CB(DEVWRITELINE(MC68901_TAG, mc68901_device, clock_w))
- MCFG_MC68901_OUT_SO_CB(DEVWRITELINE("keyboard", rs232_port_device, write_txd))
+ MCFG_MC68901_OUT_IRQ_CB(WRITELINE(*this, x68k_state, mfp_irq_callback))
+ MCFG_MC68901_OUT_TBO_CB(WRITELINE(MC68901_TAG, mc68901_device, clock_w))
+ MCFG_MC68901_OUT_SO_CB(WRITELINE("keyboard", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("keyboard", keyboard, "x68k")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(MC68901_TAG, mc68901_device, write_rx))
+ MCFG_DEVICE_ADD("keyboard", RS232_PORT, keyboard, "x68k")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(MC68901_TAG, mc68901_device, write_rx))
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(READ8(x68k_state, ppi_port_a_r))
- MCFG_I8255_IN_PORTB_CB(READ8(x68k_state, ppi_port_b_r))
- MCFG_I8255_IN_PORTC_CB(READ8(x68k_state, ppi_port_c_r))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(x68k_state, ppi_port_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8(*this, x68k_state, ppi_port_a_r))
+ MCFG_I8255_IN_PORTB_CB(READ8(*this, x68k_state, ppi_port_b_r))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, x68k_state, ppi_port_c_r))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, x68k_state, ppi_port_c_w))
MCFG_DEVICE_ADD("hd63450", HD63450, 0)
MCFG_HD63450_CPU("maincpu") // CPU - 68000
MCFG_HD63450_CLOCKS(attotime::from_usec(2), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2))
MCFG_HD63450_BURST_CLOCKS(attotime::from_usec(2), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50))
- MCFG_HD63450_DMA_END_CB(WRITE8(x68k_state, dma_end))
- MCFG_HD63450_DMA_ERROR_CB(WRITE8(x68k_state, dma_error))
- MCFG_HD63450_DMA_READ_0_CB(DEVREAD8("upd72065", upd72065_device, mdma_r))
- MCFG_HD63450_DMA_WRITE_0_CB(DEVWRITE8("upd72065", upd72065_device, mdma_w))
+ MCFG_HD63450_DMA_END_CB(WRITE8(*this, x68k_state, dma_end))
+ MCFG_HD63450_DMA_ERROR_CB(WRITE8(*this, x68k_state, dma_error))
+ MCFG_HD63450_DMA_READ_0_CB(READ8("upd72065", upd72065_device, mdma_r))
+ MCFG_HD63450_DMA_WRITE_0_CB(WRITE8("upd72065", upd72065_device, mdma_w))
MCFG_DEVICE_ADD("scc", SCC8530, 5000000)
MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL(32'768))
- MCFG_RP5C15_OUT_ALARM_CB(DEVWRITELINE(MC68901_TAG, mc68901_device, i0_w))
+ MCFG_RP5C15_OUT_ALARM_CB(WRITELINE(MC68901_TAG, mc68901_device, i0_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1696,8 +1696,8 @@ MACHINE_CONFIG_START(x68k_state::x68000)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_YM2151_ADD("ym2151", 4000000)
- MCFG_YM2151_IRQ_HANDLER(WRITELINE(x68k_state,x68k_fm_irq))
- MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(x68k_state,x68k_ct_w)) // CT1, CT2 from YM2151 port 0x1b
+ MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, x68k_state,x68k_fm_irq))
+ MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, x68k_state,x68k_ct_w)) // CT1, CT2 from YM2151 port 0x1b
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -1714,8 +1714,8 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_UPD72065_ADD("upd72065", true, false)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(x68k_state, fdc_irq))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("hd63450", hd63450_device, drq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, x68k_state, fdc_irq))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("hd63450", hd63450_device, drq0_w))
MCFG_FLOPPY_DRIVE_ADD("upd72065:0", x68k_floppies, "525hd", x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:1", x68k_floppies, "525hd", x68k_state::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("upd72065:2", x68k_floppies, "525hd", x68k_state::floppy_formats)
@@ -1725,8 +1725,8 @@ MACHINE_CONFIG_START(x68k_state::x68000)
MCFG_DEVICE_ADD("exp", X68K_EXPANSION_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(x68000_exp_cards, nullptr, false)
- MCFG_X68K_EXPANSION_SLOT_OUT_IRQ2_CB(WRITELINE(x68k_state, x68k_irq2_line))
- MCFG_X68K_EXPANSION_SLOT_OUT_IRQ4_CB(WRITELINE(x68k_state, x68k_irq4_line))
+ MCFG_X68K_EXPANSION_SLOT_OUT_IRQ2_CB(WRITELINE(*this, x68k_state, x68k_irq2_line))
+ MCFG_X68K_EXPANSION_SLOT_OUT_IRQ4_CB(WRITELINE(*this, x68k_state, x68k_irq4_line))
MCFG_X68K_EXPANSION_SLOT_OUT_NMI_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
/* internal ram */
@@ -1743,8 +1743,8 @@ MACHINE_CONFIG_START(x68k_state::x68ksupr)
x68000(config);
MCFG_DEVICE_REMOVE("x68k_hdc")
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(x68kxvi_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(x68kxvi_map)
MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
@@ -1757,21 +1757,21 @@ MACHINE_CONFIG_START(x68k_state::x68ksupr)
MCFG_DEVICE_ADD("mb89352", MB89352A, 0)
MCFG_LEGACY_SCSI_PORT("scsi")
- MCFG_MB89352A_IRQ_CB(WRITELINE(x68k_state, x68k_scsi_irq))
- MCFG_MB89352A_DRQ_CB(WRITELINE(x68k_state, x68k_scsi_drq))
+ MCFG_MB89352A_IRQ_CB(WRITELINE(*this, x68k_state, x68k_scsi_irq))
+ MCFG_MB89352A_DRQ_CB(WRITELINE(*this, x68k_state, x68k_scsi_drq))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(x68k_state::x68kxvi)
x68ksupr(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(16000000) /* 16 MHz */
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_CLOCK(16000000) /* 16 MHz */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(x68k_state::x68030)
x68ksupr(config);
- MCFG_CPU_REPLACE("maincpu", M68030, 25000000) /* 25 MHz 68EC030 */
- MCFG_CPU_PROGRAM_MAP(x68030_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
+ MCFG_DEVICE_REPLACE("maincpu", M68030, 25000000) /* 25 MHz 68EC030 */
+ MCFG_DEVICE_PROGRAM_MAP(x68030_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(x68k_state,x68k_int_ack)
MACHINE_CONFIG_END
ROM_START( x68000 )
diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp
index 5f1e3123940..4d8ac3dbdb0 100644
--- a/src/mame/drivers/xain.cpp
+++ b/src/mame/drivers/xain.cpp
@@ -455,15 +455,15 @@ void xain_state::machine_start()
MACHINE_CONFIG_START(xain_state::xsleena)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, CPU_CLOCK) // 68B09E
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", MC6809E, CPU_CLOCK) // 68B09E
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xain_state, scanline, "screen", 0, 1)
- MCFG_CPU_ADD("sub", MC6809E, CPU_CLOCK) // 68B09E
- MCFG_CPU_PROGRAM_MAP(cpu_map_B)
+ MCFG_DEVICE_ADD("sub", MC6809E, CPU_CLOCK) // 68B09E
+ MCFG_DEVICE_PROGRAM_MAP(cpu_map_B)
- MCFG_CPU_ADD("audiocpu", MC6809, PIXEL_CLOCK) // 68A09
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", MC6809, PIXEL_CLOCK) // 68A09
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_DEVICE_ADD("mcu", TAITO68705_MCU, MCU_CLOCK)
@@ -485,14 +485,14 @@ MACHINE_CONFIG_START(xain_state::xsleena)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", M6809_IRQ_LINE))
- MCFG_SOUND_ADD("ym1", YM2203, MCU_CLOCK)
+ MCFG_DEVICE_ADD("ym1", YM2203, MCU_CLOCK)
MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, MCU_CLOCK)
+ MCFG_DEVICE_ADD("ym2", YM2203, MCU_CLOCK)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
MCFG_SOUND_ROUTE(2, "mono", 0.50)
@@ -502,8 +502,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(xain_state::xsleenab)
xsleena(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bootleg_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bootleg_map)
MCFG_DEVICE_REMOVE("mcu")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp
index ad03c11a0d2..60817898cc4 100644
--- a/src/mame/drivers/xavix.cpp
+++ b/src/mame/drivers/xavix.cpp
@@ -630,10 +630,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(xavix_state::xavix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",XAVIX,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(xavix_map)
+ MCFG_DEVICE_ADD("maincpu",XAVIX,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(xavix_map)
MCFG_M6502_DISABLE_DIRECT()
- MCFG_CPU_VBLANK_INT_DRIVER("screen", xavix_state, interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", xavix_state, interrupt)
MCFG_XAVIX_VECTOR_CALLBACK(xavix_state, get_vectors)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xavix_state, scanline_cb, "screen", 0, 1)
@@ -677,10 +677,10 @@ MACHINE_CONFIG_START(xavix_state::xavix2000)
MCFG_DEVICE_REMOVE("maincpu")
- MCFG_CPU_ADD("maincpu",XAVIX2000,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(xavix_map)
+ MCFG_DEVICE_ADD("maincpu",XAVIX2000,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(xavix_map)
MCFG_M6502_DISABLE_DIRECT()
- MCFG_CPU_VBLANK_INT_DRIVER("screen", xavix_state, interrupt)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", xavix_state, interrupt)
MCFG_XAVIX_VECTOR_CALLBACK(xavix_state, get_vectors)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp
index b85dc2c2ab9..8da39f7d2e0 100644
--- a/src/mame/drivers/xbox.cpp
+++ b/src/mame/drivers/xbox.cpp
@@ -171,9 +171,9 @@ void xbox_ata_devices(device_slot_interface &device)
MACHINE_CONFIG_START(xbox_state::xbox)
xbox_base(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(xbox_map)
- MCFG_CPU_IO_MAP(xbox_map_io)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(xbox_map)
+ MCFG_DEVICE_IO_MAP(xbox_map_io)
MCFG_DEVICE_MODIFY(":pci:09.0:ide:0")
MCFG_DEVICE_SLOT_INTERFACE(xbox_ata_devices, "hdd", true)
@@ -187,7 +187,7 @@ MACHINE_CONFIG_START(xbox_state::xbox)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADD("ohci_gamepad", OHCI_GAME_CONTROLLER, 0)
diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp
index 3f944013753..80343d7e35d 100644
--- a/src/mame/drivers/xerox820.cpp
+++ b/src/mame/drivers/xerox820.cpp
@@ -605,9 +605,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(xerox820_state::xerox820)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(20'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(xerox820_mem)
- MCFG_CPU_IO_MAP(xerox820_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(20'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(xerox820_mem)
+ MCFG_DEVICE_IO_MAP(xerox820_io)
MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain)
/* video hardware */
@@ -621,46 +621,46 @@ MACHINE_CONFIG_START(xerox820_state::xerox820)
/* devices */
MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL(20'000'000)/8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(xerox820_state, kbpio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(xerox820_state, kbpio_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(xerox820_state, kbpio_pb_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, xerox820_state, kbpio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, xerox820_state, kbpio_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, xerox820_state, kbpio_pb_r))
MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL(20'000'000)/8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(20'000'000)/8)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
//MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL(20'000'000)/8))
MCFG_FD1771_ADD(FD1771_TAG, XTAL(20'000'000)/20)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(xerox820_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(xerox820_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", xerox820_floppies, "sa400l", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":1", xerox820_floppies, "sa400l", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(20'000'000)/8)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio0_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio0_device, rxa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w))
MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(xerox820_state, fr_w))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, xerox820_state, fr_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
MCFG_DEVICE_ADD(KEYBOARD_TAG, XEROX_820_KEYBOARD, 0)
- MCFG_XEROX_820_KEYBOARD_KBSTB_CALLBACK(DEVWRITELINE(Z80PIO_KB_TAG, z80pio_device, strobe_b))
+ MCFG_XEROX_820_KEYBOARD_KBSTB_CALLBACK(WRITELINE(Z80PIO_KB_TAG, z80pio_device, strobe_b))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -675,15 +675,15 @@ MACHINE_CONFIG_START(bigboard_state::bigboard)
xerox820(config);
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 950)
+ MCFG_DEVICE_ADD("beeper", BEEP, 950)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* bigboard only */
MACHINE_CONFIG_END
MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(xerox820ii_mem)
- MCFG_CPU_IO_MAP(xerox820ii_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(xerox820ii_mem)
+ MCFG_DEVICE_IO_MAP(xerox820ii_io)
MCFG_Z80_DAISY_CHAIN(xerox820_daisy_chain)
/* video hardware */
@@ -696,69 +696,69 @@ MACHINE_CONFIG_START(xerox820ii_state::xerox820ii)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* devices */
MCFG_DEVICE_ADD(Z80PIO_KB_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(xerox820_state, kbpio_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(xerox820_state, kbpio_pa_w))
- MCFG_Z80PIO_IN_PB_CB(READ8(xerox820_state, kbpio_pb_r))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, xerox820_state, kbpio_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, xerox820_state, kbpio_pa_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, xerox820_state, kbpio_pb_r))
MCFG_DEVICE_ADD(Z80PIO_GP_TAG, Z80PIO, XTAL(16'000'000)/4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD(Z80PIO_RD_TAG, Z80PIO, XTAL(20'000'000)/8)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(DEVREAD8("sasi_data_in", input_buffer_device, read))
- MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("sasi_data_out", output_latch_device, write))
- MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(xerox820ii_state, rdpio_pardy_w))
- MCFG_Z80PIO_IN_PB_CB(DEVREAD8("sasi_ctrl_in", input_buffer_device, read))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(xerox820ii_state, rdpio_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8("sasi_data_in", input_buffer_device, read))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8("sasi_data_out", output_latch_device, write))
+ MCFG_Z80PIO_OUT_ARDY_CB(WRITELINE(*this, xerox820ii_state, rdpio_pardy_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8("sasi_ctrl_in", input_buffer_device, read))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, xerox820ii_state, rdpio_pb_w))
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(16'000'000)/4)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg1))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(Z80CTC_TAG, z80ctc_device, trg3))
//MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL(16'000'000)/4))
MCFG_FD1797_ADD(FD1797_TAG, XTAL(16'000'000)/8)
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(xerox820_state, fdc_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(xerox820_state, fdc_drq_w))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(*this, xerox820_state, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD(Z80SIO_TAG, Z80SIO0, XTAL(16'000'000)/4)
- MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_Z80DART_OUT_TXDB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_Z80DART_OUT_DTRB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSA_CB(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80DART_OUT_TXDB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80DART_OUT_DTRB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80DART_OUT_RTSB_CB(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
MCFG_Z80DART_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio0_device, rxa_w))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio0_device, rxa_w))
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w))
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(Z80SIO_TAG, z80sio0_device, rxb_w))
MCFG_DEVICE_ADD(COM8116_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(WRITELINE(xerox820_state, fr_w))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(*this, xerox820_state, fr_w))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(Z80SIO_TAG, z80dart_device, rxtxcb_w))
MCFG_DEVICE_ADD(KEYBOARD_TAG, XEROX_820_KEYBOARD, 0)
- MCFG_XEROX_820_KEYBOARD_KBSTB_CALLBACK(DEVWRITELINE(Z80PIO_KB_TAG, z80pio_device, strobe_b))
+ MCFG_XEROX_820_KEYBOARD_KBSTB_CALLBACK(WRITELINE(Z80PIO_KB_TAG, z80pio_device, strobe_b))
// SASI bus
MCFG_DEVICE_ADD(SASIBUS_TAG, SCSI_PORT, 0)
MCFG_SCSI_DATA_INPUT_BUFFER("sasi_data_in")
- MCFG_SCSI_BSY_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit0)) MCFG_DEVCB_XOR(1)
- MCFG_SCSI_MSG_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit1)) MCFG_DEVCB_XOR(1)
- MCFG_SCSI_CD_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit2)) MCFG_DEVCB_XOR(1)
- MCFG_SCSI_REQ_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit3)) MCFG_DEVCB_XOR(1)
- MCFG_SCSI_IO_HANDLER(DEVWRITELINE("sasi_ctrl_in", input_buffer_device, write_bit4)) MCFG_DEVCB_XOR(1)
+ MCFG_SCSI_BSY_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit0)) MCFG_DEVCB_XOR(1)
+ MCFG_SCSI_MSG_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit1)) MCFG_DEVCB_XOR(1)
+ MCFG_SCSI_CD_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit2)) MCFG_DEVCB_XOR(1)
+ MCFG_SCSI_REQ_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit3)) MCFG_DEVCB_XOR(1)
+ MCFG_SCSI_IO_HANDLER(WRITELINE("sasi_ctrl_in", input_buffer_device, write_bit4)) MCFG_DEVCB_XOR(1)
MCFG_SCSIDEV_ADD(SASIBUS_TAG ":" SCSI_PORT_DEVICE1, "harddisk", SA1403D, SCSI_ID_0)
@@ -777,8 +777,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(xerox820ii_state::xerox168)
xerox820ii(config);
- MCFG_CPU_ADD(I8086_TAG, I8086, 4770000)
- MCFG_CPU_PROGRAM_MAP(xerox168_mem)
+ MCFG_DEVICE_ADD(I8086_TAG, I8086, 4770000)
+ MCFG_DEVICE_PROGRAM_MAP(xerox168_mem)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -788,8 +788,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(xerox820_state::mk83)
xerox820(config);
- MCFG_CPU_MODIFY(Z80_TAG)
- MCFG_CPU_PROGRAM_MAP(mk83_mem)
+ MCFG_DEVICE_MODIFY(Z80_TAG)
+ MCFG_DEVICE_PROGRAM_MAP(mk83_mem)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp
index 6c81f42e1ed..5f06ebb3beb 100644
--- a/src/mame/drivers/xexex.cpp
+++ b/src/mame/drivers/xexex.cpp
@@ -473,12 +473,12 @@ void xexex_state::machine_reset()
MACHINE_CONFIG_START(xexex_state::xexex)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) // 16MHz
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(32'000'000)/2) // 16MHz
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xexex_state, xexex_interrupt, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // Z80E 8Mhz
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(32'000'000)/4) // Z80E 8Mhz
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(1920))
diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp
index ba9343b4cb6..e79ff8b248f 100644
--- a/src/mame/drivers/xmen.cpp
+++ b/src/mame/drivers/xmen.cpp
@@ -300,12 +300,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(xmen_state::xmen_scanline)
MACHINE_CONFIG_START(xmen_state::xmen)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000)) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xmen_state, xmen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -352,12 +352,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(xmen_state::xmen6p)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(_6p_main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(_6p_main_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", xmen_state, xmen_scanline, "screen", 0, 1)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_EEPROM_SERIAL_ER5911_8BIT_ADD("eeprom")
@@ -383,7 +383,7 @@ MACHINE_CONFIG_START(xmen_state::xmen6p)
MCFG_SCREEN_SIZE(64*8, 32*8)
MCFG_SCREEN_VISIBLE_AREA(16*8, 52*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(xmen_state, screen_update_xmen6p_right)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(xmen_state, screen_vblank_xmen6p))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xmen_state, screen_vblank_xmen6p))
MCFG_SCREEN_PALETTE("palette")
MCFG_VIDEO_START_OVERRIDE(xmen_state,xmen6p)
diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp
index 5278ae2d0b9..61163c2f500 100644
--- a/src/mame/drivers/xor100.cpp
+++ b/src/mame/drivers/xor100.cpp
@@ -509,47 +509,47 @@ void xor100_state::post_load()
MACHINE_CONFIG_START(xor100_state::xor100)
/* basic machine hardware */
- MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(xor100_mem)
- MCFG_CPU_IO_MAP(xor100_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(xor100_mem)
+ MCFG_DEVICE_IO_MAP(xor100_io)
/* devices */
MCFG_DEVICE_ADD(I8251_A_TAG, I8251, 0/*XTAL(8'000'000)/2,*/)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_A_TAG, rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD(RS232_A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_A_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_A_TAG, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD(RS232_A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_A_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_A_TAG, i8251_device, write_dsr))
MCFG_DEVICE_ADD(I8251_B_TAG, I8251, 0/*XTAL(8'000'000)/2,*/)
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD(RS232_B_TAG, default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_rxd))
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_dsr))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_cts))
+ MCFG_I8251_TXD_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_txd))
+ MCFG_I8251_DTR_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE(RS232_B_TAG, rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD(RS232_B_TAG, RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(I8251_B_TAG, i8251_device, write_rxd))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(I8251_B_TAG, i8251_device, write_dsr))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(I8251_B_TAG, i8251_device, write_cts))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", terminal)
MCFG_DEVICE_ADD(COM5016_TAG, COM8116, XTAL(5'068'800))
- MCFG_COM8116_FR_HANDLER(DEVWRITELINE(I8251_A_TAG, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_A_TAG, i8251_device, write_rxc))
- MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_B_TAG, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(I8251_B_TAG, i8251_device, write_rxc))
+ MCFG_COM8116_FR_HANDLER(WRITELINE(I8251_A_TAG, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_A_TAG, i8251_device, write_rxc))
+ MCFG_COM8116_FT_HANDLER(WRITELINE(I8251_B_TAG, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(I8251_B_TAG, i8251_device, write_rxc))
MCFG_DEVICE_ADD(I8255A_TAG, I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_I8255_OUT_PORTB_CB(DEVWRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
- MCFG_I8255_IN_PORTC_CB(READ8(xor100_state, i8255_pc_r))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_I8255_OUT_PORTB_CB(WRITELINE(CENTRONICS_TAG, centronics_device, write_strobe))
+ MCFG_I8255_IN_PORTC_CB(READ8(*this, xor100_state, i8255_pc_r))
MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(8'000'000)/2)
MCFG_Z80CTC_INTR_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(xor100_state, ctc_z0_w))
- MCFG_Z80CTC_ZC1_CB(WRITELINE(xor100_state, ctc_z1_w))
- MCFG_Z80CTC_ZC2_CB(WRITELINE(xor100_state, ctc_z2_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, xor100_state, ctc_z0_w))
+ MCFG_Z80CTC_ZC1_CB(WRITELINE(*this, xor100_state, ctc_z1_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE(*this, xor100_state, ctc_z2_w))
MCFG_FD1795_ADD(WD1795_TAG, XTAL(8'000'000)/4)
MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":0", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats)
@@ -558,9 +558,9 @@ MACHINE_CONFIG_START(xor100_state::xor100)
MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":3", xor100_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_CENTRONICS_ADD(CENTRONICS_TAG, centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(I8255A_TAG, i8255_device, pc4_w))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(xor100_state, write_centronics_busy))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(xor100_state, write_centronics_select))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(I8255A_TAG, i8255_device, pc4_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, xor100_state, write_centronics_busy))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, xor100_state, write_centronics_select))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp
index e9e8b4caca9..b904f4e300f 100644
--- a/src/mame/drivers/xorworld.cpp
+++ b/src/mame/drivers/xorworld.cpp
@@ -154,22 +154,22 @@ GFXDECODE_END
MACHINE_CONFIG_START(xorworld_state::xorworld)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz
- MCFG_CPU_PROGRAM_MAP(xorworld_map)
- //MCFG_CPU_VBLANK_INT_DRIVER("screen", xorworld_state, irq6_line_assert) // irq 4 or 6
- //MCFG_CPU_PERIODIC_INT_DRIVER(xorworld_state, irq2_line_assert, 3*60) //timed irq, unknown timing
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) // 10 MHz
+ MCFG_DEVICE_PROGRAM_MAP(xorworld_map)
+ //MCFG_DEVICE_VBLANK_INT_DRIVER("screen", xorworld_state, irq6_line_assert) // irq 4 or 6
+ //MCFG_DEVICE_PERIODIC_INT_DRIVER(xorworld_state, irq2_line_assert, 3*60) //timed irq, unknown timing
// Simple fix - but this sounds good!! -Valley Bell
- MCFG_CPU_VBLANK_INT_DRIVER("screen", xorworld_state, irq2_line_assert) // irq 4 or 6
- MCFG_CPU_PERIODIC_INT_DRIVER(xorworld_state, irq6_line_assert, 3*60) //timed irq, unknown timing
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", xorworld_state, irq2_line_assert) // irq 4 or 6
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(xorworld_state, irq6_line_assert, 3*60) //timed irq, unknown timing
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
MCFG_DEVICE_ADD("mainlatch", LS259, 0)
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) // CS (active low)
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) // SK (active high)
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(DEVWRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) // EEPROM data (DIN)
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, cs_write)) // CS (active low)
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, clk_write)) // SK (active high)
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE("eeprom", eeprom_serial_93cxx_device, di_write)) // EEPROM data (DIN)
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp
index b2d0e844a13..1cb9b239613 100644
--- a/src/mame/drivers/xtheball.cpp
+++ b/src/mame/drivers/xtheball.cpp
@@ -298,28 +298,28 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(xtheball_state::xtheball)
- MCFG_CPU_ADD("maincpu", TMS34010, 40000000)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", TMS34010, 40000000)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_TMS340X0_HALT_ON_RESET(false) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(10000000) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(1) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(xtheball_state, scanline_update) /* scanline updater (rgb32) */
MCFG_TMS340X0_TO_SHIFTREG_CB(xtheball_state, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(xtheball_state, from_shiftreg) /* read from shiftreg function */
- MCFG_CPU_PERIODIC_INT_DRIVER(xtheball_state, irq1_line_hold, 15000)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(xtheball_state, irq1_line_hold, 15000)
MCFG_NVRAM_ADD_1FILL("nvram")
MCFG_DEVICE_ADD("latch1", LS259, 0) // exact type uncertain
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(DEVWRITELINE("ticket", ticket_dispenser_device, motor_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE("ticket", ticket_dispenser_device, motor_w))
// Q4 = meter, Q6 = tickets, Q7 = tickets?
MCFG_DEVICE_ADD("latch2", LS259, 0) // exact type uncertain
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(xtheball_state, start_lamp_w))
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, xtheball_state, start_lamp_w))
// Q0 = start lamp, Q1-Q7 = more lamps?
MCFG_DEVICE_ADD("latch3", LS259, 0) // exact type uncertain
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(xtheball_state, foreground_mode_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, xtheball_state, foreground_mode_w))
// Q3 = video foreground control?
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
@@ -336,7 +336,7 @@ MACHINE_CONFIG_START(xtheball_state::xtheball)
/* 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
+ MCFG_DEVICE_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)
MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/xtom3d.cpp b/src/mame/drivers/xtom3d.cpp
index 4aa6b37b8fc..bbdef618080 100644
--- a/src/mame/drivers/xtom3d.cpp
+++ b/src/mame/drivers/xtom3d.cpp
@@ -405,10 +405,10 @@ void xtom3d_state::machine_reset()
}
MACHINE_CONFIG_START(xtom3d_state::xtom3d)
- MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000/16) // actually Pentium II 450
- MCFG_CPU_PROGRAM_MAP(xtom3d_map)
- MCFG_CPU_IO_MAP(xtom3d_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM2, 450000000/16) // actually Pentium II 450
+ MCFG_DEVICE_PROGRAM_MAP(xtom3d_map)
+ MCFG_DEVICE_IO_MAP(xtom3d_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb)
pcat_common(config);
diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp
index 553dfecf6f3..ef7b09bbdbf 100644
--- a/src/mame/drivers/xxmissio.cpp
+++ b/src/mame/drivers/xxmissio.cpp
@@ -268,12 +268,12 @@ GFXDECODE_END
MACHINE_CONFIG_START(xxmissio_state::xxmissio)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */
- MCFG_CPU_PROGRAM_MAP(map1)
+ MCFG_DEVICE_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */
+ MCFG_DEVICE_PROGRAM_MAP(map1)
- MCFG_CPU_ADD("sub", Z80,12000000/4) /* 3.0MHz */
- MCFG_CPU_PROGRAM_MAP(map2)
- MCFG_CPU_PERIODIC_INT_DRIVER(xxmissio_state, interrupt_s, 2*60)
+ MCFG_DEVICE_ADD("sub", Z80,12000000/4) /* 3.0MHz */
+ MCFG_DEVICE_PROGRAM_MAP(map2)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(xxmissio_state, interrupt_s, 2*60)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -285,7 +285,7 @@ MACHINE_CONFIG_START(xxmissio_state::xxmissio)
MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 4*8, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(xxmissio_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(xxmissio_state, interrupt_m))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xxmissio_state, interrupt_m))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xxmissio)
MCFG_PALETTE_ADD("palette", 768)
@@ -294,7 +294,7 @@ MACHINE_CONFIG_START(xxmissio_state::xxmissio)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ym1", YM2203, 12000000/8)
+ MCFG_DEVICE_ADD("ym1", YM2203, 12000000/8)
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
@@ -302,9 +302,9 @@ MACHINE_CONFIG_START(xxmissio_state::xxmissio)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_SOUND_ADD("ym2", YM2203, 12000000/8)
- MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(xxmissio_state, scroll_x_w))
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(xxmissio_state, scroll_y_w))
+ MCFG_DEVICE_ADD("ym2", YM2203, 12000000/8)
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, xxmissio_state, scroll_x_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, xxmissio_state, scroll_y_w))
MCFG_SOUND_ROUTE(0, "mono", 0.15)
MCFG_SOUND_ROUTE(1, "mono", 0.15)
MCFG_SOUND_ROUTE(2, "mono", 0.15)
diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp
index 101b7a5b644..7d127e8aa61 100644
--- a/src/mame/drivers/xybots.cpp
+++ b/src/mame/drivers/xybots.cpp
@@ -177,8 +177,8 @@ GFXDECODE_END
MACHINE_CONFIG_START(xybots_state::xybots)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
MCFG_SLAPSTIC_ADD("slapstic", 107)
@@ -205,7 +205,7 @@ MACHINE_CONFIG_START(xybots_state::xybots)
MCFG_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz/2, 456, 0, 336, 262, 0, 240)
MCFG_SCREEN_UPDATE_DRIVER(xybots_state, screen_update_xybots)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(xybots_state, video_int_write_line))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xybots_state, video_int_write_line))
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp
index 5a23a6186a8..93de46eeea3 100644
--- a/src/mame/drivers/xyonix.cpp
+++ b/src/mame/drivers/xyonix.cpp
@@ -248,10 +248,10 @@ GFXDECODE_END
MACHINE_CONFIG_START(xyonix_state::xyonix)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(port_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(xyonix_state, irq0_line_assert, 4*60) /* ?? controls music tempo */
+ MCFG_DEVICE_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(port_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(xyonix_state, irq0_line_assert, 4*60) /* ?? controls music tempo */
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -261,7 +261,7 @@ MACHINE_CONFIG_START(xyonix_state::xyonix)
MCFG_SCREEN_VISIBLE_AREA(0, 80*4-1, 0, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(xyonix_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(xyonix_state, nmiclk_w))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xyonix_state, nmiclk_w))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", xyonix)
MCFG_PALETTE_ADD("palette", 256)
@@ -270,10 +270,10 @@ MACHINE_CONFIG_START(xyonix_state::xyonix)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("sn1", SN76496, 16000000/4)
+ MCFG_DEVICE_ADD("sn1", SN76496, 16000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("sn2", SN76496, 16000000/4)
+ MCFG_DEVICE_ADD("sn2", SN76496, 16000000/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index 33fc413defd..c413a83bae7 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -283,9 +283,9 @@ void yiear_state::machine_reset()
MACHINE_CONFIG_START(yiear_state::yiear)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(yiear_state, yiear_nmi_interrupt, 480) /* music tempo (correct frequency unknown) */
+ MCFG_DEVICE_ADD("maincpu", MC6809E, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(yiear_state, yiear_nmi_interrupt, 480) /* music tempo (correct frequency unknown) */
MCFG_WATCHDOG_ADD("watchdog")
@@ -297,7 +297,7 @@ MACHINE_CONFIG_START(yiear_state::yiear)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(yiear_state, screen_update_yiear)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(yiear_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, yiear_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", yiear)
MCFG_PALETTE_ADD("palette", 32)
@@ -306,12 +306,12 @@ MACHINE_CONFIG_START(yiear_state::yiear)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
+ MCFG_DEVICE_ADD("trackfld_audio", TRACKFLD_AUDIO, 0)
- MCFG_SOUND_ADD("snsnd", SN76489A, XTAL(18'432'000)/12) /* verified on pcb */
+ MCFG_DEVICE_ADD("snsnd", SN76489A, XTAL(18'432'000)/12) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_SOUND_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
+ MCFG_DEVICE_ADD("vlm", VLM5030, XTAL(3'579'545)) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(0, vlm_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp
index a77abfc646e..a307745e577 100644
--- a/src/mame/drivers/ymmu100.cpp
+++ b/src/mame/drivers/ymmu100.cpp
@@ -437,9 +437,9 @@ void mu100_state::mu100_iomap(address_map &map)
}
MACHINE_CONFIG_START(mu100_state::mu100)
- MCFG_CPU_ADD( "maincpu", H8S2655, XTAL(16'000'000) )
- MCFG_CPU_PROGRAM_MAP( mu100_map )
- MCFG_CPU_IO_MAP( mu100_iomap )
+ MCFG_DEVICE_ADD( "maincpu", H8S2655, XTAL(16'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP( mu100_map )
+ MCFG_DEVICE_IO_MAP( mu100_iomap )
MCFG_HD44780_ADD("lcd")
MCFG_HD44780_LCD_SIZE(4, 20)
@@ -455,11 +455,11 @@ MACHINE_CONFIG_START(mu100_state::mu100)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
- MCFG_MIDI_RX_HANDLER(DEVWRITELINE("maincpu:sci0", h8_sci_device, rx_w))
+ MCFG_MIDI_RX_HANDLER(WRITELINE("maincpu:sci0", h8_sci_device, rx_w))
MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
MCFG_DEVICE_MODIFY("maincpu:sci0")
- MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":mdout", midi_port_device, write_txd))
+ MCFG_H8_SCI_TX_CALLBACK(WRITELINE("mdout", midi_port_device, write_txd))
MACHINE_CONFIG_END
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp
index df815c20b0d..687f508ef94 100644
--- a/src/mame/drivers/yunsun16.cpp
+++ b/src/mame/drivers/yunsun16.cpp
@@ -593,13 +593,13 @@ MACHINE_RESET_MEMBER(yunsun16_state, shocking)
MACHINE_CONFIG_START(yunsun16_state::magicbub)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_port_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_port_map)
/* video hardware */
@@ -618,7 +618,7 @@ MACHINE_CONFIG_START(yunsun16_state::magicbub)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(16'000'000)/4)
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
@@ -636,9 +636,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(yunsun16_state::shocking)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000))
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, XTAL(16'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", yunsun16_state, irq2_line_hold)
MCFG_MACHINE_START_OVERRIDE(yunsun16_state, shocking)
MCFG_MACHINE_RESET_OVERRIDE(yunsun16_state, shocking)
diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp
index 93a8d2815bf..c30e10b6973 100644
--- a/src/mame/drivers/yunsung8.cpp
+++ b/src/mame/drivers/yunsung8.cpp
@@ -344,13 +344,13 @@ void yunsung8_state::machine_reset()
MACHINE_CONFIG_START(yunsung8_state::yunsung8)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Z80B @ 8MHz? */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_IO_MAP(port_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", yunsung8_state, irq0_line_assert) /* No nmi routine */
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* Z80B @ 8MHz? */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_IO_MAP(port_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", yunsung8_state, irq0_line_assert) /* No nmi routine */
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* ? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* ? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -368,15 +368,15 @@ MACHINE_CONFIG_START(yunsung8_state::yunsung8)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0))
- MCFG_SOUND_ADD("ymsnd", YM3812, XTAL(16'000'000)/4)
+ MCFG_DEVICE_ADD("ymsnd", YM3812, XTAL(16'000'000)/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
- MCFG_74157_OUT_CB(DEVWRITE8("msm", msm5205_device, data_w))
+ MCFG_74157_OUT_CB(WRITE8("msm", msm5205_device, data_w))
- MCFG_SOUND_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb */
- MCFG_MSM5205_VCLK_CB(WRITELINE(yunsung8_state, adpcm_int)) /* interrupt function */
+ MCFG_DEVICE_ADD("msm", MSM5205, XTAL(400'000)) /* verified on pcb */
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, yunsung8_state, adpcm_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
diff --git a/src/mame/drivers/yuvomz80.cpp b/src/mame/drivers/yuvomz80.cpp
index dd32711be5c..10b5fd57774 100644
--- a/src/mame/drivers/yuvomz80.cpp
+++ b/src/mame/drivers/yuvomz80.cpp
@@ -96,13 +96,13 @@ static INPUT_PORTS_START( goldhexa )
INPUT_PORTS_END
MACHINE_CONFIG_START(yuvomz80_state::goldhexa)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(audio_mem_map)
- MCFG_CPU_IO_MAP(audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(audio_mem_map)
+ MCFG_DEVICE_IO_MAP(audio_io_map)
MCFG_DEVICE_ADD("ppi0", I8255A, 0)
MCFG_DEVICE_ADD("ppi1", I8255A, 0)
@@ -110,21 +110,21 @@ MACHINE_CONFIG_START(yuvomz80_state::goldhexa)
MCFG_DEVICE_ADD("ppi3", I8255A, 0)
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(yuvomz80_state::hexapres)
- MCFG_CPU_ADD("maincpu", Z80, XTAL(8'000'000))
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000))
MCFG_DEVICE_DISABLE()
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(audio_mem_map)
- MCFG_CPU_IO_MAP(hexapres_audio_io_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(audio_mem_map)
+ MCFG_DEVICE_IO_MAP(hexapres_audio_io_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("ymsnd", YM2610, 8000000) // type guessed
+ MCFG_DEVICE_ADD("ymsnd", YM2610, 8000000) // type guessed
MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.25)
MCFG_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp
index 1c1c1f24809..6bea298724e 100644
--- a/src/mame/drivers/z100.cpp
+++ b/src/mame/drivers/z100.cpp
@@ -673,10 +673,10 @@ static void z100_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(z100_state::z100)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",I8088, XTAL(14'318'181)/3)
- MCFG_CPU_PROGRAM_MAP(z100_mem)
- MCFG_CPU_IO_MAP(z100_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
+ MCFG_DEVICE_ADD("maincpu",I8088, XTAL(14'318'181)/3)
+ MCFG_DEVICE_PROGRAM_MAP(z100_mem)
+ MCFG_DEVICE_IO_MAP(z100_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE("pic8259_master", pic8259_device, inta_cb)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -697,17 +697,17 @@ MACHINE_CONFIG_START(z100_state::z100)
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(z100_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, z100_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir3_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir3_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(z100_state, video_pia_A_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(z100_state, video_pia_B_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(z100_state, video_pia_CA2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(z100_state, video_pia_CB2_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, z100_state, video_pia_A_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, z100_state, video_pia_B_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, z100_state, video_pia_CA2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, z100_state, video_pia_CB2_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp
index 42bdb8a8571..7904faa8f6d 100644
--- a/src/mame/drivers/z1013.cpp
+++ b/src/mame/drivers/z1013.cpp
@@ -370,9 +370,9 @@ GFXDECODE_END
/* Machine driver */
MACHINE_CONFIG_START(z1013_state::z1013)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(1'000'000) )
- MCFG_CPU_PROGRAM_MAP(z1013_mem)
- MCFG_CPU_IO_MAP(z1013_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(1'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP(z1013_mem)
+ MCFG_DEVICE_IO_MAP(z1013_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -393,8 +393,8 @@ MACHINE_CONFIG_START(z1013_state::z1013)
/* devices */
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(1'000'000))
- MCFG_Z80PIO_IN_PB_CB(READ8(z1013_state, port_b_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(z1013_state, port_b_w))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, z1013_state, port_b_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, z1013_state, port_b_w))
MCFG_CASSETTE_ADD( "cassette" )
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)
@@ -406,7 +406,7 @@ MACHINE_CONFIG_START(z1013_state::z1013k76)
z1013(config);
MCFG_DEVICE_REMOVE("z80pio")
MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(1'000'000))
- MCFG_Z80PIO_IN_PB_CB(READ8(z1013_state, k7659_port_b_r))
+ MCFG_Z80PIO_IN_PB_CB(READ8(*this, z1013_state, k7659_port_b_r))
MACHINE_CONFIG_END
/* ROM definition */
diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp
index 83876a0a93d..6eaa508e05f 100644
--- a/src/mame/drivers/z80dev.cpp
+++ b/src/mame/drivers/z80dev.cpp
@@ -126,9 +126,9 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(z80dev_state::z80dev)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, 4_MHz_XTAL)
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, 4_MHz_XTAL)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_z80dev)
diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp
index 1ecf934d65d..96c7d4110b3 100644
--- a/src/mame/drivers/z80ne.cpp
+++ b/src/mame/drivers/z80ne.cpp
@@ -417,9 +417,9 @@ static void z80ne_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(z80ne_state::z80ne)
/* basic machine hardware */
- MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
- MCFG_CPU_PROGRAM_MAP(z80ne_mem)
- MCFG_CPU_IO_MAP(z80ne_io)
+ MCFG_DEVICE_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
+ MCFG_DEVICE_PROGRAM_MAP(z80ne_mem)
+ MCFG_DEVICE_IO_MAP(z80ne_io)
MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80ne)
MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80ne)
@@ -449,9 +449,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(z80ne_state::z80net)
z80ne(config);
- MCFG_CPU_MODIFY("z80ne")
- MCFG_CPU_PROGRAM_MAP(z80net_mem)
- MCFG_CPU_IO_MAP(z80net_io)
+ MCFG_DEVICE_MODIFY("z80ne")
+ MCFG_DEVICE_PROGRAM_MAP(z80net_mem)
+ MCFG_DEVICE_IO_MAP(z80net_io)
MCFG_MACHINE_START_OVERRIDE(z80ne_state, z80net )
MCFG_MACHINE_RESET_OVERRIDE(z80ne_state, z80net )
@@ -465,14 +465,14 @@ MACHINE_CONFIG_START(z80ne_state::z80net)
MCFG_KR2376_MATRIX_X5(IOPORT("X5"))
MCFG_KR2376_MATRIX_X6(IOPORT("X6"))
MCFG_KR2376_MATRIX_X7(IOPORT("X7"))
- MCFG_KR2376_SHIFT_CB(READLINE(z80ne_state, lx387_shift_r))
- MCFG_KR2376_CONTROL_CB(READLINE(z80ne_state, lx387_control_r))
+ MCFG_KR2376_SHIFT_CB(READLINE(*this, z80ne_state, lx387_shift_r))
+ MCFG_KR2376_CONTROL_CB(READLINE(*this, z80ne_state, lx387_control_r))
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_INPUT_CALLBACK(READ8(z80ne_state, lx388_mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, z80ne_state, lx388_mc6847_videoram_r))
// AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND
// other lines not connected
@@ -488,9 +488,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(z80ne_state::z80netb)
/* basic machine hardware */
- MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
- MCFG_CPU_PROGRAM_MAP(z80netb_mem)
- MCFG_CPU_IO_MAP(z80net_io)
+ MCFG_DEVICE_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
+ MCFG_DEVICE_PROGRAM_MAP(z80netb_mem)
+ MCFG_DEVICE_IO_MAP(z80net_io)
MCFG_MACHINE_START_OVERRIDE(z80ne_state,z80netb)
MCFG_MACHINE_RESET_OVERRIDE(z80ne_state,z80netb)
@@ -516,14 +516,14 @@ MACHINE_CONFIG_START(z80ne_state::z80netb)
MCFG_KR2376_MATRIX_X5(IOPORT("X5"))
MCFG_KR2376_MATRIX_X6(IOPORT("X6"))
MCFG_KR2376_MATRIX_X7(IOPORT("X7"))
- MCFG_KR2376_SHIFT_CB(READLINE(z80ne_state, lx387_shift_r))
- MCFG_KR2376_CONTROL_CB(READLINE(z80ne_state, lx387_control_r))
+ MCFG_KR2376_SHIFT_CB(READLINE(*this, z80ne_state, lx387_shift_r))
+ MCFG_KR2376_CONTROL_CB(READLINE(*this, z80ne_state, lx387_control_r))
/* video hardware */
MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_INPUT_CALLBACK(READ8(z80ne_state, lx388_mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, z80ne_state, lx388_mc6847_videoram_r))
// AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND
// other lines not connected
@@ -539,9 +539,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(z80netf_state::z80netf)
/* basic machine hardware */
- MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
- MCFG_CPU_PROGRAM_MAP(z80netf_mem)
- MCFG_CPU_IO_MAP(z80netf_io)
+ MCFG_DEVICE_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
+ MCFG_DEVICE_PROGRAM_MAP(z80netf_mem)
+ MCFG_DEVICE_IO_MAP(z80netf_io)
MCFG_MACHINE_START_OVERRIDE(z80netf_state,z80netf)
MCFG_MACHINE_RESET_OVERRIDE(z80netf_state,z80netf)
@@ -564,7 +564,7 @@ MACHINE_CONFIG_START(z80netf_state::z80netf)
MCFG_SCREEN_MC6847_PAL_ADD("lx388", "mc6847")
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL(4'433'619))
- MCFG_MC6847_INPUT_CALLBACK(READ8(z80ne_state, lx388_mc6847_videoram_r))
+ MCFG_MC6847_INPUT_CALLBACK(READ8(*this, z80ne_state, lx388_mc6847_videoram_r))
// AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND
// other lines not connected
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 5bfa67a3e71..0a76470650a 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -626,9 +626,9 @@ static void z88_cart(device_slot_interface &device)
MACHINE_CONFIG_START(z88_state::z88)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(9'830'400)/3) // divided by 3 through the uPD65031
- MCFG_CPU_PROGRAM_MAP(z88_mem)
- MCFG_CPU_IO_MAP(z88_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(9'830'400)/3) // divided by 3 through the uPD65031
+ MCFG_DEVICE_PROGRAM_MAP(z88_mem)
+ MCFG_DEVICE_IO_MAP(z88_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", LCD)
@@ -645,16 +645,16 @@ MACHINE_CONFIG_START(z88_state::z88)
MCFG_DEFAULT_LAYOUT(layout_lcd)
MCFG_DEVICE_ADD("blink", UPD65031, XTAL(9'830'400))
- MCFG_UPD65031_KB_CALLBACK(READ8(z88_state, kb_r))
+ MCFG_UPD65031_KB_CALLBACK(READ8(*this, z88_state, kb_r))
MCFG_UPD65031_INT_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_UPD65031_NMI_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_UPD65031_SPKR_CALLBACK(DEVWRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_UPD65031_SPKR_CALLBACK(WRITELINE("speaker", speaker_sound_device, level_w))
MCFG_UPD65031_SCR_UPDATE_CB(z88_state, lcd_update)
MCFG_UPD65031_MEM_UPDATE_CB(z88_state, bankswitch_update)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* internal ram */
@@ -665,13 +665,13 @@ MACHINE_CONFIG_START(z88_state::z88)
/* cartridges */
MCFG_DEVICE_ADD("slot1", Z88CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
- MCFG_Z88CART_SLOT_OUT_FLP_CB(DEVWRITELINE("blink", upd65031_device, flp_w))
+ MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
MCFG_DEVICE_ADD("slot2", Z88CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
- MCFG_Z88CART_SLOT_OUT_FLP_CB(DEVWRITELINE("blink", upd65031_device, flp_w))
+ MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
MCFG_DEVICE_ADD("slot3", Z88CART_SLOT, 0)
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
- MCFG_Z88CART_SLOT_OUT_FLP_CB(DEVWRITELINE("blink", upd65031_device, flp_w))
+ MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("cart_list", "z88_cart")
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index f11aabb6fdd..3659f4a24b4 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -205,9 +205,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(z9001_state::z9001)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(9'830'400) / 4)
- MCFG_CPU_PROGRAM_MAP(z9001_mem)
- MCFG_CPU_IO_MAP(z9001_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(9'830'400) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(z9001_mem)
+ MCFG_DEVICE_IO_MAP(z9001_io)
MCFG_Z80_DAISY_CHAIN(z9001_daisy_chain)
/* video hardware */
@@ -226,7 +226,7 @@ MACHINE_CONFIG_START(z9001_state::z9001)
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("beeper", BEEP, 800)
+ MCFG_DEVICE_ADD("beeper", BEEP, 800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
@@ -236,15 +236,15 @@ MACHINE_CONFIG_START(z9001_state::z9001)
MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(9'830'400) / 4)
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(z9001_state, port88_w))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, z9001_state, port88_w))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, XTAL(9'830'400) / 4) // keyboard PIO
MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL(9'830'400) / 4)
MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(WRITELINE(z9001_state, cass_w))
- MCFG_Z80CTC_ZC2_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE(*this, z9001_state, cass_w))
+ MCFG_Z80CTC_ZC2_CB(WRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp
index 159d99a0493..f0fc17f7eeb 100644
--- a/src/mame/drivers/zac2650.cpp
+++ b/src/mame/drivers/zac2650.cpp
@@ -233,9 +233,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(zac2650_state::tinvader)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 3800000/4)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_S2650_SENSE_INPUT(DEVREADLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT
+ MCFG_DEVICE_ADD("maincpu", S2650, 3800000/4)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp
index 8e5e590ab87..bd8ebdc92fb 100644
--- a/src/mame/drivers/zac_1.cpp
+++ b/src/mame/drivers/zac_1.cpp
@@ -258,12 +258,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(zac_1_state::zac_1_outtimer)
MACHINE_CONFIG_START(zac_1_state::zac_1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 6000000/2) // no xtal, just 2 chips forming a random oscillator
- MCFG_CPU_PROGRAM_MAP(zac_1_map)
- MCFG_CPU_IO_MAP(zac_1_io)
- MCFG_CPU_DATA_MAP(zac_1_data)
- MCFG_S2650_SENSE_INPUT(READLINE(zac_1_state, serial_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(zac_1_state, serial_w))
+ MCFG_DEVICE_ADD("maincpu", S2650, 6000000/2) // no xtal, just 2 chips forming a random oscillator
+ MCFG_DEVICE_PROGRAM_MAP(zac_1_map)
+ MCFG_DEVICE_IO_MAP(zac_1_io)
+ MCFG_DEVICE_DATA_MAP(zac_1_data)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, zac_1_state, serial_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, zac_1_state, serial_w))
MCFG_NVRAM_ADD_0FILL("ram")
MCFG_TIMER_DRIVER_ADD_PERIODIC("zac_1_inttimer", zac_1_state, zac_1_inttimer, attotime::from_hz(200))
@@ -306,10 +306,10 @@ READ8_MEMBER( zac_1_state::reset_int_r )
MACHINE_CONFIG_START(zac_1_state::locomotp)
zac_1(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(locomotp_map)
- MCFG_CPU_IO_MAP(locomotp_io)
- MCFG_CPU_DATA_MAP(locomotp_data)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(locomotp_map)
+ MCFG_DEVICE_IO_MAP(locomotp_io)
+ MCFG_DEVICE_DATA_MAP(locomotp_data)
// also has sound cpu
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp
index 52f2e45ad69..c7526d7e271 100644
--- a/src/mame/drivers/zac_2.cpp
+++ b/src/mame/drivers/zac_2.cpp
@@ -211,12 +211,12 @@ TIMER_DEVICE_CALLBACK_MEMBER(zac_2_state::zac_2_outtimer)
MACHINE_CONFIG_START(zac_2_state::zac_2)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", S2650, 6000000/2)
- MCFG_CPU_PROGRAM_MAP(zac_2_map)
- MCFG_CPU_IO_MAP(zac_2_io)
- MCFG_CPU_DATA_MAP(zac_2_data)
- MCFG_S2650_SENSE_INPUT(READLINE(zac_2_state, serial_r))
- MCFG_S2650_FLAG_OUTPUT(WRITELINE(zac_2_state, serial_w))
+ MCFG_DEVICE_ADD("maincpu", S2650, 6000000/2)
+ MCFG_DEVICE_PROGRAM_MAP(zac_2_map)
+ MCFG_DEVICE_IO_MAP(zac_2_io)
+ MCFG_DEVICE_DATA_MAP(zac_2_data)
+ MCFG_S2650_SENSE_INPUT(READLINE(*this, zac_2_state, serial_r))
+ MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, zac_2_state, serial_w))
MCFG_NVRAM_ADD_0FILL("ram")
MCFG_TIMER_DRIVER_ADD_PERIODIC("zac_2_inttimer", zac_2_state, zac_2_inttimer, attotime::from_hz(200))
diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp
index af577670aa0..5a646f1c77b 100644
--- a/src/mame/drivers/zac_proto.cpp
+++ b/src/mame/drivers/zac_proto.cpp
@@ -241,8 +241,8 @@ void zac_proto_state::machine_reset()
MACHINE_CONFIG_START(zac_proto_state::zac_proto)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", INS8060, XTAL(4'000'000) / 2) // Using SC/MP II chip which has an internal /2 circuit.
- MCFG_CPU_PROGRAM_MAP(zac_proto_map)
+ MCFG_DEVICE_ADD("maincpu", INS8060, XTAL(4'000'000) / 2) // Using SC/MP II chip which has an internal /2 circuit.
+ MCFG_DEVICE_PROGRAM_MAP(zac_proto_map)
MCFG_NVRAM_ADD_0FILL("nvram")
/* Video */
diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp
index 797d22e92db..7482cb63a02 100644
--- a/src/mame/drivers/zaccaria.cpp
+++ b/src/mame/drivers/zaccaria.cpp
@@ -334,25 +334,25 @@ WRITE_LINE_MEMBER(zaccaria_state::vblank_irq)
MACHINE_CONFIG_START(zaccaria_state::zaccaria)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80,XTAL(18'432'000)/6) /* verified on pcb */
- MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_ADD("maincpu", Z80,XTAL(18'432'000)/6) /* verified on pcb */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
// MCFG_QUANTUM_TIME(attotime::from_hz(1000000))
MCFG_WATCHDOG_ADD("watchdog")
MCFG_DEVICE_ADD("mainlatch", LS259, 0) // 3G on 1B1141 I/O (Z80) board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(zaccaria_state, flip_screen_x_w)) // VCMA
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(zaccaria_state, flip_screen_y_w)) // HCMA
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(DEVWRITELINE("audiopcb", zac1b11142_audio_device, ressound_w)) // RESSOUND
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(zaccaria_state, coin_w)) // COUNT
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(zaccaria_state, nmi_mask_w)) // INTST
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, zaccaria_state, flip_screen_x_w)) // VCMA
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, zaccaria_state, flip_screen_y_w)) // HCMA
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE("audiopcb", zac1b11142_audio_device, ressound_w)) // RESSOUND
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, zaccaria_state, coin_w)) // COUNT
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, zaccaria_state, nmi_mask_w)) // INTST
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
MCFG_I8255_IN_PORTA_CB(IOPORT("P1"))
MCFG_I8255_IN_PORTB_CB(IOPORT("P2"))
MCFG_I8255_IN_PORTC_CB(IOPORT("SYSTEM"))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(zaccaria_state, dsw_sel_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, zaccaria_state, dsw_sel_w))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -362,7 +362,7 @@ MACHINE_CONFIG_START(zaccaria_state::zaccaria)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(zaccaria_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(zaccaria_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, zaccaria_state, vblank_irq))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", zaccaria)
MCFG_PALETTE_ADD("palette", 32*8+32*8)
@@ -371,7 +371,7 @@ MACHINE_CONFIG_START(zaccaria_state::zaccaria)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("audiopcb", ZACCARIA_1B11142, 0)
+ MCFG_DEVICE_ADD("audiopcb", ZACCARIA_1B11142)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp
index bd84dbdbc25..42f756f2026 100644
--- a/src/mame/drivers/zapcomputer.cpp
+++ b/src/mame/drivers/zapcomputer.cpp
@@ -155,9 +155,9 @@ void zapcomp_state::machine_start()
MACHINE_CONFIG_START(zapcomp_state::zapcomp)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", Z80, XTAL(2'000'000))
- MCFG_CPU_PROGRAM_MAP(zapcomp_mem)
- MCFG_CPU_IO_MAP(zapcomp_io)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(2'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(zapcomp_mem)
+ MCFG_DEVICE_IO_MAP(zapcomp_io)
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_zapcomputer)
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index 588ed5a55ab..4cb322c87d1 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1754,8 +1754,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(zaurus_state::rtc_irq_callback)
MACHINE_CONFIG_START(zaurus_state::zaurus)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",PXA255,MAIN_CLOCK)
- MCFG_CPU_PROGRAM_MAP(zaurus_map)
+ MCFG_DEVICE_ADD("maincpu",PXA255,MAIN_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(zaurus_map)
MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", zaurus_state, rtc_irq_callback, attotime::from_hz(XTAL(32'768)))
@@ -1771,7 +1771,7 @@ MACHINE_CONFIG_START(zaurus_state::zaurus)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp
index 0c38fbb4ec7..a298ca7becf 100644
--- a/src/mame/drivers/zaxxon.cpp
+++ b/src/mame/drivers/zaxxon.cpp
@@ -918,27 +918,27 @@ GFXDECODE_END
MACHINE_CONFIG_START(zaxxon_state::root)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(zaxxon_map)
+ MCFG_DEVICE_ADD("maincpu", Z80, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(zaxxon_map)
MCFG_DEVICE_ADD("ppi8255", I8255A, 0)
- MCFG_I8255_OUT_PORTA_CB(WRITE8(zaxxon_state, zaxxon_sound_a_w))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(zaxxon_state, zaxxon_sound_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(zaxxon_state, zaxxon_sound_c_w))
+ MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, zaxxon_state, zaxxon_sound_a_w))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, zaxxon_state, zaxxon_sound_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, zaxxon_state, zaxxon_sound_c_w))
MCFG_DEVICE_ADD("mainlatch1", LS259, 0) // U55 on Zaxxon IC Board A
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(zaxxon_state, coin_enable_w)) // COIN EN A
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(zaxxon_state, coin_enable_w)) // COIN EN B
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(zaxxon_state, coin_enable_w)) // SERV EN
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(zaxxon_state, coin_counter_a_w)) // COUNT A
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(zaxxon_state, coin_counter_b_w)) // COUNT B
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(zaxxon_state, flipscreen_w)) // FLIP
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, zaxxon_state, coin_enable_w)) // COIN EN A
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, zaxxon_state, coin_enable_w)) // COIN EN B
+ MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, zaxxon_state, coin_enable_w)) // SERV EN
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, zaxxon_state, coin_counter_a_w)) // COUNT A
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, zaxxon_state, coin_counter_b_w)) // COUNT B
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, zaxxon_state, flipscreen_w)) // FLIP
MCFG_DEVICE_ADD("mainlatch2", LS259, 0) // U56 on Zaxxon IC Board A
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(zaxxon_state, int_enable_w)) // INTON
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(zaxxon_state, fg_color_w)) // CREF 1
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(zaxxon_state, bg_color_w)) // CREF 3
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(zaxxon_state, bg_enable_w)) // BEN
+ MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, zaxxon_state, int_enable_w)) // INTON
+ MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, zaxxon_state, fg_color_w)) // CREF 1
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, zaxxon_state, bg_color_w)) // CREF 3
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, zaxxon_state, bg_enable_w)) // BEN
/* video hardware */
MCFG_GFXDECODE_ADD("gfxdecode", "palette", zaxxon)
@@ -949,7 +949,7 @@ MACHINE_CONFIG_START(zaxxon_state::root)
MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART)
MCFG_SCREEN_UPDATE_DRIVER(zaxxon_state, screen_update_zaxxon)
MCFG_SCREEN_PALETTE("palette")
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(zaxxon_state, vblank_int))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, zaxxon_state, vblank_int))
MACHINE_CONFIG_END
@@ -965,16 +965,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zaxxon_state::szaxxon)
zaxxon(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(zaxxon_state::szaxxone)
zaxxon(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5013, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(zaxxon_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5013, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(zaxxon_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MCFG_SEGACRPT_SET_SIZE(0x6000)
MACHINE_CONFIG_END
@@ -983,9 +983,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zaxxon_state::futspye)
root(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5061, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(zaxxon_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5061, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(zaxxon_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MCFG_SEGACRPT_SET_SIZE(0x6000)
@@ -1005,9 +1005,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zaxxon_state::razmataze)
root(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(ixion_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5098, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(ixion_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MCFG_SEGACRPT_SET_SIZE(0x6000)
@@ -1025,9 +1025,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zaxxon_state::ixion)
razmataze(config);
- MCFG_CPU_REPLACE("maincpu", SEGA_315_5013, MASTER_CLOCK/16)
- MCFG_CPU_PROGRAM_MAP(ixion_map)
- MCFG_CPU_OPCODES_MAP(decrypted_opcodes_map)
+ MCFG_DEVICE_REPLACE("maincpu", SEGA_315_5013, MASTER_CLOCK/16)
+ MCFG_DEVICE_PROGRAM_MAP(ixion_map)
+ MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map)
MCFG_SEGACRPT_SET_DECRYPTED_TAG(":decrypted_opcodes")
MCFG_SEGACRPT_SET_SIZE(0x6000)
@@ -1038,27 +1038,27 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zaxxon_state::congo)
root(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(congo_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(congo_map)
MCFG_DEVICE_REPLACE("ppi8255", I8255A, 0)
- MCFG_I8255_IN_PORTA_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
- MCFG_I8255_OUT_PORTB_CB(WRITE8(zaxxon_state, congo_sound_b_w))
- MCFG_I8255_OUT_PORTC_CB(WRITE8(zaxxon_state, congo_sound_c_w))
+ MCFG_I8255_IN_PORTA_CB(READ8("soundlatch", generic_latch_8_device, read))
+ MCFG_I8255_OUT_PORTB_CB(WRITE8(*this, zaxxon_state, congo_sound_b_w))
+ MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, zaxxon_state, congo_sound_c_w))
MCFG_DEVICE_MODIFY("mainlatch1") // U52 on Control Board
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(zaxxon_state, bg_enable_w)) // BEN
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(zaxxon_state, int_enable_w)) // INTON
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, zaxxon_state, bg_enable_w)) // BEN
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, zaxxon_state, int_enable_w)) // INTON
MCFG_DEVICE_MODIFY("mainlatch2") // U53 on Control Board
MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(NOOP) // not used
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(zaxxon_state, bg_color_w)) // CREF 3
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(zaxxon_state, congo_fg_bank_w)) // BS
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(zaxxon_state, congo_color_bank_w)) // CBS
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, zaxxon_state, bg_color_w)) // CREF 3
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, zaxxon_state, congo_fg_bank_w)) // BS
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, zaxxon_state, congo_color_bank_w)) // CBS
- MCFG_CPU_ADD("audiocpu", Z80, SOUND_CLOCK)
- MCFG_CPU_PROGRAM_MAP(congo_sound_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(zaxxon_state, irq0_line_hold, SOUND_CLOCK/16/16/16/4)
+ MCFG_DEVICE_ADD("audiocpu", Z80, SOUND_CLOCK)
+ MCFG_DEVICE_PROGRAM_MAP(congo_sound_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(zaxxon_state, irq0_line_hold, SOUND_CLOCK/16/16/16/4)
/* video hardware */
MCFG_PALETTE_MODIFY("palette")
@@ -1074,10 +1074,10 @@ MACHINE_CONFIG_START(zaxxon_state::congo)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("sn1", SN76489A, SOUND_CLOCK) // schematic shows sn76489A
+ MCFG_DEVICE_ADD("sn1", SN76489A, SOUND_CLOCK) // schematic shows sn76489A
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
- MCFG_SOUND_ADD("sn2", SN76489A, SOUND_CLOCK/4) // schematic shows sn76489A
+ MCFG_DEVICE_ADD("sn2", SN76489A, SOUND_CLOCK/4) // schematic shows sn76489A
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
congo_samples(config);
diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp
index ed64826346f..1ccdc77266b 100644
--- a/src/mame/drivers/zerozone.cpp
+++ b/src/mame/drivers/zerozone.cpp
@@ -173,12 +173,12 @@ void zerozone_state::machine_reset()
MACHINE_CONFIG_START(zerozone_state::zerozone)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", zerozone_state, irq1_line_hold)
+ MCFG_DEVICE_ADD("maincpu", M68000, 10000000) /* 10 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", zerozone_state, irq1_line_hold)
- MCFG_CPU_ADD("audiocpu", Z80, 1000000) /* 1 MHz ??? */
- MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_ADD("audiocpu", Z80, 1000000) /* 1 MHz ??? */
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
MCFG_QUANTUM_TIME(attotime::from_hz(600))
diff --git a/src/mame/drivers/zexall.cpp b/src/mame/drivers/zexall.cpp
index e47cb7642ba..1c4543d0a5e 100644
--- a/src/mame/drivers/zexall.cpp
+++ b/src/mame/drivers/zexall.cpp
@@ -159,8 +159,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(zexall_state::zexall)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
diff --git a/src/mame/drivers/zms8085.cpp b/src/mame/drivers/zms8085.cpp
index ebbfcf1c20b..6c6eb203b88 100644
--- a/src/mame/drivers/zms8085.cpp
+++ b/src/mame/drivers/zms8085.cpp
@@ -119,9 +119,9 @@ void zms8085_state::machine_start()
}
MACHINE_CONFIG_START(zms8085_state::zephyr)
- MCFG_CPU_ADD("maincpu", I8085A, XTAL(15'582'000) / 2) // divider not verified
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu", I8085A, XTAL(15'582'000) / 2) // divider not verified
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL(15'582'000), 980, 0, 800, 265, 0, 250)
@@ -130,12 +130,12 @@ MACHINE_CONFIG_START(zms8085_state::zephyr)
MCFG_DEVICE_ADD("uart", AY51013, 0) // SMC COM2017
MCFG_AY51013_TX_CLOCK(153600) // should actually be configurable somehow
MCFG_AY51013_RX_CLOCK(153600)
- MCFG_AY51013_READ_SI_CB(DEVREADLINE("rs232", rs232_port_device, rxd_r))
- MCFG_AY51013_WRITE_SO_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_AY51013_READ_SI_CB(READLINE("rs232", rs232_port_device, rxd_r))
+ MCFG_AY51013_WRITE_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
MCFG_AY51013_WRITE_DAV_CB(INPUTLINE("maincpu", I8085_RST65_LINE))
MCFG_AY51013_AUTO_RDAV(true)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
MACHINE_CONFIG_END
/**************************************************************************************************************
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp
index f308c42747d..5c9947a4f9e 100644
--- a/src/mame/drivers/zn.cpp
+++ b/src/mame/drivers/zn.cpp
@@ -378,25 +378,25 @@ void zn_state::zn_map(address_map &map)
MACHINE_CONFIG_START(zn_state::zn1_1mb_vram)
/* basic machine hardware */
- MCFG_CPU_ADD( m_maincpu, CXD8530CQ, XTAL(67'737'600) )
- MCFG_CPU_PROGRAM_MAP( zn_map)
+ MCFG_DEVICE_ADD( m_maincpu, CXD8530CQ, XTAL(67'737'600) )
+ MCFG_DEVICE_PROGRAM_MAP( zn_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_DEVICE_MODIFY("maincpu:sio0")
- MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(zn_state, sio0_sck))
- MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(zn_state, sio0_txd))
+ MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(*this, zn_state, sio0_sck))
+ MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(*this, zn_state, sio0_txd))
MCFG_DEVICE_ADD("cat702_1", CAT702, 0)
- MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<0>))
+ MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<0>))
MCFG_DEVICE_ADD("cat702_2", CAT702, 0)
- MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<1>))
+ MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<1>))
MCFG_DEVICE_ADD("znmcu", ZNMCU, 0)
- MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(zn_state, znmcu_dataout))
- MCFG_ZNMCU_DSR_HANDLER(WRITELINE(zn_state, znmcu_dsrout))
+ MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(*this, zn_state, znmcu_dataout))
+ MCFG_ZNMCU_DSR_HANDLER(WRITELINE(*this, zn_state, znmcu_dsrout))
MCFG_ZNMCU_DSW_HANDLER(IOPORT("DSW"))
MCFG_ZNMCU_ANALOG1_HANDLER(IOPORT("ANALOG1"))
MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT("ANALOG2"))
@@ -424,25 +424,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::zn2)
/* basic machine hardware */
- MCFG_CPU_ADD( m_maincpu, CXD8661R, XTAL(100'000'000) )
- MCFG_CPU_PROGRAM_MAP( zn_map)
+ MCFG_DEVICE_ADD( m_maincpu, CXD8661R, XTAL(100'000'000) )
+ MCFG_DEVICE_PROGRAM_MAP( zn_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_DEVICE_MODIFY("maincpu:sio0")
- MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(zn_state, sio0_sck))
- MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(zn_state, sio0_txd))
+ MCFG_PSX_SIO_SCK_HANDLER(WRITELINE(*this, zn_state, sio0_sck))
+ MCFG_PSX_SIO_TXD_HANDLER(WRITELINE(*this, zn_state, sio0_txd))
MCFG_DEVICE_ADD("cat702_1", CAT702, 0)
- MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<0>))
+ MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<0>))
MCFG_DEVICE_ADD("cat702_2", CAT702, 0)
- MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(zn_state, cat702_dataout<1>))
+ MCFG_CAT702_DATAOUT_HANDLER(WRITELINE(*this, zn_state, cat702_dataout<1>))
MCFG_DEVICE_ADD("znmcu", ZNMCU, 0)
- MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(zn_state, znmcu_dataout))
- MCFG_ZNMCU_DSR_HANDLER(WRITELINE(zn_state, znmcu_dsrout))
+ MCFG_ZNMCU_DATAOUT_HANDLER(WRITELINE(*this, zn_state, znmcu_dataout))
+ MCFG_ZNMCU_DSR_HANDLER(WRITELINE(*this, zn_state, znmcu_dsrout))
MCFG_ZNMCU_DSW_HANDLER(IOPORT("DSW"))
MCFG_ZNMCU_ANALOG1_HANDLER(IOPORT("ANALOG1"))
MCFG_ZNMCU_ANALOG2_HANDLER(IOPORT("ANALOG2"))
@@ -647,13 +647,13 @@ void zn_state::qsound_portmap(address_map &map)
MACHINE_CONFIG_START(zn_state::coh1000c)
zn1_1mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000c_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000c_map)
- MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(qsound_map)
- MCFG_CPU_IO_MAP(qsound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
+ MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(qsound_map)
+ MCFG_DEVICE_IO_MAP(qsound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c)
@@ -673,13 +673,13 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::coh1002c)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000c_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000c_map)
- MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(qsound_map)
- MCFG_CPU_IO_MAP(qsound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
+ MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(qsound_map)
+ MCFG_DEVICE_IO_MAP(qsound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c)
@@ -835,13 +835,13 @@ Notes:
MACHINE_CONFIG_START(zn_state::coh3002c)
zn2(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000c_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000c_map)
- MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(8'000'000))
- MCFG_CPU_PROGRAM_MAP(qsound_map)
- MCFG_CPU_IO_MAP(qsound_portmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
+ MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(8'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(qsound_map)
+ MCFG_DEVICE_IO_MAP(qsound_portmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(zn_state, qsound_interrupt, 250) // measured (cps2.cpp)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000c)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000c)
@@ -1132,16 +1132,16 @@ void zn_state::fx1a_sound_map(address_map &map)
MACHINE_CONFIG_START(zn_state::coh1000ta)
zn1_1mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000ta_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000ta_map)
- MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(16'000'000) / 4) /* 4 MHz */
- MCFG_CPU_PROGRAM_MAP(fx1a_sound_map)
+ MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(16'000'000) / 4) /* 4 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(fx1a_sound_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta)
- MCFG_SOUND_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2)
+ MCFG_DEVICE_ADD("ymsnd", YM2610B, XTAL(16'000'000)/2)
MCFG_YM2610_IRQ_HANDLER(INPUTLINE(m_audiocpu, 0))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
@@ -1190,8 +1190,8 @@ MACHINE_CONFIG_START(zn_state::coh1000tb)
zn1_1mb_vram(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000tb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000tb_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta)
@@ -1200,7 +1200,7 @@ MACHINE_CONFIG_START(zn_state::coh1000tb)
MCFG_MB3773_ADD("mb3773")
/* sound hardware */
- MCFG_SOUND_MODIFY("spu")
+ MCFG_DEVICE_MODIFY("spu")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
@@ -1212,8 +1212,8 @@ MACHINE_CONFIG_START(zn_state::coh1002tb)
zn1_2mb_vram(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000tb_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000tb_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1000ta)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1000ta)
@@ -1222,7 +1222,7 @@ MACHINE_CONFIG_START(zn_state::coh1002tb)
MCFG_MB3773_ADD("mb3773")
/* sound hardware */
- MCFG_SOUND_MODIFY("spu")
+ MCFG_DEVICE_MODIFY("spu")
MCFG_SOUND_ROUTES_RESET()
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
@@ -1458,14 +1458,14 @@ void zn_state::coh1000w_map(address_map &map)
MACHINE_CONFIG_START(zn_state::coh1000w)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000w_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000w_map)
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("8M")
MCFG_VT83C461_ADD("ide", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10))
MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&zn_state::atpsx_dma_read, this ) )
MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&zn_state::atpsx_dma_write, this ) )
MACHINE_CONFIG_END
@@ -1677,27 +1677,27 @@ void zn_state::oki_map(address_map &map)
MACHINE_CONFIG_START(zn_state::coh1002e)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1002e_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1002e_map)
- MCFG_CPU_ADD(m_audiocpu, M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(psarc_snd_map)
+ MCFG_DEVICE_ADD(m_audiocpu, M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(psarc_snd_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e)
- MCFG_SOUND_ADD("ymf", YMF271, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymf", YMF271, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::beastrzrb)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1002e_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1002e_map)
- MCFG_CPU_ADD(m_audiocpu, AT89C4051, XTAL(12'000'000)) // clock unverified
- MCFG_CPU_PROGRAM_MAP(beastrzrb_snd_map)
+ MCFG_DEVICE_ADD(m_audiocpu, AT89C4051, XTAL(12'000'000)) // clock unverified
+ MCFG_DEVICE_PROGRAM_MAP(beastrzrb_snd_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002e)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002e)
@@ -1833,8 +1833,8 @@ MACHINE_RESET_MEMBER(zn_state,bam2)
MACHINE_CONFIG_START(zn_state::bam2)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(bam2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(bam2_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, bam2)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, bam2)
@@ -2183,14 +2183,14 @@ void zn_state::jdredd_map(address_map &map)
MACHINE_CONFIG_START(zn_state::coh1000a)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1000a_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1000a_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::nbajamex)
coh1000a(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(nbajamex_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(nbajamex_map)
MCFG_NVRAM_ADD_1FILL("71256")
@@ -2209,14 +2209,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::jdredd)
coh1000a(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(jdredd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(jdredd_map)
MCFG_DEVICE_MODIFY("gpu")
MCFG_PSXGPU_VBLANK_CALLBACK(vblank_state_delegate(&zn_state::jdredd_vblank, this))
MCFG_ATA_INTERFACE_ADD("ata", ata_devices, "hdd", nullptr, true)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE("maincpu:irq", psxirq_device, intin10))
MACHINE_CONFIG_END
/*
@@ -2377,11 +2377,11 @@ void zn_state::atlus_snd_map(address_map &map)
MACHINE_CONFIG_START(zn_state::coh1001l)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1001l_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1001l_map)
- MCFG_CPU_ADD(m_audiocpu, M68000, XTAL(10'000'000))
- MCFG_CPU_PROGRAM_MAP(atlus_snd_map)
+ MCFG_DEVICE_ADD(m_audiocpu, M68000, XTAL(10'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(atlus_snd_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1001l)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1001l)
@@ -2389,7 +2389,7 @@ MACHINE_CONFIG_START(zn_state::coh1001l)
MCFG_GENERIC_LATCH_16_ADD("soundlatch16")
MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE(m_audiocpu, 3))
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_YMZ280B_IRQ_HANDLER(INPUTLINE(m_audiocpu, 2))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
@@ -2433,8 +2433,8 @@ MACHINE_RESET_MEMBER(zn_state,coh1002v)
MACHINE_CONFIG_START(zn_state::coh1002v)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1002v_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1002v_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002v)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002v)
@@ -2623,8 +2623,8 @@ MACHINE_RESET_MEMBER(zn_state,coh1002m)
MACHINE_CONFIG_START(zn_state::coh1002m)
zn1_2mb_vram(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1002m_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1002m_map)
MCFG_MACHINE_START_OVERRIDE(zn_state, coh1002m)
MCFG_MACHINE_RESET_OVERRIDE(zn_state, coh1002m)
@@ -2680,12 +2680,12 @@ MACHINE_CONFIG_START(zn_state::coh1002msnd)
coh1002m(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(coh1002msnd_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(coh1002msnd_map)
- MCFG_CPU_ADD(m_audiocpu, Z80, XTAL(32'000'000)/8)
- MCFG_CPU_PROGRAM_MAP(cbaj_z80_map)
- MCFG_CPU_IO_MAP(cbaj_z80_port_map)
+ MCFG_DEVICE_ADD(m_audiocpu, Z80, XTAL(32'000'000)/8)
+ MCFG_DEVICE_PROGRAM_MAP(cbaj_z80_map)
+ MCFG_DEVICE_IO_MAP(cbaj_z80_port_map)
MCFG_FIFO7200_ADD("cbaj_fifo1", 0x400) // LH540202
MCFG_FIFO7200_ADD("cbaj_fifo2", 0x400) // "
@@ -2693,16 +2693,16 @@ MACHINE_CONFIG_START(zn_state::coh1002msnd)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
/* sound hardware */
- MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400))
+ MCFG_DEVICE_ADD("ymz", YMZ280B, XTAL(16'934'400))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.35)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(zn_state::coh1002ml)
coh1002m(config);
- MCFG_CPU_ADD("link", Z80, 4000000) // ?
- MCFG_CPU_PROGRAM_MAP(coh1002ml_link_map)
- MCFG_CPU_IO_MAP(coh1002ml_link_port_map)
+ MCFG_DEVICE_ADD("link", Z80, 4000000) // ?
+ MCFG_DEVICE_PROGRAM_MAP(coh1002ml_link_map)
+ MCFG_DEVICE_IO_MAP(coh1002ml_link_port_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp
index f35cdc9dd73..412782a3cd4 100644
--- a/src/mame/drivers/zodiack.cpp
+++ b/src/mame/drivers/zodiack.cpp
@@ -569,15 +569,15 @@ void zodiack_state::machine_reset()
MACHINE_CONFIG_START(zodiack_state::zodiack)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(main_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", zodiack_state, zodiack_main_nmi_gen)
- MCFG_CPU_PERIODIC_INT_DRIVER(zodiack_state, irq0_line_hold, 1*60) // sound related - unknown source, timing is guessed
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(main_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", zodiack_state, zodiack_main_nmi_gen)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(zodiack_state, irq0_line_hold, 1*60) // sound related - unknown source, timing is guessed
- MCFG_CPU_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(io_map)
- MCFG_CPU_PERIODIC_INT_DRIVER(zodiack_state, zodiack_sound_nmi_gen, 8*60) // sound tempo - unknown source, timing is guessed
+ MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(18'432'000)/6)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(io_map)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(zodiack_state, zodiack_sound_nmi_gen, 8*60) // sound tempo - unknown source, timing is guessed
MCFG_WATCHDOG_ADD("watchdog")
@@ -597,7 +597,7 @@ MACHINE_CONFIG_START(zodiack_state::zodiack)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("aysnd", AY8910, XTAL(18'432'000)/12)
+ MCFG_DEVICE_ADD("aysnd", AY8910, XTAL(18'432'000)/12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp
index ec360fcea3b..533261ac9eb 100644
--- a/src/mame/drivers/zorba.cpp
+++ b/src/mame/drivers/zorba.cpp
@@ -137,9 +137,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(zorba_state::zorba)
// basic machine hardware
- MCFG_CPU_ADD(m_maincpu, Z80, 24_MHz_XTAL / 6)
- MCFG_CPU_PROGRAM_MAP(zorba_mem)
- MCFG_CPU_IO_MAP(zorba_io)
+ MCFG_DEVICE_ADD(m_maincpu, Z80, 24_MHz_XTAL / 6)
+ MCFG_DEVICE_PROGRAM_MAP(zorba_mem)
+ MCFG_DEVICE_IO_MAP(zorba_io)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -150,86 +150,86 @@ MACHINE_CONFIG_START(zorba_state::zorba)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(m_beep, BEEP, 800) // should be horizontal frequency / 16, so depends on CRTC parameters
+ MCFG_DEVICE_ADD(m_beep, BEEP, 800) // should be horizontal frequency / 16, so depends on CRTC parameters
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_INPUT_MERGER_ANY_HIGH("irq0")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<0>))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<0>))
MCFG_INPUT_MERGER_ANY_HIGH("irq1")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<1>))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<1>))
MCFG_INPUT_MERGER_ANY_HIGH("irq2")
- MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<2>))
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, zorba_state, irq_w<2>))
/* devices */
MCFG_DEVICE_ADD(m_dma, Z80DMA, 24_MHz_XTAL / 6)
// busack on cpu connects to bai pin
- MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(zorba_state, busreq_w)) //connects to busreq on cpu
- MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE("irq0", input_merger_device, in_w<0>))
+ MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(*this, zorba_state, busreq_w)) //connects to busreq on cpu
+ MCFG_Z80DMA_OUT_INT_CB(WRITELINE("irq0", input_merger_device, in_w<0>))
//ba0 - not connected
- MCFG_Z80DMA_IN_MREQ_CB(READ8(zorba_state, memory_read_byte))
- MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(zorba_state, memory_write_byte))
- MCFG_Z80DMA_IN_IORQ_CB(READ8(zorba_state, io_read_byte))
- MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(zorba_state, io_write_byte))
+ MCFG_Z80DMA_IN_MREQ_CB(READ8(*this, zorba_state, memory_read_byte))
+ MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, zorba_state, memory_write_byte))
+ MCFG_Z80DMA_IN_IORQ_CB(READ8(*this, zorba_state, io_read_byte))
+ MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(*this, zorba_state, io_write_byte))
MCFG_DEVICE_ADD(m_uart0, I8251, 0) // U32 COM port J2
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) // TODO: this line has a LED attached
- MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<1>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<0>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd)) // TODO: this line has a LED attached
+ MCFG_I8251_DTR_HANDLER(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<1>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<0>))
MCFG_DEVICE_ADD(m_uart1, I8251, 0) // U31 printer port J3
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("serprn", rs232_port_device, write_txd))
- MCFG_I8251_RTS_HANDLER(DEVWRITELINE("serprn", rs232_port_device, write_rts))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<3>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<2>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("serprn", rs232_port_device, write_txd))
+ MCFG_I8251_RTS_HANDLER(WRITELINE("serprn", rs232_port_device, write_rts))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<3>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<2>))
MCFG_DEVICE_ADD(m_uart2, I8251, 0) // U30 serial keyboard J6
- MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", zorba_keyboard_device, txd_w))
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<5>))
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(zorba_state, tx_rx_rdy_w<4>))
+ MCFG_I8251_TXD_HANDLER(WRITELINE("keyboard", zorba_keyboard_device, txd_w))
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<5>))
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(*this, zorba_state, tx_rx_rdy_w<4>))
// port A - disk select etc, beeper
// port B - parallel interface
MCFG_DEVICE_ADD(m_pia0, PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(zorba_state, pia0_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("parprndata", output_latch_device, write))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("parprn", centronics_device, write_strobe))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, zorba_state, pia0_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("parprndata", output_latch_device, write))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("parprn", centronics_device, write_strobe))
// IEEE488 interface
MCFG_DEVICE_ADD(m_pia1, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(DEVREAD8(m_ieee, ieee488_device, dio_r)) // TODO: gated with PB1
- MCFG_PIA_WRITEPA_HANDLER(DEVWRITE8(m_ieee, ieee488_device, dio_w)) // TODO: gated with PB1
- MCFG_PIA_READPB_HANDLER(READ8(zorba_state, pia1_portb_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(zorba_state, pia1_portb_w))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE(m_ieee, ieee488_device, ifc_w))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE(m_ieee, ieee488_device, ren_w))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("irq1", input_merger_device, in_w<0>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("irq1", input_merger_device, in_w<1>))
+ MCFG_PIA_READPA_HANDLER(READ8(m_ieee, ieee488_device, dio_r)) // TODO: gated with PB1
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(m_ieee, ieee488_device, dio_w)) // TODO: gated with PB1
+ MCFG_PIA_READPB_HANDLER(READ8(*this, zorba_state, pia1_portb_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, zorba_state, pia1_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(m_ieee, ieee488_device, ifc_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(m_ieee, ieee488_device, ren_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("irq1", input_merger_device, in_w<0>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("irq1", input_merger_device, in_w<1>))
// PIT
MCFG_DEVICE_ADD("pit", PIT8254, 0)
MCFG_PIT8253_CLK0(24_MHz_XTAL / 3)
MCFG_PIT8253_CLK1(24_MHz_XTAL / 3)
MCFG_PIT8253_CLK2(24_MHz_XTAL / 3)
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(zorba_state, br1_w))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE(m_uart1, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(m_uart1, i8251_device, write_rxc))
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(m_uart2, i8251_device, write_txc))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(m_uart2, i8251_device, write_rxc))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, zorba_state, br1_w))
+ MCFG_PIT8253_OUT1_HANDLER(WRITELINE(m_uart1, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart1, i8251_device, write_rxc))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(m_uart2, i8251_device, write_txc))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart2, i8251_device, write_rxc))
// CRTC
MCFG_DEVICE_ADD(m_crtc, I8275, 14.318'181_MHz_XTAL / 7)
MCFG_I8275_CHARACTER_WIDTH(8)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(zorba_state, zorba_update_chr)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE(m_dma, z80dma_device, rdy_w))
- MCFG_I8275_IRQ_CALLBACK(DEVWRITELINE("irq0", input_merger_device, in_w<1>))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(m_dma, z80dma_device, rdy_w))
+ MCFG_I8275_IRQ_CALLBACK(WRITELINE("irq0", input_merger_device, in_w<1>))
MCFG_VIDEO_SET_SCREEN("screen")
// Floppies
MCFG_FD1793_ADD(m_fdc, 24_MHz_XTAL / 24)
- MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<0>))
- MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<1>))
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE("irq2", input_merger_device, in_w<0>))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE("irq2", input_merger_device, in_w<1>))
MCFG_FLOPPY_DRIVE_ADD(m_floppy0, zorba_floppies, "525dd", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
MCFG_FLOPPY_DRIVE_ADD(m_floppy1, zorba_floppies, "525dd", floppy_image_device::default_floppy_formats)
@@ -237,30 +237,30 @@ MACHINE_CONFIG_START(zorba_state::zorba)
// J1 IEEE-488
MCFG_IEEE488_BUS_ADD()
- MCFG_IEEE488_SRQ_CALLBACK(DEVWRITELINE(m_pia1, pia6821_device, ca2_w)) // TODO: gated with PB1 from PIA
+ MCFG_IEEE488_SRQ_CALLBACK(WRITELINE(m_pia1, pia6821_device, ca2_w)) // TODO: gated with PB1 from PIA
// J2 EIA RS232/internal modem
// TODO: this has additional lines compared to a regular RS232 port (TxC in, RxC in, RxC out, speaker in, power)
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(m_uart0, i8251_device, write_rxd)) // TODO: this line has a LED attached
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(m_uart0, i8251_device, write_cts)) // TODO: this line has a LED attached
- MCFG_RS232_DSR_HANDLER(DEVWRITELINE(m_uart0, i8251_device, write_dsr))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart0, i8251_device, write_rxd)) // TODO: this line has a LED attached
+ MCFG_RS232_CTS_HANDLER(WRITELINE(m_uart0, i8251_device, write_cts)) // TODO: this line has a LED attached
+ MCFG_RS232_DSR_HANDLER(WRITELINE(m_uart0, i8251_device, write_dsr))
// J3 Parallel printer
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("parprndata", "parprn")
MCFG_CENTRONICS_ADD("parprn", centronics_devices, "printer")
- MCFG_CENTRONICS_BUSY_HANDLER(DEVWRITELINE(m_uart1, i8251_device, write_cts))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(m_uart1, i8251_device, write_dsr)) // TODO: shared with serial CTS
- MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(zorba_state, printer_fault_w))
- MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(zorba_state, printer_select_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(m_uart1, i8251_device, write_cts))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(m_uart1, i8251_device, write_dsr)) // TODO: shared with serial CTS
+ MCFG_CENTRONICS_FAULT_HANDLER(WRITELINE(*this, zorba_state, printer_fault_w))
+ MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(*this, zorba_state, printer_select_w))
// J3 Serial printer
- MCFG_RS232_PORT_ADD("serprn", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(m_uart1, i8251_device, write_rxd)) // TODO: this line has a LED attached
+ MCFG_DEVICE_ADD("serprn", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(m_uart1, i8251_device, write_rxd)) // TODO: this line has a LED attached
// J6 TTL-level serial keyboard
MCFG_DEVICE_ADD("keyboard", ZORBA_KEYBOARD, 0)
- MCFG_ZORBA_KEYBOARD_RXD_CB(DEVWRITELINE(m_uart2, i8251_device, write_rxd))
+ MCFG_ZORBA_KEYBOARD_RXD_CB(WRITELINE(m_uart2, i8251_device, write_rxd))
MCFG_SOFTWARE_LIST_ADD("flop_list", "zorba")
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp
index 3648277f7d6..033117b47ea 100644
--- a/src/mame/drivers/zr107.cpp
+++ b/src/mame/drivers/zr107.cpp
@@ -775,16 +775,16 @@ void zr107_state::machine_reset()
MACHINE_CONFIG_START(zr107_state::zr107)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
- MCFG_CPU_PROGRAM_MAP(zr107_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
+ MCFG_DEVICE_PROGRAM_MAP(zr107_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/8) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/8) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc_map)
+ MCFG_DEVICE_DATA_MAP(sharc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(750000))// Very high sync needed to prevent lockups - why?
@@ -825,7 +825,7 @@ MACHINE_CONFIG_START(zr107_state::zr107)
MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_DEVICE_ADDRESS_MAP(0, k054539_map)
- MCFG_K054539_TIMER_HANDLER(WRITELINE(zr107_state, k054539_irq_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, zr107_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -846,16 +846,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zr107_state::jetwave)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
- MCFG_CPU_PROGRAM_MAP(jetwave_map)
- MCFG_CPU_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank)
+ MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */
+ MCFG_DEVICE_PROGRAM_MAP(jetwave_map)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank)
- MCFG_CPU_ADD("audiocpu", M68000, XTAL(64'000'000)/8) /* 8MHz */
- MCFG_CPU_PROGRAM_MAP(sound_memmap)
+ MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/8) /* 8MHz */
+ MCFG_DEVICE_PROGRAM_MAP(sound_memmap)
- MCFG_CPU_ADD("dsp", ADSP21062, XTAL(36'000'000))
+ MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000))
MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM)
- MCFG_CPU_DATA_MAP(sharc_map)
+ MCFG_DEVICE_DATA_MAP(sharc_map)
MCFG_QUANTUM_TIME(attotime::from_hz(2000000)) // Very high sync needed to prevent lockups - why?
@@ -904,7 +904,7 @@ MACHINE_CONFIG_START(zr107_state::jetwave)
MCFG_DEVICE_ADD("k054539_1", K054539, XTAL(18'432'000))
MCFG_DEVICE_ADDRESS_MAP(0, k054539_map)
- MCFG_K054539_TIMER_HANDLER(WRITELINE(zr107_state, k054539_irq_gen))
+ MCFG_K054539_TIMER_HANDLER(WRITELINE(*this, zr107_state, k054539_irq_gen))
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp
index c7705338ded..5093e779ac2 100644
--- a/src/mame/drivers/zrt80.cpp
+++ b/src/mame/drivers/zrt80.cpp
@@ -274,9 +274,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(zrt80_state::zrt80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(2'457'600))
- MCFG_CPU_PROGRAM_MAP(mem_map)
- MCFG_CPU_IO_MAP(io_map)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(2'457'600))
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_IO_MAP(io_map)
/* video hardware */
MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
@@ -290,7 +290,7 @@ MACHINE_CONFIG_START(zrt80_state::zrt80)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 800)
+ MCFG_DEVICE_ADD("beeper", BEEP, 800)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
/* Devices */
diff --git a/src/mame/drivers/zsbc3.cpp b/src/mame/drivers/zsbc3.cpp
index b5c11f06a14..24a734add87 100644
--- a/src/mame/drivers/zsbc3.cpp
+++ b/src/mame/drivers/zsbc3.cpp
@@ -83,29 +83,29 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(zsbc3_state::zsbc3)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(zsbc3_mem)
- MCFG_CPU_IO_MAP(zsbc3_io)
+ MCFG_DEVICE_ADD("maincpu",Z80, XTAL(16'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(zsbc3_mem)
+ MCFG_DEVICE_IO_MAP(zsbc3_io)
MCFG_DEVICE_ADD("ctc", Z80CTC, XTAL(16'000'000) / 4)
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("sio", z80sio_device, txca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, rxca_w))
+ MCFG_Z80CTC_ZC0_CB(WRITELINE("sio", z80sio_device, txca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio", z80sio_device, rxca_w))
MCFG_DEVICE_ADD("clk2mhz", CLOCK, XTAL(16'000'000) / 8)
- MCFG_CLOCK_SIGNAL_HANDLER(DEVWRITELINE("ctc", z80ctc_device, trg0))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg1))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg2))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("ctc", z80ctc_device, trg3))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE("ctc", z80ctc_device, trg0))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg1))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg2))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(16'000'000) / 4)
//MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // no evidence of a daisy chain because IM2 is not set
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs232", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs232", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs232", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs232", rs232_port_device, write_rts))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio", z80sio_device, rxa_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio", z80sio_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio", z80sio_device, ctsa_w))
MCFG_DEVICE_ADD("pio", Z80PIO, XTAL(16'000'000) / 4)
//MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index d827ddf4daa..bea5c6ba9be 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -494,8 +494,8 @@ void zwackery_state::machine_start()
MACHINE_CONFIG_START(zwackery_state::zwackery)
// basic machine hardware
- MCFG_CPU_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL(16'000'000)/2
- MCFG_CPU_PROGRAM_MAP(zwackery_map)
+ MCFG_DEVICE_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL(16'000'000)/2
+ MCFG_DEVICE_PROGRAM_MAP(zwackery_map)
MCFG_WATCHDOG_ADD("watchdog")
@@ -504,18 +504,18 @@ MACHINE_CONFIG_START(zwackery_state::zwackery)
MCFG_DEVICE_ADD("pia0", PIA6821, 0)
MCFG_PIA_READPB_HANDLER(IOPORT("IN0"))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(zwackery_state, pia0_porta_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(zwackery_state, pia0_irq_w))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(zwackery_state, pia0_irq_w))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, zwackery_state, pia0_porta_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, zwackery_state, pia0_irq_w))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, zwackery_state, pia0_irq_w))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(zwackery_state, pia1_porta_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(zwackery_state, pia1_porta_w))
- MCFG_PIA_READPB_HANDLER(READ8(zwackery_state, pia1_portb_r))
- MCFG_PIA_CA2_HANDLER(DEVWRITELINE("csd", midway_cheap_squeak_deluxe_device, sirq_w))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, zwackery_state, pia1_porta_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, zwackery_state, pia1_porta_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, zwackery_state, pia1_portb_r))
+ MCFG_PIA_CA2_HANDLER(WRITELINE("csd", midway_cheap_squeak_deluxe_device, sirq_w))
MCFG_DEVICE_ADD("pia2", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(zwackery_state, pia2_porta_r))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, zwackery_state, pia2_porta_r))
MCFG_PIA_READPB_HANDLER(IOPORT("DSW"))
// video hardware
@@ -537,7 +537,7 @@ MACHINE_CONFIG_START(zwackery_state::zwackery)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("csd", MIDWAY_CHEAP_SQUEAK_DELUXE, 0)
+ MCFG_DEVICE_ADD("csd", MIDWAY_CHEAP_SQUEAK_DELUXE)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp
index 91f1751d95f..9a1bd9ebd20 100644
--- a/src/mame/drivers/zx.cpp
+++ b/src/mame/drivers/zx.cpp
@@ -327,11 +327,11 @@ PALETTE_INIT_MEMBER(zx_state, zx)
MACHINE_CONFIG_START(zx_state::zx80)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(6'500'000)/2)
- MCFG_CPU_PROGRAM_MAP(zx80_map)
- MCFG_CPU_IO_MAP(zx80_io_map)
- MCFG_CPU_OPCODES_MAP(ula_map)
- MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(zx_state, refresh_w))
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(6'500'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(zx80_map)
+ MCFG_DEVICE_IO_MAP(zx80_io_map)
+ MCFG_DEVICE_OPCODES_MAP(ula_map)
+ MCFG_Z80_SET_REFRESH_CALLBACK(WRITE8(*this, zx_state, refresh_w))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(XTAL(6'500'000)/2/64159.0) // 54223 for NTSC
@@ -361,9 +361,9 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zx_state::zx81)
zx80(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(zx81_map)
- MCFG_CPU_IO_MAP(zx81_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(zx81_map)
+ MCFG_DEVICE_IO_MAP(zx81_io_map)
MCFG_CASSETTE_MODIFY( "cassette" )
MCFG_CASSETTE_FORMATS(zx81_cassette_formats)
@@ -383,7 +383,7 @@ MACHINE_CONFIG_START(zx_state::zx81_spk )
/* sound hardware */
/* Used by pc8300/lambda/pow3000 */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -406,8 +406,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zx_state::pc8300)
zx81_spk(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(pc8300_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(pc8300_io_map)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
@@ -416,8 +416,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(zx_state::pow3000)
zx81_spk(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_IO_MAP(pow3000_io_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_IO_MAP(pow3000_io_map)
/* internal ram */
MCFG_RAM_MODIFY(RAM_TAG)
diff --git a/src/mame/etc/korgm1.cpp b/src/mame/etc/korgm1.cpp
index f65a3a0a67d..a67159fad23 100644
--- a/src/mame/etc/korgm1.cpp
+++ b/src/mame/etc/korgm1.cpp
@@ -169,9 +169,9 @@ PALETTE_INIT_MEMBER(korgm1_state, korgm1)
MACHINE_CONFIG_START(korgm1_state::korgm1)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",V30,MAIN_CLOCK) // V50 actually
- MCFG_CPU_PROGRAM_MAP(korgm1_map)
- MCFG_CPU_IO_MAP(korgm1_io)
+ MCFG_DEVICE_ADD("maincpu",V30,MAIN_CLOCK) // V50 actually
+ MCFG_DEVICE_PROGRAM_MAP(korgm1_map)
+ MCFG_DEVICE_IO_MAP(korgm1_io)
MCFG_DEVICE_ADD("pio", CXD1095, 0)
@@ -190,7 +190,7 @@ MACHINE_CONFIG_START(korgm1_state::korgm1)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/etc/template_device.cpp b/src/mame/etc/template_device.cpp
index c19f2814b98..d1adea3448b 100644
--- a/src/mame/etc/template_device.cpp
+++ b/src/mame/etc/template_device.cpp
@@ -41,7 +41,7 @@ xxx_device::xxx_device(const machine_config &mconfig, const char *tag, device_t
//-------------------------------------------------
MACHINE_CONFIG_START(xxx_device::device_add_mconfig)
- //MCFG_CPU_ADD(...)
+ //MCFG_DEVICE_ADD(...)
MACHINE_CONFIG_END
diff --git a/src/mame/etc/template_device.h b/src/mame/etc/template_device.h
index 5f213dfa792..1a2c7bdfb04 100644
--- a/src/mame/etc/template_device.h
+++ b/src/mame/etc/template_device.h
@@ -17,8 +17,6 @@ Template for skeleton device
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_XXX_ADD(tag, freq) \
- MCFG_DEVICE_ADD((tag), XXX, (freq))
//**************************************************************************
diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp
index 067e2f4d1e9..68862fabaa7 100644
--- a/src/mame/etc/template_driver.cpp
+++ b/src/mame/etc/template_driver.cpp
@@ -150,9 +150,9 @@ PALETTE_INIT_MEMBER(xxx_state, xxx)
MACHINE_CONFIG_START(xxx_state::xxx)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/2)
- MCFG_CPU_PROGRAM_MAP(xxx_map)
- MCFG_CPU_IO_MAP(xxx_io)
+ MCFG_DEVICE_ADD("maincpu",Z80,MAIN_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(xxx_map)
+ MCFG_DEVICE_IO_MAP(xxx_io)
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -172,7 +172,7 @@ MACHINE_CONFIG_START(xxx_state::xxx)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
-// MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h
index 57110c2957b..f3ab7d3b635 100644
--- a/src/mame/includes/msx.h
+++ b/src/mame/includes/msx.h
@@ -52,11 +52,11 @@
msx_state::install_slot_pages(*this, _prim, _sec, _page, _numpages, device);
#define MCFG_MSX_LAYOUT_CARTRIDGE(_tag, _prim, _sec) \
- MCFG_MSX_SLOT_CARTRIDGE_ADD(_tag, WRITELINE(msx_state, msx_irq_source1)) \
+ MCFG_MSX_SLOT_CARTRIDGE_ADD(_tag, WRITELINE(DEVICE_SELF, msx_state, msx_irq_source1)) \
msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device);
#define MCFG_MSX_LAYOUT_YAMAHA_EXPANSION(_tag, _prim, _sec, _default) \
- MCFG_MSX_SLOT_YAMAHA_EXPANSION_ADD(_tag, WRITELINE(msx_state, msx_irq_source2), _default) \
+ MCFG_MSX_SLOT_YAMAHA_EXPANSION_ADD(_tag, WRITELINE(DEVICE_SELF, msx_state, msx_irq_source2), _default) \
msx_state::install_slot_pages(*this, _prim, _sec, 0, 4, device);
#define MCFG_MSX_LAYOUT_RAM_MM(_tag, _prim, _sec, _total_size) \
diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h
index ae58c17f6c6..22c74ac764b 100644
--- a/src/mame/includes/next.h
+++ b/src/mame/includes/next.h
@@ -114,7 +114,7 @@ public:
DECLARE_FLOPPY_FORMATS( floppy_formats );
DECLARE_WRITE_LINE_MEMBER(vblank_w);
- static void ncr5390(device_t *device);
+ void ncr5390(device_t *device);
void next_base(machine_config &config);
void next_fdc_base(machine_config &config);
void nextst(machine_config &config);
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index 5927c110b1a..3c6fae19f12 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -14,31 +14,8 @@
#include "machine/gen_latch.h"
#include "machine/timer.h"
#include "sound/namco.h"
-#include "sound/discrete.h"
#include "screen.h"
-struct filter2_context
-{
- filter2_context() :
- x0(0.0),
- x1(0.0),
- x2(0.0),
- y0(0.0),
- y1(0.0),
- y2(0.0),
- a1(0.0),
- a2(0.0),
- b0(0.0),
- b1(0.0),
- b2(0.0)
- {}
-
- double x0, x1, x2; /* x[k], x[k-1], x[k-2], current and previous 2 input values */
- double y0, y1, y2; /* y[k], y[k-1], y[k-2], current and previous 2 output values */
- double a1, a2; /* digital filter coefficients, denominator */
- double b0, b1, b2; /* digital filter coefficients, numerator */
-};
-
class polepos_state : public driver_device
{
@@ -149,40 +126,4 @@ public:
void z80_map(address_map &map);
};
-
-/*----------- defined in audio/polepos.c -----------*/
-
-class polepos_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~polepos_sound_device() { }
-
-protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-public:
- DECLARE_WRITE_LINE_MEMBER(clson_w);
- DECLARE_WRITE8_MEMBER(polepos_engine_sound_lsb_w);
- DECLARE_WRITE8_MEMBER(polepos_engine_sound_msb_w);
-
-private:
- uint32_t m_current_position;
- int m_sample_msb;
- int m_sample_lsb;
- int m_sample_enable;
- sound_stream *m_stream;
- filter2_context m_filter_engine[3];
-};
-
-DECLARE_DEVICE_TYPE(POLEPOS, polepos_sound_device)
-
-DISCRETE_SOUND_EXTERN( polepos );
-
#endif // MAME_INCLUDES_POLEPOS_H
diff --git a/src/mame/includes/tutankhm.h b/src/mame/includes/tutankhm.h
index d79f7caa167..06fd1908502 100644
--- a/src/mame/includes/tutankhm.h
+++ b/src/mame/includes/tutankhm.h
@@ -6,13 +6,31 @@
class tutankhm_state : public driver_device
{
public:
- tutankhm_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ tutankhm_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_videoram(*this, "videoram"),
m_scroll(*this, "scroll"),
m_maincpu(*this, "maincpu"),
m_palette(*this, "palette"),
- m_timeplt_audio(*this, "timeplt_audio") { }
+ m_timeplt_audio(*this, "timeplt_audio")
+ {
+ }
+
+ void tutankhm(machine_config &config);
+
+protected:
+ DECLARE_WRITE_LINE_MEMBER(irq_enable_w);
+ DECLARE_WRITE8_MEMBER(tutankhm_bankselect_w);
+ DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
+ DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
+ DECLARE_WRITE8_MEMBER(sound_on_w);
+ DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w);
+ DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w);
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ uint32_t screen_update_tutankhm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ DECLARE_WRITE_LINE_MEMBER(vblank_irq);
+ void main_map(address_map &map);
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@@ -31,17 +49,4 @@ public:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
optional_device<timeplt_audio_device> m_timeplt_audio;
- DECLARE_WRITE_LINE_MEMBER(irq_enable_w);
- DECLARE_WRITE8_MEMBER(tutankhm_bankselect_w);
- DECLARE_WRITE_LINE_MEMBER(coin_counter_1_w);
- DECLARE_WRITE_LINE_MEMBER(coin_counter_2_w);
- DECLARE_WRITE8_MEMBER(sound_on_w);
- DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w);
- DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w);
- DECLARE_MACHINE_START(tutankhm);
- DECLARE_MACHINE_RESET(tutankhm);
- uint32_t screen_update_tutankhm(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE_LINE_MEMBER(vblank_irq);
- void tutankhm(machine_config &config);
- void main_map(address_map &map);
};
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index b564b109dc8..58e8a081144 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -248,107 +248,4 @@ public:
void tx1_sound_prg(address_map &map);
};
-/*----------- defined in audio/tx1.c -----------*/
-
-/*************************************
- *
- * 8253 Programmable Interval Timer
- *
- *************************************/
-struct pit8253_state
-{
- union
- {
-#ifdef LSB_FIRST
- struct { uint8_t LSB; uint8_t MSB; } as8bit;
-#else
- struct { uint8_t MSB; uint8_t LSB; } as8bit;
-#endif
- uint16_t val;
- } counts[3];
-
- int idx[3];
-};
-
-class tx1_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tx1_sound_device() {}
-
- DECLARE_READ8_MEMBER( pit8253_r );
- DECLARE_WRITE8_MEMBER( pit8253_w );
- DECLARE_WRITE8_MEMBER( ay8910_a_w );
- DECLARE_WRITE8_MEMBER( ay8910_b_w );
-
-protected:
- tx1_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
- // internal state
- sound_stream *m_stream;
- uint32_t m_freq_to_step;
- uint32_t m_step0;
- uint32_t m_step1;
- uint32_t m_step2;
-
- pit8253_state m_pit8253;
-
- uint8_t m_ay_outputa;
- uint8_t m_ay_outputb;
-
- stream_sample_t m_pit0;
- stream_sample_t m_pit1;
- stream_sample_t m_pit2;
-
- double m_weights0[4];
- double m_weights1[3];
- double m_weights2[3];
- int m_eng0[4];
- int m_eng1[4];
- int m_eng2[4];
-
- int m_noise_lfsra;
- int m_noise_lfsrb;
- int m_noise_lfsrc;
- int m_noise_lfsrd;
- int m_noise_counter;
- uint8_t m_ym1_outputa;
- uint8_t m_ym2_outputa;
- uint8_t m_ym2_outputb;
- uint16_t m_eng_voltages[16];
-};
-
-DECLARE_DEVICE_TYPE(TX1, tx1_sound_device)
-
-class buggyboy_sound_device : public tx1_sound_device
-{
-public:
- buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
- DECLARE_WRITE8_MEMBER( ym1_a_w );
- DECLARE_WRITE8_MEMBER( ym2_a_w );
- DECLARE_WRITE8_MEMBER( ym2_b_w );
-
-protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-private:
- // internal state
-};
-
-DECLARE_DEVICE_TYPE(BUGGYBOY, buggyboy_sound_device)
-
#endif // MAME_INCLUDES_TX1_H
diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp
index df7b72560a4..dcf61566f86 100644
--- a/src/mame/machine/abc80kb.cpp
+++ b/src/mame/machine/abc80kb.cpp
@@ -127,8 +127,8 @@ void abc80_keyboard_device::abc80_keyboard_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(abc80_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, 4000000)
- MCFG_CPU_IO_MAP(abc80_keyboard_io)
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, 4000000)
+ MCFG_DEVICE_IO_MAP(abc80_keyboard_io)
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/mame/machine/acs8600_ics.cpp b/src/mame/machine/acs8600_ics.cpp
index febe3f3b4af..662501a18f6 100644
--- a/src/mame/machine/acs8600_ics.cpp
+++ b/src/mame/machine/acs8600_ics.cpp
@@ -95,102 +95,102 @@ static const z80_daisy_config ics_daisy_chain[] =
};
MACHINE_CONFIG_START(acs8600_ics_device::device_add_mconfig)
- MCFG_CPU_ADD("icscpu", Z80, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(ics_mem)
- MCFG_CPU_IO_MAP(ics_io)
+ MCFG_DEVICE_ADD("icscpu", Z80, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(ics_mem)
+ MCFG_DEVICE_IO_MAP(ics_io)
MCFG_Z80_DAISY_CHAIN(ics_daisy_chain)
MCFG_DEVICE_ADD("stc1", AM9513, XTAL(1'843'200))
- MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio1", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio1", z80sio_device, txca_w))
- MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio1", z80sio_device, rxtxcb_w))
- MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("sio2", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio2", z80sio_device, txca_w))
- MCFG_AM9513_OUT4_CALLBACK(DEVWRITELINE("sio2", z80sio_device, rxtxcb_w))
- MCFG_AM9513_OUT5_CALLBACK(DEVWRITELINE("sio3", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio3", z80sio_device, txca_w))
+ MCFG_AM9513_OUT1_CALLBACK(WRITELINE("sio1", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio1", z80sio_device, txca_w))
+ MCFG_AM9513_OUT2_CALLBACK(WRITELINE("sio1", z80sio_device, rxtxcb_w))
+ MCFG_AM9513_OUT3_CALLBACK(WRITELINE("sio2", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio2", z80sio_device, txca_w))
+ MCFG_AM9513_OUT4_CALLBACK(WRITELINE("sio2", z80sio_device, rxtxcb_w))
+ MCFG_AM9513_OUT5_CALLBACK(WRITELINE("sio3", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio3", z80sio_device, txca_w))
MCFG_DEVICE_ADD("stc2", AM9513, XTAL(1'843'200))
- MCFG_AM9513_OUT1_CALLBACK(DEVWRITELINE("sio3", z80sio_device, rxtxcb_w))
- MCFG_AM9513_OUT2_CALLBACK(DEVWRITELINE("sio4", z80sio_device, rxca_w))
- MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio4", z80sio_device, txca_w))
- MCFG_AM9513_OUT3_CALLBACK(DEVWRITELINE("sio4", z80sio_device, rxtxcb_w))
+ MCFG_AM9513_OUT1_CALLBACK(WRITELINE("sio3", z80sio_device, rxtxcb_w))
+ MCFG_AM9513_OUT2_CALLBACK(WRITELINE("sio4", z80sio_device, rxca_w))
+ MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("sio4", z80sio_device, txca_w))
+ MCFG_AM9513_OUT3_CALLBACK(WRITELINE("sio4", z80sio_device, rxtxcb_w))
MCFG_DEVICE_ADD("sio1", Z80SIO, XTAL(8'000'000)/2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2321a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2321a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2321a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs2321b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs2321b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs2321b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs2321a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs2321a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs2321a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs2321b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs2321b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs2321b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("icscpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_CPU("icscpu")
- MCFG_RS232_PORT_ADD("rs2321a", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs2321a", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80sio_device, ctsa_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", altos8600_terminal)
- MCFG_RS232_PORT_ADD("rs2321b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio1", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio1", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio1", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs2321b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio1", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio1", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio1", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("sio2", Z80SIO, XTAL(8'000'000)/2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2322a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2322a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2322a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs2322b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs2322b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs2322b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs2322a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs2322a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs2322a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs2322b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs2322b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs2322b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("icscpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_CPU("icscpu")
- MCFG_RS232_PORT_ADD("rs2322a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio2", z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio2", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs2322a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio2", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio2", z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio2", z80sio_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs2322b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio2", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio2", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio2", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs2322b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio2", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio2", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio2", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("sio3", Z80SIO, XTAL(8'000'000)/2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2323a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2323a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2323a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs2323b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs2323b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs2323b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs2323a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs2323a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs2323a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs2323b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs2323b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs2323b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("icscpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_CPU("icscpu")
- MCFG_RS232_PORT_ADD("rs2323a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio3", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio3", z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio3", z80sio_device, ctsa_w))
+ MCFG_DEVICE_ADD("rs2323a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio3", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio3", z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio3", z80sio_device, ctsa_w))
- MCFG_RS232_PORT_ADD("rs2323b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio3", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio3", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio3", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs2323b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio3", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio3", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio3", z80sio_device, ctsb_w))
MCFG_DEVICE_ADD("sio4", Z80SIO, XTAL(8'000'000)/2)
- MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("rs2324a", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("rs2324a", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("rs2324a", rs232_port_device, write_rts))
- MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("rs2324b", rs232_port_device, write_txd))
- MCFG_Z80SIO_OUT_DTRB_CB(DEVWRITELINE("rs2324b", rs232_port_device, write_dtr))
- MCFG_Z80SIO_OUT_RTSB_CB(DEVWRITELINE("rs2324b", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDA_CB(WRITELINE("rs2324a", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRA_CB(WRITELINE("rs2324a", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSA_CB(WRITELINE("rs2324a", rs232_port_device, write_rts))
+ MCFG_Z80SIO_OUT_TXDB_CB(WRITELINE("rs2324b", rs232_port_device, write_txd))
+ MCFG_Z80SIO_OUT_DTRB_CB(WRITELINE("rs2324b", rs232_port_device, write_dtr))
+ MCFG_Z80SIO_OUT_RTSB_CB(WRITELINE("rs2324b", rs232_port_device, write_rts))
MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("icscpu", INPUT_LINE_IRQ0))
MCFG_Z80SIO_CPU("icscpu")
- MCFG_RS232_PORT_ADD("rs2324a", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio4", z80sio_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio4", z80sio_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio4", z80sio_device, ctsa_w))
-
- MCFG_RS232_PORT_ADD("rs2324b", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sio4", z80sio_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("sio4", z80sio_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio4", z80sio_device, ctsb_w))
+ MCFG_DEVICE_ADD("rs2324a", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio4", z80sio_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio4", z80sio_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio4", z80sio_device, ctsa_w))
+
+ MCFG_DEVICE_ADD("rs2324b", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE("sio4", z80sio_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE("sio4", z80sio_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE("sio4", z80sio_device, ctsb_w))
MACHINE_CONFIG_END
void acs8600_ics_device::device_start()
diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp
index 59f1adb08be..fea973fb9e5 100644
--- a/src/mame/machine/alpha8201.cpp
+++ b/src/mame/machine/alpha8201.cpp
@@ -318,14 +318,14 @@ void alpha_8201_device::device_start()
MACHINE_CONFIG_START(alpha_8201_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", HD44801, DERIVED_CLOCK(1,1)) // 8H
- MCFG_HMCS40_READ_R_CB(0, READ8(alpha_8201_device, mcu_data_r))
- MCFG_HMCS40_READ_R_CB(1, READ8(alpha_8201_device, mcu_data_r))
- MCFG_HMCS40_WRITE_R_CB(0, WRITE8(alpha_8201_device, mcu_data_w))
- MCFG_HMCS40_WRITE_R_CB(1, WRITE8(alpha_8201_device, mcu_data_w))
- MCFG_HMCS40_WRITE_R_CB(2, WRITE8(alpha_8201_device, mcu_data_w))
- MCFG_HMCS40_WRITE_R_CB(3, WRITE8(alpha_8201_device, mcu_data_w))
- MCFG_HMCS40_WRITE_D_CB(WRITE16(alpha_8201_device, mcu_d_w))
+ MCFG_DEVICE_ADD("mcu", HD44801, DERIVED_CLOCK(1,1)) // 8H
+ MCFG_HMCS40_READ_R_CB(0, READ8(*this, alpha_8201_device, mcu_data_r))
+ MCFG_HMCS40_READ_R_CB(1, READ8(*this, alpha_8201_device, mcu_data_r))
+ MCFG_HMCS40_WRITE_R_CB(0, WRITE8(*this, alpha_8201_device, mcu_data_w))
+ MCFG_HMCS40_WRITE_R_CB(1, WRITE8(*this, alpha_8201_device, mcu_data_w))
+ MCFG_HMCS40_WRITE_R_CB(2, WRITE8(*this, alpha_8201_device, mcu_data_w))
+ MCFG_HMCS40_WRITE_R_CB(3, WRITE8(*this, alpha_8201_device, mcu_data_w))
+ MCFG_HMCS40_WRITE_D_CB(WRITE16(*this, alpha_8201_device, mcu_d_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 411ff71afd8..279674b69c7 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -1060,51 +1060,51 @@ MACHINE_CONFIG_START(apollo_state::common)
MCFG_DEVICE_ADD(APOLLO_CONF_TAG, APOLLO_CONF, 0)
MCFG_DEVICE_ADD( APOLLO_DMA1_TAG, AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(apollo_state, apollo_dma_1_hrq_changed))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(apollo_state, apollo_dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(apollo_state, apollo_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(apollo_state, apollo_dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(apollo_state, pc_dma8237_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(apollo_state, pc_dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(apollo_state, pc_dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(apollo_state, pc_dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(apollo_state, pc_dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(apollo_state, pc_dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(apollo_state, pc_dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(apollo_state, pc_dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(apollo_state, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(apollo_state, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(apollo_state, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(apollo_state, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, apollo_state, apollo_dma_1_hrq_changed))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, apollo_state, apollo_dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, apollo_state, apollo_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, apollo_state, apollo_dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, apollo_state, pc_dma8237_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, apollo_state, pc_dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, apollo_state, pc_dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, apollo_state, pc_dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, apollo_state, pc_dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, apollo_state, pc_dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, apollo_state, pc_dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, apollo_state, pc_dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, apollo_state, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, apollo_state, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, apollo_state, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, apollo_state, pc_dack3_w))
MCFG_DEVICE_ADD( APOLLO_DMA2_TAG, AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(apollo_state, apollo_dma_2_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(apollo_state, apollo_dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(apollo_state, apollo_dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(apollo_state, pc_dma8237_5_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(apollo_state, pc_dma8237_6_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(apollo_state, pc_dma8237_7_dack_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(apollo_state, pc_dma8237_5_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(apollo_state, pc_dma8237_6_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(apollo_state, pc_dma8237_7_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(apollo_state, pc_dack4_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(apollo_state, pc_dack5_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(apollo_state, pc_dack6_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(apollo_state, pc_dack7_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, apollo_state, apollo_dma_2_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, apollo_state, apollo_dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, apollo_state, apollo_dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, apollo_state, pc_dma8237_5_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, apollo_state, pc_dma8237_6_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, apollo_state, pc_dma8237_7_dack_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, apollo_state, pc_dma8237_5_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, apollo_state, pc_dma8237_6_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, apollo_state, pc_dma8237_7_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, apollo_state, pc_dack4_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, apollo_state, pc_dack5_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, apollo_state, pc_dack6_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, apollo_state, pc_dack7_w))
MCFG_DEVICE_ADD(APOLLO_PIC1_TAG, PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(apollo_state, apollo_pic8259_master_set_int_line))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, apollo_state, apollo_pic8259_master_set_int_line))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(apollo_state, apollo_pic8259_get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, apollo_state, apollo_pic8259_get_slave_ack))
MCFG_DEVICE_ADD(APOLLO_PIC2_TAG, PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(apollo_state, apollo_pic8259_slave_set_int_line))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, apollo_state, apollo_pic8259_slave_set_int_line))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD(APOLLO_PTM_TAG, PTM6840, 0)
MCFG_PTM6840_EXTERNAL_CLOCKS(250000, 125000, 62500)
- MCFG_PTM6840_IRQ_CB(WRITELINE(apollo_state, apollo_ptm_irq_function))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, apollo_state, apollo_ptm_irq_function))
MCFG_DEVICE_ADD("ptmclock", CLOCK, 250000)
- MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(apollo_state, apollo_ptm_timer_tick))
+ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, apollo_state, apollo_ptm_timer_tick))
MCFG_MC146818_ADD( APOLLO_RTC_TAG, XTAL(32'768) )
MCFG_MC146818_UTC( true )
@@ -1115,36 +1115,36 @@ MACHINE_CONFIG_START(apollo_state::common)
MCFG_APOLLO_NI_ADD( APOLLO_NI_TAG, 0 )
MCFG_APOLLO_SIO_ADD( APOLLO_SIO2_TAG, XTAL(3'686'400) )
- MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio2_irq_handler))
+ MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(*this, apollo_state, sio2_irq_handler))
MCFG_DEVICE_ADD(APOLLO_ISA_TAG, ISA16, 0)
- MCFG_ISA16_CPU(":" MAINCPU)
+ MCFG_ISA16_CPU(MAINCPU)
MCFG_ISA16_BUS_CUSTOM_SPACES()
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir7_w))
- MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir2_w))
- MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq0_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq3_w))
- MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq3_w))
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa1", apollo_isa_cards, "wdc", false)
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa2", apollo_isa_cards, "ctape", false)
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa3", apollo_isa_cards, "3c505", false)
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa4", apollo_isa_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa5", apollo_isa_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa6", apollo_isa_cards, nullptr, false)
- MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa7", apollo_isa_cards, nullptr, false)
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir7_w))
+ MCFG_ISA_OUT_IRQ10_CB(WRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir2_w))
+ MCFG_ISA_OUT_IRQ11_CB(WRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ12_CB(WRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ14_CB(WRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ15_CB(WRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ0_CB(WRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq0_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq3_w))
+ MCFG_ISA_OUT_DRQ5_CB(WRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ6_CB(WRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ7_CB(WRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq3_w))
+ MCFG_DEVICE_ADD("isa1", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, "wdc", false) // FIXME: determine ISA bus clock
+ MCFG_DEVICE_ADD("isa2", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, "ctape", false)
+ MCFG_DEVICE_ADD("isa3", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, "3c505", false)
+ MCFG_DEVICE_ADD("isa4", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa5", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa6", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, nullptr, false)
+ MCFG_DEVICE_ADD("isa7", ISA16_SLOT, 0, APOLLO_ISA_TAG, apollo_isa_cards, nullptr, false)
MCFG_SOFTWARE_LIST_ADD("ctape_list", "apollo_ctape")
MACHINE_CONFIG_END
@@ -1153,12 +1153,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apollo_state::apollo)
common(config);
MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL(3'686'400) )
- MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler))
- MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output))
- MCFG_APOLLO_SIO_A_TX_CALLBACK(DEVWRITELINE(APOLLO_KBD_TAG, apollo_kbd_device, rx_w))
+ MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(*this, apollo_state, sio_irq_handler))
+ MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(*this, apollo_state, sio_output))
+ MCFG_APOLLO_SIO_A_TX_CALLBACK(WRITELINE(APOLLO_KBD_TAG, apollo_kbd_device, rx_w))
#ifdef APOLLO_XXL
- MCFG_APOLLO_SIO_B_TX_CALLBACK(DEVWRITELINE(APOLLO_STDIO_TAG, apollo_stdio_device, rx_w))
+ MCFG_APOLLO_SIO_B_TX_CALLBACK(WRITELINE(APOLLO_STDIO_TAG, apollo_stdio_device, rx_w))
#endif
MACHINE_CONFIG_END
@@ -1175,12 +1175,12 @@ DEVICE_INPUT_DEFAULTS_END
MACHINE_CONFIG_START(apollo_state::apollo_terminal)
common(config);
MCFG_APOLLO_SIO_ADD( APOLLO_SIO_TAG, XTAL(3'686'400) )
- MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(apollo_state, sio_irq_handler))
- MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(apollo_state, sio_output))
- MCFG_APOLLO_SIO_B_TX_CALLBACK(DEVWRITELINE("rs232", rs232_port_device, write_txd))
+ MCFG_APOLLO_SIO_IRQ_CALLBACK(WRITELINE(*this, apollo_state, sio_irq_handler))
+ MCFG_APOLLO_SIO_OUTPORT_CALLBACK(WRITE8(*this, apollo_state, sio_output))
+ MCFG_APOLLO_SIO_B_TX_CALLBACK(WRITELINE("rs232", rs232_port_device, write_txd))
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_b_w))
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
+ MCFG_RS232_RXD_HANDLER(WRITELINE(APOLLO_SIO_TAG, apollo_sio, rx_b_w))
MCFG_SLOT_OPTION_DEVICE_INPUT_DEFAULTS("terminal", apollo_terminal)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp
index e3dd5d20d83..012dff9c0aa 100644
--- a/src/mame/machine/apricotkb.cpp
+++ b/src/mame/machine/apricotkb.cpp
@@ -70,8 +70,8 @@ void apricot_keyboard_device::apricot_keyboard_io(address_map &map)
MACHINE_CONFIG_START(apricot_keyboard_device::device_add_mconfig)
#ifdef UPD7507_EMULATED
- MCFG_CPU_ADD(UPD7507C_TAG, UPD7507, XTAL(32'768))
- MCFG_CPU_IO_MAP(apricot_keyboard_io)
+ MCFG_DEVICE_ADD(UPD7507C_TAG, UPD7507, XTAL(32'768))
+ MCFG_DEVICE_IO_MAP(apricot_keyboard_io)
#endif
MACHINE_CONFIG_END
diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp
index f701a54e47b..57d15048eb7 100644
--- a/src/mame/machine/asic65.cpp
+++ b/src/mame/machine/asic65.cpp
@@ -541,10 +541,10 @@ void asic65_device::asic65_io_map(address_map &map)
MACHINE_CONFIG_START(asic65_device::device_add_mconfig)
/* ASIC65 */
- MCFG_CPU_ADD("asic65cpu", TMS32010, 20000000)
- MCFG_CPU_PROGRAM_MAP(asic65_program_map)
- MCFG_CPU_IO_MAP(asic65_io_map)
- MCFG_TMS32010_BIO_IN_CB(READLINE(asic65_device, get_bio))
+ MCFG_DEVICE_ADD("asic65cpu", TMS32010, 20000000)
+ MCFG_DEVICE_PROGRAM_MAP(asic65_program_map)
+ MCFG_DEVICE_IO_MAP(asic65_io_map)
+ MCFG_TMS32010_BIO_IN_CB(READLINE(*this, asic65_device, get_bio))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp
index b3b9c292228..1451ef259d9 100644
--- a/src/mame/machine/at.cpp
+++ b/src/mame/machine/at.cpp
@@ -56,91 +56,91 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(at_mb_device::device_add_mconfig)
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_master", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259_master", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(4772720/4) /* dram refresh */
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(at_mb_device, pit8254_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, at_mb_device, pit8254_out2_changed))
MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq0_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(at_mb_device, dma8237_out_eop))
- MCFG_I8237_IN_MEMR_CB(READ8(at_mb_device, dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(at_mb_device, dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(READ8(at_mb_device, dma8237_0_dack_r))
- MCFG_I8237_IN_IOR_1_CB(READ8(at_mb_device, dma8237_1_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(at_mb_device, dma8237_2_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(at_mb_device, dma8237_3_dack_r))
- MCFG_I8237_OUT_IOW_0_CB(WRITE8(at_mb_device, dma8237_0_dack_w))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(at_mb_device, dma8237_1_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(at_mb_device, dma8237_2_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(at_mb_device, dma8237_3_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(at_mb_device, dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(at_mb_device, dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(at_mb_device, dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(at_mb_device, dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE("dma8237_2", am9517a_device, dreq0_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, at_mb_device, dma8237_out_eop))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, at_mb_device, dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, at_mb_device, dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8(*this, at_mb_device, dma8237_0_dack_r))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, at_mb_device, dma8237_1_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, at_mb_device, dma8237_2_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, at_mb_device, dma8237_3_dack_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8(*this, at_mb_device, dma8237_0_dack_w))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, at_mb_device, dma8237_1_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, at_mb_device, dma8237_2_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, at_mb_device, dma8237_3_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, at_mb_device, dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, at_mb_device, dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, at_mb_device, dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, at_mb_device, dack3_w))
MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(at_mb_device, dma_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(at_mb_device, dma_read_word))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(at_mb_device, dma_write_word))
- MCFG_I8237_IN_IOR_1_CB(READ8(at_mb_device, dma8237_5_dack_r))
- MCFG_I8237_IN_IOR_2_CB(READ8(at_mb_device, dma8237_6_dack_r))
- MCFG_I8237_IN_IOR_3_CB(READ8(at_mb_device, dma8237_7_dack_r))
- MCFG_I8237_OUT_IOW_1_CB(WRITE8(at_mb_device, dma8237_5_dack_w))
- MCFG_I8237_OUT_IOW_2_CB(WRITE8(at_mb_device, dma8237_6_dack_w))
- MCFG_I8237_OUT_IOW_3_CB(WRITE8(at_mb_device, dma8237_7_dack_w))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(at_mb_device, dack4_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(at_mb_device, dack5_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(at_mb_device, dack6_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(at_mb_device, dack7_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, at_mb_device, dma_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, at_mb_device, dma_read_word))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, at_mb_device, dma_write_word))
+ MCFG_I8237_IN_IOR_1_CB(READ8(*this, at_mb_device, dma8237_5_dack_r))
+ MCFG_I8237_IN_IOR_2_CB(READ8(*this, at_mb_device, dma8237_6_dack_r))
+ MCFG_I8237_IN_IOR_3_CB(READ8(*this, at_mb_device, dma8237_7_dack_r))
+ MCFG_I8237_OUT_IOW_1_CB(WRITE8(*this, at_mb_device, dma8237_5_dack_w))
+ MCFG_I8237_OUT_IOW_2_CB(WRITE8(*this, at_mb_device, dma8237_6_dack_w))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(*this, at_mb_device, dma8237_7_dack_w))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, at_mb_device, dack4_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, at_mb_device, dack5_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, at_mb_device, dack6_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, at_mb_device, dack7_w))
MCFG_DEVICE_ADD("pic8259_master", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE(":maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(at_mb_device, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, at_mb_device, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_slave", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_master", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("isabus", ISA16, 0)
MCFG_ISA16_CPU(":maincpu")
- MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
- MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir7_w))
- MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir3_w))
- MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir4_w))
- MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir5_w))
- MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir6_w))
- MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE("pic8259_slave", pic8259_device, ir7_w))
- MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq0_w))
- MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w))
- MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq1_w))
- MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq2_w))
- MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE("dma8237_2", am9517a_device, dreq3_w))
+ MCFG_ISA_OUT_IRQ2_CB(WRITELINE("pic8259_slave", pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used
+ MCFG_ISA_OUT_IRQ3_CB(WRITELINE("pic8259_master", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ4_CB(WRITELINE("pic8259_master", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ5_CB(WRITELINE("pic8259_master", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ6_CB(WRITELINE("pic8259_master", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ7_CB(WRITELINE("pic8259_master", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_IRQ10_CB(WRITELINE("pic8259_slave", pic8259_device, ir3_w))
+ MCFG_ISA_OUT_IRQ11_CB(WRITELINE("pic8259_slave", pic8259_device, ir4_w))
+ MCFG_ISA_OUT_IRQ12_CB(WRITELINE("pic8259_slave", pic8259_device, ir5_w))
+ MCFG_ISA_OUT_IRQ14_CB(WRITELINE("pic8259_slave", pic8259_device, ir6_w))
+ MCFG_ISA_OUT_IRQ15_CB(WRITELINE("pic8259_slave", pic8259_device, ir7_w))
+ MCFG_ISA_OUT_DRQ0_CB(WRITELINE("dma8237_1", am9517a_device, dreq0_w))
+ MCFG_ISA_OUT_DRQ1_CB(WRITELINE("dma8237_1", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ2_CB(WRITELINE("dma8237_1", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ3_CB(WRITELINE("dma8237_1", am9517a_device, dreq3_w))
+ MCFG_ISA_OUT_DRQ5_CB(WRITELINE("dma8237_2", am9517a_device, dreq1_w))
+ MCFG_ISA_OUT_DRQ6_CB(WRITELINE("dma8237_2", am9517a_device, dreq2_w))
+ MCFG_ISA_OUT_DRQ7_CB(WRITELINE("dma8237_2", am9517a_device, dreq3_w))
MCFG_MC146818_ADD( "rtc", XTAL(32'768) )
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_slave", pic8259_device, ir0_w)) MCFG_DEVCB_INVERT
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_slave", pic8259_device, ir0_w)) MCFG_DEVCB_INVERT
MCFG_MC146818_CENTURY_INDEX(0x32)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("keybc", AT_KEYBOARD_CONTROLLER, XTAL(12'000'000))
MCFG_AT_KEYBOARD_CONTROLLER_SYSTEM_RESET_CB(INPUTLINE(":maincpu", INPUT_LINE_RESET))
MCFG_AT_KEYBOARD_CONTROLLER_GATE_A20_CB(INPUTLINE(":maincpu", INPUT_LINE_A20))
- MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_master", pic8259_device, ir1_w))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
- MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(DEVWRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_INPUT_BUFFER_FULL_CB(WRITELINE("pic8259_master", pic8259_device, ir1_w))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_CLOCK_CB(WRITELINE("pc_kbdc", pc_kbdc_device, clock_write_from_mb))
+ MCFG_AT_KEYBOARD_CONTROLLER_KEYBOARD_DATA_CB(WRITELINE("pc_kbdc", pc_kbdc_device, data_write_from_mb))
MCFG_DEVICE_ADD("pc_kbdc", PC_KBDC, 0)
- MCFG_PC_KBDC_OUT_CLOCK_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
- MCFG_PC_KBDC_OUT_DATA_CB(DEVWRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
+ MCFG_PC_KBDC_OUT_CLOCK_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_clock_w))
+ MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE("keybc", at_keyboard_controller_device, keyboard_data_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/cedar_magnet_plane.cpp b/src/mame/machine/cedar_magnet_plane.cpp
index dddb09dacd6..e9c467c0664 100644
--- a/src/mame/machine/cedar_magnet_plane.cpp
+++ b/src/mame/machine/cedar_magnet_plane.cpp
@@ -72,23 +72,23 @@ WRITE8_MEMBER(cedar_magnet_plane_device::plane_portcf_w)
}
MACHINE_CONFIG_START(cedar_magnet_plane_device::device_add_mconfig)
- MCFG_CPU_ADD("planecpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(cedar_magnet_plane_map)
- MCFG_CPU_IO_MAP(cedar_magnet_plane_io)
+ MCFG_DEVICE_ADD("planecpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(cedar_magnet_plane_map)
+ MCFG_DEVICE_IO_MAP(cedar_magnet_plane_io)
MCFG_DEVICE_ADD("z80pio0", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_plane_device, pio0_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_plane_device, pio0_pa_w))
-// MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_plane_device, pio0_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_plane_device, pio0_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_plane_device, pio0_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_plane_device, pio0_pa_w))
+// MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_plane_device, pio0_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_plane_device, pio0_pb_w))
MCFG_DEVICE_ADD("z80pio1", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
-// MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_plane_device, pio1_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_plane_device, pio1_pa_w))
-// MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_plane_device, pio1_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_plane_device, pio1_pb_w))
+// MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_plane_device, pio1_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_plane_device, pio1_pa_w))
+// MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_plane_device, pio1_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_plane_device, pio1_pb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/cedar_magnet_sprite.cpp b/src/mame/machine/cedar_magnet_sprite.cpp
index 791780dadae..5234208ebc3 100644
--- a/src/mame/machine/cedar_magnet_sprite.cpp
+++ b/src/mame/machine/cedar_magnet_sprite.cpp
@@ -202,30 +202,30 @@ WRITE8_MEMBER(cedar_magnet_sprite_device::sprite_port9c_w)
}
MACHINE_CONFIG_START(cedar_magnet_sprite_device::device_add_mconfig)
- MCFG_CPU_ADD("spritecpu", Z80,4000000)
- MCFG_CPU_PROGRAM_MAP(cedar_magnet_sprite_map)
- MCFG_CPU_IO_MAP(cedar_magnet_sprite_io)
+ MCFG_DEVICE_ADD("spritecpu", Z80,4000000)
+ MCFG_DEVICE_PROGRAM_MAP(cedar_magnet_sprite_map)
+ MCFG_DEVICE_IO_MAP(cedar_magnet_sprite_io)
MCFG_DEVICE_ADD("z80pio0", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_sprite_device, pio0_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_sprite_device, pio0_pa_w))
-// MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_sprite_device, pio0_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_sprite_device, pio0_pb_w))
+ MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_sprite_device, pio0_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_sprite_device, pio0_pa_w))
+// MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_sprite_device, pio0_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_sprite_device, pio0_pb_w))
MCFG_DEVICE_ADD("z80pio1", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
-// MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_sprite_device, pio1_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_sprite_device, pio1_pa_w))
-// MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_sprite_device, pio1_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_sprite_device, pio1_pb_w))
+// MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_sprite_device, pio1_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_sprite_device, pio1_pa_w))
+// MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_sprite_device, pio1_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_sprite_device, pio1_pb_w))
MCFG_DEVICE_ADD("z80pio2", Z80PIO, 4000000/2)
// MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
-// MCFG_Z80PIO_IN_PA_CB(READ8(cedar_magnet_sprite_device, pio2_pa_r))
- MCFG_Z80PIO_OUT_PA_CB(WRITE8(cedar_magnet_sprite_device, pio2_pa_w))
-// MCFG_Z80PIO_IN_PB_CB(READ8(cedar_magnet_sprite_device, pio2_pb_r))
- MCFG_Z80PIO_OUT_PB_CB(WRITE8(cedar_magnet_sprite_device, pio2_pb_w))
+// MCFG_Z80PIO_IN_PA_CB(READ8(*this, cedar_magnet_sprite_device, pio2_pa_r))
+ MCFG_Z80PIO_OUT_PA_CB(WRITE8(*this, cedar_magnet_sprite_device, pio2_pa_w))
+// MCFG_Z80PIO_IN_PB_CB(READ8(*this, cedar_magnet_sprite_device, pio2_pb_r))
+ MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, cedar_magnet_sprite_device, pio2_pb_w))
MCFG_DEVICE_ADD("sp_sub_ram", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(cedar_magnet_sprite_sub_ram_map)
diff --git a/src/mame/machine/cit101_kbd.cpp b/src/mame/machine/cit101_kbd.cpp
index f628cdf877d..2ee02093e38 100644
--- a/src/mame/machine/cit101_kbd.cpp
+++ b/src/mame/machine/cit101_kbd.cpp
@@ -155,7 +155,7 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(cit101_hle_keyboard_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 786)
+ MCFG_DEVICE_ADD("beeper", BEEP, 786)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp
index cb9a48a5ac7..fb7c282aa6e 100644
--- a/src/mame/machine/compiskb.cpp
+++ b/src/mame/machine/compiskb.cpp
@@ -56,17 +56,17 @@ const tiny_rom_entry *compis_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(compis_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8748_TAG, I8748, 2016000) // XTAL(4'032'000)/2 ???
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(compis_keyboard_device, bus_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(compis_keyboard_device, bus_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(compis_keyboard_device, p1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(compis_keyboard_device, p2_r))
+ MCFG_DEVICE_ADD(I8748_TAG, I8748, 2016000) // XTAL(4'032'000)/2 ???
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, compis_keyboard_device, bus_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, compis_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, compis_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, compis_keyboard_device, p2_r))
MCFG_MCS48_PORT_T0_IN_CB(NOOP) // ???
MCFG_MCS48_PORT_T1_IN_CB(NOOP) // ???
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SPEAKER_TAG, SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD(SPEAKER_TAG, SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp
index c95a51d37ee..0bfcb10f035 100644
--- a/src/mame/machine/cuda.cpp
+++ b/src/mame/machine/cuda.cpp
@@ -86,8 +86,8 @@ void cuda_device::cuda_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(cuda_device::device_add_mconfig)
- MCFG_CPU_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL(32'768)*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
- MCFG_CPU_PROGRAM_MAP(cuda_map)
+ MCFG_DEVICE_ADD(CUDA_CPU_TAG, M68HC05EG, XTAL(32'768)*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
+ MCFG_DEVICE_PROGRAM_MAP(cuda_map)
MACHINE_CONFIG_END
const tiny_rom_entry *cuda_device::device_rom_region() const
diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp
index be0512b0f58..cc7efb52f15 100644
--- a/src/mame/machine/dec_lk201.cpp
+++ b/src/mame/machine/dec_lk201.cpp
@@ -212,11 +212,11 @@ void lk201_device::lk201_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(lk201_device::device_add_mconfig)
- MCFG_CPU_ADD(LK201_CPU_TAG, M68HC05EG, XTAL(4'000'000)) // actually 68HC05C4, clock verified by Lord_Nightmare
- MCFG_CPU_PROGRAM_MAP(lk201_map)
+ MCFG_DEVICE_ADD(LK201_CPU_TAG, M68HC05EG, XTAL(4'000'000)) // actually 68HC05C4, clock verified by Lord_Nightmare
+ MCFG_DEVICE_PROGRAM_MAP(lk201_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(LK201_SPK_TAG, BEEP, 2000) // clocked by a 555 timer at E8, the volume of the beep is controllable by: (8051 model) P2.0 thru P2.3, or (6805 model) the upper 4 bits of the LED data latch
+ MCFG_DEVICE_ADD(LK201_SPK_TAG, BEEP, 2000) // clocked by a 555 timer at E8, the volume of the beep is controllable by: (8051 model) P2.0 thru P2.3, or (6805 model) the upper 4 bits of the LED data latch
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp
index 1f4c47d1bb6..53b9d3ad26c 100644
--- a/src/mame/machine/decopincpu.cpp
+++ b/src/mame/machine/decopincpu.cpp
@@ -201,48 +201,48 @@ WRITE8_MEMBER( decocpu_type1_device::solenoid2_w )
MACHINE_CONFIG_START(decocpu_type1_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6808, XTAL(4'000'000))
- MCFG_CPU_PROGRAM_MAP(decocpu1_map)
+ MCFG_DEVICE_ADD("maincpu", M6808, XTAL(4'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(decocpu1_map)
/* Devices */
MCFG_DEVICE_ADD("pia21", PIA6821, 0) // 5F - PIA at 0x2100
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, solenoid1_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(decocpu_type1_device, pia21_ca2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, decocpu_type1_device, solenoid1_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, decocpu_type1_device, pia21_ca2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia24", PIA6821, 0) // 11D - PIA at 0x2400
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, lamp0_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, lamp1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, decocpu_type1_device, lamp0_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, decocpu_type1_device, lamp1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia28", PIA6821, 0) // 11B - PIA at 0x2800
- MCFG_PIA_READPA_HANDLER(READ8(decocpu_type1_device, display_strobe_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_strobe_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, display_out1_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, decocpu_type1_device, display_strobe_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, decocpu_type1_device, display_strobe_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, decocpu_type1_device, display_out1_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia2c", PIA6821, 0) // 9B - PIA at 0x2c00
- MCFG_PIA_READPB_HANDLER(READ8(decocpu_type1_device, display_in3_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_out2_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, display_out3_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, decocpu_type1_device, display_in3_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, decocpu_type1_device, display_out2_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, decocpu_type1_device, display_out3_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia30", PIA6821, 0) // 8H - PIA at 0x3000
- MCFG_PIA_READPA_HANDLER(READ8(decocpu_type1_device, switch_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, switch_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, decocpu_type1_device, switch_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, decocpu_type1_device, switch_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
MCFG_DEVICE_ADD("pia34", PIA6821, 0) // 7B - PIA at 0x3400
- MCFG_PIA_READPA_HANDLER(READ8(decocpu_type1_device, dmdstatus_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(decocpu_type1_device, display_out4_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(decocpu_type1_device, sound_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, decocpu_type1_device, dmdstatus_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, decocpu_type1_device, display_out4_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, decocpu_type1_device, sound_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, decocpu_type1_device, cpu_pia_irq))
MCFG_NVRAM_ADD_1FILL("nvram")
MACHINE_CONFIG_END
@@ -308,8 +308,8 @@ MACHINE_CONFIG_START(decocpu_type2_device::device_add_mconfig)
decocpu_type1_device::device_add_mconfig(config);
/* basic machine hardware */
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(decocpu2_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(decocpu2_map)
MACHINE_CONFIG_END
void decocpu_type2_device::device_start()
diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp
index 601c30e12ed..e1b69479883 100644
--- a/src/mame/machine/dmv_keyb.cpp
+++ b/src/mame/machine/dmv_keyb.cpp
@@ -228,10 +228,10 @@ void dmv_keyboard_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(dmv_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8741, XTAL(6'000'000))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(dmv_keyboard_device, port1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(dmv_keyboard_device, port2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dmv_keyboard_device, port2_w))
+ MCFG_DEVICE_ADD("mcu", I8741, XTAL(6'000'000))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, dmv_keyboard_device, port1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, dmv_keyboard_device, port2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, dmv_keyboard_device, port2_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp
index 1b61f4fe31e..e0fafc25055 100644
--- a/src/mame/machine/egret.cpp
+++ b/src/mame/machine/egret.cpp
@@ -85,8 +85,8 @@ void egret_device::egret_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(egret_device::device_add_mconfig)
- MCFG_CPU_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL(32'768)*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
- MCFG_CPU_PROGRAM_MAP(egret_map)
+ MCFG_DEVICE_ADD(EGRET_CPU_TAG, M68HC05EG, XTAL(32'768)*192) // 32.768 kHz input clock, can be PLL'ed to x128 = 4.1 MHz under s/w control
+ MCFG_DEVICE_PROGRAM_MAP(egret_map)
MACHINE_CONFIG_END
const tiny_rom_entry *egret_device::device_rom_region() const
diff --git a/src/mame/machine/gaelco_ds5002fp.cpp b/src/mame/machine/gaelco_ds5002fp.cpp
index 2cdb131fbc0..7b863bc4e7a 100644
--- a/src/mame/machine/gaelco_ds5002fp.cpp
+++ b/src/mame/machine/gaelco_ds5002fp.cpp
@@ -39,9 +39,9 @@ WRITE8_MEMBER(gaelco_ds5002fp_device::hostmem_w)
}
MACHINE_CONFIG_START(gaelco_ds5002fp_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", DS5002FP, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(dallas_rom)
- MCFG_CPU_IO_MAP(dallas_ram)
+ MCFG_DEVICE_ADD("mcu", DS5002FP, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(dallas_rom)
+ MCFG_DEVICE_IO_MAP(dallas_ram)
MCFG_QUANTUM_PERFECT_CPU("mcu")
diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp
index 2acf31e5506..c35073f09ee 100644
--- a/src/mame/machine/genpin.cpp
+++ b/src/mame/machine/genpin.cpp
@@ -13,7 +13,7 @@ This is for common pinball machine coding.
MACHINE_CONFIG_START(genpin_class::genpin_audio)
MCFG_SPEAKER_STANDARD_MONO("mechvol")
- MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_DEVICE_ADD("samples", SAMPLES)
MCFG_SAMPLES_CHANNELS(6)
MCFG_SAMPLES_NAMES(genpin_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mechvol", 1.0)
diff --git a/src/mame/machine/hec2hrp.cpp b/src/mame/machine/hec2hrp.cpp
index 19048ba6458..cd0955f87a0 100644
--- a/src/mame/machine/hec2hrp.cpp
+++ b/src/mame/machine/hec2hrp.cpp
@@ -808,7 +808,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hector_audio)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(0, "mono", 0.25) /* Sound level for cassette, as it is in mono => output channel=0*/
- MCFG_SOUND_ADD("sn76477", SN76477, 0)
+ MCFG_DEVICE_ADD("sn76477", SN76477)
MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(330), CAP_P(390)) // noise + filter
MCFG_SN76477_DECAY_RES(RES_K(680)) // decay_res
MCFG_SN76477_ATTACK_PARAMS(CAP_U(47), RES_K(180)) // attack_decay_cap + attack_res
@@ -820,7 +820,7 @@ MACHINE_CONFIG_START(hec2hrp_state::hector_audio)
MCFG_SN76477_ONESHOT_PARAMS(CAP_U(1.00001), RES_K(10000)) // oneshot caps + res
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1)
- MCFG_SOUND_ADD("discrete", DISCRETE, 0) /* Son 1bit*/
+ MCFG_DEVICE_ADD("discrete", DISCRETE) /* Son 1bit*/
MCFG_DISCRETE_INTF(hec2hrp)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
diff --git a/src/mame/machine/hng64_net.cpp b/src/mame/machine/hng64_net.cpp
index 4d3eca22b74..596997081e7 100644
--- a/src/mame/machine/hng64_net.cpp
+++ b/src/mame/machine/hng64_net.cpp
@@ -143,7 +143,7 @@ void hng64_state::reset_net()
}
MACHINE_CONFIG_START(hng64_state::hng64_network)
- MCFG_CPU_ADD("network", KL5C80A12, HNG64_MASTER_CLOCK / 4) /* KL5C80A12CFP - binary compatible with Z80. */
- MCFG_CPU_PROGRAM_MAP(hng_comm_map)
- MCFG_CPU_IO_MAP(hng_comm_io_map)
+ MCFG_DEVICE_ADD("network", KL5C80A12, HNG64_MASTER_CLOCK / 4) /* KL5C80A12CFP - binary compatible with Z80. */
+ MCFG_DEVICE_PROGRAM_MAP(hng_comm_map)
+ MCFG_DEVICE_IO_MAP(hng_comm_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp
index 7f0553e1d52..14648266a53 100644
--- a/src/mame/machine/ibm6580_fdc.cpp
+++ b/src/mame/machine/ibm6580_fdc.cpp
@@ -33,19 +33,19 @@ const tiny_rom_entry *dw_fdc_device::device_rom_region() const
}
MACHINE_CONFIG_START(dw_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8048, XTAL(24'000'000)/4) // divisor is unverified
-// MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_fdc_device, bus_r))
-// MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_fdc_device, bus_w))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dw_fdc_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dw_fdc_device, p2_w))
-// MCFG_MCS48_PORT_T0_IN_CB(READLINE(dw_fdc_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(dw_fdc_device, t1_r))
+ MCFG_DEVICE_ADD("mcu", I8048, XTAL(24'000'000)/4) // divisor is unverified
+// MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, dw_fdc_device, bus_r))
+// MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, dw_fdc_device, bus_w))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dw_fdc_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, dw_fdc_device, p2_w))
+// MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, dw_fdc_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, dw_fdc_device, t1_r))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MCFG_UPD765A_ADD("upd765", false, false)
-// MCFG_UPD765_INTRQ_CALLBACK(DEVWRITELINE("pic8259", pic8259_device, ir4_w))
-// MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dma8257", dma8257_device, XXX))
+// MCFG_UPD765_INTRQ_CALLBACK(WRITELINE("pic8259", pic8259_device, ir4_w))
+// MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dma8257", dma8257_device, XXX))
// MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", wangpc_floppies, "525dd", wangpc_state::floppy_formats)
// MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", wangpc_floppies, "525dd", wangpc_state::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp
index 7f950704867..e9979aedc7a 100644
--- a/src/mame/machine/ibm6580_kbd.cpp
+++ b/src/mame/machine/ibm6580_kbd.cpp
@@ -33,14 +33,14 @@ const tiny_rom_entry *dw_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(dw_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, XTAL(6'000'000)) // XXX RC oscillator
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(dw_keyboard_device, bus_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(dw_keyboard_device, bus_w))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(dw_keyboard_device, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(dw_keyboard_device, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(dw_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(dw_keyboard_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(dw_keyboard_device, t1_r))
+ MCFG_DEVICE_ADD("mcu", I8049, XTAL(6'000'000)) // XXX RC oscillator
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, dw_keyboard_device, bus_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, dw_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, dw_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, dw_keyboard_device, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, dw_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, dw_keyboard_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, dw_keyboard_device, t1_r))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp
index 6e00261d965..8b11331eb63 100644
--- a/src/mame/machine/inder_sb.cpp
+++ b/src/mame/machine/inder_sb.cpp
@@ -151,24 +151,24 @@ void inder_sb_device::sound_io(address_map &map)
MACHINE_CONFIG_START(inder_sb_device::device_add_mconfig)
- MCFG_CPU_ADD("audiocpu", Z80, 8000000) // unk freq
+ MCFG_DEVICE_ADD("audiocpu", Z80, 8000000) // unk freq
MCFG_Z80_DAISY_CHAIN(daisy_chain)
- MCFG_CPU_PROGRAM_MAP(sound_map)
- MCFG_CPU_IO_MAP(sound_io)
+ MCFG_DEVICE_PROGRAM_MAP(sound_map)
+ MCFG_DEVICE_IO_MAP(sound_io)
MCFG_DEVICE_ADD("ctc", Z80CTC, 4000000) // unk freq
// runs in IM2 , vector set to 0x20 , values there are 0xCC, 0x02, 0xE6, 0x02, 0x09, 0x03, 0x23, 0x03 (so 02cc, 02e6, 0309, 0323, all of which are valid irq handlers)
MCFG_Z80CTC_INTR_CB(INPUTLINE("audiocpu", 0))
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("dac0", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac1", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac2", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac3", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
- MCFG_SOUND_ADD("dac0vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac1vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac2vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
- MCFG_SOUND_ADD("dac3vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac0", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac3", DAC_8BIT_R2R_TWOS_COMPLEMENT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // unknown DAC
+ MCFG_DEVICE_ADD("dac0vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac1vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac2vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
+ MCFG_DEVICE_ADD("dac3vol", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "dac3", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac3", -1.0, DAC_VREF_NEG_INPUT) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "dac0vol", 1.0, DAC_VREF_POS_INPUT)
MCFG_SOUND_ROUTE(0, "dac1vol", 1.0, DAC_VREF_POS_INPUT)
diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp
index d1d8dd3d30b..c993a03b010 100644
--- a/src/mame/machine/inder_vid.cpp
+++ b/src/mame/machine/inder_vid.cpp
@@ -106,13 +106,13 @@ void inder_vid_device::ramdac_map(address_map &map)
}
MACHINE_CONFIG_START(inder_vid_device::device_add_mconfig)
- MCFG_CPU_ADD("tms", TMS34010, XTAL(40'000'000))
- MCFG_CPU_PROGRAM_MAP(megaphx_tms_map)
+ MCFG_DEVICE_ADD("tms", TMS34010, XTAL(40'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(megaphx_tms_map)
MCFG_TMS340X0_HALT_ON_RESET(true) /* halt on reset */
MCFG_TMS340X0_PIXEL_CLOCK(XTAL(40'000'000)/12) /* pixel clock */
MCFG_TMS340X0_PIXELS_PER_CLOCK(2) /* pixels per clock */
MCFG_TMS340X0_SCANLINE_RGB32_CB(inder_vid_device, scanline) /* scanline updater (RGB32) */
- MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(inder_vid_device, m68k_gen_int))
+ MCFG_TMS340X0_OUTPUT_INT_CB(WRITELINE(*this, inder_vid_device, m68k_gen_int))
MCFG_TMS340X0_TO_SHIFTREG_CB(inder_vid_device, to_shiftreg) /* write to shiftreg function */
MCFG_TMS340X0_FROM_SHIFTREG_CB(inder_vid_device, from_shiftreg) /* read from shiftreg function */
diff --git a/src/mame/machine/ioc2.cpp b/src/mame/machine/ioc2.cpp
index a9019033f95..5c4f17620e2 100644
--- a/src/mame/machine/ioc2.cpp
+++ b/src/mame/machine/ioc2.cpp
@@ -50,22 +50,22 @@ ioport_constructor ioc2_device::device_input_ports() const
MACHINE_CONFIG_START(ioc2_device::device_add_mconfig)
MCFG_SCC85230_ADD(SCC_TAG, SCC_PCLK, SCC_RXA_CLK.value(), SCC_TXA_CLK.value(), SCC_RXB_CLK.value(), SCC_TXB_CLK.value())
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_DTRA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_dtr))
- MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE(RS232A_TAG, rs232_port_device, write_rts))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_DTRB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_dtr))
- MCFG_Z80SCC_OUT_RTSB_CB(DEVWRITELINE(RS232B_TAG, rs232_port_device, write_rts))
-
- MCFG_RS232_PORT_ADD(RS232A_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC_TAG, scc85230_device, ctsa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC_TAG, scc85230_device, dcda_w))
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC_TAG, scc85230_device, rxa_w))
-
- MCFG_RS232_PORT_ADD(RS232B_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC_TAG, scc85230_device, ctsb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(SCC_TAG, scc85230_device, dcdb_w))
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(SCC_TAG, scc85230_device, rxb_w))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_DTRA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80SCC_OUT_RTSA_CB(WRITELINE(RS232A_TAG, rs232_port_device, write_rts))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_DTRB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_dtr))
+ MCFG_Z80SCC_OUT_RTSB_CB(WRITELINE(RS232B_TAG, rs232_port_device, write_rts))
+
+ MCFG_DEVICE_ADD(RS232A_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC_TAG, scc85230_device, ctsa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC_TAG, scc85230_device, dcda_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC_TAG, scc85230_device, rxa_w))
+
+ MCFG_DEVICE_ADD(RS232B_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_CTS_HANDLER(WRITELINE(SCC_TAG, scc85230_device, ctsb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(SCC_TAG, scc85230_device, dcdb_w))
+ MCFG_RS232_RXD_HANDLER(WRITELINE(SCC_TAG, scc85230_device, rxb_w))
MCFG_DEVICE_ADD(PI1_TAG, PC_LPT, 0)
@@ -77,7 +77,7 @@ MACHINE_CONFIG_START(ioc2_device::device_add_mconfig)
MCFG_PIT8253_CLK0(1000000)
MCFG_PIT8253_CLK1(1000000)
MCFG_PIT8253_CLK2(1000000)
- MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE(KBDC_TAG, kbdc8042_device, write_out2))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(KBDC_TAG, kbdc8042_device, write_out2))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp
index 7cd4022f294..1b18c428c86 100644
--- a/src/mame/machine/isbc_208.cpp
+++ b/src/mame/machine/isbc_208.cpp
@@ -31,16 +31,16 @@ static void isbc_208_floppies(device_slot_interface &device)
MACHINE_CONFIG_START(isbc_208_device::device_add_mconfig)
MCFG_DEVICE_ADD("dmac", AM9517A, XTAL(8'000'000)/4)
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(isbc_208_device, hreq_w))
- MCFG_I8237_OUT_EOP_CB(WRITELINE(isbc_208_device, out_eop_w))
- MCFG_I8237_IN_MEMR_CB(READ8(isbc_208_device, dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(isbc_208_device, dma_write_byte))
- MCFG_I8237_IN_IOR_0_CB(DEVREAD8("fdc", i8272a_device, mdma_r))
- MCFG_I8237_OUT_IOW_0_CB(DEVWRITE8("fdc", i8272a_device, mdma_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, isbc_208_device, hreq_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(*this, isbc_208_device, out_eop_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, isbc_208_device, dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, isbc_208_device, dma_write_byte))
+ MCFG_I8237_IN_IOR_0_CB(READ8("fdc", i8272a_device, mdma_r))
+ MCFG_I8237_OUT_IOW_0_CB(WRITE8("fdc", i8272a_device, mdma_w))
MCFG_I8272A_ADD("fdc", true)
- MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(isbc_208_device, irq_w))
- MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE("dmac", am9517a_device, dreq0_w))
+ MCFG_UPD765_INTRQ_CALLBACK(WRITELINE(*this, isbc_208_device, irq_w))
+ MCFG_UPD765_DRQ_CALLBACK(WRITELINE("dmac", am9517a_device, dreq0_w))
MCFG_FLOPPY_DRIVE_ADD("fdc:0", isbc_208_floppies, "525dd", isbc_208_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD("fdc:1", isbc_208_floppies, "525dd", isbc_208_device::floppy_formats)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp
index 2e1d58d746d..51e9ca0a1c2 100644
--- a/src/mame/machine/isbc_215g.cpp
+++ b/src/mame/machine/isbc_215g.cpp
@@ -353,20 +353,20 @@ WRITE_LINE_MEMBER(isbc_215g_device::isbx_irq_11_w)
}
MACHINE_CONFIG_START(isbc_215g_device::device_add_mconfig)
- MCFG_CPU_ADD("u84", I8089, XTAL(15'000'000) / 3)
- MCFG_CPU_PROGRAM_MAP(isbc_215g_mem)
- MCFG_CPU_IO_MAP(isbc_215g_io)
+ MCFG_DEVICE_ADD("u84", I8089, XTAL(15'000'000) / 3)
+ MCFG_DEVICE_PROGRAM_MAP(isbc_215g_mem)
+ MCFG_DEVICE_IO_MAP(isbc_215g_io)
MCFG_I8089_DATA_WIDTH(16)
MCFG_HARDDISK_ADD("drive0")
MCFG_HARDDISK_ADD("drive1")
MCFG_ISBX_SLOT_ADD("sbx1", 0, isbx_cards, nullptr)
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE(isbc_215g_device, isbx_irq_00_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE(isbc_215g_device, isbx_irq_01_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE(*this, isbc_215g_device, isbx_irq_00_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE(*this, isbc_215g_device, isbx_irq_01_w))
MCFG_ISBX_SLOT_ADD("sbx2", 0, isbx_cards, "fdc_218a")
- MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE(isbc_215g_device, isbx_irq_10_w))
- MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE(isbc_215g_device, isbx_irq_11_w))
+ MCFG_ISBX_SLOT_MINTR0_CALLBACK(WRITELINE(*this, isbc_215g_device, isbx_irq_10_w))
+ MCFG_ISBX_SLOT_MINTR1_CALLBACK(WRITELINE(*this, isbc_215g_device, isbx_irq_11_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp
index 2df0987eabf..8986ad245ce 100644
--- a/src/mame/machine/iteagle_fpga.cpp
+++ b/src/mame/machine/iteagle_fpga.cpp
@@ -46,19 +46,19 @@ MACHINE_CONFIG_START(iteagle_fpga_device::device_add_mconfig)
// RS232 serial ports
// The console terminal (com1) operates at 38400 baud
MCFG_SCC85C30_ADD(AM85C30_TAG, XTAL(7'372'800).value(), XTAL(7'372'800).value(), 0, XTAL(7'372'800).value(), 0)
- MCFG_Z80SCC_OUT_INT_CB(WRITELINE(iteagle_fpga_device, serial_interrupt))
- MCFG_Z80SCC_OUT_TXDA_CB(DEVWRITELINE(COM2_TAG, rs232_port_device, write_txd))
- MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(COM1_TAG, rs232_port_device, write_txd))
-
- MCFG_RS232_PORT_ADD(COM1_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, ctsb_w))
-
- MCFG_RS232_PORT_ADD(COM2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, ctsa_w))
+ MCFG_Z80SCC_OUT_INT_CB(WRITELINE(*this, iteagle_fpga_device, serial_interrupt))
+ MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(COM2_TAG, rs232_port_device, write_txd))
+ MCFG_Z80SCC_OUT_TXDB_CB(WRITELINE(COM1_TAG, rs232_port_device, write_txd))
+
+ MCFG_DEVICE_ADD(COM1_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(AM85C30_TAG, scc85c30_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(AM85C30_TAG, scc85c30_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(AM85C30_TAG, scc85c30_device, ctsb_w))
+
+ MCFG_DEVICE_ADD(COM2_TAG, RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(AM85C30_TAG, scc85c30_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(AM85C30_TAG, scc85c30_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(AM85C30_TAG, scc85c30_device, ctsa_w))
MACHINE_CONFIG_END
void iteagle_fpga_device::device_start()
diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp
index 6b75d21dd6a..98464554036 100644
--- a/src/mame/machine/jvs13551.cpp
+++ b/src/mame/machine/jvs13551.cpp
@@ -44,7 +44,7 @@ const tiny_rom_entry *sega_837_13551_device::device_rom_region() const
}
MACHINE_CONFIG_START(sega_837_13551_device::device_add_mconfig)
- MCFG_CPU_ADD("iomcu", TMP90PH44, 10000000) // unknown clock
+ MCFG_DEVICE_ADD("iomcu", TMP90PH44, 10000000) // unknown clock
MACHINE_CONFIG_END
ioport_constructor sega_837_13551_device::device_input_ports() const
diff --git a/src/mame/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp
index ccda70529fd..932527690fc 100644
--- a/src/mame/machine/kay_kbd.cpp
+++ b/src/mame/machine/kay_kbd.cpp
@@ -350,16 +350,16 @@ tiny_rom_entry const *kaypro_10_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(kaypro_10_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, 6_MHz_XTAL)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(kaypro_10_keyboard_device, p1_r))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(kaypro_10_keyboard_device, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(kaypro_10_keyboard_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(kaypro_10_keyboard_device, t1_r))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(kaypro_10_keyboard_device, bus_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(kaypro_10_keyboard_device, bus_w))
+ MCFG_DEVICE_ADD("mcu", I8049, 6_MHz_XTAL)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, kaypro_10_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, kaypro_10_keyboard_device, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, kaypro_10_keyboard_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, kaypro_10_keyboard_device, t1_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, kaypro_10_keyboard_device, bus_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, kaypro_10_keyboard_device, bus_w))
MCFG_SPEAKER_STANDARD_MONO("keyboard")
- MCFG_SOUND_ADD("bell", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("bell", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "keyboard", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp
index 8dd6decc742..d5186ee16ed 100644
--- a/src/mame/machine/km035.cpp
+++ b/src/mame/machine/km035.cpp
@@ -56,18 +56,18 @@ void km035_device::km035_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(km035_device::device_add_mconfig)
- MCFG_CPU_ADD(KM035_CPU_TAG, I8035, XTAL(4'608'000))
- MCFG_CPU_PROGRAM_MAP(km035_map)
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(km035_device, bus_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(km035_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(km035_device, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(km035_device, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(km035_device, p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(km035_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(km035_device, t1_r))
+ MCFG_DEVICE_ADD(KM035_CPU_TAG, I8035, XTAL(4'608'000))
+ MCFG_DEVICE_PROGRAM_MAP(km035_map)
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, km035_device, bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, km035_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, km035_device, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, km035_device, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, km035_device, p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, km035_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, km035_device, t1_r))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(KM035_SPK_TAG, BEEP, 3250)
+ MCFG_DEVICE_ADD(KM035_SPK_TAG, BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp
index 57f6bb14a01..42b2661ba5f 100644
--- a/src/mame/machine/m1comm.cpp
+++ b/src/mame/machine/m1comm.cpp
@@ -105,24 +105,24 @@ DEFINE_DEVICE_TYPE(M1COMM, m1comm_device, "m1comm", "Model-1 Communication Board
//-------------------------------------------------
MACHINE_CONFIG_START(m1comm_device::device_add_mconfig)
- MCFG_CPU_ADD(Z80_TAG, Z80, 8000000) /* 32 MHz / 4 */
- MCFG_CPU_PROGRAM_MAP(m1comm_mem)
- MCFG_CPU_IO_MAP(m1comm_io)
+ MCFG_DEVICE_ADD(Z80_TAG, Z80, 8000000) /* 32 MHz / 4 */
+ MCFG_DEVICE_PROGRAM_MAP(m1comm_mem)
+ MCFG_DEVICE_IO_MAP(m1comm_io)
MCFG_DEVICE_ADD(DMA_TAG, AM9517A, 8000000) /* 32 MHz / 4 */
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(m1comm_device, dma_hreq_w))
- MCFG_I8237_IN_MEMR_CB(READ8(m1comm_device, dma_mem_r))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(m1comm_device, dma_mem_w))
- MCFG_I8237_OUT_DACK_2_CB(DEVWRITELINE(DLC_TAG, mb89374_device, pi3_w))
- MCFG_I8237_OUT_DACK_3_CB(DEVWRITELINE(DLC_TAG, mb89374_device, pi2_w))
- MCFG_I8237_OUT_EOP_CB(DEVWRITELINE(DLC_TAG, mb89374_device, ci_w))
- MCFG_I8237_IN_IOR_2_CB(DEVREAD8(DLC_TAG, mb89374_device, dma_r))
- MCFG_I8237_OUT_IOW_3_CB(DEVWRITE8(DLC_TAG, mb89374_device, dma_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, m1comm_device, dma_hreq_w))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, m1comm_device, dma_mem_r))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, m1comm_device, dma_mem_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(DLC_TAG, mb89374_device, pi3_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(DLC_TAG, mb89374_device, pi2_w))
+ MCFG_I8237_OUT_EOP_CB(WRITELINE(DLC_TAG, mb89374_device, ci_w))
+ MCFG_I8237_IN_IOR_2_CB(READ8(DLC_TAG, mb89374_device, dma_r))
+ MCFG_I8237_OUT_IOW_3_CB(WRITE8(DLC_TAG, mb89374_device, dma_w))
MCFG_DEVICE_ADD(DLC_TAG, MB89374, 8000000) /* 32 MHz / 4 */
- MCFG_MB89374_PO2_CB(DEVWRITELINE(DMA_TAG, am9517a_device, dreq3_w))
- MCFG_MB89374_PO3_CB(DEVWRITELINE(DMA_TAG, am9517a_device, dreq2_w))
- MCFG_MB89374_IRQ_CB(WRITELINE(m1comm_device, dlc_int7_w))
+ MCFG_MB89374_PO2_CB(WRITELINE(DMA_TAG, am9517a_device, dreq3_w))
+ MCFG_MB89374_PO3_CB(WRITELINE(DMA_TAG, am9517a_device, dreq2_w))
+ MCFG_MB89374_IRQ_CB(WRITELINE(*this, m1comm_device, dlc_int7_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp
index a054094198c..5902c835e6c 100644
--- a/src/mame/machine/m20_8086.cpp
+++ b/src/mame/machine/m20_8086.cpp
@@ -58,10 +58,10 @@ void m20_8086_device::i86_io(address_map &map)
}
MACHINE_CONFIG_START(m20_8086_device::device_add_mconfig)
- MCFG_CPU_ADD("8086", I8086, XTAL(24'000'000)/3)
- MCFG_CPU_PROGRAM_MAP(i86_prog)
- MCFG_CPU_IO_MAP(i86_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(m20_8086_device, int_cb)
+ MCFG_DEVICE_ADD("8086", I8086, XTAL(24'000'000)/3)
+ MCFG_DEVICE_PROGRAM_MAP(i86_prog)
+ MCFG_DEVICE_IO_MAP(i86_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(m20_8086_device, int_cb)
MACHINE_CONFIG_END
READ16_MEMBER(m20_8086_device::z8000_io_r)
diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp
index 8b6102b994d..89a17f3cdbe 100644
--- a/src/mame/machine/m24_kbd.cpp
+++ b/src/mame/machine/m24_kbd.cpp
@@ -17,13 +17,13 @@ const tiny_rom_entry *m24_keyboard_device::device_rom_region() const
}
MACHINE_CONFIG_START(m24_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8049, XTAL(6'000'000))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(m24_keyboard_device, bus_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(m24_keyboard_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(m24_keyboard_device, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(m24_keyboard_device, p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(m24_keyboard_device, t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(m24_keyboard_device, t1_r))
+ MCFG_DEVICE_ADD("mcu", I8049, XTAL(6'000'000))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, m24_keyboard_device, bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, m24_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, m24_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, m24_keyboard_device, p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, m24_keyboard_device, t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, m24_keyboard_device, t1_r))
MACHINE_CONFIG_END
INPUT_PORTS_START( m24_keyboard )
diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp
index 01034661a71..d4b462e5f0a 100644
--- a/src/mame/machine/m24_z8000.cpp
+++ b/src/mame/machine/m24_z8000.cpp
@@ -69,12 +69,12 @@ void m24_z8000_device::z8000_io(address_map &map)
}
MACHINE_CONFIG_START(m24_z8000_device::device_add_mconfig)
- MCFG_CPU_ADD("z8000", Z8001, XTAL(8'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(z8000_prog)
- MCFG_CPU_DATA_MAP(z8000_data)
- MCFG_CPU_IO_MAP(z8000_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(m24_z8000_device, int_cb)
- MCFG_Z8000_MO(WRITELINE(m24_z8000_device, mo_w))
+ MCFG_DEVICE_ADD("z8000", Z8001, XTAL(8'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(z8000_prog)
+ MCFG_DEVICE_DATA_MAP(z8000_data)
+ MCFG_DEVICE_IO_MAP(z8000_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(m24_z8000_device, int_cb)
+ MCFG_Z8000_MO(WRITELINE(*this, m24_z8000_device, mo_w))
MCFG_DEVICE_ADD("pit8253", PIT8253, 0)
MCFG_PIT8253_CLK0(19660000/15)
@@ -82,7 +82,7 @@ MACHINE_CONFIG_START(m24_z8000_device::device_add_mconfig)
MCFG_PIT8253_CLK1(19660000/15)
MCFG_PIT8253_OUT1_HANDLER(NOOP)
MCFG_PIT8253_CLK2(19660000/15)
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(m24_z8000_device, timer_irq_w))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, m24_z8000_device, timer_irq_w))
MCFG_DEVICE_ADD("i8251", I8251, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp
index 5d1a7342921..6b3641c9c66 100644
--- a/src/mame/machine/m3comm.cpp
+++ b/src/mame/machine/m3comm.cpp
@@ -119,8 +119,8 @@ DEFINE_DEVICE_TYPE(M3COMM, m3comm_device, "m3comm", "Model 3 Communication Board
//-------------------------------------------------
MACHINE_CONFIG_START(m3comm_device::device_add_mconfig)
- MCFG_CPU_ADD(M68K_TAG, M68000, 10000000) // random
- MCFG_CPU_PROGRAM_MAP(m3comm_mem)
+ MCFG_DEVICE_ADD(M68K_TAG, M68000, 10000000) // random
+ MCFG_DEVICE_PROGRAM_MAP(m3comm_mem)
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("128K")
diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp
index c051f0f4ea8..c5af275772d 100644
--- a/src/mame/machine/mackbd.cpp
+++ b/src/mame/machine/mackbd.cpp
@@ -161,13 +161,13 @@ INPUT_PORTS_END
//-------------------------------------------------
MACHINE_CONFIG_START(mackbd_device::device_add_mconfig)
- MCFG_CPU_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz"
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(mackbd_device, p0_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(mackbd_device, p0_w))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(mackbd_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(mackbd_device, p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(mackbd_device, p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(mackbd_device, p2_w))
+ MCFG_DEVICE_ADD(MACKBD_CPU_TAG, I8021, 3000000) // "the approximate clock rate of the MPU is 3 MHz"
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, mackbd_device, p0_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, mackbd_device, p0_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, mackbd_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, mackbd_device, p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, mackbd_device, p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, mackbd_device, p2_w))
MCFG_MCS48_PORT_T1_IN_CB(IOPORT("MODS")) MCFG_DEVCB_RSHIFT(1) // option
MACHINE_CONFIG_END
diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp
index a042c31ed17..8eef8453af2 100644
--- a/src/mame/machine/mega32x.cpp
+++ b/src/mame/machine/mega32x.cpp
@@ -1766,26 +1766,26 @@ const rom_entry *sega_32x_device::device_rom_region() const
MACHINE_CONFIG_START(sega_32x_ntsc_device::device_add_mconfig)
#ifndef _32X_SWAP_MASTER_SLAVE_HACK
- MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_DEVICE_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
+ MCFG_DEVICE_PROGRAM_MAP(sh2_main_map)
MCFG_SH2_IS_SLAVE(0)
MCFG_SH2_FIFO_DATA_AVAIL_CB(sega_32x_device, _32x_fifo_available_callback)
#endif
- MCFG_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MCFG_CPU_PROGRAM_MAP(sh2_slave_map)
+ MCFG_DEVICE_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
+ MCFG_DEVICE_PROGRAM_MAP(sh2_slave_map)
MCFG_SH2_IS_SLAVE(1)
MCFG_SH2_FIFO_DATA_AVAIL_CB(sega_32x_device, _32x_fifo_available_callback)
#ifdef _32X_SWAP_MASTER_SLAVE_HACK
- MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
- MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_DEVICE_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_NTSC*3)/7 )
+ MCFG_DEVICE_PROGRAM_MAP(sh2_main_map)
MCFG_SH2_IS_SLAVE(0)
MCFG_SH2_FIFO_DATA_AVAIL_CB(sega_32x_device, _32x_fifo_available_callback)
#endif
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":lspeaker", 0.4) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":rspeaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":lspeaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":rspeaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
@@ -1796,26 +1796,26 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(sega_32x_pal_device::device_add_mconfig)
#ifndef _32X_SWAP_MASTER_SLAVE_HACK
- MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_DEVICE_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
+ MCFG_DEVICE_PROGRAM_MAP(sh2_main_map)
MCFG_SH2_IS_SLAVE(0)
MCFG_SH2_FIFO_DATA_AVAIL_CB(sega_32x_device, _32x_fifo_available_callback)
#endif
- MCFG_CPU_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MCFG_CPU_PROGRAM_MAP(sh2_slave_map)
+ MCFG_DEVICE_ADD("32x_slave_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
+ MCFG_DEVICE_PROGRAM_MAP(sh2_slave_map)
MCFG_SH2_IS_SLAVE(1)
MCFG_SH2_FIFO_DATA_AVAIL_CB(sega_32x_device, _32x_fifo_available_callback)
#ifdef _32X_SWAP_MASTER_SLAVE_HACK
- MCFG_CPU_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
- MCFG_CPU_PROGRAM_MAP(sh2_main_map)
+ MCFG_DEVICE_ADD("32x_master_sh2", SH2, (MASTER_CLOCK_PAL*3)/7 )
+ MCFG_DEVICE_PROGRAM_MAP(sh2_main_map)
MCFG_SH2_IS_SLAVE(0)
MCFG_SH2_FIFO_DATA_AVAIL_CB(sega_32x_device, _32x_fifo_available_callback)
#endif
- MCFG_SOUND_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":lspeaker", 0.4) // unknown DAC
- MCFG_SOUND_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":rspeaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("ldac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":lspeaker", 0.4) // unknown DAC
+ MCFG_DEVICE_ADD("rdac", DAC_16BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":rspeaker", 0.4) // unknown DAC
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE(0, "ldac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "ldac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_SOUND_ROUTE(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp
index 299c5e46ed5..38dec5072d6 100644
--- a/src/mame/machine/megacd.cpp
+++ b/src/mame/machine/megacd.cpp
@@ -288,9 +288,9 @@ GFXDECODE_END
MACHINE_CONFIG_START(sega_segacd_device::device_add_mconfig)
- MCFG_CPU_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
- MCFG_CPU_PROGRAM_MAP(segacd_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, sega_segacd_device, segacd_sub_int_callback)
+ MCFG_DEVICE_ADD("segacd_68k", M68000, SEGACD_CLOCK ) /* 12.5 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(segacd_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, sega_segacd_device, segacd_sub_int_callback)
MCFG_DEVICE_ADD("cdc", LC89510, 0) // cd controller
diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp
index 32791449db3..5620ab2f25c 100644
--- a/src/mame/machine/megacdcd.cpp
+++ b/src/mame/machine/megacdcd.cpp
@@ -1157,7 +1157,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( lc89510_temp_device::segacd_access_timer_callback
MACHINE_CONFIG_START(lc89510_temp_device::device_add_mconfig)
MCFG_TIMER_DRIVER_ADD_PERIODIC("hock_timer", lc89510_temp_device, segacd_access_timer_callback, attotime::from_hz(75))
- MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_DEVICE_ADD( "cdda", CDDA )
MCFG_SOUND_ROUTE( 0, ":lspeaker", 0.50 ) // TODO: accurate volume balance
MCFG_SOUND_ROUTE( 1, ":rspeaker", 0.50 )
MACHINE_CONFIG_END
diff --git a/src/mame/machine/megadriv.cpp b/src/mame/machine/megadriv.cpp
index 9eb0ea259c4..4091f2ef70e 100644
--- a/src/mame/machine/megadriv.cpp
+++ b/src/mame/machine/megadriv.cpp
@@ -883,15 +883,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(md_base_state::md_ntsc)
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
- MCFG_CPU_PROGRAM_MAP(megadriv_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_NTSC / 7) /* 7.67 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
/* IRQs are handled via the timers */
- MCFG_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
- MCFG_CPU_PROGRAM_MAP(megadriv_z80_map)
- MCFG_CPU_IO_MAP(megadriv_z80_io_map)
+ MCFG_DEVICE_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_NTSC / 15) /* 3.58 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_z80_map)
+ MCFG_DEVICE_IO_MAP(megadriv_z80_io_map)
/* IRQ handled via the timers */
MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv)
@@ -901,9 +901,9 @@ MACHINE_CONFIG_START(md_base_state::md_ntsc)
MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0)
MCFG_SEGA315_5313_IS_PAL(false)
- MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_sndirqline_callback_genesis_z80));
- MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv6irqline_callback_genesis_68k));
- MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv4irqline_callback_genesis_68k));
+ MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_sndirqline_callback_genesis_z80));
+ MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv6irqline_callback_genesis_68k));
+ MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv4irqline_callback_genesis_68k));
MCFG_VIDEO_SET_SCREEN("megadriv")
MCFG_SCREEN_ADD("megadriv", RASTER)
@@ -912,19 +912,19 @@ MACHINE_CONFIG_START(md_base_state::md_ntsc)
MCFG_SCREEN_SIZE(64*8, 620)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(md_base_state, screen_update_megadriv) /* Copies a bitmap */
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */
MCFG_VIDEO_START_OVERRIDE(md_base_state, megadriv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* sound hardware */
- MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
+ MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_NTSC/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
MACHINE_CONFIG_END
@@ -932,22 +932,22 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(md_cons_state::dcat16_megadriv_base)
md_ntsc(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(dcat16_megadriv_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(dcat16_megadriv_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
MACHINE_CONFIG_END
/************ PAL hardware has a different master clock *************/
MACHINE_CONFIG_START(md_base_state::md_pal)
- MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */
- MCFG_CPU_PROGRAM_MAP(megadriv_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
+ MCFG_DEVICE_ADD("maincpu", M68000, MASTER_CLOCK_PAL / 7) /* 7.67 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_map)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(md_base_state,genesis_int_callback)
/* IRQs are handled via the timers */
- MCFG_CPU_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */
- MCFG_CPU_PROGRAM_MAP(megadriv_z80_map)
- MCFG_CPU_IO_MAP(megadriv_z80_io_map)
+ MCFG_DEVICE_ADD("genesis_snd_z80", Z80, MASTER_CLOCK_PAL / 15) /* 3.58 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(megadriv_z80_map)
+ MCFG_DEVICE_IO_MAP(megadriv_z80_io_map)
/* IRQ handled via the timers */
MCFG_MACHINE_START_OVERRIDE(md_base_state,megadriv)
@@ -957,9 +957,9 @@ MACHINE_CONFIG_START(md_base_state::md_pal)
MCFG_DEVICE_ADD("gen_vdp", SEGA315_5313, 0)
MCFG_SEGA315_5313_IS_PAL(true)
- MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_sndirqline_callback_genesis_z80));
- MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv6irqline_callback_genesis_68k));
- MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(md_base_state, vdp_lv4irqline_callback_genesis_68k));
+ MCFG_SEGA315_5313_SND_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_sndirqline_callback_genesis_z80));
+ MCFG_SEGA315_5313_LV6_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv6irqline_callback_genesis_68k));
+ MCFG_SEGA315_5313_LV4_IRQ_CALLBACK(WRITELINE(*this, md_base_state, vdp_lv4irqline_callback_genesis_68k));
MCFG_VIDEO_SET_SCREEN("megadriv")
MCFG_SCREEN_ADD("megadriv", RASTER)
@@ -968,19 +968,19 @@ MACHINE_CONFIG_START(md_base_state::md_pal)
MCFG_SCREEN_SIZE(64*8, 620)
MCFG_SCREEN_VISIBLE_AREA(0, 32*8-1, 0, 28*8-1)
MCFG_SCREEN_UPDATE_DRIVER(md_base_state, screen_update_megadriv) /* Copies a bitmap */
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, md_base_state, screen_vblank_megadriv)) /* Used to Sync the timing */
MCFG_VIDEO_START_OVERRIDE(md_base_state, megadriv)
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_SOUND_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */
+ MCFG_DEVICE_ADD("ymsnd", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
/* sound hardware */
- MCFG_SOUND_ADD("snsnd", SEGAPSG, MASTER_CLOCK_PAL/15)
+ MCFG_DEVICE_ADD("snsnd", SEGAPSG, MASTER_CLOCK_PAL/15)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */
MACHINE_CONFIG_END
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 816dc10ec0a..a75933ad455 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -250,12 +250,12 @@ WRITE8_MEMBER(midway_serial_pic_emu_device::write_c)
}
MACHINE_CONFIG_START(midway_serial_pic_emu_device::device_add_mconfig)
- MCFG_CPU_ADD("pic", PIC16C57, 12000000) /* ? Mhz */
- MCFG_PIC16C5x_WRITE_A_CB(WRITE8(midway_serial_pic_emu_device, write_a))
- MCFG_PIC16C5x_READ_B_CB(READ8(midway_serial_pic_emu_device, read_b))
- MCFG_PIC16C5x_WRITE_B_CB(WRITE8(midway_serial_pic_emu_device, write_b))
- MCFG_PIC16C5x_READ_C_CB(READ8(midway_serial_pic_emu_device, read_c))
- MCFG_PIC16C5x_WRITE_C_CB(WRITE8(midway_serial_pic_emu_device, write_c))
+ MCFG_DEVICE_ADD("pic", PIC16C57, 12000000) /* ? Mhz */
+ MCFG_PIC16C5x_WRITE_A_CB(WRITE8(*this, midway_serial_pic_emu_device, write_a))
+ MCFG_PIC16C5x_READ_B_CB(READ8(*this, midway_serial_pic_emu_device, read_b))
+ MCFG_PIC16C5x_WRITE_B_CB(WRITE8(*this, midway_serial_pic_emu_device, write_b))
+ MCFG_PIC16C5x_READ_C_CB(READ8(*this, midway_serial_pic_emu_device, read_c))
+ MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, midway_serial_pic_emu_device, write_c))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp
index f9c5137881b..0907dfd1d83 100644
--- a/src/mame/machine/mie.cpp
+++ b/src/mame/machine/mie.cpp
@@ -66,10 +66,10 @@ const tiny_rom_entry *mie_device::device_rom_region() const
}
MACHINE_CONFIG_START(mie_device::device_add_mconfig)
- MCFG_CPU_ADD("mie", Z80, DERIVED_CLOCK(1,1))
- MCFG_CPU_PROGRAM_MAP(mie_map)
- MCFG_CPU_IO_MAP(mie_port)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, mie_device, irq_callback)
+ MCFG_DEVICE_ADD("mie", Z80, DERIVED_CLOCK(1,1))
+ MCFG_DEVICE_PROGRAM_MAP(mie_map)
+ MCFG_DEVICE_IO_MAP(mie_port)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DEVICE(DEVICE_SELF, mie_device, irq_callback)
MACHINE_CONFIG_END
mie_jvs_device::mie_jvs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp
index bb2663e070b..fe649ab2518 100644
--- a/src/mame/machine/mm1kb.cpp
+++ b/src/mame/machine/mm1kb.cpp
@@ -59,7 +59,7 @@ bool mm1_keyboard_device::first_time = true;
MACHINE_CONFIG_START(mm1_keyboard_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("keyboard_and_chassis_sounds", SAMPLES, 0)
+ MCFG_DEVICE_ADD("keyboard_and_chassis_sounds", SAMPLES)
MCFG_SAMPLES_CHANNELS(2)
MCFG_SAMPLES_NAMES(mm1_kb_sample_names)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7)
diff --git a/src/mame/machine/mmboard.cpp b/src/mame/machine/mmboard.cpp
index b29e3ccfd09..129d8d6b2ae 100644
--- a/src/mame/machine/mmboard.cpp
+++ b/src/mame/machine/mmboard.cpp
@@ -334,7 +334,7 @@ MACHINE_CONFIG_START(mephisto_display_modul_device::device_add_mconfig)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/model1io.cpp b/src/mame/machine/model1io.cpp
index 5d150fff4ea..3510796e4b4 100644
--- a/src/mame/machine/model1io.cpp
+++ b/src/mame/machine/model1io.cpp
@@ -129,22 +129,22 @@ const tiny_rom_entry *model1io_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START( model1io_device::device_add_mconfig )
- MCFG_CPU_ADD("iocpu", Z80, 32_MHz_XTAL/8)
- MCFG_CPU_PROGRAM_MAP(mem_map)
+ MCFG_DEVICE_ADD("iocpu", Z80, 32_MHz_XTAL/8)
+ MCFG_DEVICE_PROGRAM_MAP(mem_map)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom") // 93C45
MCFG_DEVICE_ADD("io", SEGA_315_5338A, 0)
- MCFG_315_5338A_READ_CB(READ8(model1io_device, io_r))
- MCFG_315_5338A_WRITE_CB(WRITE8(model1io_device, io_w))
- MCFG_315_5338A_OUT0_CB(WRITE8(model1io_device, out0_w))
- MCFG_315_5338A_IN1_CB(READ8(model1io_device, in1_r))
- MCFG_315_5338A_IN2_CB(READ8(model1io_device, in2_r))
- MCFG_315_5338A_IN3_CB(READ8(model1io_device, in3_r))
- MCFG_315_5338A_IN4_CB(READ8(model1io_device, in4_r))
- MCFG_315_5338A_OUT4_CB(WRITE8(model1io_device, out4_w))
- MCFG_315_5338A_OUT5_CB(WRITE8(model1io_device, out5_w))
- MCFG_315_5338A_IN6_CB(READ8(model1io_device, in6_r))
+ MCFG_315_5338A_READ_CB(READ8(*this, model1io_device, io_r))
+ MCFG_315_5338A_WRITE_CB(WRITE8(*this, model1io_device, io_w))
+ MCFG_315_5338A_OUT0_CB(WRITE8(*this, model1io_device, out0_w))
+ MCFG_315_5338A_IN1_CB(READ8(*this, model1io_device, in1_r))
+ MCFG_315_5338A_IN2_CB(READ8(*this, model1io_device, in2_r))
+ MCFG_315_5338A_IN3_CB(READ8(*this, model1io_device, in3_r))
+ MCFG_315_5338A_IN4_CB(READ8(*this, model1io_device, in4_r))
+ MCFG_315_5338A_OUT4_CB(WRITE8(*this, model1io_device, out4_w))
+ MCFG_315_5338A_OUT5_CB(WRITE8(*this, model1io_device, out5_w))
+ MCFG_315_5338A_IN6_CB(READ8(*this, model1io_device, in6_r))
MCFG_DEVICE_ADD("adc", MSM6253, 0)
MCFG_MSM6253_IN0_ANALOG_READ(model1io_device, analog0_r)
diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp
index 4591f5a3722..a41c0410049 100644
--- a/src/mame/machine/mpu4.cpp
+++ b/src/mame/machine/mpu4.cpp
@@ -2668,338 +2668,338 @@ void mpu4_state::mpu4_memmap(address_map &map)
MACHINE_CONFIG_START(mpu4_state::mpu4_std_3reel)
MCFG_MPU4_STD_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_STD_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_STD_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type2_3reel)
MCFG_MPU4_TYPE2_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE2_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE2_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type3_3reel)
MCFG_MPU4_TYPE3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type4_3reel)
MCFG_MPU4_TYPE4_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE4_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE4_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_3reel)
MCFG_MPU4_BWB_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_BWB_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_BWB_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_std_4reel)
MCFG_MPU4_STD_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_STD_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_STD_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_STD_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type2_4reel)
MCFG_MPU4_TYPE2_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE2_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE2_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE2_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type3_4reel)
MCFG_MPU4_TYPE3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE3_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type4_4reel)
MCFG_MPU4_TYPE4_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE4_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE4_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE4_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_4reel)
MCFG_MPU4_BWB_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_BWB_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_BWB_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_BWB_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_std_5reel)
MCFG_MPU4_STD_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_STD_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_STD_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_STD_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_STD_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type2_5reel)
MCFG_MPU4_TYPE2_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE2_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE2_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE2_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE2_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type3_5reel)
MCFG_MPU4_TYPE3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE3_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE3_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type4_5reel)
MCFG_MPU4_TYPE4_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE4_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE4_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE4_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE4_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_5reel)
MCFG_MPU4_BWB_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_BWB_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_BWB_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_BWB_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_BWB_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_std_6reel)
MCFG_MPU4_STD_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_STD_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_STD_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_STD_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_STD_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_STD_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type2_6reel)
MCFG_MPU4_TYPE2_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE2_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE2_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE2_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE2_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_TYPE2_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type3_6reel)
MCFG_MPU4_TYPE3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE3_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE3_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_TYPE3_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type4_6reel)
MCFG_MPU4_TYPE4_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE4_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE4_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE4_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE4_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_TYPE4_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_6reel)
MCFG_MPU4_BWB_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_BWB_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_BWB_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_BWB_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_BWB_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_BWB_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_std_7reel)
MCFG_MPU4_STD_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_STD_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_STD_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_STD_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_STD_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_STD_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MCFG_MPU4_STD_REEL_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>))
MCFG_MPU4_STD_REEL_ADD("reel7")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type2_7reel)
MCFG_MPU4_TYPE2_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE2_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE2_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE2_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE2_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_TYPE2_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MCFG_MPU4_TYPE2_REEL_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>))
MCFG_MPU4_TYPE2_REEL_ADD("reel7")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type3_7reel)
MCFG_MPU4_TYPE3_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE3_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE3_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE3_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE3_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_TYPE3_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MCFG_MPU4_TYPE3_REEL_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>))
MCFG_MPU4_TYPE3_REEL_ADD("reel7")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_type4_7reel)
MCFG_MPU4_TYPE4_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_TYPE4_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_TYPE4_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_TYPE4_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_TYPE4_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_TYPE4_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MCFG_MPU4_TYPE4_REEL_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>))
MCFG_MPU4_TYPE4_REEL_ADD("reel7")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_bwb_7reel)
MCFG_MPU4_BWB_REEL_ADD("reel0")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<0>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<0>))
MCFG_MPU4_BWB_REEL_ADD("reel1")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<1>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<1>))
MCFG_MPU4_BWB_REEL_ADD("reel2")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<2>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<2>))
MCFG_MPU4_BWB_REEL_ADD("reel3")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<3>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<3>))
MCFG_MPU4_BWB_REEL_ADD("reel4")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<4>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<4>))
MCFG_MPU4_BWB_REEL_ADD("reel5")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<5>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<5>))
MCFG_MPU4_BWB_REEL_ADD("reel6")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<6>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<6>))
MCFG_MPU4_BWB_REEL_ADD("reel7")
- MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(mpu4_state, reel_optic_cb<7>))
+ MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, mpu4_state, reel_optic_cb<7>))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_common)
@@ -3009,62 +3009,62 @@ MACHINE_CONFIG_START(mpu4_state::mpu4_common)
/* 6840 PTM */
MCFG_DEVICE_ADD("ptm_ic2", PTM6840, MPU4_MASTER_CLOCK / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(WRITELINE(mpu4_state, ic2_o1_callback))
- MCFG_PTM6840_O2_CB(WRITELINE(mpu4_state, ic2_o2_callback))
- MCFG_PTM6840_O3_CB(WRITELINE(mpu4_state, ic2_o3_callback))
- MCFG_PTM6840_IRQ_CB(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE(*this, mpu4_state, ic2_o1_callback))
+ MCFG_PTM6840_O2_CB(WRITELINE(*this, mpu4_state, ic2_o2_callback))
+ MCFG_PTM6840_O3_CB(WRITELINE(*this, mpu4_state, ic2_o3_callback))
+ MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic3", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic3_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic3_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic3_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic3_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic3_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic3_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic3_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic3_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic4", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic4_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic4_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic4_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state,pia_ic4_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state,pia_ic4_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state,cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state,cpu0_irq))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_ic4_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic4_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic4_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state,pia_ic4_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state,pia_ic4_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state,cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state,cpu0_irq))
MCFG_DEVICE_ADD("pia_ic5", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu4_state, pia_ic5_porta_r))
- MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic5_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic5_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic5_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic5_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic5_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu4_state, pia_ic5_porta_r))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_ic5_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic5_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic5_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic5_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic5_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic6", PIA6821, 0)
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic6_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic6_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic6_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic6_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic6_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic6_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic6_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic6_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic7", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_ic7_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_ic7_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic7_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic7_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic7_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_ic7_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_ic7_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic7_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic7_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic7_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("pia_ic8", PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(mpu4_state, pia_ic8_porta_r))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_ic8_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_ic8_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_ic8_cb2_w))
- MCFG_PIA_IRQA_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
- MCFG_PIA_IRQB_HANDLER(WRITELINE(mpu4_state, cpu0_irq))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, mpu4_state, pia_ic8_porta_r))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_ic8_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic8_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_ic8_cb2_w))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, mpu4_state, cpu0_irq))
MCFG_DEVICE_ADD("meters", METERS, 0)
MCFG_METERS_NUMBER(8)
@@ -3074,17 +3074,17 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mpu4_common2)
MCFG_DEVICE_ADD("ptm_ic3ss", PTM6840, MPU4_MASTER_CLOCK / 4)
MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0)
- MCFG_PTM6840_O1_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c2))
- MCFG_PTM6840_O2_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_c1))
- //MCFG_PTM6840_O3_CB(DEVWRITELINE("ptm_ic3ss", ptm6840_device, set_g1))
- //MCFG_PTM6840_IRQ_CB(WRITELINE(mpu4_state, cpu1_ptm_irq))
+ MCFG_PTM6840_O1_CB(WRITELINE("ptm_ic3ss", ptm6840_device, set_c2))
+ MCFG_PTM6840_O2_CB(WRITELINE("ptm_ic3ss", ptm6840_device, set_c1))
+ //MCFG_PTM6840_O3_CB(WRITELINE("ptm_ic3ss", ptm6840_device, set_g1))
+ //MCFG_PTM6840_IRQ_CB(WRITELINE(*this, mpu4_state, cpu1_ptm_irq))
MCFG_DEVICE_ADD("pia_ic4ss", PIA6821, 0)
- MCFG_PIA_READPB_HANDLER(READ8(mpu4_state, pia_gb_portb_r))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(mpu4_state, pia_gb_porta_w))
- MCFG_PIA_WRITEPB_HANDLER(WRITE8(mpu4_state, pia_gb_portb_w))
- MCFG_PIA_CA2_HANDLER(WRITELINE(mpu4_state, pia_gb_ca2_w))
- MCFG_PIA_CB2_HANDLER(WRITELINE(mpu4_state, pia_gb_cb2_w))
+ MCFG_PIA_READPB_HANDLER(READ8(*this, mpu4_state, pia_gb_portb_r))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, mpu4_state, pia_gb_porta_w))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, mpu4_state, pia_gb_portb_w))
+ MCFG_PIA_CA2_HANDLER(WRITELINE(*this, mpu4_state, pia_gb_ca2_w))
+ MCFG_PIA_CB2_HANDLER(WRITELINE(*this, mpu4_state, pia_gb_cb2_w))
MACHINE_CONFIG_END
/* machine driver for MOD 2 board */
@@ -3092,8 +3092,8 @@ MACHINE_CONFIG_START(mpu4_state::mpu4base)
MCFG_MACHINE_START_OVERRIDE(mpu4_state,mod2 )
MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4)
- MCFG_CPU_ADD("maincpu", MC6809, MPU4_MASTER_CLOCK) // MC68B09P
- MCFG_CPU_PROGRAM_MAP(mpu4_memmap)
+ MCFG_DEVICE_ADD("maincpu", MC6809, MPU4_MASTER_CLOCK) // MC68B09P
+ MCFG_DEVICE_PROGRAM_MAP(mpu4_memmap)
mpu4_common(config);
@@ -3107,7 +3107,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mod2)
mpu4base(config);
- MCFG_SOUND_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(820, 0, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
@@ -3117,7 +3117,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(mpu4_state::mod2_alt)
mpu4base(config);
- MCFG_SOUND_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ay8913", AY8913, MPU4_MASTER_CLOCK/4)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
MCFG_AY8910_RES_LOADS(820, 0, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
@@ -3133,7 +3133,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4yam)
mpu4_std_6reel(config);
- MCFG_SOUND_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4)
+ MCFG_DEVICE_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -3145,7 +3145,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4oki)
mpu4_common2(config);
mpu4_std_6reel(config);
- MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -3157,7 +3157,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4oki_alt)
mpu4_common2(config);
mpu4_type2_6reel(config);
- MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -3169,7 +3169,7 @@ MACHINE_CONFIG_START(mpu4_state::mod4oki_5r)
mpu4_common2(config);
mpu4_std_5reel(config);
- MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -3180,7 +3180,7 @@ MACHINE_CONFIG_START(mpu4_state::bwboki)
mpu4_common2(config);
mpu4_bwb_5reel(config);
- MCFG_SOUND_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+ MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -3189,7 +3189,7 @@ MACHINE_CONFIG_START(mpu4_state::mpu4crys)
mod2(config);
MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4cry)
- MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_DEVICE_ADD("upd", UPD7759)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp
index a17b2ac897a..19096297cbe 100644
--- a/src/mame/machine/ms7004.cpp
+++ b/src/mame/machine/ms7004.cpp
@@ -58,17 +58,17 @@ void ms7004_device::ms7004_map(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(ms7004_device::device_add_mconfig)
- MCFG_CPU_ADD(MS7004_CPU_TAG, I8035, XTAL(4'608'000))
- MCFG_CPU_PROGRAM_MAP(ms7004_map)
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(ms7004_device, p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(ms7004_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(ms7004_device, t1_r))
- MCFG_MCS48_PORT_PROG_OUT_CB(DEVWRITELINE("i8243", i8243_device, prog_w))
+ MCFG_DEVICE_ADD(MS7004_CPU_TAG, I8035, XTAL(4'608'000))
+ MCFG_DEVICE_PROGRAM_MAP(ms7004_map)
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, ms7004_device, p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, ms7004_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, ms7004_device, t1_r))
+ MCFG_MCS48_PORT_PROG_OUT_CB(WRITELINE("i8243", i8243_device, prog_w))
- MCFG_I8243_ADD("i8243", NOOP, WRITE8(ms7004_device, i8243_port_w))
+ MCFG_I8243_ADD("i8243", NOOP, WRITE8(*this, ms7004_device, i8243_port_w))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(MS7004_SPK_TAG, BEEP, 3250)
+ MCFG_DEVICE_ADD(MS7004_SPK_TAG, BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp
index 0490ef47308..66500d6e05b 100644
--- a/src/mame/machine/namco50.cpp
+++ b/src/mame/machine/namco50.cpp
@@ -251,11 +251,11 @@ void namco_50xx_device::device_start()
//-------------------------------------------------
MACHINE_CONFIG_START(namco_50xx_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MCFG_MB88XX_READ_K_CB(READ8(namco_50xx_device, K_r))
- MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_50xx_device, O_w))
- MCFG_MB88XX_READ_R0_CB(READ8(namco_50xx_device, R0_r))
- MCFG_MB88XX_READ_R2_CB(READ8(namco_50xx_device, R2_r))
+ MCFG_DEVICE_ADD("mcu", MB8842, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_MB88XX_READ_K_CB(READ8(*this, namco_50xx_device, K_r))
+ MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, namco_50xx_device, O_w))
+ MCFG_MB88XX_READ_R0_CB(READ8(*this, namco_50xx_device, R0_r))
+ MCFG_MB88XX_READ_R2_CB(READ8(*this, namco_50xx_device, R2_r))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp
index 6f6c6061d85..c69cf47e0e6 100644
--- a/src/mame/machine/namco51.cpp
+++ b/src/mame/machine/namco51.cpp
@@ -391,11 +391,11 @@ void namco_51xx_device::device_reset()
//-------------------------------------------------
MACHINE_CONFIG_START(namco_51xx_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
-// MCFG_MB88XX_READ_K_CB(READ8(namco_51xx_device, namco_51xx_K_r))
-// MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_51xx_device, namco_51xx_O_w))
-// MCFG_MB88XX_READ_R0_CB(READ8(namco_51xx_device, namco_51xx_R0_r))
-// MCFG_MB88XX_READ_R2_CB(READ8(namco_51xx_device, namco_51xx_R2_r))
+ MCFG_DEVICE_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+// MCFG_MB88XX_READ_K_CB(READ8(*this, namco_51xx_device, namco_51xx_K_r))
+// MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, namco_51xx_device, namco_51xx_O_w))
+// MCFG_MB88XX_READ_R0_CB(READ8(*this, namco_51xx_device, namco_51xx_R0_r))
+// MCFG_MB88XX_READ_R2_CB(READ8(*this, namco_51xx_device, namco_51xx_R2_r))
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp
index 8ae59a45cef..8a45757ccc5 100644
--- a/src/mame/machine/namco53.cpp
+++ b/src/mame/machine/namco53.cpp
@@ -169,14 +169,14 @@ void namco_53xx_device::device_start()
//-------------------------------------------------
MACHINE_CONFIG_START(namco_53xx_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MCFG_MB88XX_READ_K_CB(READ8(namco_53xx_device, K_r))
- MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_53xx_device, O_w))
- MCFG_MB88XX_WRITE_P_CB(WRITE8(namco_53xx_device, P_w))
- MCFG_MB88XX_READ_R0_CB(READ8(namco_53xx_device, R0_r))
- MCFG_MB88XX_READ_R1_CB(READ8(namco_53xx_device, R1_r))
- MCFG_MB88XX_READ_R2_CB(READ8(namco_53xx_device, R2_r))
- MCFG_MB88XX_READ_R3_CB(READ8(namco_53xx_device, R3_r))
+ MCFG_DEVICE_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_MB88XX_READ_K_CB(READ8(*this, namco_53xx_device, K_r))
+ MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, namco_53xx_device, O_w))
+ MCFG_MB88XX_WRITE_P_CB(WRITE8(*this, namco_53xx_device, P_w))
+ MCFG_MB88XX_READ_R0_CB(READ8(*this, namco_53xx_device, R0_r))
+ MCFG_MB88XX_READ_R1_CB(READ8(*this, namco_53xx_device, R1_r))
+ MCFG_MB88XX_READ_R2_CB(READ8(*this, namco_53xx_device, R2_r))
+ MCFG_MB88XX_READ_R3_CB(READ8(*this, namco_53xx_device, R3_r))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp
index f63eac5db2d..f64e4fedcce 100644
--- a/src/mame/machine/namco62.cpp
+++ b/src/mame/machine/namco62.cpp
@@ -58,11 +58,11 @@ void namco_62xx_device::device_start()
//-------------------------------------------------
MACHINE_CONFIG_START(namco_62xx_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 (TODO: Correct?) */
-// MCFG_MB88XX_READ_K_CB(READ8(namco_62xx_device, namco_62xx_K_r))
-// MCFG_MB88XX_WRITE_O_CB(WRITE8(namco_62xx_device, namco_62xx_O_w))
-// MCFG_MB88XX_READ_R0_CB(READ8(namco_62xx_device, namco_62xx_R0_r))
-// MCFG_MB88XX_READ_R2_CB(READ8(namco_62xx_device, namco_62xx_R2_r))
+ MCFG_DEVICE_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 (TODO: Correct?) */
+// MCFG_MB88XX_READ_K_CB(READ8(*this, namco_62xx_device, namco_62xx_K_r))
+// MCFG_MB88XX_WRITE_O_CB(WRITE8(*this, namco_62xx_device, namco_62xx_O_w))
+// MCFG_MB88XX_READ_R0_CB(READ8(*this, namco_62xx_device, namco_62xx_R0_r))
+// MCFG_MB88XX_READ_R2_CB(READ8(*this, namco_62xx_device, namco_62xx_R2_r))
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp
index 8d9f0e8cc16..fa49c5ae9d2 100644
--- a/src/mame/machine/nmk004.cpp
+++ b/src/mame/machine/nmk004.cpp
@@ -111,9 +111,9 @@ void nmk004_device::device_start()
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(nmk004_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu",TMP90840, DERIVED_CLOCK(1,1)) // Toshiba TMP90C840AF in QFP64 package with 8Kbyte internal ROM
- MCFG_CPU_PROGRAM_MAP(nmk004_sound_mem_map)
- MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(nmk004_device, nmk004_port4_w))
+ MCFG_DEVICE_ADD("mcu",TMP90840, DERIVED_CLOCK(1,1)) // Toshiba TMP90C840AF in QFP64 package with 8Kbyte internal ROM
+ MCFG_DEVICE_PROGRAM_MAP(nmk004_sound_mem_map)
+ MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(*this, nmk004_device, nmk004_port4_w))
MACHINE_CONFIG_END
//-------------------------------------------------
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index 24b31eacbd2..54fec692b1a 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -51,13 +51,13 @@ const tiny_rom_entry *pc1512_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(pc1512_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(6'000'000))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_device, kb_bus_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(pc1512_keyboard_device, kb_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(pc1512_keyboard_device, kb_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(pc1512_keyboard_device, kb_t1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, XTAL(6'000'000))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, pc1512_keyboard_device, kb_bus_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, pc1512_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, pc1512_keyboard_device, kb_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pc1512_keyboard_device, kb_p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, pc1512_keyboard_device, kb_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, pc1512_keyboard_device, kb_t1_r))
MCFG_VCS_CONTROL_PORT_ADD("joy", vcs_control_port_devices, nullptr)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp
index da95a88bdc7..77843eeb714 100644
--- a/src/mame/machine/pcd_kbd.cpp
+++ b/src/mame/machine/pcd_kbd.cpp
@@ -28,16 +28,16 @@ void pcd_keyboard_device::pcd_keyboard_map(address_map &map)
}
MACHINE_CONFIG_START(pcd_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", I8035, 5760000*2) // FIXME: the mc2661 baud rate calculation
- MCFG_CPU_PROGRAM_MAP(pcd_keyboard_map)
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(pcd_keyboard_device, bus_r))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(pcd_keyboard_device, p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pcd_keyboard_device, p1_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(pcd_keyboard_device, t0_r))
+ MCFG_DEVICE_ADD("mcu", I8035, 5760000*2) // FIXME: the mc2661 baud rate calculation
+ MCFG_DEVICE_PROGRAM_MAP(pcd_keyboard_map)
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, pcd_keyboard_device, bus_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, pcd_keyboard_device, p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, pcd_keyboard_device, p1_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, pcd_keyboard_device, t0_r))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp
index 3edeb5d57a6..8788ee177cc 100644
--- a/src/mame/machine/pce_cd.cpp
+++ b/src/mame/machine/pce_cd.cpp
@@ -247,13 +247,13 @@ void pce_cd_device::nvram_init(nvram_device &nvram, void *data, size_t size)
MCFG_CDROM_ADD("cdrom")
MCFG_CDROM_INTERFACE("pce_cdrom")
- MCFG_SOUND_ADD( "msm5205", MSM5205, PCE_CD_CLOCK / 6 )
- MCFG_MSM5205_VCLK_CB(WRITELINE(pce_cd_device, msm5205_int)) /* interrupt function */
+ MCFG_DEVICE_ADD( "msm5205", MSM5205, PCE_CD_CLOCK / 6 )
+ MCFG_MSM5205_VCLK_CB(WRITELINE(*this, pce_cd_device, msm5205_int)) /* interrupt function */
MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 1/48 prescaler, 4bit data */
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "^lspeaker", 0.50 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "^rspeaker", 0.50 )
- MCFG_SOUND_ADD( "cdda", CDDA, 0 )
+ MCFG_DEVICE_ADD( "cdda", CDDA )
MCFG_SOUND_ROUTE( 0, "^lspeaker", 1.00 )
MCFG_SOUND_ROUTE( 1, "^rspeaker", 1.00 )
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pcshare.cpp b/src/mame/machine/pcshare.cpp
index 510adbf93b0..5b2d60fb3f5 100644
--- a/src/mame/machine/pcshare.cpp
+++ b/src/mame/machine/pcshare.cpp
@@ -191,36 +191,36 @@ MACHINE_CONFIG_START(pcat_base_state::pcat_common)
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(pcat_base_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, pcat_base_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD( "dma8237_1", AM9517A, XTAL(14'318'181)/3 )
- MCFG_I8237_OUT_HREQ_CB(WRITELINE(pcat_base_state, pc_dma_hrq_changed))
- MCFG_I8237_IN_MEMR_CB(READ8(pcat_base_state, pc_dma_read_byte))
- MCFG_I8237_OUT_MEMW_CB(WRITE8(pcat_base_state, pc_dma_write_byte))
- MCFG_I8237_OUT_DACK_0_CB(WRITELINE(pcat_base_state, pc_dack0_w))
- MCFG_I8237_OUT_DACK_1_CB(WRITELINE(pcat_base_state, pc_dack1_w))
- MCFG_I8237_OUT_DACK_2_CB(WRITELINE(pcat_base_state, pc_dack2_w))
- MCFG_I8237_OUT_DACK_3_CB(WRITELINE(pcat_base_state, pc_dack3_w))
+ MCFG_I8237_OUT_HREQ_CB(WRITELINE(*this, pcat_base_state, pc_dma_hrq_changed))
+ MCFG_I8237_IN_MEMR_CB(READ8(*this, pcat_base_state, pc_dma_read_byte))
+ MCFG_I8237_OUT_MEMW_CB(WRITE8(*this, pcat_base_state, pc_dma_write_byte))
+ MCFG_I8237_OUT_DACK_0_CB(WRITELINE(*this, pcat_base_state, pc_dack0_w))
+ MCFG_I8237_OUT_DACK_1_CB(WRITELINE(*this, pcat_base_state, pc_dack1_w))
+ MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, pcat_base_state, pc_dack2_w))
+ MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, pcat_base_state, pc_dack3_w))
MCFG_DEVICE_ADD( "dma8237_2", AM9517A, XTAL(14'318'181)/3 )
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(4772720/4) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic8259_1", pic8259_device, ir0_w))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE("pic8259_1", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(4772720/4) /* dram refresh */
MCFG_PIT8253_CLK2(4772720/4) /* pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(pcat_base_state, at_pit8254_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, pcat_base_state, at_pit8254_out2_changed))
MCFG_MC146818_ADD("rtc", XTAL(32'768))
- MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir0_w))
+ MCFG_MC146818_IRQ_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir0_w))
MCFG_MC146818_CENTURY_INDEX(0x32)
MCFG_DEVICE_ADD("kbdc", KBDC8042, 0)
MCFG_KBDC8042_KEYBOARD_TYPE(KBDC8042_AT386)
MCFG_KBDC8042_SYSTEM_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_KBDC8042_GATE_A20_CB(INPUTLINE("maincpu", INPUT_LINE_A20))
- MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir1_w))
+ MCFG_KBDC8042_INPUT_BUFFER_FULL_CB(WRITELINE("pic8259_1", pic8259_device, ir1_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pgmprot_igs025_igs012.cpp b/src/mame/machine/pgmprot_igs025_igs012.cpp
index 8578f322b50..f86da36e6e1 100644
--- a/src/mame/machine/pgmprot_igs025_igs012.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs012.cpp
@@ -136,8 +136,8 @@ void pgm_012_025_state::drgw2_mem(address_map &map)
MACHINE_CONFIG_START(pgm_012_025_state::pgm_012_025_drgw2)
pgmbase(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(drgw2_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(drgw2_mem)
MCFG_DEVICE_ADD("igs025", IGS025, 0)
//MCFG_IGS025_SET_EXTERNAL_EXECUTE( pgm_022_025_state, igs025_to_igs012_callback )
diff --git a/src/mame/machine/pgmprot_igs025_igs022.cpp b/src/mame/machine/pgmprot_igs025_igs022.cpp
index 1b0764d84a9..8cf2d21e444 100644
--- a/src/mame/machine/pgmprot_igs025_igs022.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs022.cpp
@@ -378,8 +378,8 @@ void pgm_022_025_state::killbld_mem(address_map &map)
MACHINE_CONFIG_START(pgm_022_025_state::pgm_022_025)
pgmbase(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(killbld_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(killbld_mem)
MCFG_DEVICE_ADD("igs025", IGS025, 0)
MCFG_IGS025_SET_EXTERNAL_EXECUTE( pgm_022_025_state, igs025_to_igs022_callback )
diff --git a/src/mame/machine/pgmprot_igs025_igs028.cpp b/src/mame/machine/pgmprot_igs025_igs028.cpp
index 084f5faa882..d441f3583e1 100644
--- a/src/mame/machine/pgmprot_igs025_igs028.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs028.cpp
@@ -189,8 +189,8 @@ void pgm_028_025_state::igs025_to_igs028_callback( void )
MACHINE_CONFIG_START(pgm_028_025_state::pgm_028_025_ol)
pgmbase(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(olds_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(olds_mem)
MCFG_DEVICE_ADD("igs025", IGS025, 0)
MCFG_IGS025_SET_EXTERNAL_EXECUTE( pgm_028_025_state, igs025_to_igs028_callback )
diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp
index f112e37b092..33fef9b1b07 100644
--- a/src/mame/machine/pgmprot_igs027a_type1.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type1.cpp
@@ -218,8 +218,8 @@ MACHINE_START_MEMBER(pgm_arm_type1_state,pgm_arm_type1)
MACHINE_CONFIG_START(pgm_arm_type1_state::pgm_arm_type1_cave)
pgmbase(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(cavepgm_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(cavepgm_mem)
MCFG_MACHINE_START_OVERRIDE(pgm_arm_type1_state, pgm_arm_type1 )
@@ -229,23 +229,23 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(pgm_arm_type1_state::pgm_arm_type1_sim)
pgm_arm_type1_cave(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kov_sim_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kov_sim_map)
/* protection CPU */
- MCFG_CPU_ADD("prot", ARM7, 20000000 ) // 55857E?
- MCFG_CPU_PROGRAM_MAP(_55857E_arm7_map)
+ MCFG_DEVICE_ADD("prot", ARM7, 20000000 ) // 55857E?
+ MCFG_DEVICE_PROGRAM_MAP(_55857E_arm7_map)
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
MACHINE_CONFIG_START(pgm_arm_type1_state::pgm_arm_type1)
pgm_arm_type1_cave(config);
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kov_map)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kov_map)
/* protection CPU */
- MCFG_CPU_ADD("prot", ARM7, 20000000) // 55857E?
- MCFG_CPU_PROGRAM_MAP(_55857E_arm7_map)
+ MCFG_DEVICE_ADD("prot", ARM7, 20000000) // 55857E?
+ MCFG_DEVICE_PROGRAM_MAP(_55857E_arm7_map)
MACHINE_CONFIG_END
void pgm_arm_type1_state::pgm_arm7_type1_latch_init()
diff --git a/src/mame/machine/pgmprot_igs027a_type2.cpp b/src/mame/machine/pgmprot_igs027a_type2.cpp
index 6103ee67621..efaeda1f533 100644
--- a/src/mame/machine/pgmprot_igs027a_type2.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type2.cpp
@@ -137,12 +137,12 @@ MACHINE_CONFIG_START(pgm_arm_type2_state::pgm_arm_type2)
MCFG_MACHINE_START_OVERRIDE(pgm_arm_type2_state, pgm_arm_type2 )
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(kov2_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(kov2_mem)
/* protection CPU */
- MCFG_CPU_ADD("prot", ARM7, 20000000) // 55857F
- MCFG_CPU_PROGRAM_MAP(_55857F_arm7_map)
+ MCFG_DEVICE_ADD("prot", ARM7, 20000000) // 55857F
+ MCFG_DEVICE_PROGRAM_MAP(_55857F_arm7_map)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp
index 969a565026c..762a76368a2 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type3.cpp
@@ -195,12 +195,12 @@ MACHINE_CONFIG_START(pgm_arm_type3_state::pgm_arm_type3)
MCFG_MACHINE_START_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3 )
- MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_PROGRAM_MAP(svg_68k_mem)
+ MCFG_DEVICE_MODIFY("maincpu")
+ MCFG_DEVICE_PROGRAM_MAP(svg_68k_mem)
/* protection CPU */
- MCFG_CPU_ADD("prot", ARM7, XTAL(33'000'000)) // 55857G - 33Mhz Xtal, at least on SVG
- MCFG_CPU_PROGRAM_MAP(_55857G_arm7_map)
+ MCFG_DEVICE_ADD("prot", ARM7, XTAL(33'000'000)) // 55857G - 33Mhz Xtal, at least on SVG
+ MCFG_DEVICE_PROGRAM_MAP(_55857G_arm7_map)
MCFG_MACHINE_RESET_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3_reset)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/saturn_cdb.cpp b/src/mame/machine/saturn_cdb.cpp
index f4a13e965b5..536988d11da 100644
--- a/src/mame/machine/saturn_cdb.cpp
+++ b/src/mame/machine/saturn_cdb.cpp
@@ -29,8 +29,8 @@ void saturn_cdb_device::saturn_cdb_map(address_map &map)
}
MACHINE_CONFIG_START(saturn_cdb_device::device_add_mconfig)
- MCFG_CPU_ADD("cdbcpu", SH1, DERIVED_CLOCK(1, 1))
- MCFG_CPU_PROGRAM_MAP(saturn_cdb_map)
+ MCFG_DEVICE_ADD("cdbcpu", SH1, DERIVED_CLOCK(1, 1))
+ MCFG_DEVICE_PROGRAM_MAP(saturn_cdb_map)
MCFG_DEVICE_DISABLE() // we're not actually using the CD Block ROM for now
MACHINE_CONFIG_END
diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp
index 120e4877f8c..e6e9a5e39a7 100644
--- a/src/mame/machine/st0016.cpp
+++ b/src/mame/machine/st0016.cpp
@@ -124,7 +124,7 @@ MACHINE_CONFIG_START(st0016_cpu_device::device_add_mconfig)
MCFG_PALETTE_ADD("palette", 16*16*4+1)
MCFG_DEVICE_ADD("stsnd", ST0016, 0)
- MCFG_ST0016_SOUNDRAM_READ_CB(READ8(st0016_cpu_device, soundram_read))
+ MCFG_ST0016_SOUNDRAM_READ_CB(READ8(*this, st0016_cpu_device, soundram_read))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp
index 0082bf174ff..20630322d45 100644
--- a/src/mame/machine/taito68705interface.cpp
+++ b/src/mame/machine/taito68705interface.cpp
@@ -190,10 +190,10 @@ taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, devi
}
MACHINE_CONFIG_START(taito68705_mcu_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1))
- MCFG_M68705_PORTC_R_CB(READ8(taito68705_mcu_device, mcu_portc_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(taito68705_mcu_device, mcu_pa_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(taito68705_mcu_device, mcu_portb_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, taito68705_mcu_device, mcu_portc_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, taito68705_mcu_device, mcu_pa_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, taito68705_mcu_device, mcu_portb_w))
MACHINE_CONFIG_END
void taito68705_mcu_device::device_start()
@@ -322,11 +322,11 @@ arkanoid_68705p3_device::arkanoid_68705p3_device(
}
MACHINE_CONFIG_START(arkanoid_68705p3_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", M68705P3, DERIVED_CLOCK(1, 1))
- MCFG_M68705_PORTB_R_CB(READ8(arkanoid_68705p3_device, mcu_pb_r))
- MCFG_M68705_PORTC_R_CB(READ8(arkanoid_68705p3_device, mcu_pc_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(arkanoid_68705p3_device, mcu_pa_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(arkanoid_68705p3_device, mcu_pc_w))
+ MCFG_DEVICE_ADD("mcu", M68705P3, DERIVED_CLOCK(1, 1))
+ MCFG_M68705_PORTB_R_CB(READ8(*this, arkanoid_68705p3_device, mcu_pb_r))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, arkanoid_68705p3_device, mcu_pc_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, arkanoid_68705p3_device, mcu_pa_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, arkanoid_68705p3_device, mcu_pc_w))
MACHINE_CONFIG_END
@@ -340,9 +340,9 @@ arkanoid_68705p5_device::arkanoid_68705p5_device(
}
MACHINE_CONFIG_START(arkanoid_68705p5_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1))
- MCFG_M68705_PORTB_R_CB(READ8(arkanoid_68705p5_device, mcu_pb_r))
- MCFG_M68705_PORTC_R_CB(READ8(arkanoid_68705p5_device, mcu_pc_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(arkanoid_68705p5_device, mcu_pa_w))
- MCFG_M68705_PORTC_W_CB(WRITE8(arkanoid_68705p5_device, mcu_pc_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1))
+ MCFG_M68705_PORTB_R_CB(READ8(*this, arkanoid_68705p5_device, mcu_pb_r))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, arkanoid_68705p5_device, mcu_pc_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, arkanoid_68705p5_device, mcu_pa_w))
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, arkanoid_68705p5_device, mcu_pc_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/taitocchip.cpp b/src/mame/machine/taitocchip.cpp
index 61c60481013..44a05f7db41 100644
--- a/src/mame/machine/taitocchip.cpp
+++ b/src/mame/machine/taitocchip.cpp
@@ -288,23 +288,23 @@ READ_LINE_MEMBER( taito_cchip_device::an7_r )
MACHINE_CONFIG_START(taito_cchip_device::device_add_mconfig)
- MCFG_CPU_ADD("upd7811", UPD7811, DERIVED_CLOCK(1,1))
- MCFG_CPU_PROGRAM_MAP(cchip_map)
- MCFG_UPD7810_PORTA_READ_CB(READ8(taito_cchip_device, porta_r))
- MCFG_UPD7810_PORTB_READ_CB(READ8(taito_cchip_device, portb_r))
- MCFG_UPD7810_PORTC_READ_CB(READ8(taito_cchip_device, portc_r))
- MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(taito_cchip_device, porta_w))
- MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(taito_cchip_device, portb_w))
- MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(taito_cchip_device, portc_w))
- MCFG_UPD7810_PORTF_WRITE_CB(WRITE8(taito_cchip_device, portf_w))
- MCFG_UPD7810_AN0(READLINE(taito_cchip_device, an0_r))
- MCFG_UPD7810_AN1(READLINE(taito_cchip_device, an1_r))
- MCFG_UPD7810_AN2(READLINE(taito_cchip_device, an2_r))
- MCFG_UPD7810_AN3(READLINE(taito_cchip_device, an3_r))
- MCFG_UPD7810_AN4(READLINE(taito_cchip_device, an4_r))
- MCFG_UPD7810_AN5(READLINE(taito_cchip_device, an5_r))
- MCFG_UPD7810_AN6(READLINE(taito_cchip_device, an6_r))
- MCFG_UPD7810_AN7(READLINE(taito_cchip_device, an7_r))
+ MCFG_DEVICE_ADD("upd7811", UPD7811, DERIVED_CLOCK(1,1))
+ MCFG_DEVICE_PROGRAM_MAP(cchip_map)
+ MCFG_UPD7810_PORTA_READ_CB(READ8(*this, taito_cchip_device, porta_r))
+ MCFG_UPD7810_PORTB_READ_CB(READ8(*this, taito_cchip_device, portb_r))
+ MCFG_UPD7810_PORTC_READ_CB(READ8(*this, taito_cchip_device, portc_r))
+ MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(*this, taito_cchip_device, porta_w))
+ MCFG_UPD7810_PORTB_WRITE_CB(WRITE8(*this, taito_cchip_device, portb_w))
+ MCFG_UPD7810_PORTC_WRITE_CB(WRITE8(*this, taito_cchip_device, portc_w))
+ MCFG_UPD7810_PORTF_WRITE_CB(WRITE8(*this, taito_cchip_device, portf_w))
+ MCFG_UPD7810_AN0(READLINE(*this, taito_cchip_device, an0_r))
+ MCFG_UPD7810_AN1(READLINE(*this, taito_cchip_device, an1_r))
+ MCFG_UPD7810_AN2(READLINE(*this, taito_cchip_device, an2_r))
+ MCFG_UPD7810_AN3(READLINE(*this, taito_cchip_device, an3_r))
+ MCFG_UPD7810_AN4(READLINE(*this, taito_cchip_device, an4_r))
+ MCFG_UPD7810_AN5(READLINE(*this, taito_cchip_device, an5_r))
+ MCFG_UPD7810_AN6(READLINE(*this, taito_cchip_device, an6_r))
+ MCFG_UPD7810_AN7(READLINE(*this, taito_cchip_device, an7_r))
MCFG_DEVICE_ADD("upd4464_bank", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(cchip_ram_bank)
diff --git a/src/mame/machine/taitosjsec.cpp b/src/mame/machine/taitosjsec.cpp
index 3f779bde819..cbb2502078c 100644
--- a/src/mame/machine/taitosjsec.cpp
+++ b/src/mame/machine/taitosjsec.cpp
@@ -122,11 +122,11 @@ void taito_sj_security_mcu_device::device_reset()
}
MACHINE_CONFIG_START(taito_sj_security_mcu_device::device_add_mconfig)
- MCFG_CPU_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1))
- MCFG_M68705_PORTA_R_CB(READ8(taito_sj_security_mcu_device, mcu_pa_r))
- MCFG_M68705_PORTC_R_CB(READ8(taito_sj_security_mcu_device, mcu_pc_r))
- MCFG_M68705_PORTA_W_CB(WRITE8(taito_sj_security_mcu_device, mcu_pa_w))
- MCFG_M68705_PORTB_W_CB(WRITE8(taito_sj_security_mcu_device, mcu_pb_w))
+ MCFG_DEVICE_ADD("mcu", M68705P5, DERIVED_CLOCK(1, 1))
+ MCFG_M68705_PORTA_R_CB(READ8(*this, taito_sj_security_mcu_device, mcu_pa_r))
+ MCFG_M68705_PORTC_R_CB(READ8(*this, taito_sj_security_mcu_device, mcu_pc_r))
+ MCFG_M68705_PORTA_W_CB(WRITE8(*this, taito_sj_security_mcu_device, mcu_pa_w))
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, taito_sj_security_mcu_device, mcu_pb_w))
MACHINE_CONFIG_END
READ8_MEMBER(taito_sj_security_mcu_device::mcu_pa_r)
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index 6ec4ed4a6de..2872e5dd87d 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -52,10 +52,10 @@ const tiny_rom_entry *tandy2k_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(tandy2k_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, 1000000) // ?
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(tandy2k_keyboard_device, kb_p2_w))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(tandy2k_keyboard_device, kb_p1_r))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, 1000000) // ?
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, tandy2k_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, tandy2k_keyboard_device, kb_p2_w))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, tandy2k_keyboard_device, kb_p1_r))
MCFG_DEVICE_DISABLE() // TODO
MACHINE_CONFIG_END
diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp
index 2604e527924..1e41f6ce64e 100644
--- a/src/mame/machine/teleprinter.cpp
+++ b/src/mame/machine/teleprinter.cpp
@@ -222,7 +222,7 @@ MACHINE_CONFIG_START(teleprinter_device::device_add_mconfig)
MCFG_GENERIC_KEYBOARD_CB(PUT(generic_terminal_device, kbd_put))
MCFG_SPEAKER_STANDARD_MONO("bell")
- MCFG_SOUND_ADD("beeper", BEEP, 2'000)
+ MCFG_DEVICE_ADD("beeper", BEEP, 2'000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp
index 2ae86f46038..7245b86867f 100644
--- a/src/mame/machine/thomson.cpp
+++ b/src/mame/machine/thomson.cpp
@@ -523,21 +523,21 @@ to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char
MACHINE_CONFIG_START(to7_io_line_device::device_add_mconfig)
/// THIS PIO is part of CC 90-232 expansion
MCFG_DEVICE_ADD(THOM_PIA_IO, PIA6821, 0)
- MCFG_PIA_READPA_HANDLER(READ8(to7_io_line_device, porta_in))
- MCFG_PIA_WRITEPA_HANDLER(WRITE8(to7_io_line_device, porta_out))
- MCFG_PIA_WRITEPB_HANDLER(DEVWRITE8("cent_data_out", output_latch_device, write))
- MCFG_PIA_CB2_HANDLER(DEVWRITELINE("centronics", centronics_device, write_strobe))
- MCFG_PIA_IRQA_HANDLER(DEVWRITELINE("^mainfirq", input_merger_device, in_w<1>))
- MCFG_PIA_IRQB_HANDLER(DEVWRITELINE("^mainfirq", input_merger_device, in_w<1>))
-
- MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(to7_io_line_device, write_rxd))
- MCFG_RS232_CTS_HANDLER(WRITELINE(to7_io_line_device, write_cts))
- MCFG_RS232_DSR_HANDLER(WRITELINE(to7_io_line_device, write_dsr))
+ MCFG_PIA_READPA_HANDLER(READ8(*this, to7_io_line_device, porta_in))
+ MCFG_PIA_WRITEPA_HANDLER(WRITE8(*this, to7_io_line_device, porta_out))
+ MCFG_PIA_WRITEPB_HANDLER(WRITE8("cent_data_out", output_latch_device, write))
+ MCFG_PIA_CB2_HANDLER(WRITELINE("centronics", centronics_device, write_strobe))
+ MCFG_PIA_IRQA_HANDLER(WRITELINE("^mainfirq", input_merger_device, in_w<1>))
+ MCFG_PIA_IRQB_HANDLER(WRITELINE("^mainfirq", input_merger_device, in_w<1>))
+
+ MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(*this, to7_io_line_device, write_rxd))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(*this, to7_io_line_device, write_cts))
+ MCFG_RS232_DSR_HANDLER(WRITELINE(*this, to7_io_line_device, write_dsr))
MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
- MCFG_CENTRONICS_ACK_HANDLER(DEVWRITELINE(THOM_PIA_IO, pia6821_device, cb1_w))
- MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(to7_io_line_device, write_centronics_busy))
+ MCFG_CENTRONICS_ACK_HANDLER(WRITELINE(THOM_PIA_IO, pia6821_device, cb1_w))
+ MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, to7_io_line_device, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 53b8e8d0bf4..f69dcc4b0f0 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -52,11 +52,11 @@ const tiny_rom_entry *trs80m2_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(trs80m2_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8021_TAG, I8021, 3000000) // 1000uH inductor connected across the XTAL inputs
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(trs80m2_keyboard_device, kb_t1_r))
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(trs80m2_keyboard_device, kb_p0_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(trs80m2_keyboard_device, kb_p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(trs80m2_keyboard_device, kb_p2_w))
+ MCFG_DEVICE_ADD(I8021_TAG, I8021, 3000000) // 1000uH inductor connected across the XTAL inputs
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, trs80m2_keyboard_device, kb_t1_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(*this, trs80m2_keyboard_device, kb_p0_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, trs80m2_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, trs80m2_keyboard_device, kb_p2_w))
MCFG_DEVICE_DISABLE() // TODO
MACHINE_CONFIG_END
diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp
index 34fc2d2b8e8..e93602c87f7 100644
--- a/src/mame/machine/v1050kb.cpp
+++ b/src/mame/machine/v1050kb.cpp
@@ -73,15 +73,15 @@ DISCRETE_SOUND_END
//-------------------------------------------------
MACHINE_CONFIG_START(v1050_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8049_TAG, I8049, XTAL(4'608'000))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(v1050_keyboard_device, kb_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(v1050_keyboard_device, kb_p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(v1050_keyboard_device, kb_p2_w))
+ MCFG_DEVICE_ADD(I8049_TAG, I8049, XTAL(4'608'000))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, v1050_keyboard_device, kb_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, v1050_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, v1050_keyboard_device, kb_p2_w))
MCFG_DEVICE_DISABLE() // TODO
// discrete sound
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
+ MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE)
MCFG_DISCRETE_INTF(v1050kb)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index caf82b6cbf6..89909e3237f 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -160,36 +160,36 @@ FLOPPY_FORMATS_END
//-------------------------------------------------
MACHINE_CONFIG_START(victor_9000_fdc_device::device_add_mconfig)
- MCFG_CPU_ADD(I8048_TAG, I8048, XTAL(30'000'000)/6)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_device, floppy_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(victor_9000_fdc_device, floppy_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(victor_9000_fdc_device, tach0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_fdc_device, tach1_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(victor_9000_fdc_device, da_w))
+ MCFG_DEVICE_ADD(I8048_TAG, I8048, XTAL(30'000'000)/6)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, victor_9000_fdc_device, floppy_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, victor_9000_fdc_device, floppy_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, victor_9000_fdc_device, floppy_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, victor_9000_fdc_device, floppy_p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, victor_9000_fdc_device, tach0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, victor_9000_fdc_device, tach1_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, victor_9000_fdc_device, da_w))
MCFG_DEVICE_ADD(M6522_4_TAG, VIA6522, XTAL(30'000'000)/30)
- MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via4_pa_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_device, via4_pa_w))
- MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_device, via4_pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via4_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_device, wrsync_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via4_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, victor_9000_fdc_device, via4_pa_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, victor_9000_fdc_device, via4_pa_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, victor_9000_fdc_device, via4_pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor_9000_fdc_device, via4_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, victor_9000_fdc_device, wrsync_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor_9000_fdc_device, via4_irq_w))
MCFG_DEVICE_ADD(M6522_5_TAG, VIA6522, XTAL(30'000'000)/30)
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via5_irq_w))
- MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via5_pa_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via5_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor_9000_fdc_device, via5_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, victor_9000_fdc_device, via5_pa_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor_9000_fdc_device, via5_pb_w))
MCFG_DEVICE_ADD(M6522_6_TAG, VIA6522, XTAL(30'000'000)/30)
- MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via6_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_device, via6_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_device, via6_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via6_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_device, drw_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(victor_9000_fdc_device, erase_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via6_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(*this, victor_9000_fdc_device, via6_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(*this, victor_9000_fdc_device, via6_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(*this, victor_9000_fdc_device, via6_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, victor_9000_fdc_device, via6_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(*this, victor_9000_fdc_device, drw_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(*this, victor_9000_fdc_device, erase_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, victor_9000_fdc_device, via6_irq_w))
MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":0", victor9k_floppies, "525qd", victor_9000_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":1", victor9k_floppies, "525qd", victor_9000_fdc_device::floppy_formats)
diff --git a/src/mame/machine/victor9k_kb.cpp b/src/mame/machine/victor9k_kb.cpp
index 8a0a4d0bd6c..63a32fcc5ce 100644
--- a/src/mame/machine/victor9k_kb.cpp
+++ b/src/mame/machine/victor9k_kb.cpp
@@ -381,12 +381,12 @@ const tiny_rom_entry *victor_9000_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(victor_9000_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8021_TAG, I8021, XTAL(3'579'545))
+ MCFG_DEVICE_ADD(I8021_TAG, I8021, XTAL(3'579'545))
// P0 is unconnected on pcb
- MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_device, kb_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_keyboard_device, kb_p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(victor_9000_keyboard_device, kb_p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_keyboard_device, kb_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, victor_9000_keyboard_device, kb_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, victor_9000_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, victor_9000_keyboard_device, kb_p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, victor_9000_keyboard_device, kb_t1_r))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/vt100_kbd.cpp b/src/mame/machine/vt100_kbd.cpp
index fb6adc6e522..a6143ee4999 100644
--- a/src/mame/machine/vt100_kbd.cpp
+++ b/src/mame/machine/vt100_kbd.cpp
@@ -193,15 +193,15 @@ vt100_keyboard_device::vt100_keyboard_device(const machine_config &mconfig, devi
MACHINE_CONFIG_START(vt100_keyboard_device::device_add_mconfig)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper", BEEP, 786) // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
+ MCFG_DEVICE_ADD("beeper", BEEP, 786) // 7.945us per serial clock = ~125865.324hz, / 160 clocks per char = ~ 786 hz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("uart", AY31015, 0)
- MCFG_AY31015_WRITE_SO_CB(WRITELINE(vt100_keyboard_device, signal_out_w))
+ MCFG_AY31015_WRITE_SO_CB(WRITELINE(*this, vt100_keyboard_device, signal_out_w))
MCFG_DEVICE_ADD("counter", RIPPLE_COUNTER, 0) // 2x 74LS93
MCFG_RIPPLE_COUNTER_STAGES(8)
- MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(vt100_keyboard_device, key_scan_w))
+ MCFG_RIPPLE_COUNTER_COUNT_OUT_CB(WRITE8(*this, vt100_keyboard_device, key_scan_w))
MACHINE_CONFIG_END
@@ -502,7 +502,7 @@ MACHINE_CONFIG_START(ms7002_device::device_add_mconfig)
vt100_keyboard_device::device_add_mconfig(config);
MCFG_DEVICE_MODIFY("uart")
- MCFG_AY31015_WRITE_TBMT_CB(WRITELINE(ms7002_device, scan_disable_w))
+ MCFG_AY31015_WRITE_TBMT_CB(WRITELINE(*this, ms7002_device, scan_disable_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index 47fc56fc2d4..eb91a982730 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -111,18 +111,18 @@ void wangpc_keyboard_device::wangpc_keyboard_io(address_map &map)
//-------------------------------------------------
MACHINE_CONFIG_START(wangpc_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8051_TAG, I8051, XTAL(4'000'000))
- MCFG_CPU_IO_MAP(wangpc_keyboard_io)
- MCFG_MCS51_PORT_P1_IN_CB(READ8(wangpc_keyboard_device, kb_p1_r))
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(wangpc_keyboard_device, kb_p1_w))
- MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(wangpc_keyboard_device, kb_p2_w))
- MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(wangpc_keyboard_device, kb_p3_w))
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_device, mcs51_tx_callback))
- MCFG_MCS51_SERIAL_RX_CB(READ8(wangpc_keyboard_device, mcs51_rx_callback))
+ MCFG_DEVICE_ADD(I8051_TAG, I8051, XTAL(4'000'000))
+ MCFG_DEVICE_IO_MAP(wangpc_keyboard_io)
+ MCFG_MCS51_PORT_P1_IN_CB(READ8(*this, wangpc_keyboard_device, kb_p1_r))
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, wangpc_keyboard_device, kb_p1_w))
+ MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, wangpc_keyboard_device, kb_p2_w))
+ MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, wangpc_keyboard_device, kb_p3_w))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, wangpc_keyboard_device, mcs51_tx_callback))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, wangpc_keyboard_device, mcs51_rx_callback))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD(SN76496_TAG, SN76496, 2000000) // ???
+ MCFG_DEVICE_ADD(SN76496_TAG, SN76496, 2000000) // ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp
index 9d5a2f657ca..54533b49c33 100644
--- a/src/mame/machine/x820kb.cpp
+++ b/src/mame/machine/x820kb.cpp
@@ -85,13 +85,13 @@ const tiny_rom_entry *xerox_820_keyboard_device::device_rom_region() const
//-------------------------------------------------
MACHINE_CONFIG_START(xerox_820_keyboard_device::device_add_mconfig)
- MCFG_CPU_ADD(I8748_TAG, I8048, XTAL(6'000'000))
- MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_device, kb_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(xerox_820_keyboard_device, kb_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(xerox_820_keyboard_device, kb_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(xerox_820_keyboard_device, kb_t1_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_bus_w))
+ MCFG_DEVICE_ADD(I8748_TAG, I8048, XTAL(6'000'000))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, xerox_820_keyboard_device, kb_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, xerox_820_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(*this, xerox_820_keyboard_device, kb_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, xerox_820_keyboard_device, kb_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, xerox_820_keyboard_device, kb_t1_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, xerox_820_keyboard_device, kb_bus_w))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index 2ac5be2a29e..c7ee6233543 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -862,10 +862,10 @@ void xbox_base_state::xbox_base_map_io(address_map &map)
MACHINE_CONFIG_START(xbox_base_state::xbox_base)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333) /* Wrong! family 6 model 8 stepping 10 */
- MCFG_CPU_PROGRAM_MAP(xbox_base_map)
- MCFG_CPU_IO_MAP(xbox_base_map_io)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(xbox_base_state, irq_callback)
+ MCFG_DEVICE_ADD("maincpu", PENTIUM3, 733333333) /* Wrong! family 6 model 8 stepping 10 */
+ MCFG_DEVICE_PROGRAM_MAP(xbox_base_map)
+ MCFG_DEVICE_IO_MAP(xbox_base_map_io)
+ MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(xbox_base_state, irq_callback)
MCFG_QUANTUM_TIME(attotime::from_hz(6000))
@@ -874,9 +874,9 @@ MACHINE_CONFIG_START(xbox_base_state::xbox_base)
MCFG_PCI_DEVICE_ADD(":pci:00.3", NV2A_RAM, 0x10de02a6, 0, 0, 0)
MCFG_PCI_DEVICE_ADD(":pci:01.0", MCPX_LPC, 0x10de01b2, 0xb4, 0, 0) // revision id must be at least 0xb4, otherwise usb will require a hub
MCFG_PCI_DEVICE_ADD(":pci:01.1", MCPX_SMBUS, 0x10de01b4, 0, 0, 0)
- MCFG_MCPX_SMBUS_INTERRUPT_HANDLER(DEVWRITELINE(":", xbox_base_state, xbox_smbus_interrupt_changed))
+ MCFG_MCPX_SMBUS_INTERRUPT_HANDLER(WRITELINE(*this, xbox_base_state, xbox_smbus_interrupt_changed))
MCFG_PCI_DEVICE_ADD(":pci:02.0", MCPX_OHCI, 0x10de01c2, 0, 0, 0)
- MCFG_MCPX_OHCI_INTERRUPT_HANDLER(DEVWRITELINE(":", xbox_base_state, xbox_ohci_usb_interrupt_changed))
+ MCFG_MCPX_OHCI_INTERRUPT_HANDLER(WRITELINE(*this, xbox_base_state, xbox_ohci_usb_interrupt_changed))
MCFG_PCI_DEVICE_ADD(":pci:03.0", MCPX_OHCI, 0x10de01c2, 0, 0, 0)
MCFG_PCI_DEVICE_ADD(":pci:04.0", MCPX_ETH, 0x10de01c3, 0, 0, 0)
MCFG_MCPX_APU_ADD( ":pci:05.0", "maincpu")
@@ -884,27 +884,27 @@ MACHINE_CONFIG_START(xbox_base_state::xbox_base)
MCFG_PCI_DEVICE_ADD(":pci:06.1", MCPX_AC97_MODEM, 0x10de01c1, 0, 0, 0)
MCFG_PCI_BRIDGE_ADD(":pci:08.0", 0x10de01b8, 0)
MCFG_PCI_DEVICE_ADD(":pci:09.0", MCPX_IDE, 0x10de01bc, 0, 0, 0)
- MCFG_MCPX_IDE_INTERRUPT_HANDLER(DEVWRITELINE(":pic8259_2", pic8259_device, ir6_w))
+ MCFG_MCPX_IDE_INTERRUPT_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w))
MCFG_AGP_BRIDGE_ADD(":pci:1e.0", NV2A_AGP, 0x10de01b7, 0)
MCFG_PCI_DEVICE_ADD(":pci:1e.0:00.0", NV2A_GPU, 0x10de02a0, 0, 0, 0)
MCFG_MCPX_NV2A_GPU_CPU("maincpu")
- MCFG_MCPX_NV2A_GPU_INTERRUPT_HANDLER(DEVWRITELINE(":", xbox_base_state, xbox_nv2a_interrupt_changed))
+ MCFG_MCPX_NV2A_GPU_INTERRUPT_HANDLER(WRITELINE(*this, xbox_base_state, xbox_nv2a_interrupt_changed))
MCFG_DEVICE_ADD("pic8259_1", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(WRITELINE(xbox_base_state, xbox_pic8259_1_set_int_line))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE(*this, xbox_base_state, xbox_pic8259_1_set_int_line))
MCFG_PIC8259_IN_SP_CB(VCC)
- MCFG_PIC8259_CASCADE_ACK_CB(READ8(xbox_base_state, get_slave_ack))
+ MCFG_PIC8259_CASCADE_ACK_CB(READ8(*this, xbox_base_state, get_slave_ack))
MCFG_DEVICE_ADD("pic8259_2", PIC8259, 0)
- MCFG_PIC8259_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir2_w))
+ MCFG_PIC8259_OUT_INT_CB(WRITELINE("pic8259_1", pic8259_device, ir2_w))
MCFG_PIC8259_IN_SP_CB(GND)
MCFG_DEVICE_ADD("pit8254", PIT8254, 0)
MCFG_PIT8253_CLK0(1125000) /* heartbeat IRQ */
- MCFG_PIT8253_OUT0_HANDLER(WRITELINE(xbox_base_state, xbox_pit8254_out0_changed))
+ MCFG_PIT8253_OUT0_HANDLER(WRITELINE(*this, xbox_base_state, xbox_pit8254_out0_changed))
MCFG_PIT8253_CLK1(1125000) /* (unused) dram refresh */
MCFG_PIT8253_CLK2(1125000) /* (unused) pio port c pin 4, and speaker polling enough */
- MCFG_PIT8253_OUT2_HANDLER(WRITELINE(xbox_base_state, xbox_pit8254_out2_changed))
+ MCFG_PIT8253_OUT2_HANDLER(WRITELINE(*this, xbox_base_state, xbox_pit8254_out2_changed))
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -913,5 +913,5 @@ MACHINE_CONFIG_START(xbox_base_state::xbox_base)
MCFG_SCREEN_SIZE(640, 480)
MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 479)
MCFG_SCREEN_UPDATE_DRIVER(xbox_base_state, screen_update_callback)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(xbox_base_state, vblank_callback))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, xbox_base_state, vblank_callback))
MACHINE_CONFIG_END
diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp
index b33f4d6ab42..42fdd2c68fb 100644
--- a/src/mame/machine/xbox_pci.cpp
+++ b/src/mame/machine/xbox_pci.cpp
@@ -716,7 +716,7 @@ void mcpx_ide_device::device_reset()
MACHINE_CONFIG_START(mcpx_ide_device::device_add_mconfig)
MCFG_DEVICE_ADD("ide", BUS_MASTER_IDE_CONTROLLER, 0)
- MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(mcpx_ide_device, ide_interrupt))
+ MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, mcpx_ide_device, ide_interrupt))
MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE("maincpu", AS_PROGRAM)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp
index aa9c63027ad..c772425df02 100644
--- a/src/mame/machine/zorbakbd.cpp
+++ b/src/mame/machine/zorbakbd.cpp
@@ -311,15 +311,15 @@ void zorba_keyboard_device::device_start()
MACHINE_CONFIG_START(zorba_keyboard_device::device_add_mconfig)
// MC68705P3S
- MCFG_CPU_ADD("mcu", M68705P3, 3.579'545_MHz_XTAL)
- MCFG_M68705_PORTA_R_CB(READ8(zorba_keyboard_device, mcu_pa_r));
- MCFG_M68705_PORTB_R_CB(READ8(zorba_keyboard_device, mcu_pb_r));
- MCFG_M68705_PORTB_W_CB(WRITE8(zorba_keyboard_device, mcu_pb_w));
- MCFG_M68705_PORTC_W_CB(WRITE8(zorba_keyboard_device, mcu_pc_w));
+ MCFG_DEVICE_ADD("mcu", M68705P3, 3.579'545_MHz_XTAL)
+ MCFG_M68705_PORTA_R_CB(READ8(*this, zorba_keyboard_device, mcu_pa_r));
+ MCFG_M68705_PORTB_R_CB(READ8(*this, zorba_keyboard_device, mcu_pb_r));
+ MCFG_M68705_PORTB_W_CB(WRITE8(*this, zorba_keyboard_device, mcu_pb_w));
+ MCFG_M68705_PORTC_W_CB(WRITE8(*this, zorba_keyboard_device, mcu_pc_w));
// TODO: beeper frequency is unknown, using value from Sun keyboard for now
MCFG_SPEAKER_STANDARD_MONO("bell")
- MCFG_SOUND_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
+ MCFG_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 0.4)
MACHINE_CONFIG_END
diff --git a/src/mame/video/20pacgal.cpp b/src/mame/video/20pacgal.cpp
index e515c656cac..310b26b5a82 100644
--- a/src/mame/video/20pacgal.cpp
+++ b/src/mame/video/20pacgal.cpp
@@ -435,5 +435,5 @@ MACHINE_CONFIG_START(_20pacgal_state::_20pacgal_video)
MCFG_SCREEN_SIZE(SCREEN_WIDTH, SCREEN_HEIGHT)
MCFG_SCREEN_VISIBLE_AREA(0, SCREEN_WIDTH - 1, 0, SCREEN_HEIGHT - 1)
MCFG_SCREEN_UPDATE_DRIVER(_20pacgal_state, screen_update_20pacgal)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(_20pacgal_state, vblank_irq))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, _20pacgal_state, vblank_irq))
MACHINE_CONFIG_END
diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp
index 5632d04b1c4..b7804176618 100644
--- a/src/mame/video/911_vdt.cpp
+++ b/src/mame/video/911_vdt.cpp
@@ -813,7 +813,7 @@ MACHINE_CONFIG_START(vdt911_device::device_add_mconfig)
MCFG_SCREEN_PALETTE("palette")
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("beeper", BEEP, 3250)
+ MCFG_DEVICE_ADD("beeper", BEEP, 3250)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.50)
MCFG_PALETTE_ADD("palette", 8)
diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp
index 2b867977dff..2e9cb2f645d 100644
--- a/src/mame/video/abc800.cpp
+++ b/src/mame/video/abc800.cpp
@@ -186,7 +186,7 @@ MACHINE_CONFIG_START(abc800c_state::abc800c_video)
MCFG_PALETTE_INIT_OWNER(abc800c_state, abc800c)
MCFG_DEVICE_ADD(SAA5052_TAG, SAA5052, XTAL(12'000'000)/2)
- MCFG_SAA5050_D_CALLBACK(READ8(abc800c_state, char_ram_r))
+ MCFG_SAA5050_D_CALLBACK(READ8(*this, abc800c_state, char_ram_r))
MCFG_SAA5050_SCREEN_SIZE(40, 24, 40)
MACHINE_CONFIG_END
@@ -300,7 +300,7 @@ MACHINE_CONFIG_START(abc800m_state::abc800m_video)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH)
MCFG_MC6845_UPDATE_ROW_CB(abc800m_state, abc800m_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(DEVWRITELINE(Z80DART_TAG, z80dart_device, rib_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(Z80DART_TAG, z80dart_device, rib_w))
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t(0xff, 0xff, 0x00))
MCFG_SCREEN_UPDATE_DRIVER(abc800m_state, screen_update)
diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp
index 98531fa16c6..2e32ede3307 100644
--- a/src/mame/video/abc802.cpp
+++ b/src/mame/video/abc802.cpp
@@ -208,7 +208,7 @@ MACHINE_CONFIG_START(abc802_state::abc802_video)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH)
MCFG_MC6845_UPDATE_ROW_CB(abc802_state, abc802_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(abc802_state, vs_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, abc802_state, vs_w))
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::amber())
MCFG_SCREEN_UPDATE_DRIVER(abc802_state, screen_update)
diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp
index e85958885ba..77b38276325 100644
--- a/src/mame/video/abc806.cpp
+++ b/src/mame/video/abc806.cpp
@@ -494,8 +494,8 @@ MACHINE_CONFIG_START(abc806_state::abc806_video)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(ABC800_CHAR_WIDTH)
MCFG_MC6845_UPDATE_ROW_CB(abc806_state, abc806_update_row)
- MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(abc806_state, hs_w))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(abc806_state, vs_w))
+ MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, abc806_state, hs_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, abc806_state, vs_w))
MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
MCFG_SCREEN_UPDATE_DRIVER(abc806_state, screen_update)
diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp
index 609998f3cec..8ccf9b54a58 100644
--- a/src/mame/video/bfm_adr2.cpp
+++ b/src/mame/video/bfm_adr2.cpp
@@ -555,10 +555,10 @@ MACHINE_CONFIG_START(bfm_adder2_device::device_add_mconfig)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_PALETTE("palette")
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, bfm_adder2_device, update_screen)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(bfm_adder2_device, adder2_vbl_w)) // board has a VBL IRQ
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, bfm_adder2_device, adder2_vbl_w)) // board has a VBL IRQ
MCFG_PALETTE_ADD("palette", 16)
- MCFG_CPU_ADD("adder2", M6809, ADDER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
- MCFG_CPU_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
+ MCFG_DEVICE_ADD("adder2", M6809, ADDER_CLOCK/4 ) // adder2 board 6809 CPU at 2 Mhz
+ MCFG_DEVICE_PROGRAM_MAP(adder2_memmap) // setup adder2 board memorymap
MACHINE_CONFIG_END
diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp
index 68bdbd86c74..8b3bf0dee80 100644
--- a/src/mame/video/bfm_dm01.cpp
+++ b/src/mame/video/bfm_dm01.cpp
@@ -289,9 +289,9 @@ INTERRUPT_GEN_MEMBER( bfm_dm01_device::nmi_line_assert )
}
MACHINE_CONFIG_START(bfm_dm01_device::device_add_mconfig)
- MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
- MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(bfm_dm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
+ MCFG_DEVICE_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
+ MCFG_DEVICE_PROGRAM_MAP(bfm_dm01_memmap)
+ MCFG_DEVICE_PERIODIC_INT_DRIVER(bfm_dm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
MCFG_PALETTE_ADD("palette_lcd", 3)
diff --git a/src/mame/video/cgc7900.cpp b/src/mame/video/cgc7900.cpp
index c4c9ed7324f..05a06916fd3 100644
--- a/src/mame/video/cgc7900.cpp
+++ b/src/mame/video/cgc7900.cpp
@@ -234,7 +234,7 @@ MACHINE_CONFIG_START(cgc7900_state::cgc7900_video)
MCFG_SCREEN_UPDATE_DRIVER(cgc7900_state, screen_update)
MCFG_SCREEN_SIZE(1024, 768)
MCFG_SCREEN_VISIBLE_AREA(0, 1024-1, 0, 768-1)
- MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(cgc7900_state, irq<0xc>))
+ MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cgc7900_state, irq<0xc>))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", cgc7900)
MCFG_PALETTE_ADD("palette", 8)
diff --git a/src/mame/video/cidelsa.cpp b/src/mame/video/cidelsa.cpp
index f4662aa9eb2..f969aafa982 100644
--- a/src/mame/video/cidelsa.cpp
+++ b/src/mame/video/cidelsa.cpp
@@ -160,7 +160,7 @@ MACHINE_CONFIG_START(cidelsa_state::destryer_video)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(cidelsa_state, cidelsa_charram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(cidelsa_state, cidelsa_charram_w)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
- MCFG_CDP1869_PRD_CALLBACK(WRITELINE(cidelsa_state, prd_w))
+ MCFG_CDP1869_PRD_CALLBACK(WRITELINE(*this, cidelsa_state, prd_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -174,7 +174,7 @@ MACHINE_CONFIG_START(cidelsa_state::altair_video)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(cidelsa_state, cidelsa_charram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(cidelsa_state, cidelsa_charram_w)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
- MCFG_CDP1869_PRD_CALLBACK(WRITELINE(cidelsa_state, prd_w))
+ MCFG_CDP1869_PRD_CALLBACK(WRITELINE(*this, cidelsa_state, prd_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -189,8 +189,8 @@ MACHINE_CONFIG_START(draco_state::draco_video)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(draco_state, draco_charram_w)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
MCFG_CDP1869_PRD_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1))
- MCFG_SOUND_ADD(AY8910_TAG, AY8910, DRACO_SND_CHR1)
+ MCFG_DEVICE_ADD(AY8910_TAG, AY8910, DRACO_SND_CHR1)
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT)
- MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(draco_state, psg_pb_w))
+ MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, draco_state, psg_pb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp
index 3c74f238ab1..6ad14b00c60 100644
--- a/src/mame/video/comx35.cpp
+++ b/src/mame/video/comx35.cpp
@@ -101,7 +101,7 @@ MACHINE_CONFIG_START(comx35_state::comx35_pal_video)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(comx35_state, comx35_charram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(comx35_state, comx35_charram_w)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
- MCFG_CDP1869_PRD_CALLBACK(WRITELINE(comx35_state, prd_w))
+ MCFG_CDP1869_PRD_CALLBACK(WRITELINE(*this, comx35_state, prd_w))
MCFG_CDP1869_SET_SCREEN(SCREEN_TAG)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -121,7 +121,7 @@ MACHINE_CONFIG_START(comx35_state::comx35_ntsc_video)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(comx35_state, comx35_charram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(comx35_state, comx35_charram_w)
MCFG_CDP1869_PAL_NTSC_CALLBACK(GND)
- MCFG_CDP1869_PRD_CALLBACK(WRITELINE(comx35_state, prd_w))
+ MCFG_CDP1869_PRD_CALLBACK(WRITELINE(*this, comx35_state, prd_w))
MCFG_CDP1869_SET_SCREEN(SCREEN_TAG)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp
index 3e9bfea9bf3..08e27bd598e 100644
--- a/src/mame/video/decodmd1.cpp
+++ b/src/mame/video/decodmd1.cpp
@@ -203,9 +203,9 @@ void decodmd_type1_device::decodmd1_io_map(address_map &map)
MACHINE_CONFIG_START(decodmd_type1_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("dmdcpu", Z80, XTAL(8'000'000) / 2)
- MCFG_CPU_PROGRAM_MAP(decodmd1_map)
- MCFG_CPU_IO_MAP(decodmd1_io_map)
+ MCFG_DEVICE_ADD("dmdcpu", Z80, XTAL(8'000'000) / 2)
+ MCFG_DEVICE_PROGRAM_MAP(decodmd1_map)
+ MCFG_DEVICE_IO_MAP(decodmd1_io_map)
MCFG_QUANTUM_TIME(attotime::from_hz(50))
@@ -224,11 +224,11 @@ MACHINE_CONFIG_START(decodmd_type1_device::device_add_mconfig)
MCFG_DEVICE_ADD("bitlatch", HC259, 0) // U4
MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(MEMBANK("dmdbank1")) MCFG_DEVCB_MASK(0x07) MCFG_DEVCB_INVERT
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(decodmd_type1_device, blank_w))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(decodmd_type1_device, status_w))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(decodmd_type1_device, rowdata_w))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(decodmd_type1_device, rowclock_w))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(decodmd_type1_device, test_w))
+ MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, decodmd_type1_device, blank_w))
+ MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, decodmd_type1_device, status_w))
+ MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, decodmd_type1_device, rowdata_w))
+ MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, decodmd_type1_device, rowclock_w))
+ MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, decodmd_type1_device, test_w))
MACHINE_CONFIG_END
diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp
index 2429f661997..11bff4e8c7a 100644
--- a/src/mame/video/decodmd2.cpp
+++ b/src/mame/video/decodmd2.cpp
@@ -131,8 +131,8 @@ void decodmd_type2_device::decodmd2_map(address_map &map)
MACHINE_CONFIG_START(decodmd_type2_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("dmdcpu", MC6809E, XTAL(8'000'000) / 4)
- MCFG_CPU_PROGRAM_MAP(decodmd2_map)
+ MCFG_DEVICE_ADD("dmdcpu", MC6809E, XTAL(8'000'000) / 4)
+ MCFG_DEVICE_PROGRAM_MAP(decodmd2_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp
index 140181b1cf4..4d0fd36f9de 100644
--- a/src/mame/video/decodmd3.cpp
+++ b/src/mame/video/decodmd3.cpp
@@ -133,8 +133,8 @@ void decodmd_type3_device::decodmd3_map(address_map &map)
MACHINE_CONFIG_START(decodmd_type3_device::device_add_mconfig)
/* basic machine hardware */
- MCFG_CPU_ADD("dmdcpu", M68000, XTAL(12'000'000))
- MCFG_CPU_PROGRAM_MAP(decodmd3_map)
+ MCFG_DEVICE_ADD("dmdcpu", M68000, XTAL(12'000'000))
+ MCFG_DEVICE_PROGRAM_MAP(decodmd3_map)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp
index e1e4abe78d7..45c7d8a2c81 100644
--- a/src/mame/video/mikromik.cpp
+++ b/src/mame/video/mikromik.cpp
@@ -144,8 +144,8 @@ MACHINE_CONFIG_START(mm1_state::mm1m6_video)
MCFG_DEVICE_ADD(I8275_TAG, I8275, XTAL(18'720'000)/8)
MCFG_I8275_CHARACTER_WIDTH(HORIZONTAL_CHARACTER_PIXELS)
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(mm1_state, crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq0_w))
- MCFG_I8275_VRTC_CALLBACK(DEVWRITELINE(UPD7220_TAG, upd7220_device, ext_sync_w))
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(I8237_TAG, am9517a_device, dreq0_w))
+ MCFG_I8275_VRTC_CALLBACK(WRITELINE(UPD7220_TAG, upd7220_device, ext_sync_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_DEVICE_ADD(UPD7220_TAG, UPD7220, XTAL(18'720'000)/8)
diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp
index 05e9835ffc5..d8ffb866c34 100644
--- a/src/mame/video/pc_t1t.cpp
+++ b/src/mame/video/pc_t1t.cpp
@@ -128,8 +128,8 @@ MACHINE_CONFIG_START(pcvideo_t1000_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(pc_t1t_device, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(pc_t1t_device, t1000_de_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(pcvideo_t1000_device, t1000_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, pc_t1t_device, t1000_de_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, pcvideo_t1000_device, t1000_vsync_changed))
MCFG_DEVICE_ADD("vram", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(vram_map)
@@ -152,8 +152,8 @@ MACHINE_CONFIG_START(pcvideo_pcjr_device::device_add_mconfig)
MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(pcvideo_pcjr_device, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(pc_t1t_device, t1000_de_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(pcvideo_pcjr_device, pcjr_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, pc_t1t_device, t1000_de_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, pcvideo_pcjr_device, pcjr_vsync_changed))
MCFG_DEVICE_ADD("vram", ADDRESS_MAP_BANK, 0)
MCFG_DEVICE_PROGRAM_MAP(vram_map)
MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE)
diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp
index 29b24637d68..9de0fea491c 100644
--- a/src/mame/video/pcd.cpp
+++ b/src/mame/video/pcd.cpp
@@ -100,10 +100,10 @@ ioport_constructor pcd_video_device::device_input_ports() const
}
MACHINE_CONFIG_START(pcd_video_device::device_add_mconfig)
- MCFG_CPU_ADD("graphics", I8741, XTAL(16'000'000)/2)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(pcd_video_device, p1_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pcd_video_device, p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(pcd_video_device, t1_r))
+ MCFG_DEVICE_ADD("graphics", I8741, XTAL(16'000'000)/2)
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, pcd_video_device, p1_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, pcd_video_device, p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, pcd_video_device, t1_r))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
@@ -142,12 +142,12 @@ void pcx_video_device::pcx_vram(address_map &map)
}
MACHINE_CONFIG_START(pcx_video_device::device_add_mconfig)
- MCFG_CPU_ADD("graphics", I8031, XTAL(24'000'000)/2)
- MCFG_CPU_PROGRAM_MAP(pcx_vid_map)
- MCFG_CPU_IO_MAP(pcx_vid_io)
- MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(pcx_video_device, p1_w))
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(pcx_video_device, tx_callback))
- MCFG_MCS51_SERIAL_RX_CB(READ8(pcx_video_device, rx_callback))
+ MCFG_DEVICE_ADD("graphics", I8031, XTAL(24'000'000)/2)
+ MCFG_DEVICE_PROGRAM_MAP(pcx_vid_map)
+ MCFG_DEVICE_IO_MAP(pcx_vid_io)
+ MCFG_MCS51_PORT_P1_OUT_CB(WRITE8(*this, pcx_video_device, p1_w))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(*this, pcx_video_device, tx_callback))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(*this, pcx_video_device, rx_callback))
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp
index 731d78ced3f..e20f9e16dfa 100644
--- a/src/mame/video/pecom.cpp
+++ b/src/mame/video/pecom.cpp
@@ -102,7 +102,7 @@ MACHINE_CONFIG_START(pecom_state::pecom_video)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(pecom_state, pecom_char_ram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(pecom_state, pecom_char_ram_w)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
- MCFG_CDP1869_PRD_CALLBACK(WRITELINE(pecom_state, pecom_prd_w))
+ MCFG_CDP1869_PRD_CALLBACK(WRITELINE(*this, pecom_state, pecom_prd_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mame/video/qix.cpp b/src/mame/video/qix.cpp
index 8e116aa498d..6963e14c003 100644
--- a/src/mame/video/qix.cpp
+++ b/src/mame/video/qix.cpp
@@ -381,8 +381,8 @@ void qix_state::slither_video_map(address_map &map)
*************************************/
MACHINE_CONFIG_START(qix_state::qix_video)
- MCFG_CPU_ADD("videocpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
- MCFG_CPU_PROGRAM_MAP(qix_video_map)
+ MCFG_DEVICE_ADD("videocpu", MC6809E, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(qix_video_map)
MCFG_VIDEO_START_OVERRIDE(qix_state,qix)
@@ -391,8 +391,8 @@ MACHINE_CONFIG_START(qix_state::qix_video)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_BEGIN_UPDATE_CB(qix_state, crtc_begin_update)
MCFG_MC6845_UPDATE_ROW_CB(qix_state, crtc_update_row)
- MCFG_MC6845_OUT_DE_CB(WRITELINE(qix_state, display_enable_changed))
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(qix_state, qix_vsync_changed))
+ MCFG_MC6845_OUT_DE_CB(WRITELINE(*this, qix_state, display_enable_changed))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, qix_state, qix_vsync_changed))
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(QIX_CHARACTER_CLOCK*8, 0x148, 0, 0x100, 0x111, 0, 0x100) /* from CRTC */
@@ -401,20 +401,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(qix_state::kram3_video)
- MCFG_CPU_MODIFY("videocpu")
- MCFG_CPU_PROGRAM_MAP(kram3_video_map)
- MCFG_MC6809E_LIC_CB(WRITELINE(qix_state, kram3_lic_videocpu_changed))
+ MCFG_DEVICE_MODIFY("videocpu")
+ MCFG_DEVICE_PROGRAM_MAP(kram3_video_map)
+ MCFG_MC6809E_LIC_CB(WRITELINE(*this, qix_state, kram3_lic_videocpu_changed))
MACHINE_CONFIG_END
MACHINE_CONFIG_START(qix_state::zookeep_video)
- MCFG_CPU_MODIFY("videocpu")
- MCFG_CPU_PROGRAM_MAP(zookeep_video_map)
+ MCFG_DEVICE_MODIFY("videocpu")
+ MCFG_DEVICE_PROGRAM_MAP(zookeep_video_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_START(qix_state::slither_video)
- MCFG_CPU_MODIFY("videocpu")
- MCFG_CPU_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
- MCFG_CPU_PROGRAM_MAP(slither_video_map)
+ MCFG_DEVICE_MODIFY("videocpu")
+ MCFG_DEVICE_CLOCK(SLITHER_CLOCK_OSC/4/4) /* 1.34 MHz */
+ MCFG_DEVICE_PROGRAM_MAP(slither_video_map)
MACHINE_CONFIG_END
diff --git a/src/mame/video/tmc1800.cpp b/src/mame/video/tmc1800.cpp
index 42a1820d732..389ad1e28e7 100644
--- a/src/mame/video/tmc1800.cpp
+++ b/src/mame/video/tmc1800.cpp
@@ -57,7 +57,7 @@ MACHINE_CONFIG_START(tmc2000_state::tmc2000_video)
MCFG_SCREEN_UPDATE_DEVICE(CDP1864_TAG, cdp1864_device, screen_update)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(tmc2000_state, rdata_r), READLINE(tmc2000_state, bdata_r), READLINE(tmc2000_state, gdata_r))
+ MCFG_CDP1864_ADD(CDP1864_TAG, SCREEN_TAG, XTAL(1'750'000), GND, INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_DMAOUT), INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF1), NOOP, READLINE(*this, tmc2000_state, rdata_r), READLINE(*this, tmc2000_state, bdata_r), READLINE(*this, tmc2000_state, gdata_r))
MCFG_CDP1864_CHROMINANCE(RES_K(1.21), RES_K(2.05), RES_K(2.26), RES_K(3.92)) // RL64, RL63, RL61, RL65 (also RH62 (2K pot) in series, but ignored here)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp
index db6ba5835f9..58b40dfc980 100644
--- a/src/mame/video/tmc600.cpp
+++ b/src/mame/video/tmc600.cpp
@@ -129,7 +129,7 @@ MACHINE_CONFIG_START(tmc600_state::tmc600_video)
MCFG_CDP1869_CHAR_PCB_READ_OWNER(tmc600_state, tmc600_pcb_r)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(tmc600_state, tmc600_char_ram_r)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
- MCFG_CDP1869_PRD_CALLBACK(WRITELINE(tmc600_state, prd_w))
+ MCFG_CDP1869_PRD_CALLBACK(WRITELINE(*this, tmc600_state, prd_w))
MCFG_VIDEO_SET_SCREEN(SCREEN_TAG)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp
index de6d3139138..7c77fce7a43 100644
--- a/src/mame/video/v1050.cpp
+++ b/src/mame/video/v1050.cpp
@@ -114,7 +114,7 @@ MACHINE_CONFIG_START(v1050_state::v1050_video)
MCFG_MC6845_SHOW_BORDER_AREA(true)
MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(v1050_state, crtc_update_row)
- MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(v1050_state, crtc_vs_w))
+ MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, v1050_state, crtc_vs_w))
MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
MCFG_SCREEN_UPDATE_DEVICE(H46505_TAG, h46505_device, screen_update)
diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp
index 826e9336b3f..f05b20ca12f 100644
--- a/src/zexall/zexall.cpp
+++ b/src/zexall/zexall.cpp
@@ -143,8 +143,8 @@ INPUT_PORTS_END
MACHINE_CONFIG_START(zexall_state::zexall)
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, XTAL(3'579'545))
- MCFG_CPU_PROGRAM_MAP(z80_mem)
+ MCFG_DEVICE_ADD("maincpu", Z80, XTAL(3'579'545))
+ MCFG_DEVICE_PROGRAM_MAP(z80_mem)
MACHINE_CONFIG_END