summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.h2
-rw-r--r--src/emu/deprecat.h2
-rw-r--r--src/emu/devcb.h24
-rw-r--r--src/emu/devcpu.h20
-rw-r--r--src/emu/devintrf.h6
-rw-r--r--src/emu/devlegcy.h106
-rw-r--r--src/emu/diexec.c6
-rw-r--r--src/emu/diexec.h6
-rw-r--r--src/emu/dimemory.c4
-rw-r--r--src/emu/dimemory.h14
-rw-r--r--src/emu/disound.c4
-rw-r--r--src/emu/disound.h28
-rw-r--r--src/emu/drivers/empty.c12
-rw-r--r--src/emu/drivers/emudummy.c6
-rw-r--r--src/emu/emupal.h2
-rw-r--r--src/emu/machine/6522via.h6
-rw-r--r--src/emu/machine/6526cia.h18
-rw-r--r--src/emu/machine/6532riot.h6
-rw-r--r--src/emu/machine/6821pia.h24
-rw-r--r--src/emu/machine/6840ptm.h6
-rw-r--r--src/emu/machine/6850acia.h6
-rw-r--r--src/emu/machine/68681.h6
-rw-r--r--src/emu/machine/74123.h6
-rw-r--r--src/emu/machine/74148.h6
-rw-r--r--src/emu/machine/74153.h6
-rw-r--r--src/emu/machine/7474.h30
-rw-r--r--src/emu/machine/8237dma.h6
-rw-r--r--src/emu/machine/8255ppi.h12
-rw-r--r--src/emu/machine/8257dma.h6
-rw-r--r--src/emu/machine/adc083x.h24
-rw-r--r--src/emu/machine/adc1038.h6
-rw-r--r--src/emu/machine/adc1213x.h18
-rw-r--r--src/emu/machine/at28c16.h4
-rw-r--r--src/emu/machine/cdp1852.h6
-rw-r--r--src/emu/machine/ds1302.h4
-rw-r--r--src/emu/machine/ds2404.h16
-rw-r--r--src/emu/machine/eeprom.h16
-rw-r--r--src/emu/machine/er2055.h4
-rw-r--r--src/emu/machine/f3853.h6
-rw-r--r--src/emu/machine/i2cmem.h4
-rw-r--r--src/emu/machine/i8243.h12
-rw-r--r--src/emu/machine/i8255a.h6
-rw-r--r--src/emu/machine/idectrl.h18
-rw-r--r--src/emu/machine/ins8154.h6
-rw-r--r--src/emu/machine/ins8250.h18
-rw-r--r--src/emu/machine/intelfsh.h44
-rw-r--r--src/emu/machine/k033906.h6
-rw-r--r--src/emu/machine/k056230.h6
-rw-r--r--src/emu/machine/laserdsc.h74
-rw-r--r--src/emu/machine/latch8.h36
-rw-r--r--src/emu/machine/ldpr8210.c10
-rw-r--r--src/emu/machine/ldv1000.c18
-rw-r--r--src/emu/machine/ldvp931.c6
-rw-r--r--src/emu/machine/mb14241.h4
-rw-r--r--src/emu/machine/mb3773.h4
-rw-r--r--src/emu/machine/mb87078.h6
-rw-r--r--src/emu/machine/mc146818.h4
-rw-r--r--src/emu/machine/msm6242.h4
-rw-r--r--src/emu/machine/nvram.h32
-rw-r--r--src/emu/machine/pci.h18
-rw-r--r--src/emu/machine/pd4990a.h4
-rw-r--r--src/emu/machine/pic8259.h6
-rw-r--r--src/emu/machine/pit8253.h12
-rw-r--r--src/emu/machine/rp5h01.h4
-rw-r--r--src/emu/machine/rtc65271.h6
-rw-r--r--src/emu/machine/s3c2400.h6
-rw-r--r--src/emu/machine/s3c2410.h6
-rw-r--r--src/emu/machine/s3c2440.h6
-rw-r--r--src/emu/machine/smc91c9x.h12
-rw-r--r--src/emu/machine/timekpr.h16
-rw-r--r--src/emu/machine/upd4701.h4
-rw-r--r--src/emu/machine/x2212.h8
-rw-r--r--src/emu/machine/z80ctc.h6
-rw-r--r--src/emu/machine/z80dart.h40
-rw-r--r--src/emu/machine/z80dma.h6
-rw-r--r--src/emu/machine/z80pio.h6
-rw-r--r--src/emu/machine/z80sio.h6
-rw-r--r--src/emu/machine/z80sti.h6
-rw-r--r--src/emu/mconfig.h48
-rw-r--r--src/emu/screen.h28
-rw-r--r--src/emu/softlist.h30
-rw-r--r--src/emu/sound.h14
-rw-r--r--src/emu/sound/asc.h20
-rw-r--r--src/emu/sound/cdp1863.h6
-rw-r--r--src/emu/sound/cdp1864.h16
-rw-r--r--src/emu/sound/cdp1869.h32
-rw-r--r--src/emu/sound/discrete.h2
-rw-r--r--src/emu/sound/flt_rc.h6
-rw-r--r--src/emu/sound/ics2115.h14
-rw-r--r--src/emu/sound/k056800.h6
-rw-r--r--src/emu/sound/mos6560.h6
-rw-r--r--src/emu/sound/okim6295.h14
-rw-r--r--src/emu/sound/wave.h6
-rw-r--r--src/emu/timer.h24
-rw-r--r--src/emu/video/hd63484.h6
-rw-r--r--src/emu/video/mc6845.h6
-rw-r--r--src/emu/video/pc_vga.c40
-rw-r--r--src/emu/video/s2636.h6
-rw-r--r--src/emu/video/saa5050.h6
-rw-r--r--src/emu/video/tlc34076.h6
-rw-r--r--src/emu/video/tms9927.h16
-rw-r--r--src/emu/video/tms9928a.c18
-rw-r--r--src/emu/video/voodoo.h46
-rw-r--r--src/ldplayer/ldplayer.c26
-rw-r--r--src/mame/audio/astrof.c16
-rw-r--r--src/mame/audio/atarijsa.c108
-rw-r--r--src/mame/audio/bzone.c14
-rw-r--r--src/mame/audio/cage.c42
-rw-r--r--src/mame/audio/carnival.c18
-rw-r--r--src/mame/audio/cinemat.c202
-rw-r--r--src/mame/audio/crbaloon.c14
-rw-r--r--src/mame/audio/dcs.c118
-rw-r--r--src/mame/audio/depthch.c6
-rw-r--r--src/mame/audio/dkong.c150
-rw-r--r--src/mame/audio/exidy.c44
-rw-r--r--src/mame/audio/exidy440.c30
-rw-r--r--src/mame/audio/galaxian.c16
-rw-r--r--src/mame/audio/gottlieb.c42
-rw-r--r--src/mame/audio/hyprolyb.c12
-rw-r--r--src/mame/audio/invinco.c6
-rw-r--r--src/mame/audio/irem.c74
-rw-r--r--src/mame/audio/jedi.c36
-rw-r--r--src/mame/audio/mario.c36
-rw-r--r--src/mame/audio/mcr.c86
-rw-r--r--src/mame/audio/mw8080bw.c242
-rw-r--r--src/mame/audio/n8080.c52
-rw-r--r--src/mame/audio/namco52.c4
-rw-r--r--src/mame/audio/namco52.h6
-rw-r--r--src/mame/audio/namco54.c4
-rw-r--r--src/mame/audio/namco54.h8
-rw-r--r--src/mame/audio/namcoc7x.h28
-rw-r--r--src/mame/audio/pulsar.c6
-rw-r--r--src/mame/audio/qix.c32
-rw-r--r--src/mame/audio/redalert.c62
-rw-r--r--src/mame/audio/scramble.c32
-rw-r--r--src/mame/audio/segag80r.c56
-rw-r--r--src/mame/audio/segasnd.c28
-rw-r--r--src/mame/audio/seibu.h100
-rw-r--r--src/mame/audio/spacefb.c12
-rw-r--r--src/mame/audio/spiders.c8
-rw-r--r--src/mame/audio/taito_en.c18
-rw-r--r--src/mame/audio/taito_zm.c16
-rw-r--r--src/mame/audio/taitosnd.h6
-rw-r--r--src/mame/audio/targ.c24
-rw-r--r--src/mame/audio/timeplt.c64
-rw-r--r--src/mame/audio/turbo.c88
-rw-r--r--src/mame/audio/vicdual.c18
-rw-r--r--src/mame/audio/williams.c78
-rw-r--r--src/mame/audio/zaxxon.c12
-rw-r--r--src/mame/drivers/1942.c48
-rw-r--r--src/mame/drivers/1943.c64
-rw-r--r--src/mame/drivers/1945kiii.c38
-rw-r--r--src/mame/drivers/20pacgal.c28
-rw-r--r--src/mame/drivers/2mindril.c54
-rw-r--r--src/mame/drivers/39in1.c38
-rw-r--r--src/mame/drivers/3super8.c32
-rw-r--r--src/mame/drivers/40love.c166
-rw-r--r--src/mame/drivers/4enraya.c40
-rw-r--r--src/mame/drivers/4roses.c40
-rw-r--r--src/mame/drivers/5clown.c52
-rw-r--r--src/mame/drivers/8080bw.c294
-rw-r--r--src/mame/drivers/86lions.c40
-rw-r--r--src/mame/drivers/88games.c56
-rw-r--r--src/mame/drivers/ace.c32
-rw-r--r--src/mame/drivers/acefruit.c36
-rw-r--r--src/mame/drivers/acommand.c42
-rw-r--r--src/mame/drivers/actfancr.c116
-rw-r--r--src/mame/drivers/adp.c140
-rw-r--r--src/mame/drivers/aeroboto.c50
-rw-r--r--src/mame/drivers/aerofgt.c548
-rw-r--r--src/mame/drivers/airbustr.c82
-rw-r--r--src/mame/drivers/ajax.c80
-rw-r--r--src/mame/drivers/albazc.c36
-rw-r--r--src/mame/drivers/albazg.c48
-rw-r--r--src/mame/drivers/aleck64.c58
-rw-r--r--src/mame/drivers/alg.c68
-rw-r--r--src/mame/drivers/aliens.c56
-rw-r--r--src/mame/drivers/alpha68k.c482
-rw-r--r--src/mame/drivers/amaticmg.c52
-rw-r--r--src/mame/drivers/ambush.c44
-rw-r--r--src/mame/drivers/ampoker2.c46
-rw-r--r--src/mame/drivers/amspdwy.c48
-rw-r--r--src/mame/drivers/angelkds.c72
-rw-r--r--src/mame/drivers/appoooh.c80
-rw-r--r--src/mame/drivers/aquarium.c54
-rw-r--r--src/mame/drivers/arabian.c46
-rw-r--r--src/mame/drivers/arcadecl.c34
-rw-r--r--src/mame/drivers/arcadia.c46
-rw-r--r--src/mame/drivers/argus.c204
-rw-r--r--src/mame/drivers/aristmk4.c64
-rw-r--r--src/mame/drivers/aristmk5.c62
-rw-r--r--src/mame/drivers/arkanoid.c94
-rw-r--r--src/mame/drivers/armedf.c400
-rw-r--r--src/mame/drivers/artmagic.c66
-rw-r--r--src/mame/drivers/ashnojoe.c50
-rw-r--r--src/mame/drivers/asterix.c54
-rw-r--r--src/mame/drivers/asteroid.c74
-rw-r--r--src/mame/drivers/astinvad.c68
-rw-r--r--src/mame/drivers/astrocde.c194
-rw-r--r--src/mame/drivers/astrocorp.c86
-rw-r--r--src/mame/drivers/astrof.c46
-rw-r--r--src/mame/drivers/asuka.c378
-rw-r--r--src/mame/drivers/atarifb.c70
-rw-r--r--src/mame/drivers/atarig1.c32
-rw-r--r--src/mame/drivers/atarig42.c34
-rw-r--r--src/mame/drivers/atarigt.c34
-rw-r--r--src/mame/drivers/atarigx2.c32
-rw-r--r--src/mame/drivers/atarisy1.c64
-rw-r--r--src/mame/drivers/atarisy2.c70
-rw-r--r--src/mame/drivers/atarisy4.c38
-rw-r--r--src/mame/drivers/ataxx.c40
-rw-r--r--src/mame/drivers/atetris.c76
-rw-r--r--src/mame/drivers/attckufo.c30
-rw-r--r--src/mame/drivers/avalnche.c32
-rw-r--r--src/mame/drivers/avt.c40
-rw-r--r--src/mame/drivers/aztarac.c46
-rw-r--r--src/mame/drivers/backfire.c56
-rw-r--r--src/mame/drivers/badlands.c80
-rw-r--r--src/mame/drivers/bagman.c130
-rw-r--r--src/mame/drivers/balsente.c86
-rw-r--r--src/mame/drivers/bankp.c48
-rw-r--r--src/mame/drivers/baraduke.c50
-rw-r--r--src/mame/drivers/bartop52.c36
-rw-r--r--src/mame/drivers/batman.c28
-rw-r--r--src/mame/drivers/battlane.c46
-rw-r--r--src/mame/drivers/battlera.c58
-rw-r--r--src/mame/drivers/battlex.c40
-rw-r--r--src/mame/drivers/battlnts.c46
-rw-r--r--src/mame/drivers/bbusters.c102
-rw-r--r--src/mame/drivers/beaminv.c22
-rw-r--r--src/mame/drivers/beathead.c24
-rw-r--r--src/mame/drivers/beezer.c36
-rw-r--r--src/mame/drivers/berzerk.c38
-rw-r--r--src/mame/drivers/bestleag.c36
-rw-r--r--src/mame/drivers/bfcobra.c52
-rw-r--r--src/mame/drivers/bfm_sc1.c60
-rw-r--r--src/mame/drivers/bfm_sc2.c128
-rw-r--r--src/mame/drivers/bfmsys85.c22
-rw-r--r--src/mame/drivers/big10.c40
-rw-r--r--src/mame/drivers/bigevglf.c86
-rw-r--r--src/mame/drivers/bigfghtr.c56
-rw-r--r--src/mame/drivers/bigstrkb.c42
-rw-r--r--src/mame/drivers/bingoc.c46
-rw-r--r--src/mame/drivers/bingor.c44
-rw-r--r--src/mame/drivers/bionicc.c56
-rw-r--r--src/mame/drivers/bishi.c46
-rw-r--r--src/mame/drivers/bishjan.c66
-rw-r--r--src/mame/drivers/bking.c76
-rw-r--r--src/mame/drivers/blackt96.c46
-rw-r--r--src/mame/drivers/bladestl.c54
-rw-r--r--src/mame/drivers/blitz.c44
-rw-r--r--src/mame/drivers/blitz68k.c280
-rw-r--r--src/mame/drivers/blktiger.c66
-rw-r--r--src/mame/drivers/blmbycar.c76
-rw-r--r--src/mame/drivers/blockade.c58
-rw-r--r--src/mame/drivers/blockhl.c46
-rw-r--r--src/mame/drivers/blockout.c48
-rw-r--r--src/mame/drivers/bloodbro.c46
-rw-r--r--src/mame/drivers/blstroid.c30
-rw-r--r--src/mame/drivers/blueprnt.c52
-rw-r--r--src/mame/drivers/bmcbowl.c46
-rw-r--r--src/mame/drivers/bnstars.c62
-rw-r--r--src/mame/drivers/bogeyman.c46
-rw-r--r--src/mame/drivers/bombjack.c52
-rw-r--r--src/mame/drivers/boogwing.c54
-rw-r--r--src/mame/drivers/bottom9.c60
-rw-r--r--src/mame/drivers/boxer.c28
-rw-r--r--src/mame/drivers/brkthru.c96
-rw-r--r--src/mame/drivers/bsktball.c40
-rw-r--r--src/mame/drivers/btime.c166
-rw-r--r--src/mame/drivers/btoads.c38
-rw-r--r--src/mame/drivers/bublbobl.c124
-rw-r--r--src/mame/drivers/buggychl.c84
-rw-r--r--src/mame/drivers/buster.c34
-rw-r--r--src/mame/drivers/bwidow.c58
-rw-r--r--src/mame/drivers/bwing.c62
-rw-r--r--src/mame/drivers/bzone.c54
-rw-r--r--src/mame/drivers/cabal.c118
-rw-r--r--src/mame/drivers/cabaret.c36
-rw-r--r--src/mame/drivers/calchase.c60
-rw-r--r--src/mame/drivers/calomega.c92
-rw-r--r--src/mame/drivers/calorie.c52
-rw-r--r--src/mame/drivers/canyon.c40
-rw-r--r--src/mame/drivers/capbowl.c58
-rw-r--r--src/mame/drivers/cardline.c38
-rw-r--r--src/mame/drivers/carjmbre.c48
-rw-r--r--src/mame/drivers/carpolo.c76
-rw-r--r--src/mame/drivers/carrera.c38
-rw-r--r--src/mame/drivers/caswin.c40
-rw-r--r--src/mame/drivers/cave.c818
-rw-r--r--src/mame/drivers/cb2001.c44
-rw-r--r--src/mame/drivers/cball.c32
-rw-r--r--src/mame/drivers/cbasebal.c46
-rw-r--r--src/mame/drivers/cbuster.c58
-rw-r--r--src/mame/drivers/ccastles.c40
-rw-r--r--src/mame/drivers/cchance.c40
-rw-r--r--src/mame/drivers/cchasm.c48
-rw-r--r--src/mame/drivers/cclimber.c144
-rw-r--r--src/mame/drivers/cdi.c74
-rw-r--r--src/mame/drivers/centiped.c140
-rw-r--r--src/mame/drivers/chaknpop.c46
-rw-r--r--src/mame/drivers/cham24.c42
-rw-r--r--src/mame/drivers/champbas.c210
-rw-r--r--src/mame/drivers/champbwl.c44
-rw-r--r--src/mame/drivers/chanbara.c38
-rw-r--r--src/mame/drivers/changela.c44
-rw-r--r--src/mame/drivers/cheekyms.c38
-rw-r--r--src/mame/drivers/chihiro.c46
-rw-r--r--src/mame/drivers/chinagat.c166
-rw-r--r--src/mame/drivers/chinsan.c58
-rw-r--r--src/mame/drivers/chqflag.c80
-rw-r--r--src/mame/drivers/chsuper.c36
-rw-r--r--src/mame/drivers/cidelsa.c80
-rw-r--r--src/mame/drivers/cinemat.c112
-rw-r--r--src/mame/drivers/circus.c184
-rw-r--r--src/mame/drivers/circusc.c58
-rw-r--r--src/mame/drivers/cischeat.c184
-rw-r--r--src/mame/drivers/citycon.c56
-rw-r--r--src/mame/drivers/clayshoo.c30
-rw-r--r--src/mame/drivers/cliffhgr.c40
-rw-r--r--src/mame/drivers/cloak.c50
-rw-r--r--src/mame/drivers/cloud9.c44
-rw-r--r--src/mame/drivers/clshroad.c84
-rw-r--r--src/mame/drivers/cmmb.c34
-rw-r--r--src/mame/drivers/cninja.c342
-rw-r--r--src/mame/drivers/cntsteer.c118
-rw-r--r--src/mame/drivers/coinmstr.c58
-rw-r--r--src/mame/drivers/coinmvga.c42
-rw-r--r--src/mame/drivers/cojag.c52
-rw-r--r--src/mame/drivers/combatsc.c104
-rw-r--r--src/mame/drivers/comebaby.c22
-rw-r--r--src/mame/drivers/commando.c52
-rw-r--r--src/mame/drivers/compgolf.c40
-rw-r--r--src/mame/drivers/contra.c48
-rw-r--r--src/mame/drivers/coolpool.c72
-rw-r--r--src/mame/drivers/coolridr.c38
-rw-r--r--src/mame/drivers/cop01.c100
-rw-r--r--src/mame/drivers/copsnrob.c38
-rw-r--r--src/mame/drivers/cosmic.c150
-rw-r--r--src/mame/drivers/cps1.c238
-rw-r--r--src/mame/drivers/cps2.c56
-rw-r--r--src/mame/drivers/cps3.c178
-rw-r--r--src/mame/drivers/crbaloon.c36
-rw-r--r--src/mame/drivers/crgolf.c32
-rw-r--r--src/mame/drivers/crimfght.c64
-rw-r--r--src/mame/drivers/crospang.c96
-rw-r--r--src/mame/drivers/crshrace.c56
-rw-r--r--src/mame/drivers/crystal.c52
-rw-r--r--src/mame/drivers/cshooter.c68
-rw-r--r--src/mame/drivers/csplayh5.c64
-rw-r--r--src/mame/drivers/cubeqst.c142
-rw-r--r--src/mame/drivers/cubocd32.c50
-rw-r--r--src/mame/drivers/cultures.c38
-rw-r--r--src/mame/drivers/cvs.c78
-rw-r--r--src/mame/drivers/cyberbal.c100
-rw-r--r--src/mame/drivers/cybertnk.c70
-rw-r--r--src/mame/drivers/cyclemb.c44
-rw-r--r--src/mame/drivers/d9final.c38
-rw-r--r--src/mame/drivers/dacholer.c62
-rw-r--r--src/mame/drivers/dai3wksi.c66
-rw-r--r--src/mame/drivers/dambustr.c36
-rw-r--r--src/mame/drivers/darius.c224
-rw-r--r--src/mame/drivers/darkhors.c112
-rw-r--r--src/mame/drivers/darkmist.c46
-rw-r--r--src/mame/drivers/darkseal.c54
-rw-r--r--src/mame/drivers/dassault.c68
-rw-r--r--src/mame/drivers/dblewing.c50
-rw-r--r--src/mame/drivers/dbz.c64
-rw-r--r--src/mame/drivers/dcheese.c48
-rw-r--r--src/mame/drivers/dcon.c60
-rw-r--r--src/mame/drivers/dday.c42
-rw-r--r--src/mame/drivers/ddayjlc.c52
-rw-r--r--src/mame/drivers/ddealer.c40
-rw-r--r--src/mame/drivers/ddenlovr.c506
-rw-r--r--src/mame/drivers/ddragon.c180
-rw-r--r--src/mame/drivers/ddragon3.c70
-rw-r--r--src/mame/drivers/ddribble.c90
-rw-r--r--src/mame/drivers/ddz.c40
-rw-r--r--src/mame/drivers/deadang.c40
-rw-r--r--src/mame/drivers/dec0.c556
-rw-r--r--src/mame/drivers/dec8.c528
-rw-r--r--src/mame/drivers/deco156.c88
-rw-r--r--src/mame/drivers/deco32.c398
-rw-r--r--src/mame/drivers/deco_ld.c54
-rw-r--r--src/mame/drivers/deco_mlc.c80
-rw-r--r--src/mame/drivers/decocass.c110
-rw-r--r--src/mame/drivers/deniam.c94
-rw-r--r--src/mame/drivers/deshoros.c28
-rw-r--r--src/mame/drivers/destroyr.c30
-rw-r--r--src/mame/drivers/dgpix.c34
-rw-r--r--src/mame/drivers/dietgo.c44
-rw-r--r--src/mame/drivers/discoboy.c54
-rw-r--r--src/mame/drivers/diverboy.c38
-rw-r--r--src/mame/drivers/djboy.c72
-rw-r--r--src/mame/drivers/djmain.c56
-rw-r--r--src/mame/drivers/dkong.c134
-rw-r--r--src/mame/drivers/dlair.c78
-rw-r--r--src/mame/drivers/dmndrby.c44
-rw-r--r--src/mame/drivers/docastle.c90
-rw-r--r--src/mame/drivers/dogfgt.c48
-rw-r--r--src/mame/drivers/dominob.c36
-rw-r--r--src/mame/drivers/dooyong.c376
-rw-r--r--src/mame/drivers/dorachan.c24
-rw-r--r--src/mame/drivers/dotrikun.c28
-rw-r--r--src/mame/drivers/dragrace.c46
-rw-r--r--src/mame/drivers/dreamwld.c44
-rw-r--r--src/mame/drivers/drgnmst.c48
-rw-r--r--src/mame/drivers/dribling.c36
-rw-r--r--src/mame/drivers/drmicro.c56
-rw-r--r--src/mame/drivers/drtomy.c36
-rw-r--r--src/mame/drivers/drw80pkr.c40
-rw-r--r--src/mame/drivers/dunhuang.c50
-rw-r--r--src/mame/drivers/dwarfd.c56
-rw-r--r--src/mame/drivers/dynadice.c46
-rw-r--r--src/mame/drivers/dynax.c540
-rw-r--r--src/mame/drivers/dynduke.c44
-rw-r--r--src/mame/drivers/egghunt.c42
-rw-r--r--src/mame/drivers/embargo.c22
-rw-r--r--src/mame/drivers/enigma2.c62
-rw-r--r--src/mame/drivers/eolith.c36
-rw-r--r--src/mame/drivers/eolith16.c36
-rw-r--r--src/mame/drivers/epos.c66
-rw-r--r--src/mame/drivers/eprom.c100
-rw-r--r--src/mame/drivers/equites.c148
-rw-r--r--src/mame/drivers/ertictac.c64
-rw-r--r--src/mame/drivers/esd16.c74
-rw-r--r--src/mame/drivers/esh.c32
-rw-r--r--src/mame/drivers/espial.c56
-rw-r--r--src/mame/drivers/esripsys.c46
-rw-r--r--src/mame/drivers/ettrivia.c50
-rw-r--r--src/mame/drivers/exedexes.c56
-rw-r--r--src/mame/drivers/exerion.c40
-rw-r--r--src/mame/drivers/exidy.c68
-rw-r--r--src/mame/drivers/exidy440.c18
-rw-r--r--src/mame/drivers/expro02.c44
-rw-r--r--src/mame/drivers/exprraid.c52
-rw-r--r--src/mame/drivers/exterm.c48
-rw-r--r--src/mame/drivers/exzisus.c56
-rw-r--r--src/mame/drivers/f-32.c42
-rw-r--r--src/mame/drivers/f1gp.c122
-rw-r--r--src/mame/drivers/fantland.c178
-rw-r--r--src/mame/drivers/fastfred.c68
-rw-r--r--src/mame/drivers/fastlane.c52
-rw-r--r--src/mame/drivers/fcombat.c42
-rw-r--r--src/mame/drivers/fcrash.c126
-rw-r--r--src/mame/drivers/feversoc.c34
-rw-r--r--src/mame/drivers/fgoal.c34
-rw-r--r--src/mame/drivers/finalizr.c48
-rw-r--r--src/mame/drivers/firebeat.c130
-rw-r--r--src/mame/drivers/firefox.c74
-rw-r--r--src/mame/drivers/firetrap.c96
-rw-r--r--src/mame/drivers/firetrk.c78
-rw-r--r--src/mame/drivers/fitfight.c82
-rw-r--r--src/mame/drivers/flkatck.c62
-rw-r--r--src/mame/drivers/flower.c50
-rw-r--r--src/mame/drivers/flstory.c312
-rw-r--r--src/mame/drivers/flyball.c34
-rw-r--r--src/mame/drivers/foodf.c46
-rw-r--r--src/mame/drivers/forte2.c30
-rw-r--r--src/mame/drivers/fortecar.c48
-rw-r--r--src/mame/drivers/freekick.c88
-rw-r--r--src/mame/drivers/fromanc2.c216
-rw-r--r--src/mame/drivers/fromance.c138
-rw-r--r--src/mame/drivers/funkybee.c42
-rw-r--r--src/mame/drivers/funkyjet.c48
-rw-r--r--src/mame/drivers/funworld.c104
-rw-r--r--src/mame/drivers/funybubl.c42
-rw-r--r--src/mame/drivers/fuukifg2.c54
-rw-r--r--src/mame/drivers/fuukifg3.c46
-rw-r--r--src/mame/drivers/gaelco.c150
-rw-r--r--src/mame/drivers/gaelco2.c288
-rw-r--r--src/mame/drivers/gaelco3d.c80
-rw-r--r--src/mame/drivers/gaiden.c186
-rw-r--r--src/mame/drivers/gal3.c88
-rw-r--r--src/mame/drivers/galaga.c292
-rw-r--r--src/mame/drivers/galastrm.c34
-rw-r--r--src/mame/drivers/galaxi.c42
-rw-r--r--src/mame/drivers/galaxia.c54
-rw-r--r--src/mame/drivers/galaxian.c324
-rw-r--r--src/mame/drivers/galaxold.c300
-rw-r--r--src/mame/drivers/galivan.c112
-rw-r--r--src/mame/drivers/galpani2.c50
-rw-r--r--src/mame/drivers/galpani3.c36
-rw-r--r--src/mame/drivers/galpanic.c108
-rw-r--r--src/mame/drivers/galspnbl.c44
-rw-r--r--src/mame/drivers/gamecstl.c54
-rw-r--r--src/mame/drivers/gameplan.c44
-rw-r--r--src/mame/drivers/gaplus.c84
-rw-r--r--src/mame/drivers/gatron.c42
-rw-r--r--src/mame/drivers/gauntlet.c52
-rw-r--r--src/mame/drivers/gberet.c66
-rw-r--r--src/mame/drivers/gbusters.c54
-rw-r--r--src/mame/drivers/gcpinbal.c42
-rw-r--r--src/mame/drivers/gei.c96
-rw-r--r--src/mame/drivers/ggconnie.c36
-rw-r--r--src/mame/drivers/ghosteo.c34
-rw-r--r--src/mame/drivers/gijoe.c52
-rw-r--r--src/mame/drivers/ginganin.c46
-rw-r--r--src/mame/drivers/gladiatr.c138
-rw-r--r--src/mame/drivers/glass.c36
-rw-r--r--src/mame/drivers/gng.c66
-rw-r--r--src/mame/drivers/go2000.c42
-rw-r--r--src/mame/drivers/goal92.c54
-rw-r--r--src/mame/drivers/goindol.c44
-rw-r--r--src/mame/drivers/goldngam.c40
-rw-r--r--src/mame/drivers/goldnpkr.c160
-rw-r--r--src/mame/drivers/goldstar.c920
-rw-r--r--src/mame/drivers/gomoku.c34
-rw-r--r--src/mame/drivers/good.c34
-rw-r--r--src/mame/drivers/goodejan.c34
-rw-r--r--src/mame/drivers/gotcha.c50
-rw-r--r--src/mame/drivers/gottlieb.c78
-rw-r--r--src/mame/drivers/gotya.c40
-rw-r--r--src/mame/drivers/gpworld.c28
-rw-r--r--src/mame/drivers/gradius3.c70
-rw-r--r--src/mame/drivers/grchamp.c68
-rw-r--r--src/mame/drivers/gridlee.c36
-rw-r--r--src/mame/drivers/groundfx.c34
-rw-r--r--src/mame/drivers/gstream.c44
-rw-r--r--src/mame/drivers/gstriker.c98
-rw-r--r--src/mame/drivers/gsword.c126
-rw-r--r--src/mame/drivers/gticlub.c166
-rw-r--r--src/mame/drivers/guab.c34
-rw-r--r--src/mame/drivers/gumbo.c42
-rw-r--r--src/mame/drivers/gunbustr.c32
-rw-r--r--src/mame/drivers/gundealr.c38
-rw-r--r--src/mame/drivers/gunpey.c44
-rw-r--r--src/mame/drivers/gunsmoke.c64
-rw-r--r--src/mame/drivers/gyruss.c122
-rw-r--r--src/mame/drivers/halleys.c62
-rw-r--r--src/mame/drivers/hanaawas.c42
-rw-r--r--src/mame/drivers/harddriv.c188
-rw-r--r--src/mame/drivers/hcastle.c62
-rw-r--r--src/mame/drivers/hexion.c38
-rw-r--r--src/mame/drivers/higemaru.c38
-rw-r--r--src/mame/drivers/highvdeo.c104
-rw-r--r--src/mame/drivers/hikaru.c54
-rw-r--r--src/mame/drivers/himesiki.c52
-rw-r--r--src/mame/drivers/hitme.c52
-rw-r--r--src/mame/drivers/hitpoker.c40
-rw-r--r--src/mame/drivers/hnayayoi.c72
-rw-r--r--src/mame/drivers/hng64.c44
-rw-r--r--src/mame/drivers/holeland.c90
-rw-r--r--src/mame/drivers/homedata.c232
-rw-r--r--src/mame/drivers/homerun.c40
-rw-r--r--src/mame/drivers/hornet.c148
-rw-r--r--src/mame/drivers/hotblock.c34
-rw-r--r--src/mame/drivers/hotstuff.c24
-rw-r--r--src/mame/drivers/hvyunit.c64
-rw-r--r--src/mame/drivers/hyhoo.c40
-rw-r--r--src/mame/drivers/hyperspt.c66
-rw-r--r--src/mame/drivers/hyprduel.c102
-rw-r--r--src/mame/drivers/igs009.c46
-rw-r--r--src/mame/drivers/igs011.c98
-rw-r--r--src/mame/drivers/igs017.c158
-rw-r--r--src/mame/drivers/igs_m027.c28
-rw-r--r--src/mame/drivers/igspoker.c56
-rw-r--r--src/mame/drivers/ikki.c50
-rw-r--r--src/mame/drivers/imolagp.c60
-rw-r--r--src/mame/drivers/intrscti.c32
-rw-r--r--src/mame/drivers/inufuku.c50
-rw-r--r--src/mame/drivers/iqblock.c36
-rw-r--r--src/mame/drivers/irobot.c54
-rw-r--r--src/mame/drivers/ironhors.c80
-rw-r--r--src/mame/drivers/istellar.c42
-rw-r--r--src/mame/drivers/itech32.c80
-rw-r--r--src/mame/drivers/itech8.c228
-rw-r--r--src/mame/drivers/itgambl2.c36
-rw-r--r--src/mame/drivers/itgambl3.c36
-rw-r--r--src/mame/drivers/itgamble.c50
-rw-r--r--src/mame/drivers/jack.c88
-rw-r--r--src/mame/drivers/jackal.c46
-rw-r--r--src/mame/drivers/jackie.c36
-rw-r--r--src/mame/drivers/jackpool.c34
-rw-r--r--src/mame/drivers/jailbrek.c38
-rw-r--r--src/mame/drivers/jalmah.c46
-rw-r--r--src/mame/drivers/jangou.c114
-rw-r--r--src/mame/drivers/jantotsu.c48
-rw-r--r--src/mame/drivers/jchan.c40
-rw-r--r--src/mame/drivers/jedi.c16
-rw-r--r--src/mame/drivers/jokrwild.c40
-rw-r--r--src/mame/drivers/jollyjgr.c44
-rw-r--r--src/mame/drivers/jongkyo.c46
-rw-r--r--src/mame/drivers/jpmimpct.c62
-rw-r--r--src/mame/drivers/jpmsys5.c40
-rw-r--r--src/mame/drivers/jrpacman.c38
-rw-r--r--src/mame/drivers/jubilee.c32
-rw-r--r--src/mame/drivers/junofrst.c68
-rw-r--r--src/mame/drivers/kaneko16.c304
-rw-r--r--src/mame/drivers/kangaroo.c42
-rw-r--r--src/mame/drivers/karnov.c100
-rw-r--r--src/mame/drivers/kchamp.c116
-rw-r--r--src/mame/drivers/kickgoal.c94
-rw-r--r--src/mame/drivers/kingdrby.c94
-rw-r--r--src/mame/drivers/kingobox.c132
-rw-r--r--src/mame/drivers/kingpin.c34
-rw-r--r--src/mame/drivers/kinst.c36
-rw-r--r--src/mame/drivers/klax.c34
-rw-r--r--src/mame/drivers/kncljoe.c58
-rw-r--r--src/mame/drivers/koftball.c34
-rw-r--r--src/mame/drivers/koikoi.c42
-rw-r--r--src/mame/drivers/konamigq.c58
-rw-r--r--src/mame/drivers/konamigv.c60
-rw-r--r--src/mame/drivers/konamigx.c200
-rw-r--r--src/mame/drivers/konamim2.c38
-rw-r--r--src/mame/drivers/kongambl.c34
-rw-r--r--src/mame/drivers/kopunch.c38
-rw-r--r--src/mame/drivers/ksayakyu.c58
-rw-r--r--src/mame/drivers/ksys573.c132
-rw-r--r--src/mame/drivers/kungfur.c46
-rw-r--r--src/mame/drivers/kyugo.c92
-rw-r--r--src/mame/drivers/labyrunr.c64
-rw-r--r--src/mame/drivers/ladybug.c102
-rw-r--r--src/mame/drivers/ladyfrog.c72
-rw-r--r--src/mame/drivers/laserbas.c36
-rw-r--r--src/mame/drivers/laserbat.c110
-rw-r--r--src/mame/drivers/lasso.c124
-rw-r--r--src/mame/drivers/lastduel.c104
-rw-r--r--src/mame/drivers/lastfght.c28
-rw-r--r--src/mame/drivers/lazercmd.c114
-rw-r--r--src/mame/drivers/legionna.c226
-rw-r--r--src/mame/drivers/leland.c64
-rw-r--r--src/mame/drivers/lemmings.c52
-rw-r--r--src/mame/drivers/lethal.c64
-rw-r--r--src/mame/drivers/lethalj.c44
-rw-r--r--src/mame/drivers/lgp.c36
-rw-r--r--src/mame/drivers/liberate.c138
-rw-r--r--src/mame/drivers/liberatr.c38
-rw-r--r--src/mame/drivers/limenko.c70
-rw-r--r--src/mame/drivers/littlerb.c26
-rw-r--r--src/mame/drivers/lkage.c132
-rw-r--r--src/mame/drivers/lockon.c116
-rw-r--r--src/mame/drivers/looping.c60
-rw-r--r--src/mame/drivers/lordgun.c104
-rw-r--r--src/mame/drivers/lsasquad.c122
-rw-r--r--src/mame/drivers/ltcasino.c32
-rw-r--r--src/mame/drivers/luckgrln.c32
-rw-r--r--src/mame/drivers/lucky74.c68
-rw-r--r--src/mame/drivers/lvcards.c58
-rw-r--r--src/mame/drivers/lwings.c108
-rw-r--r--src/mame/drivers/m10.c80
-rw-r--r--src/mame/drivers/m107.c72
-rw-r--r--src/mame/drivers/m14.c44
-rw-r--r--src/mame/drivers/m52.c32
-rw-r--r--src/mame/drivers/m57.c30
-rw-r--r--src/mame/drivers/m58.c24
-rw-r--r--src/mame/drivers/m62.c190
-rw-r--r--src/mame/drivers/m63.c106
-rw-r--r--src/mame/drivers/m72.c702
-rw-r--r--src/mame/drivers/m79amb.c28
-rw-r--r--src/mame/drivers/m90.c228
-rw-r--r--src/mame/drivers/m92.c148
-rw-r--r--src/mame/drivers/macrossp.c50
-rw-r--r--src/mame/drivers/macs.c40
-rw-r--r--src/mame/drivers/madalien.c30
-rw-r--r--src/mame/drivers/madmotor.c58
-rw-r--r--src/mame/drivers/magic10.c64
-rw-r--r--src/mame/drivers/magicard.c32
-rw-r--r--src/mame/drivers/magicfly.c40
-rw-r--r--src/mame/drivers/magictg.c24
-rw-r--r--src/mame/drivers/magmax.c54
-rw-r--r--src/mame/drivers/magtouch.c24
-rw-r--r--src/mame/drivers/mainevt.c112
-rw-r--r--src/mame/drivers/mainsnk.c46
-rw-r--r--src/mame/drivers/malzak.c64
-rw-r--r--src/mame/drivers/mappy.c214
-rw-r--r--src/mame/drivers/marineb.c76
-rw-r--r--src/mame/drivers/marinedt.c38
-rw-r--r--src/mame/drivers/mario.c36
-rw-r--r--src/mame/drivers/markham.c46
-rw-r--r--src/mame/drivers/mastboy.c44
-rw-r--r--src/mame/drivers/matmania.c106
-rw-r--r--src/mame/drivers/maxaflex.c52
-rw-r--r--src/mame/drivers/maygay1b.c30
-rw-r--r--src/mame/drivers/maygayv1.c54
-rw-r--r--src/mame/drivers/mayumi.c50
-rw-r--r--src/mame/drivers/mazerbla.c108
-rw-r--r--src/mame/drivers/mcatadv.c60
-rw-r--r--src/mame/drivers/mcr.c102
-rw-r--r--src/mame/drivers/mcr3.c80
-rw-r--r--src/mame/drivers/mcr68.c100
-rw-r--r--src/mame/drivers/meadows.c126
-rw-r--r--src/mame/drivers/mediagx.c58
-rw-r--r--src/mame/drivers/megadriv.c254
-rw-r--r--src/mame/drivers/megaplay.c24
-rw-r--r--src/mame/drivers/megasys1.c216
-rw-r--r--src/mame/drivers/megatech.c32
-rw-r--r--src/mame/drivers/megazone.c82
-rw-r--r--src/mame/drivers/meijinsn.c46
-rw-r--r--src/mame/drivers/merit.c96
-rw-r--r--src/mame/drivers/meritm.c78
-rw-r--r--src/mame/drivers/mermaid.c54
-rw-r--r--src/mame/drivers/metalmx.c54
-rw-r--r--src/mame/drivers/metlclsh.c52
-rw-r--r--src/mame/drivers/metro.c1160
-rw-r--r--src/mame/drivers/mexico86.c76
-rw-r--r--src/mame/drivers/mgolf.c32
-rw-r--r--src/mame/drivers/mhavoc.c74
-rw-r--r--src/mame/drivers/micro3d.c72
-rw-r--r--src/mame/drivers/midas.c82
-rw-r--r--src/mame/drivers/midqslvr.c26
-rw-r--r--src/mame/drivers/midtunit.c26
-rw-r--r--src/mame/drivers/midvunit.c44
-rw-r--r--src/mame/drivers/midwunit.c24
-rw-r--r--src/mame/drivers/midxunit.c24
-rw-r--r--src/mame/drivers/midyunit.c104
-rw-r--r--src/mame/drivers/midzeus.c56
-rw-r--r--src/mame/drivers/mikie.c46
-rw-r--r--src/mame/drivers/mil4000.c34
-rw-r--r--src/mame/drivers/miniboy7.c42
-rw-r--r--src/mame/drivers/minivadr.c22
-rw-r--r--src/mame/drivers/mirage.c44
-rw-r--r--src/mame/drivers/mirax.c52
-rw-r--r--src/mame/drivers/missb2.c56
-rw-r--r--src/mame/drivers/missile.c28
-rw-r--r--src/mame/drivers/mitchell.c244
-rw-r--r--src/mame/drivers/mjkjidai.c46
-rw-r--r--src/mame/drivers/mjsister.c44
-rw-r--r--src/mame/drivers/mlanding.c70
-rw-r--r--src/mame/drivers/model1.c114
-rw-r--r--src/mame/drivers/model2.c294
-rw-r--r--src/mame/drivers/model3.c228
-rw-r--r--src/mame/drivers/mogura.c42
-rw-r--r--src/mame/drivers/mole.c38
-rw-r--r--src/mame/drivers/momoko.c60
-rw-r--r--src/mame/drivers/monzagp.c34
-rw-r--r--src/mame/drivers/moo.c118
-rw-r--r--src/mame/drivers/mosaic.c46
-rw-r--r--src/mame/drivers/mouser.c48
-rw-r--r--src/mame/drivers/mpoker.c36
-rw-r--r--src/mame/drivers/mpu4.c68
-rw-r--r--src/mame/drivers/mpu4drvr.c136
-rw-r--r--src/mame/drivers/mpu5.c24
-rw-r--r--src/mame/drivers/mquake.c58
-rw-r--r--src/mame/drivers/mrdo.c32
-rw-r--r--src/mame/drivers/mrflea.c58
-rw-r--r--src/mame/drivers/mrjong.c40
-rw-r--r--src/mame/drivers/ms32.c50
-rw-r--r--src/mame/drivers/msisaac.c78
-rw-r--r--src/mame/drivers/mugsmash.c48
-rw-r--r--src/mame/drivers/multfish.c54
-rw-r--r--src/mame/drivers/multigam.c60
-rw-r--r--src/mame/drivers/munchmo.c48
-rw-r--r--src/mame/drivers/murogem.c28
-rw-r--r--src/mame/drivers/murogmbl.c32
-rw-r--r--src/mame/drivers/mustache.c46
-rw-r--r--src/mame/drivers/mw8080bw.c252
-rw-r--r--src/mame/drivers/mwarr.c40
-rw-r--r--src/mame/drivers/mystston.c16
-rw-r--r--src/mame/drivers/mystwarr.c176
-rw-r--r--src/mame/drivers/n8080.c110
-rw-r--r--src/mame/drivers/namcofl.c48
-rw-r--r--src/mame/drivers/namcona1.c60
-rw-r--r--src/mame/drivers/namconb1.c120
-rw-r--r--src/mame/drivers/namcond1.c56
-rw-r--r--src/mame/drivers/namcops2.c22
-rw-r--r--src/mame/drivers/namcos1.c80
-rw-r--r--src/mame/drivers/namcos10.c30
-rw-r--r--src/mame/drivers/namcos11.c64
-rw-r--r--src/mame/drivers/namcos12.c50
-rw-r--r--src/mame/drivers/namcos2.c444
-rw-r--r--src/mame/drivers/namcos21.c262
-rw-r--r--src/mame/drivers/namcos22.c158
-rw-r--r--src/mame/drivers/namcos23.c210
-rw-r--r--src/mame/drivers/namcos86.c114
-rw-r--r--src/mame/drivers/naomi.c70
-rw-r--r--src/mame/drivers/naughtyb.c80
-rw-r--r--src/mame/drivers/nbmj8688.c246
-rw-r--r--src/mame/drivers/nbmj8891.c224
-rw-r--r--src/mame/drivers/nbmj8900.c42
-rw-r--r--src/mame/drivers/nbmj8991.c146
-rw-r--r--src/mame/drivers/nbmj9195.c204
-rw-r--r--src/mame/drivers/nemesis.c564
-rw-r--r--src/mame/drivers/neogeo.c50
-rw-r--r--src/mame/drivers/neoprint.c52
-rw-r--r--src/mame/drivers/neptunp2.c32
-rw-r--r--src/mame/drivers/news.c36
-rw-r--r--src/mame/drivers/nightgal.c76
-rw-r--r--src/mame/drivers/ninjakd2.c110
-rw-r--r--src/mame/drivers/ninjaw.c276
-rw-r--r--src/mame/drivers/nitedrvr.c44
-rw-r--r--src/mame/drivers/niyanpai.c60
-rw-r--r--src/mame/drivers/nmg5.c76
-rw-r--r--src/mame/drivers/nmk16.c1164
-rw-r--r--src/mame/drivers/norautp.c150
-rw-r--r--src/mame/drivers/nova2001.c178
-rw-r--r--src/mame/drivers/nsmpoker.c30
-rw-r--r--src/mame/drivers/nss.c48
-rw-r--r--src/mame/drivers/nwk-tr.c66
-rw-r--r--src/mame/drivers/nycaptor.c284
-rw-r--r--src/mame/drivers/nyny.c58
-rw-r--r--src/mame/drivers/offtwall.c28
-rw-r--r--src/mame/drivers/ohmygod.c38
-rw-r--r--src/mame/drivers/ojankohs.c192
-rw-r--r--src/mame/drivers/olibochu.c46
-rw-r--r--src/mame/drivers/omegrace.c42
-rw-r--r--src/mame/drivers/oneshot.c48
-rw-r--r--src/mame/drivers/onetwo.c48
-rw-r--r--src/mame/drivers/opwolf.c136
-rw-r--r--src/mame/drivers/orbit.c38
-rw-r--r--src/mame/drivers/othello.c58
-rw-r--r--src/mame/drivers/othldrby.c38
-rw-r--r--src/mame/drivers/othunder.c94
-rw-r--r--src/mame/drivers/overdriv.c78
-rw-r--r--src/mame/drivers/pachifev.c38
-rw-r--r--src/mame/drivers/pacland.c46
-rw-r--r--src/mame/drivers/pacman.c192
-rw-r--r--src/mame/drivers/pandoras.c62
-rw-r--r--src/mame/drivers/pangofun.c22
-rw-r--r--src/mame/drivers/panicr.c44
-rw-r--r--src/mame/drivers/paradise.c70
-rw-r--r--src/mame/drivers/paranoia.c48
-rw-r--r--src/mame/drivers/parodius.c52
-rw-r--r--src/mame/drivers/pasha2.c42
-rw-r--r--src/mame/drivers/pass.c44
-rw-r--r--src/mame/drivers/pastelg.c90
-rw-r--r--src/mame/drivers/pbaction.c54
-rw-r--r--src/mame/drivers/pcat_dyn.c54
-rw-r--r--src/mame/drivers/pcat_nit.c24
-rw-r--r--src/mame/drivers/pcktgal.c50
-rw-r--r--src/mame/drivers/pcxt.c104
-rw-r--r--src/mame/drivers/pengadvb.c32
-rw-r--r--src/mame/drivers/pengo.c36
-rw-r--r--src/mame/drivers/peplus.c40
-rw-r--r--src/mame/drivers/pgm.c162
-rw-r--r--src/mame/drivers/phoenix.c96
-rw-r--r--src/mame/drivers/photon.c40
-rw-r--r--src/mame/drivers/photon2.c42
-rw-r--r--src/mame/drivers/photoply.c44
-rw-r--r--src/mame/drivers/pingpong.c42
-rw-r--r--src/mame/drivers/pinkiri8.c36
-rw-r--r--src/mame/drivers/pipedrm.c100
-rw-r--r--src/mame/drivers/pipeline.c56
-rw-r--r--src/mame/drivers/pirates.c34
-rw-r--r--src/mame/drivers/pitnrun.c60
-rw-r--r--src/mame/drivers/pkscram.c42
-rw-r--r--src/mame/drivers/pktgaldx.c82
-rw-r--r--src/mame/drivers/playch10.c74
-rw-r--r--src/mame/drivers/playmark.c208
-rw-r--r--src/mame/drivers/plygonet.c64
-rw-r--r--src/mame/drivers/pntnpuzl.c26
-rw-r--r--src/mame/drivers/pokechmp.c48
-rw-r--r--src/mame/drivers/poker72.c38
-rw-r--r--src/mame/drivers/polepos.c172
-rw-r--r--src/mame/drivers/policetr.c40
-rw-r--r--src/mame/drivers/polyplay.c42
-rw-r--r--src/mame/drivers/poo.c54
-rw-r--r--src/mame/drivers/poolshrk.c36
-rw-r--r--src/mame/drivers/pooyan.c32
-rw-r--r--src/mame/drivers/popeye.c52
-rw-r--r--src/mame/drivers/popper.c50
-rw-r--r--src/mame/drivers/portrait.c40
-rw-r--r--src/mame/drivers/powerbal.c76
-rw-r--r--src/mame/drivers/powerins.c82
-rw-r--r--src/mame/drivers/ppmast93.c48
-rw-r--r--src/mame/drivers/prehisle.c44
-rw-r--r--src/mame/drivers/progolf.c46
-rw-r--r--src/mame/drivers/psattack.c44
-rw-r--r--src/mame/drivers/psikyo.c196
-rw-r--r--src/mame/drivers/psikyo4.c72
-rw-r--r--src/mame/drivers/psikyosh.c58
-rw-r--r--src/mame/drivers/psychic5.c132
-rw-r--r--src/mame/drivers/pturn.c46
-rw-r--r--src/mame/drivers/puckpkmn.c16
-rw-r--r--src/mame/drivers/punchout.c80
-rw-r--r--src/mame/drivers/pushman.c104
-rw-r--r--src/mame/drivers/pzletime.c42
-rw-r--r--src/mame/drivers/qdrmfgp.c90
-rw-r--r--src/mame/drivers/qix.c50
-rw-r--r--src/mame/drivers/quakeat.c30
-rw-r--r--src/mame/drivers/quantum.c34
-rw-r--r--src/mame/drivers/quasar.c54
-rw-r--r--src/mame/drivers/queen.c24
-rw-r--r--src/mame/drivers/quizdna.c56
-rw-r--r--src/mame/drivers/quizo.c32
-rw-r--r--src/mame/drivers/quizpani.c36
-rw-r--r--src/mame/drivers/quizpun2.c46
-rw-r--r--src/mame/drivers/r2dtank.c42
-rw-r--r--src/mame/drivers/r2dx_v33.c70
-rw-r--r--src/mame/drivers/rabbit.c42
-rw-r--r--src/mame/drivers/raiden.c56
-rw-r--r--src/mame/drivers/raiden2.c74
-rw-r--r--src/mame/drivers/rainbow.c94
-rw-r--r--src/mame/drivers/rallyx.c106
-rw-r--r--src/mame/drivers/rampart.c40
-rw-r--r--src/mame/drivers/rastan.c56
-rw-r--r--src/mame/drivers/rbmk.c52
-rw-r--r--src/mame/drivers/rcorsair.c32
-rw-r--r--src/mame/drivers/re900.c30
-rw-r--r--src/mame/drivers/realbrk.c60
-rw-r--r--src/mame/drivers/redalert.c40
-rw-r--r--src/mame/drivers/redclash.c68
-rw-r--r--src/mame/drivers/relief.c36
-rw-r--r--src/mame/drivers/renegade.c52
-rw-r--r--src/mame/drivers/retofinv.c58
-rw-r--r--src/mame/drivers/rgum.c38
-rw-r--r--src/mame/drivers/rmhaihai.c60
-rw-r--r--src/mame/drivers/rockrage.c50
-rw-r--r--src/mame/drivers/rocnrope.c30
-rw-r--r--src/mame/drivers/rohga.c220
-rw-r--r--src/mame/drivers/rollerg.c48
-rw-r--r--src/mame/drivers/rollrace.c50
-rw-r--r--src/mame/drivers/rotaryf.c20
-rw-r--r--src/mame/drivers/roul.c42
-rw-r--r--src/mame/drivers/route16.c78
-rw-r--r--src/mame/drivers/royalmah.c208
-rw-r--r--src/mame/drivers/rpunch.c42
-rw-r--r--src/mame/drivers/runaway.c48
-rw-r--r--src/mame/drivers/rungun.c66
-rw-r--r--src/mame/drivers/safarir.c38
-rw-r--r--src/mame/drivers/sandscrp.c56
-rw-r--r--src/mame/drivers/sangho.c76
-rw-r--r--src/mame/drivers/sauro.c62
-rw-r--r--src/mame/drivers/savquest.c26
-rw-r--r--src/mame/drivers/sbasketb.c48
-rw-r--r--src/mame/drivers/sbowling.c34
-rw-r--r--src/mame/drivers/sbrkout.c32
-rw-r--r--src/mame/drivers/sbugger.c40
-rw-r--r--src/mame/drivers/scobra.c174
-rw-r--r--src/mame/drivers/scotrsht.c40
-rw-r--r--src/mame/drivers/scramble.c252
-rw-r--r--src/mame/drivers/scregg.c84
-rw-r--r--src/mame/drivers/sderby.c110
-rw-r--r--src/mame/drivers/seattle.c80
-rw-r--r--src/mame/drivers/segac2.c50
-rw-r--r--src/mame/drivers/segae.c40
-rw-r--r--src/mame/drivers/segag80r.c92
-rw-r--r--src/mame/drivers/segag80v.c58
-rw-r--r--src/mame/drivers/segahang.c208
-rw-r--r--src/mame/drivers/segald.c28
-rw-r--r--src/mame/drivers/segamsys.c38
-rw-r--r--src/mame/drivers/segaorun.c68
-rw-r--r--src/mame/drivers/segas16a.c76
-rw-r--r--src/mame/drivers/segas16b.c92
-rw-r--r--src/mame/drivers/segas18.c60
-rw-r--r--src/mame/drivers/segas24.c52
-rw-r--r--src/mame/drivers/segas32.c132
-rw-r--r--src/mame/drivers/segaxbd.c74
-rw-r--r--src/mame/drivers/segaybd.c78
-rw-r--r--src/mame/drivers/seibuspi.c164
-rw-r--r--src/mame/drivers/seicross.c58
-rw-r--r--src/mame/drivers/sengokmj.c36
-rw-r--r--src/mame/drivers/senjyo.c68
-rw-r--r--src/mame/drivers/seta.c1526
-rw-r--r--src/mame/drivers/seta2.c152
-rw-r--r--src/mame/drivers/sf.c86
-rw-r--r--src/mame/drivers/sfbonus.c40
-rw-r--r--src/mame/drivers/sfcbox.c32
-rw-r--r--src/mame/drivers/sfkick.c54
-rw-r--r--src/mame/drivers/sg1000a.c26
-rw-r--r--src/mame/drivers/shadfrce.c42
-rw-r--r--src/mame/drivers/shangha3.c136
-rw-r--r--src/mame/drivers/shanghai.c126
-rw-r--r--src/mame/drivers/shangkid.c114
-rw-r--r--src/mame/drivers/shaolins.c46
-rw-r--r--src/mame/drivers/shisen.c58
-rw-r--r--src/mame/drivers/shootout.c72
-rw-r--r--src/mame/drivers/shougi.c44
-rw-r--r--src/mame/drivers/shuuz.c32
-rw-r--r--src/mame/drivers/sidearms.c174
-rw-r--r--src/mame/drivers/sidepckt.c44
-rw-r--r--src/mame/drivers/sigmab52.c36
-rw-r--r--src/mame/drivers/sigmab98.c40
-rw-r--r--src/mame/drivers/silkroad.c46
-rw-r--r--src/mame/drivers/simpl156.c66
-rw-r--r--src/mame/drivers/simpsons.c58
-rw-r--r--src/mame/drivers/skeetsht.c34
-rw-r--r--src/mame/drivers/skimaxx.c62
-rw-r--r--src/mame/drivers/skullxbo.c30
-rw-r--r--src/mame/drivers/skyarmy.c38
-rw-r--r--src/mame/drivers/skydiver.c40
-rw-r--r--src/mame/drivers/skyfox.c44
-rw-r--r--src/mame/drivers/skykid.c48
-rw-r--r--src/mame/drivers/skylncr.c42
-rw-r--r--src/mame/drivers/skyraid.c38
-rw-r--r--src/mame/drivers/slapfght.c248
-rw-r--r--src/mame/drivers/slapshot.c120
-rw-r--r--src/mame/drivers/sliver.c36
-rw-r--r--src/mame/drivers/slotcarn.c36
-rw-r--r--src/mame/drivers/sms.c52
-rw-r--r--src/mame/drivers/snesb.c32
-rw-r--r--src/mame/drivers/snk.c456
-rw-r--r--src/mame/drivers/snk6502.c180
-rw-r--r--src/mame/drivers/snk68.c44
-rw-r--r--src/mame/drivers/snookr10.c46
-rw-r--r--src/mame/drivers/snowbros.c226
-rw-r--r--src/mame/drivers/solomon.c50
-rw-r--r--src/mame/drivers/sonson.c46
-rw-r--r--src/mame/drivers/sothello.c68
-rw-r--r--src/mame/drivers/spacefb.c30
-rw-r--r--src/mame/drivers/spaceg.c42
-rw-r--r--src/mame/drivers/spbactn.c42
-rw-r--r--src/mame/drivers/spcforce.c46
-rw-r--r--src/mame/drivers/spdodgeb.c66
-rw-r--r--src/mame/drivers/speedatk.c42
-rw-r--r--src/mame/drivers/speedbal.c44
-rw-r--r--src/mame/drivers/speedspn.c38
-rw-r--r--src/mame/drivers/speglsht.c50
-rw-r--r--src/mame/drivers/spiders.c36
-rw-r--r--src/mame/drivers/splash.c154
-rw-r--r--src/mame/drivers/spoker.c42
-rw-r--r--src/mame/drivers/spool99.c44
-rw-r--r--src/mame/drivers/sprcros2.c54
-rw-r--r--src/mame/drivers/sprint2.c68
-rw-r--r--src/mame/drivers/sprint4.c36
-rw-r--r--src/mame/drivers/sprint8.c52
-rw-r--r--src/mame/drivers/spy.c62
-rw-r--r--src/mame/drivers/srmp2.c132
-rw-r--r--src/mame/drivers/srmp5.c46
-rw-r--r--src/mame/drivers/srmp6.c32
-rw-r--r--src/mame/drivers/srumbler.c64
-rw-r--r--src/mame/drivers/ssfindo.c48
-rw-r--r--src/mame/drivers/sshangha.c56
-rw-r--r--src/mame/drivers/ssingles.c36
-rw-r--r--src/mame/drivers/sslam.c72
-rw-r--r--src/mame/drivers/ssozumo.c48
-rw-r--r--src/mame/drivers/sspeedr.c36
-rw-r--r--src/mame/drivers/ssrj.c40
-rw-r--r--src/mame/drivers/sstrangr.c22
-rw-r--r--src/mame/drivers/ssv.c240
-rw-r--r--src/mame/drivers/st0016.c48
-rw-r--r--src/mame/drivers/stactics.c10
-rw-r--r--src/mame/drivers/stadhero.c52
-rw-r--r--src/mame/drivers/starcrus.c38
-rw-r--r--src/mame/drivers/starfire.c16
-rw-r--r--src/mame/drivers/starshp1.c32
-rw-r--r--src/mame/drivers/starwars.c54
-rw-r--r--src/mame/drivers/statriv2.c48
-rw-r--r--src/mame/drivers/stepstag.c64
-rw-r--r--src/mame/drivers/stfight.c72
-rw-r--r--src/mame/drivers/stlforce.c42
-rw-r--r--src/mame/drivers/strnskil.c50
-rw-r--r--src/mame/drivers/stv.c60
-rw-r--r--src/mame/drivers/sub.c48
-rw-r--r--src/mame/drivers/subs.c58
-rw-r--r--src/mame/drivers/subsino.c224
-rw-r--r--src/mame/drivers/suna16.c250
-rw-r--r--src/mame/drivers/suna8.c314
-rw-r--r--src/mame/drivers/supbtime.c96
-rw-r--r--src/mame/drivers/supdrapo.c42
-rw-r--r--src/mame/drivers/superchs.c40
-rw-r--r--src/mame/drivers/superdq.c38
-rw-r--r--src/mame/drivers/superqix.c190
-rw-r--r--src/mame/drivers/supertnk.c32
-rw-r--r--src/mame/drivers/suprgolf.c44
-rw-r--r--src/mame/drivers/suprloco.c44
-rw-r--r--src/mame/drivers/suprnova.c58
-rw-r--r--src/mame/drivers/suprridr.c48
-rw-r--r--src/mame/drivers/suprslam.c54
-rw-r--r--src/mame/drivers/surpratk.c44
-rw-r--r--src/mame/drivers/system1.c94
-rw-r--r--src/mame/drivers/system16.c316
-rw-r--r--src/mame/drivers/tagteam.c48
-rw-r--r--src/mame/drivers/tail2nos.c54
-rw-r--r--src/mame/drivers/taito_b.c1038
-rw-r--r--src/mame/drivers/taito_f2.c566
-rw-r--r--src/mame/drivers/taito_f3.c98
-rw-r--r--src/mame/drivers/taito_h.c156
-rw-r--r--src/mame/drivers/taito_l.c316
-rw-r--r--src/mame/drivers/taito_o.c42
-rw-r--r--src/mame/drivers/taito_x.c198
-rw-r--r--src/mame/drivers/taito_z.c912
-rw-r--r--src/mame/drivers/taitoair.c60
-rw-r--r--src/mame/drivers/taitogn.c56
-rw-r--r--src/mame/drivers/taitojc.c48
-rw-r--r--src/mame/drivers/taitopjc.c22
-rw-r--r--src/mame/drivers/taitosj.c82
-rw-r--r--src/mame/drivers/taitotz.c22
-rw-r--r--src/mame/drivers/taitowlf.c54
-rw-r--r--src/mame/drivers/tank8.c40
-rw-r--r--src/mame/drivers/tankbatt.c36
-rw-r--r--src/mame/drivers/tankbust.c54
-rw-r--r--src/mame/drivers/taotaido.c50
-rw-r--r--src/mame/drivers/targeth.c32
-rw-r--r--src/mame/drivers/tatsumi.c218
-rw-r--r--src/mame/drivers/tattack.c32
-rw-r--r--src/mame/drivers/taxidrvr.c64
-rw-r--r--src/mame/drivers/tbowl.c78
-rw-r--r--src/mame/drivers/tceptor.c118
-rw-r--r--src/mame/drivers/tcl.c34
-rw-r--r--src/mame/drivers/tecmo.c102
-rw-r--r--src/mame/drivers/tecmo16.c56
-rw-r--r--src/mame/drivers/tecmosys.c70
-rw-r--r--src/mame/drivers/tehkanwc.c62
-rw-r--r--src/mame/drivers/tempest.c40
-rw-r--r--src/mame/drivers/terracre.c168
-rw-r--r--src/mame/drivers/tetrisp2.c200
-rw-r--r--src/mame/drivers/tgtpanic.c24
-rw-r--r--src/mame/drivers/thayers.c30
-rw-r--r--src/mame/drivers/thedeep.c42
-rw-r--r--src/mame/drivers/thepit.c52
-rw-r--r--src/mame/drivers/thief.c132
-rw-r--r--src/mame/drivers/thoop2.c32
-rw-r--r--src/mame/drivers/thunderj.c34
-rw-r--r--src/mame/drivers/thunderx.c100
-rw-r--r--src/mame/drivers/tiamc1.c38
-rw-r--r--src/mame/drivers/tickee.c108
-rw-r--r--src/mame/drivers/tigeroad.c62
-rw-r--r--src/mame/drivers/timelimt.c60
-rw-r--r--src/mame/drivers/timeplt.c50
-rw-r--r--src/mame/drivers/timetrv.c30
-rw-r--r--src/mame/drivers/tmaster.c86
-rw-r--r--src/mame/drivers/tmmjprd.c76
-rw-r--r--src/mame/drivers/tmnt.c648
-rw-r--r--src/mame/drivers/tnzs.c382
-rw-r--r--src/mame/drivers/toaplan1.c370
-rw-r--r--src/mame/drivers/toaplan2.c920
-rw-r--r--src/mame/drivers/toki.c74
-rw-r--r--src/mame/drivers/tokyocop.c22
-rw-r--r--src/mame/drivers/tomcat.c66
-rw-r--r--src/mame/drivers/toobin.c30
-rw-r--r--src/mame/drivers/topspeed.c62
-rw-r--r--src/mame/drivers/toratora.c44
-rw-r--r--src/mame/drivers/tourtabl.c30
-rw-r--r--src/mame/drivers/toypop.c66
-rw-r--r--src/mame/drivers/tp84.c72
-rw-r--r--src/mame/drivers/trackfld.c140
-rw-r--r--src/mame/drivers/travrusa.c36
-rw-r--r--src/mame/drivers/triforce.c24
-rw-r--r--src/mame/drivers/triplhnt.c44
-rw-r--r--src/mame/drivers/truco.c32
-rw-r--r--src/mame/drivers/trucocl.c34
-rw-r--r--src/mame/drivers/trvmadns.c36
-rw-r--r--src/mame/drivers/trvquest.c30
-rw-r--r--src/mame/drivers/tryout.c38
-rw-r--r--src/mame/drivers/tsamurai.c158
-rw-r--r--src/mame/drivers/ttchamp.c26
-rw-r--r--src/mame/drivers/tubep.c146
-rw-r--r--src/mame/drivers/tugboat.c36
-rw-r--r--src/mame/drivers/tumbleb.c370
-rw-r--r--src/mame/drivers/tumblep.c48
-rw-r--r--src/mame/drivers/tunhunt.c42
-rw-r--r--src/mame/drivers/turbo.c104
-rw-r--r--src/mame/drivers/turrett.c24
-rw-r--r--src/mame/drivers/tutankhm.c26
-rw-r--r--src/mame/drivers/twin16.c162
-rw-r--r--src/mame/drivers/twincobr.c64
-rw-r--r--src/mame/drivers/twinkle.c62
-rw-r--r--src/mame/drivers/twins.c68
-rw-r--r--src/mame/drivers/tx1.c208
-rw-r--r--src/mame/drivers/uapce.c42
-rw-r--r--src/mame/drivers/ultraman.c60
-rw-r--r--src/mame/drivers/ultratnk.c34
-rw-r--r--src/mame/drivers/ultrsprt.c44
-rw-r--r--src/mame/drivers/undrfire.c76
-rw-r--r--src/mame/drivers/unico.c130
-rw-r--r--src/mame/drivers/upscope.c46
-rw-r--r--src/mame/drivers/usgames.c42
-rw-r--r--src/mame/drivers/vamphalf.c186
-rw-r--r--src/mame/drivers/vaportra.c58
-rw-r--r--src/mame/drivers/vastar.c50
-rw-r--r--src/mame/drivers/vball.c42
-rw-r--r--src/mame/drivers/vcombat.c90
-rw-r--r--src/mame/drivers/vega.c22
-rw-r--r--src/mame/drivers/vegaeo.c26
-rw-r--r--src/mame/drivers/vegas.c100
-rw-r--r--src/mame/drivers/vendetta.c82
-rw-r--r--src/mame/drivers/vertigo.c34
-rw-r--r--src/mame/drivers/vicdual.c190
-rw-r--r--src/mame/drivers/victory.c26
-rw-r--r--src/mame/drivers/videopin.c34
-rw-r--r--src/mame/drivers/videopkr.c102
-rw-r--r--src/mame/drivers/vigilant.c216
-rw-r--r--src/mame/drivers/vindictr.c28
-rw-r--r--src/mame/drivers/viper.c40
-rw-r--r--src/mame/drivers/vmetal.c40
-rw-r--r--src/mame/drivers/volfied.c54
-rw-r--r--src/mame/drivers/vp101.c28
-rw-r--r--src/mame/drivers/vpoker.c40
-rw-r--r--src/mame/drivers/vroulet.c42
-rw-r--r--src/mame/drivers/vsnes.c124
-rw-r--r--src/mame/drivers/vulgus.c44
-rw-r--r--src/mame/drivers/wallc.c34
-rw-r--r--src/mame/drivers/wardner.c58
-rw-r--r--src/mame/drivers/warpwarp.c72
-rw-r--r--src/mame/drivers/warriorb.c216
-rw-r--r--src/mame/drivers/wc90.c50
-rw-r--r--src/mame/drivers/wc90b.c50
-rw-r--r--src/mame/drivers/wecleman.c114
-rw-r--r--src/mame/drivers/welltris.c48
-rw-r--r--src/mame/drivers/wgp.c70
-rw-r--r--src/mame/drivers/wheelfir.c46
-rw-r--r--src/mame/drivers/williams.c194
-rw-r--r--src/mame/drivers/wink.c48
-rw-r--r--src/mame/drivers/wiping.c38
-rw-r--r--src/mame/drivers/witch.c52
-rw-r--r--src/mame/drivers/wiz.c82
-rw-r--r--src/mame/drivers/wldarrow.c26
-rw-r--r--src/mame/drivers/wolfpack.c34
-rw-r--r--src/mame/drivers/wrally.c42
-rw-r--r--src/mame/drivers/wwfsstar.c40
-rw-r--r--src/mame/drivers/wwfwfest.c44
-rw-r--r--src/mame/drivers/xain.c66
-rw-r--r--src/mame/drivers/xexex.c98
-rw-r--r--src/mame/drivers/xmen.c134
-rw-r--r--src/mame/drivers/xorworld.c38
-rw-r--r--src/mame/drivers/xtheball.c28
-rw-r--r--src/mame/drivers/xtom3d.c26
-rw-r--r--src/mame/drivers/xxmissio.c66
-rw-r--r--src/mame/drivers/xybots.c30
-rw-r--r--src/mame/drivers/xyonix.c42
-rw-r--r--src/mame/drivers/yiear.c46
-rw-r--r--src/mame/drivers/yunsun16.c90
-rw-r--r--src/mame/drivers/yunsung8.c54
-rw-r--r--src/mame/drivers/zac2650.c34
-rw-r--r--src/mame/drivers/zaccaria.c72
-rw-r--r--src/mame/drivers/zaxxon.c76
-rw-r--r--src/mame/drivers/zerozone.c42
-rw-r--r--src/mame/drivers/zn.c222
-rw-r--r--src/mame/drivers/zodiack.c48
-rw-r--r--src/mame/drivers/zr107.c132
-rw-r--r--src/mame/includes/naomibd.h48
-rw-r--r--src/mame/machine/asic65.c6
-rw-r--r--src/mame/machine/atari_vg.h4
-rw-r--r--src/mame/machine/cdicdic.h8
-rw-r--r--src/mame/machine/cdislave.h8
-rw-r--r--src/mame/machine/decocass.h4
-rw-r--r--src/mame/machine/mathbox.h4
-rw-r--r--src/mame/machine/namco06.h14
-rw-r--r--src/mame/machine/namco50.c4
-rw-r--r--src/mame/machine/namco50.h4
-rw-r--r--src/mame/machine/namco51.c6
-rw-r--r--src/mame/machine/namco51.h6
-rw-r--r--src/mame/machine/namco53.c4
-rw-r--r--src/mame/machine/namco53.h6
-rw-r--r--src/mame/machine/namcoio.h18
-rw-r--r--src/mame/machine/nmk112.h6
-rw-r--r--src/mame/machine/pcshare.c12
-rw-r--r--src/mame/machine/segaic16.h14
-rw-r--r--src/mame/machine/taitoio.h18
-rw-r--r--src/mame/machine/ticket.h8
-rw-r--r--src/mame/video/20pacgal.c16
-rw-r--r--src/mame/video/cidelsa.c36
-rw-r--r--src/mame/video/crgolf.c18
-rw-r--r--src/mame/video/deco16ic.h6
-rw-r--r--src/mame/video/exidy440.c26
-rw-r--r--src/mame/video/gameplan.c22
-rw-r--r--src/mame/video/gp9001.h8
-rw-r--r--src/mame/video/jedi.c16
-rw-r--r--src/mame/video/kan_pand.h6
-rw-r--r--src/mame/video/konicdev.h132
-rw-r--r--src/mame/video/leland.c22
-rw-r--r--src/mame/video/madalien.c18
-rw-r--r--src/mame/video/mystston.c16
-rw-r--r--src/mame/video/ppu2c0x.h48
-rw-r--r--src/mame/video/qix.c28
-rw-r--r--src/mame/video/redalert.c54
-rw-r--r--src/mame/video/segaic16.h54
-rw-r--r--src/mame/video/stactics.c22
-rw-r--r--src/mame/video/taitoic.h64
-rw-r--r--src/mame/video/vrender0.h6
1251 files changed, 47710 insertions, 47710 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h
index 360d866006c..f3f4ac813b1 100644
--- a/src/emu/cpu/adsp2100/adsp2100.h
+++ b/src/emu/cpu/adsp2100/adsp2100.h
@@ -55,7 +55,7 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_ADSP21XX_CONFIG(_config) \
+#define MCFG_ADSP21XX_CONFIG(_config) \
adsp21xx_device_config::static_set_config(device, _config); \
diff --git a/src/emu/deprecat.h b/src/emu/deprecat.h
index 70a34b02b7f..aae7624b722 100644
--- a/src/emu/deprecat.h
+++ b/src/emu/deprecat.h
@@ -30,7 +30,7 @@
*
*************************************/
-#define MDRV_CPU_VBLANK_INT_HACK(_func, _rate) \
+#define MCFG_CPU_VBLANK_INT_HACK(_func, _rate) \
device_config_execute_interface::static_set_vblank_int(device, _func, NULL, _rate); \
diff --git a/src/emu/devcb.h b/src/emu/devcb.h
index 6c9f540fa17..77b7dd3dc65 100644
--- a/src/emu/devcb.h
+++ b/src/emu/devcb.h
@@ -135,18 +135,18 @@ void devcb_stub(device_t *device, offs_t offset, UINT8 data)
/* macros for inline device handler initialization */
-#define MDRV_DEVICE_CONFIG_DEVCB_GENERIC(_access, _struct, _entry, _tag, _type, _linefunc, _devfunc, _spacefunc) \
- MDRV_DEVICE_CONFIG_DATA32(_struct, _entry .type, DEVCB_TYPE_DEVICE) \
- MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry .tag, _tag) \
- MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## line, _linefunc) \
- MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## device, _devfunc) \
- MDRV_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## space, _spacefunc)
-
-#define MDRV_DEVICE_CONFIG_READ_LINE(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL)
-#define MDRV_DEVICE_CONFIG_WRITE_LINE(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL)
-
-#define MDRV_DEVICE_CONFIG_READ_HANDLER(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL)
-#define MDRV_DEVICE_CONFIG_WRITE_HANDLER(_struct, _entry, _tag, _func) MDRV_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL)
+#define MCFG_DEVICE_CONFIG_DEVCB_GENERIC(_access, _struct, _entry, _tag, _type, _linefunc, _devfunc, _spacefunc) \
+ MCFG_DEVICE_CONFIG_DATA32(_struct, _entry .type, DEVCB_TYPE_DEVICE) \
+ MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry .tag, _tag) \
+ MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## line, _linefunc) \
+ MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## device, _devfunc) \
+ MCFG_DEVICE_CONFIG_DATAPTR(_struct, _entry . _access ## space, _spacefunc)
+
+#define MCFG_DEVICE_CONFIG_READ_LINE(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL)
+#define MCFG_DEVICE_CONFIG_WRITE_LINE(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, _func, NULL, NULL)
+
+#define MCFG_DEVICE_CONFIG_READ_HANDLER(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(read, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL)
+#define MCFG_DEVICE_CONFIG_WRITE_HANDLER(_struct, _entry, _tag, _func) MCFG_DEVICE_CONFIG_DEVCB_GENERIC(write, _struct, _entry, _tag, DEVCB_TYPE_DEVICE, NULL, _func, NULL)
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index 2d9f5bc398d..b3e8412b65b 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -147,19 +147,19 @@ enum
// CPU DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_CPU_ADD MDRV_DEVICE_ADD
-#define MDRV_CPU_MODIFY MDRV_DEVICE_MODIFY
-#define MDRV_CPU_REPLACE MDRV_DEVICE_REPLACE
+#define MCFG_CPU_ADD MCFG_DEVICE_ADD
+#define MCFG_CPU_MODIFY MCFG_DEVICE_MODIFY
+#define MCFG_CPU_REPLACE MCFG_DEVICE_REPLACE
-#define MDRV_CPU_CLOCK MDRV_DEVICE_CLOCK
-#define MDRV_CPU_CONFIG MDRV_DEVICE_CONFIG
+#define MCFG_CPU_CLOCK MCFG_DEVICE_CLOCK
+#define MCFG_CPU_CONFIG MCFG_DEVICE_CONFIG
-#define MDRV_CPU_PROGRAM_MAP MDRV_DEVICE_PROGRAM_MAP
-#define MDRV_CPU_DATA_MAP MDRV_DEVICE_DATA_MAP
-#define MDRV_CPU_IO_MAP MDRV_DEVICE_IO_MAP
+#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 MDRV_CPU_VBLANK_INT MDRV_DEVICE_VBLANK_INT
-#define MDRV_CPU_PERIODIC_INT MDRV_DEVICE_PERIODIC_INT
+#define MCFG_CPU_VBLANK_INT MCFG_DEVICE_VBLANK_INT
+#define MCFG_CPU_PERIODIC_INT MCFG_DEVICE_PERIODIC_INT
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index ed7c058d0c3..6ed7bba226a 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -99,13 +99,13 @@ device_t *_ConfigClass::alloc_device(running_machine &machine) const \
//**************************************************************************
// configure devices
-#define MDRV_DEVICE_CONFIG(_config) \
+#define MCFG_DEVICE_CONFIG(_config) \
device_config::static_set_static_config(device, &(_config)); \
-#define MDRV_DEVICE_CONFIG_CLEAR() \
+#define MCFG_DEVICE_CONFIG_CLEAR() \
device_config::static_set_static_config(device, NULL); \
-#define MDRV_DEVICE_CLOCK(_clock) \
+#define MCFG_DEVICE_CLOCK(_clock) \
device_config::static_set_clock(device, _clock); \
diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h
index d49bc594bf0..a70fae5fb2e 100644
--- a/src/emu/devlegcy.h
+++ b/src/emu/devlegcy.h
@@ -278,91 +278,91 @@ const device_type name = configclass::static_alloc_device_config
#define structsizeof(_struct, _field) sizeof(((_struct *)NULL)->_field)
// inline device configurations that require 32 bits of storage in the token
-#define MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(_size, _offset, _val) \
+#define MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(_size, _offset, _val) \
legacy_device_config_base::static_set_inline32(device, _offset, _size, (UINT32)(_val));
-#define MDRV_DEVICE_CONFIG_DATA32(_struct, _field, _val) \
- MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val)
+#define MCFG_DEVICE_CONFIG_DATA32(_struct, _field, _val) \
+ MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val)
-#define MDRV_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \
- MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val)
+#define MCFG_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \
+ MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val)
-#define MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
- MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val)
+#define MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
+ MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val)
-#define MDRV_NEW_DEVICE_CONFIG_DATA32(_struct, _field, _val) \
- MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val)
+#define MCFG_NEW_DEVICE_CONFIG_DATA32(_struct, _field, _val) \
+ MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val)
-#define MDRV_NEW_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \
- MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val)
+#define MCFG_NEW_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val) \
+ MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val)
-#define MDRV_NEW_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
- MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val)
+#define MCFG_NEW_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
+ MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val)
// inline device configurations that require 32 bits of fixed-point storage in the token
-#define MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(_size, _offset, _val, _fixbits) \
+#define MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(_size, _offset, _val, _fixbits) \
legacy_device_config_base::static_set_inline_float(device, _offset, _size, (float)(_val));
-#define MDRV_DEVICE_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \
- MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val, _fixbits)
+#define MCFG_DEVICE_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \
+ MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val, _fixbits)
-#define MDRV_DEVICE_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \
- MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val, _fixbits)
+#define MCFG_DEVICE_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \
+ MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val, _fixbits)
-#define MDRV_DEVICE_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \
- MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val, _fixbits)
+#define MCFG_DEVICE_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \
+ MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val, _fixbits)
-#define MDRV_DEVICE_NEW_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \
- MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val, _fixbits)
+#define MCFG_DEVICE_NEW_CONFIG_DATAFP32(_struct, _field, _val, _fixbits) \
+ MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val, _fixbits)
-#define MDRV_DEVICE_NEW_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \
- MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val, _fixbits)
+#define MCFG_DEVICE_NEW_CONFIG_DATAFP32_ARRAY(_struct, _field, _index, _val, _fixbits) \
+ MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val, _fixbits)
-#define MDRV_DEVICE_NEW_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \
- MDRV_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val, _fixbits)
+#define MCFG_DEVICE_NEW_CONFIG_DATAFP32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val, _fixbits) \
+ MCFG_DEVICE_CONFIG_DATAFP32_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val, _fixbits)
// inline device configurations that require 64 bits of storage in the token
-#define MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(_size, _offset, _val) \
+#define MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(_size, _offset, _val) \
legacy_device_config_base::static_set_inline64(device, _offset, _size, (UINT64)(_val));
-#define MDRV_DEVICE_CONFIG_DATA64(_struct, _field, _val) \
- MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val)
+#define MCFG_DEVICE_CONFIG_DATA64(_struct, _field, _val) \
+ MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field), offsetof(_struct, _field), _val)
-#define MDRV_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \
- MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val)
+#define MCFG_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \
+ MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_struct, _field[0]), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]), _val)
-#define MDRV_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
- MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val)
+#define MCFG_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
+ MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(structsizeof(_memstruct, _member), offsetof(_struct, _field) + (_index) * structsizeof(_struct, _field[0]) + offsetof(_memstruct, _member), _val)
-#define MDRV_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val) \
- MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val)
+#define MCFG_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val) \
+ MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field), DEVCONFIG_OFFSETOF(_struct, _field), _val)
-#define MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \
- MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val)
+#define MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val) \
+ MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_struct, _field[0]), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]), _val)
-#define MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
- MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val)
+#define MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) \
+ MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(DEVCONFIG_SIZEOF(_memstruct, _member), DEVCONFIG_OFFSETOF(_struct, _field) + (_index) * DEVCONFIG_SIZEOF(_struct, _field[0]) + DEVCONFIG_OFFSETOF(_memstruct, _member), _val)
// inline device configurations that require a pointer-sized amount of storage in the token
#ifdef PTR64
-#define MDRV_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MDRV_DEVICE_CONFIG_DATA64_EXPLICIT(_struct, _size, _offset)
-#define MDRV_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MDRV_DEVICE_CONFIG_DATA64(_struct, _field, _val)
-#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val)
-#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
-#define MDRV_DEVICE_NEW_CONFIG_DATAPTR(_struct, _field, _val) MDRV_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val)
-#define MDRV_DEVICE_NEW_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val)
-#define MDRV_DEVICE_NEW_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
+#define MCFG_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MCFG_DEVICE_CONFIG_DATA64_EXPLICIT(_struct, _size, _offset)
+#define MCFG_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MCFG_DEVICE_CONFIG_DATA64(_struct, _field, _val)
+#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val)
+#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
+#define MCFG_DEVICE_NEW_CONFIG_DATAPTR(_struct, _field, _val) MCFG_DEVICE_NEW_CONFIG_DATA64(_struct, _field, _val)
+#define MCFG_DEVICE_NEW_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY(_struct, _field, _index, _val)
+#define MCFG_DEVICE_NEW_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_NEW_CONFIG_DATA64_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
#else
-#define MDRV_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MDRV_DEVICE_CONFIG_DATA32_EXPLICIT(_struct, _size, _offset)
-#define MDRV_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MDRV_DEVICE_CONFIG_DATA32(_struct, _field, _val)
-#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val)
-#define MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
-#define MDRV_DEVICE_CONFIG_NEW_DATAPTR(_struct, _field, _val) MDRV_DEVICE_NEW_CONFIG_DATA32(_struct, _field, _val)
-#define MDRV_DEVICE_CONFIG_NEW_DATAPTR_ARRAY(_struct, _field, _index, _val) MDRV_DEVICE_NEW_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val)
-#define MDRV_DEVICE_CONFIG_NEW_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MDRV_DEVICE_NEW_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
+#define MCFG_DEVICE_CONFIG_DATAPTR_EXPLICIT(_struct, _size, _offset) MCFG_DEVICE_CONFIG_DATA32_EXPLICIT(_struct, _size, _offset)
+#define MCFG_DEVICE_CONFIG_DATAPTR(_struct, _field, _val) MCFG_DEVICE_CONFIG_DATA32(_struct, _field, _val)
+#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val)
+#define MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
+#define MCFG_DEVICE_CONFIG_NEW_DATAPTR(_struct, _field, _val) MCFG_DEVICE_NEW_CONFIG_DATA32(_struct, _field, _val)
+#define MCFG_DEVICE_CONFIG_NEW_DATAPTR_ARRAY(_struct, _field, _index, _val) MCFG_DEVICE_NEW_CONFIG_DATA32_ARRAY(_struct, _field, _index, _val)
+#define MCFG_DEVICE_CONFIG_NEW_DATAPTR_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val) MCFG_DEVICE_NEW_CONFIG_DATA32_ARRAY_MEMBER(_struct, _field, _index, _memstruct, _member, _val)
#endif
diff --git a/src/emu/diexec.c b/src/emu/diexec.c
index d3a32d62493..b404baba375 100644
--- a/src/emu/diexec.c
+++ b/src/emu/diexec.c
@@ -101,7 +101,7 @@ void device_config_execute_interface::static_set_disable(device_config *device)
{
device_config_execute_interface *exec = dynamic_cast<device_config_execute_interface *>(device);
if (exec == NULL)
- throw emu_fatalerror("MDRV_DEVICE_DISABLE called on device '%s' with no execute interface", device->tag());
+ throw emu_fatalerror("MCFG_DEVICE_DISABLE called on device '%s' with no execute interface", device->tag());
exec->m_disabled = true;
}
@@ -115,7 +115,7 @@ void device_config_execute_interface::static_set_vblank_int(device_config *devic
{
device_config_execute_interface *exec = dynamic_cast<device_config_execute_interface *>(device);
if (exec == NULL)
- throw emu_fatalerror("MDRV_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device->tag());
+ throw emu_fatalerror("MCFG_DEVICE_VBLANK_INT called on device '%s' with no execute interface", device->tag());
exec->m_vblank_interrupt = function;
exec->m_vblank_interrupts_per_frame = rate;
exec->m_vblank_interrupt_screen = tag;
@@ -131,7 +131,7 @@ void device_config_execute_interface::static_set_periodic_int(device_config *dev
{
device_config_execute_interface *exec = dynamic_cast<device_config_execute_interface *>(device);
if (exec == NULL)
- throw emu_fatalerror("MDRV_DEVICE_PERIODIC_INT called on device '%s' with no execute interface", device->tag());
+ throw emu_fatalerror("MCFG_DEVICE_PERIODIC_INT called on device '%s' with no execute interface", device->tag());
exec->m_timed_interrupt = function;
exec->m_timed_interrupt_period = rate;
}
diff --git a/src/emu/diexec.h b/src/emu/diexec.h
index e19f4d1f997..cb9b6ae35ef 100644
--- a/src/emu/diexec.h
+++ b/src/emu/diexec.h
@@ -108,13 +108,13 @@ enum
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_DEVICE_DISABLE() \
+#define MCFG_DEVICE_DISABLE() \
device_config_execute_interface::static_set_disable(device); \
-#define MDRV_DEVICE_VBLANK_INT(_tag, _func) \
+#define MCFG_DEVICE_VBLANK_INT(_tag, _func) \
device_config_execute_interface::static_set_vblank_int(device, _func, _tag); \
-#define MDRV_DEVICE_PERIODIC_INT(_func, _rate) \
+#define MCFG_DEVICE_PERIODIC_INT(_func, _rate) \
device_config_execute_interface::static_set_periodic_int(device, _func, ATTOTIME_IN_HZ(_rate)); \
diff --git a/src/emu/dimemory.c b/src/emu/dimemory.c
index 4e36a84fc7c..f120f64aa00 100644
--- a/src/emu/dimemory.c
+++ b/src/emu/dimemory.c
@@ -152,9 +152,9 @@ void device_config_memory_interface::static_set_addrmap(device_config *device, i
{
device_config_memory_interface *memory = dynamic_cast<device_config_memory_interface *>(device);
if (memory == NULL)
- throw emu_fatalerror("MDRV_DEVICE_ADDRESS_MAP called on device '%s' with no memory interface", device->tag());
+ throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called on device '%s' with no memory interface", device->tag());
if (spacenum >= ARRAY_LENGTH(memory->m_address_map))
- throw emu_fatalerror("MDRV_DEVICE_ADDRESS_MAP called with out-of-range space number %d", device->tag(), spacenum);
+ throw emu_fatalerror("MCFG_DEVICE_ADDRESS_MAP called with out-of-range space number %d", device->tag(), spacenum);
memory->m_address_map[spacenum] = map;
}
diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h
index 362c86c1497..9ee9b0847dd 100644
--- a/src/emu/dimemory.h
+++ b/src/emu/dimemory.h
@@ -81,17 +81,17 @@ const int TRANSLATE_FETCH_DEBUG = (TRANSLATE_FETCH | TRANSLATE_DEBUG_MASK);
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_DEVICE_ADDRESS_MAP(_space, _map) \
+#define MCFG_DEVICE_ADDRESS_MAP(_space, _map) \
device_config_memory_interface::static_set_addrmap(device, _space, ADDRESS_MAP_NAME(_map));
-#define MDRV_DEVICE_PROGRAM_MAP(_map) \
- MDRV_DEVICE_ADDRESS_MAP(AS_PROGRAM, _map)
+#define MCFG_DEVICE_PROGRAM_MAP(_map) \
+ MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, _map)
-#define MDRV_DEVICE_DATA_MAP(_map) \
- MDRV_DEVICE_ADDRESS_MAP(AS_DATA, _map)
+#define MCFG_DEVICE_DATA_MAP(_map) \
+ MCFG_DEVICE_ADDRESS_MAP(AS_DATA, _map)
-#define MDRV_DEVICE_IO_MAP(_map) \
- MDRV_DEVICE_ADDRESS_MAP(AS_IO, _map)
+#define MCFG_DEVICE_IO_MAP(_map) \
+ MCFG_DEVICE_ADDRESS_MAP(AS_IO, _map)
diff --git a/src/emu/disound.c b/src/emu/disound.c
index 7e1151fcc1f..4bba628bb68 100644
--- a/src/emu/disound.c
+++ b/src/emu/disound.c
@@ -76,7 +76,7 @@ void device_config_sound_interface::static_add_route(device_config *device, UINT
{
device_config_sound_interface *sound = dynamic_cast<device_config_sound_interface *>(device);
if (sound == NULL)
- throw emu_fatalerror("MDRV_SOUND_ROUTE called on device '%s' with no sound interface", device->tag());
+ throw emu_fatalerror("MCFG_SOUND_ROUTE called on device '%s' with no sound interface", device->tag());
sound_route **routeptr;
for (routeptr = &sound->m_route_list; *routeptr != NULL; routeptr = &(*routeptr)->m_next) ;
@@ -93,7 +93,7 @@ void device_config_sound_interface::static_reset_routes(device_config *device)
{
device_config_sound_interface *sound = dynamic_cast<device_config_sound_interface *>(device);
if (sound == NULL)
- throw emu_fatalerror("MDRV_SOUND_ROUTES_RESET called on device '%s' with no sound interface", device->tag());
+ throw emu_fatalerror("MCFG_SOUND_ROUTES_RESET called on device '%s' with no sound interface", device->tag());
sound->reset_routes();
}
diff --git a/src/emu/disound.h b/src/emu/disound.h
index 47bcc16ea92..8fbb6414c4e 100644
--- a/src/emu/disound.h
+++ b/src/emu/disound.h
@@ -60,28 +60,28 @@ const int ALL_OUTPUTS = MAX_OUTPUTS; // special value indicating all outputs fo
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_SOUND_ADD(_tag, _type, _clock) \
- MDRV_DEVICE_ADD(_tag, _type, _clock) \
+#define MCFG_SOUND_ADD(_tag, _type, _clock) \
+ MCFG_DEVICE_ADD(_tag, _type, _clock) \
-#define MDRV_SOUND_MODIFY(_tag) \
- MDRV_DEVICE_MODIFY(_tag)
+#define MCFG_SOUND_MODIFY(_tag) \
+ MCFG_DEVICE_MODIFY(_tag)
-#define MDRV_SOUND_CLOCK(_clock) \
- MDRV_DEVICE_CLOCK(_clock)
+#define MCFG_SOUND_CLOCK(_clock) \
+ MCFG_DEVICE_CLOCK(_clock)
-#define MDRV_SOUND_REPLACE(_tag, _type, _clock) \
- MDRV_DEVICE_REPLACE(_tag, _type, _clock)
+#define MCFG_SOUND_REPLACE(_tag, _type, _clock) \
+ MCFG_DEVICE_REPLACE(_tag, _type, _clock)
-#define MDRV_SOUND_CONFIG(_config) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_SOUND_CONFIG(_config) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_SOUND_ROUTE_EX(_output, _target, _gain, _input) \
+#define MCFG_SOUND_ROUTE_EX(_output, _target, _gain, _input) \
device_config_sound_interface::static_add_route(device, _output, _target, _gain, _input); \
-#define MDRV_SOUND_ROUTE(_output, _target, _gain) \
- MDRV_SOUND_ROUTE_EX(_output, _target, _gain, 0)
+#define MCFG_SOUND_ROUTE(_output, _target, _gain) \
+ MCFG_SOUND_ROUTE_EX(_output, _target, _gain, 0)
-#define MDRV_SOUND_ROUTES_RESET() \
+#define MCFG_SOUND_ROUTES_RESET() \
device_config_sound_interface::static_reset_routes(device); \
diff --git a/src/emu/drivers/empty.c b/src/emu/drivers/empty.c
index d057e34e5b7..ad4511b44f3 100644
--- a/src/emu/drivers/empty.c
+++ b/src/emu/drivers/empty.c
@@ -36,14 +36,14 @@ static MACHINE_START( empty )
static MACHINE_CONFIG_START( empty, driver_device )
- MDRV_MACHINE_START(empty)
+ MCFG_MACHINE_START(empty)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(640,480)
- MDRV_SCREEN_VISIBLE_AREA(0,639, 0,479)
- MDRV_SCREEN_REFRESH_RATE(30)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(640,480)
+ MCFG_SCREEN_VISIBLE_AREA(0,639, 0,479)
+ MCFG_SCREEN_REFRESH_RATE(30)
MACHINE_CONFIG_END
diff --git a/src/emu/drivers/emudummy.c b/src/emu/drivers/emudummy.c
index a52e106e71e..af5f26f9743 100644
--- a/src/emu/drivers/emudummy.c
+++ b/src/emu/drivers/emudummy.c
@@ -49,9 +49,9 @@
MACHINE_CONFIG_START( __dummy, driver_device )
- MDRV_CPU_ADD("dummy1", I8049, 1000000)
- MDRV_CPU_ADD("dummy2", I8748, 1000000)
- MDRV_CPU_ADD("dummy3", Z80, 1000000)
+ MCFG_CPU_ADD("dummy1", I8049, 1000000)
+ MCFG_CPU_ADD("dummy2", I8748, 1000000)
+ MCFG_CPU_ADD("dummy3", Z80, 1000000)
MACHINE_CONFIG_END
diff --git a/src/emu/emupal.h b/src/emu/emupal.h
index 47f8a5ef67f..9b590de8c46 100644
--- a/src/emu/emupal.h
+++ b/src/emu/emupal.h
@@ -72,7 +72,7 @@
Shadows(Highlights) Quick Reference
-----------------------------------
- 1) declare MDRV_VIDEO_ATTRIBUTES( ... VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS ... )
+ 1) declare MCFG_VIDEO_ATTRIBUTES( ... VIDEO_HAS_SHADOWS | VIDEO_HAS_HIGHLIGHTS ... )
2) make a pen table fill with DRAWMODE_NONE, DRAWMODE_SOURCE or DRAWMODE_SHADOW
diff --git a/src/emu/machine/6522via.h b/src/emu/machine/6522via.h
index a446df91cfe..deb02af94f1 100644
--- a/src/emu/machine/6522via.h
+++ b/src/emu/machine/6522via.h
@@ -24,9 +24,9 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_VIA6522_ADD(_tag, _clock, _intrf) \
- MDRV_DEVICE_ADD(_tag, VIA6522, _clock) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_VIA6522_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, VIA6522, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h
index 7868a67e8d8..e79387d4917 100644
--- a/src/emu/machine/6526cia.h
+++ b/src/emu/machine/6526cia.h
@@ -43,17 +43,17 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_MOS6526R1_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, MOS6526R1, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_MOS6526R1_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, MOS6526R1, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_MOS6526R2_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, MOS6526R2, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_MOS6526R2_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, MOS6526R2, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_MOS8520_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, MOS8520, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_MOS8520_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, MOS8520, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define MOS6526_INTERFACE(name) \
const mos6526_interface (name)=
diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h
index cbdfb5a158d..a97f0a6d3fa 100644
--- a/src/emu/machine/6532riot.h
+++ b/src/emu/machine/6532riot.h
@@ -17,9 +17,9 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_RIOT6532_ADD(_tag, _clock, _intrf) \
- MDRV_DEVICE_ADD(_tag, RIOT6532, _clock) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_RIOT6532_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, RIOT6532, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h
index 0f05acd72ed..7934a5d5f98 100644
--- a/src/emu/machine/6821pia.h
+++ b/src/emu/machine/6821pia.h
@@ -30,21 +30,21 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PIA6821_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PIA6821, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIA6821_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PIA6821, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PIA6821_MODIFY(_tag, _intrf) \
- MDRV_DEVICE_MODIFY(_tag) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIA6821_MODIFY(_tag, _intrf) \
+ MCFG_DEVICE_MODIFY(_tag) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PIA6822_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PIA6822, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIA6822_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PIA6822, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PIA6822_MODIFY(_tag, _intrf) \
- MDRV_DEVICE_MODIFY(_tag) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIA6822_MODIFY(_tag, _intrf) \
+ MCFG_DEVICE_MODIFY(_tag) \
+ MCFG_DEVICE_CONFIG(_intrf)
diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h
index 85677adc800..df77dc4bb4c 100644
--- a/src/emu/machine/6840ptm.h
+++ b/src/emu/machine/6840ptm.h
@@ -19,9 +19,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PTM6840_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, PTM6840, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_PTM6840_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, PTM6840, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/***************************************************************************
diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h
index c3f7a238928..8bc38b96941 100644
--- a/src/emu/machine/6850acia.h
+++ b/src/emu/machine/6850acia.h
@@ -34,9 +34,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_ACIA6850_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ACIA6850, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ACIA6850_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ACIA6850, 0) \
+ MCFG_DEVICE_CONFIG(_config)
#define ACIA6850_INTERFACE(_name) \
const acia6850_interface(_name) =
diff --git a/src/emu/machine/68681.h b/src/emu/machine/68681.h
index 34e5a7ccb96..581930a6776 100644
--- a/src/emu/machine/68681.h
+++ b/src/emu/machine/68681.h
@@ -17,9 +17,9 @@ struct _duart68681_config
DECLARE_LEGACY_DEVICE(DUART68681, duart68681);
-#define MDRV_DUART68681_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, DUART68681, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_DUART68681_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, DUART68681, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
READ8_DEVICE_HANDLER(duart68681_r);
diff --git a/src/emu/machine/74123.h b/src/emu/machine/74123.h
index 7e6c5c95639..005231a646d 100644
--- a/src/emu/machine/74123.h
+++ b/src/emu/machine/74123.h
@@ -56,9 +56,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_TTL74123_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, TTL74123, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_TTL74123_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, TTL74123, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/* constants for the different ways the cap/res can be connected.
This determines the formula for calculating the pulse width */
diff --git a/src/emu/machine/74148.h b/src/emu/machine/74148.h
index a3948b5b410..252a8d6205f 100644
--- a/src/emu/machine/74148.h
+++ b/src/emu/machine/74148.h
@@ -51,9 +51,9 @@ struct _ttl74148_config
};
-#define MDRV_74148_ADD(_tag, _output_cb) \
- MDRV_DEVICE_ADD(_tag, TTL74148, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(ttl74148_config, output_cb, _output_cb)
+#define MCFG_74148_ADD(_tag, _output_cb) \
+ MCFG_DEVICE_ADD(_tag, TTL74148, 0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(ttl74148_config, output_cb, _output_cb)
/* must call ttl74148_update() after setting the inputs */
diff --git a/src/emu/machine/74153.h b/src/emu/machine/74153.h
index d4e73fb01a5..d6e75a5b8bd 100644
--- a/src/emu/machine/74153.h
+++ b/src/emu/machine/74153.h
@@ -46,9 +46,9 @@ struct _ttl74153_config
};
-#define MDRV_74153_ADD(_tag, _output_cb) \
- MDRV_DEVICE_ADD(_tag, TTL74153, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(ttl74153_config, output_cb, _output_cb)
+#define MCFG_74153_ADD(_tag, _output_cb) \
+ MCFG_DEVICE_ADD(_tag, TTL74153, 0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(ttl74153_config, output_cb, _output_cb)
diff --git a/src/emu/machine/7474.h b/src/emu/machine/7474.h
index a4ed2b270ab..0f04969b9ce 100644
--- a/src/emu/machine/7474.h
+++ b/src/emu/machine/7474.h
@@ -50,25 +50,25 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_7474_ADD(_tag, _target_tag, _output_cb, _comp_output_cb) \
- MDRV_DEVICE_ADD(_tag, MACHINE_TTL7474, 0) \
- MDRV_7474_TARGET_TAG(_target_tag) \
- MDRV_7474_OUTPUT_CB(_output_cb) \
- MDRV_7474_COMP_OUTPUT_CB(_comp_output_cb)
-
-#define MDRV_7474_REPLACE(_tag, _target_tag, _output_cb, _comp_output_cb) \
- MDRV_DEVICE_REPLACE(_tag, TTL7474, 0) \
- MDRV_7474_TARGET_TAG(_target_tag) \
- MDRV_7474_OUTPUT_CB(_output_cb) \
- MDRV_7474_COMP_OUTPUT_CB(_comp_output_cb)
-
-#define MDRV_7474_TARGET_TAG(_target_tag) \
+#define MCFG_7474_ADD(_tag, _target_tag, _output_cb, _comp_output_cb) \
+ MCFG_DEVICE_ADD(_tag, MACHINE_TTL7474, 0) \
+ MCFG_7474_TARGET_TAG(_target_tag) \
+ MCFG_7474_OUTPUT_CB(_output_cb) \
+ MCFG_7474_COMP_OUTPUT_CB(_comp_output_cb)
+
+#define MCFG_7474_REPLACE(_tag, _target_tag, _output_cb, _comp_output_cb) \
+ MCFG_DEVICE_REPLACE(_tag, TTL7474, 0) \
+ MCFG_7474_TARGET_TAG(_target_tag) \
+ MCFG_7474_OUTPUT_CB(_output_cb) \
+ MCFG_7474_COMP_OUTPUT_CB(_comp_output_cb)
+
+#define MCFG_7474_TARGET_TAG(_target_tag) \
ttl7474_device_config::static_set_target_tag(device, _target_tag); \
-#define MDRV_7474_OUTPUT_CB(_cb) \
+#define MCFG_7474_OUTPUT_CB(_cb) \
ttl7474_device_config::static_set_output_cb(device, _cb); \
-#define MDRV_7474_COMP_OUTPUT_CB(_cb) \
+#define MCFG_7474_COMP_OUTPUT_CB(_cb) \
ttl7474_device_config::static_set_comp_output_cb(device, _cb); \
diff --git a/src/emu/machine/8237dma.h b/src/emu/machine/8237dma.h
index c7d76b81f2a..3a0ccc9ac3a 100644
--- a/src/emu/machine/8237dma.h
+++ b/src/emu/machine/8237dma.h
@@ -43,9 +43,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_I8237_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, I8237, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_I8237_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, I8237, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define I8237_INTERFACE(_name) \
const i8237_interface (_name) =
diff --git a/src/emu/machine/8255ppi.h b/src/emu/machine/8255ppi.h
index c946b3d0b5b..c255460a826 100644
--- a/src/emu/machine/8255ppi.h
+++ b/src/emu/machine/8255ppi.h
@@ -19,13 +19,13 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PPI8255_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PPI8255, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPI8255_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PPI8255, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PPI8255_RECONFIG(_tag, _intrf) \
- MDRV_DEVICE_MODIFY(_tag) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PPI8255_RECONFIG(_tag, _intrf) \
+ MCFG_DEVICE_MODIFY(_tag) \
+ MCFG_DEVICE_CONFIG(_intrf)
/***************************************************************************
diff --git a/src/emu/machine/8257dma.h b/src/emu/machine/8257dma.h
index 3f25a79d2dc..9e912dcdda6 100644
--- a/src/emu/machine/8257dma.h
+++ b/src/emu/machine/8257dma.h
@@ -43,9 +43,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_I8257_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, I8257, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_I8257_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, I8257, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define I8257_INTERFACE(_name) \
const i8257_interface (_name) =
diff --git a/src/emu/machine/adc083x.h b/src/emu/machine/adc083x.h
index f21affaa6ea..7d1f8cdc983 100644
--- a/src/emu/machine/adc083x.h
+++ b/src/emu/machine/adc083x.h
@@ -37,21 +37,21 @@ DECLARE_LEGACY_DEVICE(ADC0832, adc0832);
DECLARE_LEGACY_DEVICE(ADC0834, adc0834);
DECLARE_LEGACY_DEVICE(ADC0838, adc0838);
-#define MDRV_ADC0831_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC0831, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC0831_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC0831, 0) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_ADC0832_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC0832, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC0832_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC0832, 0) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_ADC0834_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC0834, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC0834_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC0834, 0) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_ADC0838_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC0838, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC0838_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC0838, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/***************************************************************************
diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h
index 855b603379f..7745b2adb13 100644
--- a/src/emu/machine/adc1038.h
+++ b/src/emu/machine/adc1038.h
@@ -33,9 +33,9 @@ struct _adc1038_interface
DECLARE_LEGACY_DEVICE(ADC1038, adc1038);
-#define MDRV_ADC1038_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC1038, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC1038_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC1038, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/***************************************************************************
diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h
index 6846c3bc912..b915b83a375 100644
--- a/src/emu/machine/adc1213x.h
+++ b/src/emu/machine/adc1213x.h
@@ -21,17 +21,17 @@ DECLARE_LEGACY_DEVICE(ADC12130, adc12130);
DECLARE_LEGACY_DEVICE(ADC12132, adc12132);
DECLARE_LEGACY_DEVICE(ADC12138, adc12138);
-#define MDRV_ADC12130_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC12130, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC12130_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC12130, 0) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_ADC12132_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC12132, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC12132_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC12132, 0) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_ADC12138_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, ADC12138, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_ADC12138_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, ADC12138, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/***************************************************************************
diff --git a/src/emu/machine/at28c16.h b/src/emu/machine/at28c16.h
index b210296d459..6fb4765313e 100644
--- a/src/emu/machine/at28c16.h
+++ b/src/emu/machine/at28c16.h
@@ -16,8 +16,8 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_AT28C16_ADD( _tag, _interface ) \
- MDRV_DEVICE_ADD( _tag, AT28C16, 0 )
+#define MCFG_AT28C16_ADD( _tag, _interface ) \
+ MCFG_DEVICE_ADD( _tag, AT28C16, 0 )
//**************************************************************************
diff --git a/src/emu/machine/cdp1852.h b/src/emu/machine/cdp1852.h
index 7073ee77b3f..7805d41fa0b 100644
--- a/src/emu/machine/cdp1852.h
+++ b/src/emu/machine/cdp1852.h
@@ -36,9 +36,9 @@
DECLARE_LEGACY_DEVICE(CDP1852, cdp1852);
-#define MDRV_CDP1852_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, CDP1852, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_CDP1852_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, CDP1852, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define CDP1852_INTERFACE(_name) \
const cdp1852_interface (_name)=
diff --git a/src/emu/machine/ds1302.h b/src/emu/machine/ds1302.h
index 98673e425a8..7b97d58be65 100644
--- a/src/emu/machine/ds1302.h
+++ b/src/emu/machine/ds1302.h
@@ -19,8 +19,8 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_DS1302_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, DS1302, 0)
+#define MCFG_DS1302_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, DS1302, 0)
/***************************************************************************
diff --git a/src/emu/machine/ds2404.h b/src/emu/machine/ds2404.h
index d46b2e29eb1..06c8c6b90f1 100644
--- a/src/emu/machine/ds2404.h
+++ b/src/emu/machine/ds2404.h
@@ -17,19 +17,19 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_DS2404_ADD(_tag, _ref_year, _ref_month, _ref_day) \
- MDRV_DEVICE_ADD(_tag, DS2404, 0) \
- MDRV_DS2404_REF_YEAR(_ref_year) \
- MDRV_DS2404_REF_MONTH(_ref_month) \
- MDRV_DS2404_REF_DAY(_ref_day)
+#define MCFG_DS2404_ADD(_tag, _ref_year, _ref_month, _ref_day) \
+ MCFG_DEVICE_ADD(_tag, DS2404, 0) \
+ MCFG_DS2404_REF_YEAR(_ref_year) \
+ MCFG_DS2404_REF_MONTH(_ref_month) \
+ MCFG_DS2404_REF_DAY(_ref_day)
-#define MDRV_DS2404_REF_YEAR(_ref_year) \
+#define MCFG_DS2404_REF_YEAR(_ref_year) \
ds2404_device_config::static_set_ref_year(device, _ref_year);
-#define MDRV_DS2404_REF_MONTH(_ref_month) \
+#define MCFG_DS2404_REF_MONTH(_ref_month) \
ds2404_device_config::static_set_ref_month(device, _ref_month);
-#define MDRV_DS2404_REF_DAY(_ref_day) \
+#define MCFG_DS2404_REF_DAY(_ref_day) \
ds2404_device_config::static_set_ref_day(device, _ref_day);
diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h
index 912074319e3..97463bbe025 100644
--- a/src/emu/machine/eeprom.h
+++ b/src/emu/machine/eeprom.h
@@ -17,20 +17,20 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_EEPROM_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, EEPROM, 0) \
+#define MCFG_EEPROM_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, EEPROM, 0) \
eeprom_device_config::static_set_interface(device, _interface); \
-#define MDRV_EEPROM_93C46_ADD(_tag) \
- MDRV_EEPROM_ADD(_tag, eeprom_interface_93C46)
+#define MCFG_EEPROM_93C46_ADD(_tag) \
+ MCFG_EEPROM_ADD(_tag, eeprom_interface_93C46)
-#define MDRV_EEPROM_93C66B_ADD(_tag) \
- MDRV_EEPROM_ADD(_tag, eeprom_interface_93C66B)
+#define MCFG_EEPROM_93C66B_ADD(_tag) \
+ MCFG_EEPROM_ADD(_tag, eeprom_interface_93C66B)
-#define MDRV_EEPROM_DATA(_data, _size) \
+#define MCFG_EEPROM_DATA(_data, _size) \
eeprom_device_config::static_set_default_data(device, _data, _size); \
-#define MDRV_EEPROM_DEFAULT_VALUE(_value) \
+#define MCFG_EEPROM_DEFAULT_VALUE(_value) \
eeprom_device_config::static_set_default_value(device, _value); \
diff --git a/src/emu/machine/er2055.h b/src/emu/machine/er2055.h
index f274f14acbc..656cfc08df2 100644
--- a/src/emu/machine/er2055.h
+++ b/src/emu/machine/er2055.h
@@ -48,8 +48,8 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_ER2055_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, ER2055, 0) \
+#define MCFG_ER2055_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ER2055, 0) \
diff --git a/src/emu/machine/f3853.h b/src/emu/machine/f3853.h
index 997915178e3..92741cc3ffd 100644
--- a/src/emu/machine/f3853.h
+++ b/src/emu/machine/f3853.h
@@ -45,9 +45,9 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_F3853_ADD(_tag, _clock, _intrf) \
- MDRV_DEVICE_ADD(_tag, F3853, _clock) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_F3853_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, F3853, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
diff --git a/src/emu/machine/i2cmem.h b/src/emu/machine/i2cmem.h
index d73a54f24b7..db564625347 100644
--- a/src/emu/machine/i2cmem.h
+++ b/src/emu/machine/i2cmem.h
@@ -24,8 +24,8 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_I2CMEM_ADD( _tag, _interface ) \
- MDRV_DEVICE_ADD( _tag, I2CMEM, 0 ) \
+#define MCFG_I2CMEM_ADD( _tag, _interface ) \
+ MCFG_DEVICE_ADD( _tag, I2CMEM, 0 ) \
i2cmem_device_config::static_set_interface(device, _interface);
diff --git a/src/emu/machine/i8243.h b/src/emu/machine/i8243.h
index 1a3cb11dd30..00b170ebe0c 100644
--- a/src/emu/machine/i8243.h
+++ b/src/emu/machine/i8243.h
@@ -22,15 +22,15 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_I8243_ADD(_tag, _read, _write) \
- MDRV_DEVICE_ADD(_tag, I8243, 0) \
- MDRV_I8243_READHANDLER(_read) \
- MDRV_I8243_WRITEHANDLER(_write) \
+#define MCFG_I8243_ADD(_tag, _read, _write) \
+ MCFG_DEVICE_ADD(_tag, I8243, 0) \
+ MCFG_I8243_READHANDLER(_read) \
+ MCFG_I8243_WRITEHANDLER(_write) \
-#define MDRV_I8243_READHANDLER(_read) \
+#define MCFG_I8243_READHANDLER(_read) \
i8243_device_config::static_set_read_handler(device, _read); \
-#define MDRV_I8243_WRITEHANDLER(_write) \
+#define MCFG_I8243_WRITEHANDLER(_write) \
i8243_device_config::static_set_write_handler(device, _write); \
/***************************************************************************
diff --git a/src/emu/machine/i8255a.h b/src/emu/machine/i8255a.h
index f74cd509b72..fcdcb54f012 100644
--- a/src/emu/machine/i8255a.h
+++ b/src/emu/machine/i8255a.h
@@ -41,9 +41,9 @@
DECLARE_LEGACY_DEVICE(I8255A, i8255a);
-#define MDRV_I8255A_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, I8255A, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_I8255A_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, I8255A, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
#define I8255A_INTERFACE(name) \
const i8255a_interface (name)=
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index af287b6aae0..4a0fa37acd2 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -39,17 +39,17 @@ struct _ide_config
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_IDE_CONTROLLER_ADD(_tag, _callback) \
- MDRV_DEVICE_ADD(_tag, IDE_CONTROLLER, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(ide_config, interrupt, _callback)
+#define MCFG_IDE_CONTROLLER_ADD(_tag, _callback) \
+ MCFG_DEVICE_ADD(_tag, IDE_CONTROLLER, 0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(ide_config, interrupt, _callback)
-#define MDRV_IDE_CONTROLLER_REGIONS(_master, _slave) \
- MDRV_DEVICE_CONFIG_DATAPTR(ide_config, master, _master) \
- MDRV_DEVICE_CONFIG_DATAPTR(ide_config, master, _slave)
+#define MCFG_IDE_CONTROLLER_REGIONS(_master, _slave) \
+ MCFG_DEVICE_CONFIG_DATAPTR(ide_config, master, _master) \
+ MCFG_DEVICE_CONFIG_DATAPTR(ide_config, master, _slave)
-#define MDRV_IDE_BUS_MASTER_SPACE(_cpu, _space) \
- MDRV_DEVICE_CONFIG_DATAPTR(ide_config, bmcpu, _cpu) \
- MDRV_DEVICE_CONFIG_DATA32(ide_config, bmspace, ADDRESS_SPACE_##_space)
+#define MCFG_IDE_BUS_MASTER_SPACE(_cpu, _space) \
+ MCFG_DEVICE_CONFIG_DATAPTR(ide_config, bmcpu, _cpu) \
+ MCFG_DEVICE_CONFIG_DATA32(ide_config, bmspace, ADDRESS_SPACE_##_space)
diff --git a/src/emu/machine/ins8154.h b/src/emu/machine/ins8154.h
index df3fc8d4842..13acfc521b2 100644
--- a/src/emu/machine/ins8154.h
+++ b/src/emu/machine/ins8154.h
@@ -41,9 +41,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_INS8154_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, INS8154, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_INS8154_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, INS8154, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
/***************************************************************************
diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h
index f440a78c821..93eaa4e446b 100644
--- a/src/emu/machine/ins8250.h
+++ b/src/emu/machine/ins8250.h
@@ -56,19 +56,19 @@ typedef struct
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_INS8250_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, INS8250, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_INS8250_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, INS8250, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_NS16450_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, NS16450, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_NS16450_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, NS16450, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_NS16550_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, NS16550, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_NS16550_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, NS16550, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
/***************************************************************************
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 863b0444c91..871cf206433 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -10,38 +10,38 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_INTEL_28F016S5_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, INTEL_28F016S5, 0)
+#define MCFG_INTEL_28F016S5_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, INTEL_28F016S5, 0)
-#define MDRV_SHARP_LH28F016S_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, SHARP_LH28F016S, 0)
+#define MCFG_SHARP_LH28F016S_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SHARP_LH28F016S, 0)
-#define MDRV_FUJITSU_29F016A_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, FUJITSU_29F016A, 0)
+#define MCFG_FUJITSU_29F016A_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, FUJITSU_29F016A, 0)
-#define MDRV_INTEL_E28F400_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, INTEL_E28F400, 0)
+#define MCFG_INTEL_E28F400_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, INTEL_E28F400, 0)
-#define MDRV_MACRONIX_29L001MC_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MACRONIX_29L001MC, 0)
+#define MCFG_MACRONIX_29L001MC_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MACRONIX_29L001MC, 0)
-#define MDRV_PANASONIC_MN63F805MNP_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, PANASONIC_MN63F805MNP, 0)
+#define MCFG_PANASONIC_MN63F805MNP_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, PANASONIC_MN63F805MNP, 0)
-#define MDRV_SANYO_LE26FV10N1TS_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, SANYO_LE26FV10N1TS, 0)
+#define MCFG_SANYO_LE26FV10N1TS_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SANYO_LE26FV10N1TS, 0)
-#define MDRV_SHARP_LH28F400_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, SHARP_LH28F400, 0)
+#define MCFG_SHARP_LH28F400_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SHARP_LH28F400, 0)
-#define MDRV_INTEL_E28F008SA_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, INTEL_E28F008SA, 0)
+#define MCFG_INTEL_E28F008SA_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, INTEL_E28F008SA, 0)
-#define MDRV_INTEL_TE28F160_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, INTEL_TE28F160, 0)
+#define MCFG_INTEL_TE28F160_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, INTEL_TE28F160, 0)
-#define MDRV_SHARP_UNK128MBIT_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, SHARP_UNK128MBIT, 0)
+#define MCFG_SHARP_UNK128MBIT_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, SHARP_UNK128MBIT, 0)
diff --git a/src/emu/machine/k033906.h b/src/emu/machine/k033906.h
index 2f0a6183341..166804a8e85 100644
--- a/src/emu/machine/k033906.h
+++ b/src/emu/machine/k033906.h
@@ -17,9 +17,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_K033906_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, K033906, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_K033906_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, K033906, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/***************************************************************************
diff --git a/src/emu/machine/k056230.h b/src/emu/machine/k056230.h
index 19dd41e8604..94b27dc5563 100644
--- a/src/emu/machine/k056230.h
+++ b/src/emu/machine/k056230.h
@@ -17,9 +17,9 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_K056230_ADD(_tag, _config) \
- MDRV_DEVICE_ADD(_tag, K0506230, 0) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_K056230_ADD(_tag, _config) \
+ MCFG_DEVICE_ADD(_tag, K0506230, 0) \
+ MCFG_DEVICE_CONFIG(_config)
/***************************************************************************
diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h
index a2ca38a0b8c..2abc19c4366 100644
--- a/src/emu/machine/laserdsc.h
+++ b/src/emu/machine/laserdsc.h
@@ -90,56 +90,56 @@ struct _laserdisc_config
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_LASERDISC_ADD(_tag, _type, _screen, _sound) \
- MDRV_DEVICE_ADD(_tag, LASERDISC, 0) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, type, LASERDISC_TYPE_##_type) \
- MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, screen, _screen) \
- MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, sound, _sound) \
+#define MCFG_LASERDISC_ADD(_tag, _type, _screen, _sound) \
+ MCFG_DEVICE_ADD(_tag, LASERDISC, 0) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, type, LASERDISC_TYPE_##_type) \
+ MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, screen, _screen) \
+ MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, sound, _sound) \
-#define MDRV_LASERDISC_GET_DISC(_func) \
- MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, getdisc, _func)
+#define MCFG_LASERDISC_GET_DISC(_func) \
+ MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, getdisc, _func)
-#define MDRV_LASERDISC_AUDIO(_func) \
- MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, audio, _func)
+#define MCFG_LASERDISC_AUDIO(_func) \
+ MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, audio, _func)
-#define MDRV_LASERDISC_OVERLAY(_update, _width, _height, _format) \
- MDRV_DEVICE_CONFIG_DATAPTR(laserdisc_config, overupdate, VIDEO_UPDATE_NAME(_update)) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overwidth, _width) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overheight, _height) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overformat, _format)
+#define MCFG_LASERDISC_OVERLAY(_update, _width, _height, _format) \
+ MCFG_DEVICE_CONFIG_DATAPTR(laserdisc_config, overupdate, VIDEO_UPDATE_NAME(_update)) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overwidth, _width) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overheight, _height) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overformat, _format)
-#define MDRV_LASERDISC_OVERLAY_CLIP(_minx, _maxx, _miny, _maxy) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_x, _minx) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_x, _maxx) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_y, _miny) \
- MDRV_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_y, _maxy)
+#define MCFG_LASERDISC_OVERLAY_CLIP(_minx, _maxx, _miny, _maxy) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_x, _minx) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_x, _maxx) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.min_y, _miny) \
+ MCFG_DEVICE_CONFIG_DATA32(laserdisc_config, overclip.max_y, _maxy)
-#define MDRV_LASERDISC_OVERLAY_POSITION(_posx, _posy) \
- MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposx, _posx, 24) \
- MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposy, _posy, 24)
+#define MCFG_LASERDISC_OVERLAY_POSITION(_posx, _posy) \
+ MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposx, _posx, 24) \
+ MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overposy, _posy, 24)
-#define MDRV_LASERDISC_OVERLAY_SCALE(_scalex, _scaley) \
- MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscalex, _scalex, 24) \
- MDRV_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscaley, _scaley, 24)
+#define MCFG_LASERDISC_OVERLAY_SCALE(_scalex, _scaley) \
+ MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscalex, _scalex, 24) \
+ MCFG_DEVICE_CONFIG_DATAFP32(laserdisc_config, overscaley, _scaley, 24)
/* use these to add laserdisc screens with proper video update parameters */
-#define MDRV_LASERDISC_SCREEN_ADD_NTSC(_tag, _overlayformat) \
- MDRV_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \
- MDRV_VIDEO_UPDATE(laserdisc) \
+#define MCFG_LASERDISC_SCREEN_ADD_NTSC(_tag, _overlayformat) \
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \
+ MCFG_VIDEO_UPDATE(laserdisc) \
\
- MDRV_SCREEN_ADD(_tag, RASTER) \
- MDRV_SCREEN_FORMAT(_overlayformat) \
- MDRV_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \
+ MCFG_SCREEN_ADD(_tag, RASTER) \
+ MCFG_SCREEN_FORMAT(_overlayformat) \
+ MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz*2, 910, 0, 704, 525, 44, 524) \
/* not correct yet; fix me... */
-#define MDRV_LASERDISC_SCREEN_ADD_PAL(_tag, _format) \
- MDRV_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \
- MDRV_VIDEO_UPDATE(laserdisc) \
+#define MCFG_LASERDISC_SCREEN_ADD_PAL(_tag, _format) \
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_SELF_RENDER) \
+ MCFG_VIDEO_UPDATE(laserdisc) \
\
- MDRV_SCREEN_ADD(_tag, RASTER) \
- MDRV_SCREEN_FORMAT(_format) \
- MDRV_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 910, 0, 704, 525.0/2, 0, 480/2) \
+ MCFG_SCREEN_ADD(_tag, RASTER) \
+ MCFG_SCREEN_FORMAT(_format) \
+ MCFG_SCREEN_RAW_PARAMS(XTAL_14_31818MHz, 910, 0, 704, 525.0/2, 0, 480/2) \
diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h
index b4a376b1016..23bea91faef 100644
--- a/src/emu/machine/latch8.h
+++ b/src/emu/machine/latch8.h
@@ -50,36 +50,36 @@ struct _latch8_config
***************************************************************************/
/* add device */
-#define MDRV_LATCH8_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, LATCH8, 0)
+#define MCFG_LATCH8_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, LATCH8, 0)
/* Bit mask specifying bits to be masked *out* */
-#define MDRV_LATCH8_MASKOUT(_maskout) \
- MDRV_DEVICE_CONFIG_DATA32(latch8_config, maskout, _maskout)
+#define MCFG_LATCH8_MASKOUT(_maskout) \
+ MCFG_DEVICE_CONFIG_DATA32(latch8_config, maskout, _maskout)
/* Bit mask specifying bits to be inverted */
-#define MDRV_LATCH8_INVERT(_xor) \
- MDRV_DEVICE_CONFIG_DATA32(latch8_config, xorvalue, _xor)
+#define MCFG_LATCH8_INVERT(_xor) \
+ MCFG_DEVICE_CONFIG_DATA32(latch8_config, xorvalue, _xor)
/* Bit mask specifying bits not needing cpu synchronization. */
-#define MDRV_LATCH8_NOSYNC(_nosync) \
- MDRV_DEVICE_CONFIG_DATA32(latch8_config, nosync, _nosync)
+#define MCFG_LATCH8_NOSYNC(_nosync) \
+ MCFG_DEVICE_CONFIG_DATA32(latch8_config, nosync, _nosync)
/* Write bit to discrete node */
-#define MDRV_LATCH8_DISCRETE_NODE(_device, _bit, _node) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(latch8_config, node_device, _bit, _device) \
- MDRV_DEVICE_CONFIG_DATA32_ARRAY(latch8_config, node_map, _bit, _node)
+#define MCFG_LATCH8_DISCRETE_NODE(_device, _bit, _node) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(latch8_config, node_device, _bit, _device) \
+ MCFG_DEVICE_CONFIG_DATA32_ARRAY(latch8_config, node_map, _bit, _node)
/* Upon read, replace bits by reading from another device handler */
-#define MDRV_LATCH8_DEVREAD(_bit, _tag, _handler, _from_bit) \
- MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, tag, _tag) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, devread_handler, _handler) \
+#define MCFG_LATCH8_DEVREAD(_bit, _tag, _handler, _from_bit) \
+ MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, tag, _tag) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, devread_handler, _handler) \
/* Upon read, replace bits by reading from another machine handler */
-#define MDRV_LATCH8_READ(_bit, _handler, _from_bit) \
- MDRV_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, read_handler, _handler) \
+#define MCFG_LATCH8_READ(_bit, _handler, _from_bit) \
+ MCFG_DEVICE_CONFIG_DATA32_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, from_bit, _from_bit) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(latch8_config, devread, _bit, latch8_devread, read_handler, _handler) \
/* Accessor macros */
diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c
index af3948a335c..8ba3e7eb9c7 100644
--- a/src/emu/machine/ldpr8210.c
+++ b/src/emu/machine/ldpr8210.c
@@ -286,8 +286,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( pr8210 )
- MDRV_CPU_ADD("pr8210", I8049, XTAL_4_41MHz)
- MDRV_CPU_IO_MAP(pr8210_portmap)
+ MCFG_CPU_ADD("pr8210", I8049, XTAL_4_41MHz)
+ MCFG_CPU_IO_MAP(pr8210_portmap)
MACHINE_CONFIG_END
@@ -997,10 +997,10 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( simutrek )
- MDRV_CPU_ADD("simutrek", I8748, XTAL_6MHz)
- MDRV_CPU_IO_MAP(simutrek_portmap)
+ MCFG_CPU_ADD("simutrek", I8748, XTAL_6MHz)
+ MCFG_CPU_IO_MAP(simutrek_portmap)
- MDRV_FRAGMENT_ADD(pr8210)
+ MCFG_FRAGMENT_ADD(pr8210)
MACHINE_CONFIG_END
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index 24703ade1f2..15e07632a87 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -167,15 +167,15 @@ static const z80_daisy_config daisy_chain[] =
static MACHINE_CONFIG_FRAGMENT( ldv1000 )
- MDRV_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2)
- MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(ldv1000_map)
- MDRV_CPU_IO_MAP(ldv1000_portmap)
-
- MDRV_Z80CTC_ADD("ldvctc", XTAL_5MHz/2 /* same as "ldv1000" */, ctcintf)
- MDRV_PPI8255_ADD("ldvppi0", ppi0intf)
- MDRV_PPI8255_ADD("ldvppi1", ppi1intf)
- MDRV_TIMER_ADD("multitimer", multijump_timer)
+ MCFG_CPU_ADD("ldv1000", Z80, XTAL_5MHz/2)
+ MCFG_CPU_CONFIG(daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(ldv1000_map)
+ MCFG_CPU_IO_MAP(ldv1000_portmap)
+
+ MCFG_Z80CTC_ADD("ldvctc", XTAL_5MHz/2 /* same as "ldv1000" */, ctcintf)
+ MCFG_PPI8255_ADD("ldvppi0", ppi0intf)
+ MCFG_PPI8255_ADD("ldvppi1", ppi1intf)
+ MCFG_TIMER_ADD("multitimer", multijump_timer)
MACHINE_CONFIG_END
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c
index 5ad5a0b123a..e64554c04ae 100644
--- a/src/emu/machine/ldvp931.c
+++ b/src/emu/machine/ldvp931.c
@@ -134,9 +134,9 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( vp931 )
- MDRV_CPU_ADD("vp931", I8049, XTAL_11MHz)
- MDRV_CPU_IO_MAP(vp931_portmap)
- MDRV_TIMER_ADD("tracktimer", track_timer)
+ MCFG_CPU_ADD("vp931", I8049, XTAL_11MHz)
+ MCFG_CPU_IO_MAP(vp931_portmap)
+ MCFG_TIMER_ADD("tracktimer", track_timer)
MACHINE_CONFIG_END
diff --git a/src/emu/machine/mb14241.h b/src/emu/machine/mb14241.h
index 89d5b1da530..120054591a8 100644
--- a/src/emu/machine/mb14241.h
+++ b/src/emu/machine/mb14241.h
@@ -16,8 +16,8 @@ DECLARE_LEGACY_DEVICE(MB14241, mb14241);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_MB14241_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MB14241, 0)
+#define MCFG_MB14241_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MB14241, 0)
/***************************************************************************
diff --git a/src/emu/machine/mb3773.h b/src/emu/machine/mb3773.h
index c1617aa4eae..c3be2d91086 100644
--- a/src/emu/machine/mb3773.h
+++ b/src/emu/machine/mb3773.h
@@ -16,8 +16,8 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_MB3773_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MB3773, 0)
+#define MCFG_MB3773_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MB3773, 0)
// ======================> mb3773_device_config
diff --git a/src/emu/machine/mb87078.h b/src/emu/machine/mb87078.h
index a5e378bb814..8d7ffee6783 100644
--- a/src/emu/machine/mb87078.h
+++ b/src/emu/machine/mb87078.h
@@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(MB87078, mb87078);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_MB87078_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, MB87078, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_MB87078_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, MB87078, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h
index e42b532e88b..7d4ce43134e 100644
--- a/src/emu/machine/mc146818.h
+++ b/src/emu/machine/mc146818.h
@@ -19,8 +19,8 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_MC146818_ADD(_tag, _type) \
- MDRV_DEVICE_ADD(_tag, MC146818, 0) \
+#define MCFG_MC146818_ADD(_tag, _type) \
+ MCFG_DEVICE_ADD(_tag, MC146818, 0) \
mc146818_device_config::static_set_type(device, mc146818_device_config::_type); \
diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h
index cffe8dc7167..9bf403701e9 100644
--- a/src/emu/machine/msm6242.h
+++ b/src/emu/machine/msm6242.h
@@ -17,8 +17,8 @@
DECLARE_LEGACY_DEVICE(MSM6242, msm6242);
-#define MDRV_MSM6242_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MSM6242, 0)
+#define MCFG_MSM6242_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MSM6242, 0)
READ8_DEVICE_HANDLER( msm6242_r );
diff --git a/src/emu/machine/nvram.h b/src/emu/machine/nvram.h
index 71783f0d39f..b652ca427cd 100644
--- a/src/emu/machine/nvram.h
+++ b/src/emu/machine/nvram.h
@@ -48,37 +48,37 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_NVRAM_ADD_0FILL(_tag) \
- MDRV_DEVICE_ADD(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_ADD_0FILL(_tag) \
+ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \
nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_0); \
-#define MDRV_NVRAM_ADD_1FILL(_tag) \
- MDRV_DEVICE_ADD(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_ADD_1FILL(_tag) \
+ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \
nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_1); \
-#define MDRV_NVRAM_ADD_RANDOM_FILL(_tag) \
- MDRV_DEVICE_ADD(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_ADD_RANDOM_FILL(_tag) \
+ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \
nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_RANDOM); \
-#define MDRV_NVRAM_ADD_CUSTOM(_tag, _class, _method) \
- MDRV_DEVICE_ADD(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_ADD_CUSTOM(_tag, _class, _method) \
+ MCFG_DEVICE_ADD(_tag, NVRAM, 0) \
nvram_device_config::static_set_custom_handler(device, nvram_init_proto_delegate::_create_member<_class, &_class::_method>(#_class "::" #_method)); \
-#define MDRV_NVRAM_REPLACE_0FILL(_tag) \
- MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_REPLACE_0FILL(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \
nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_0); \
-#define MDRV_NVRAM_REPLACE_1FILL(_tag) \
- MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_REPLACE_1FILL(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \
nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_ALL_1); \
-#define MDRV_NVRAM_REPLACE_RANDOM_FILL(_tag) \
- MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_REPLACE_RANDOM_FILL(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \
nvram_device_config::static_set_default_value(device, nvram_device_config::DEFAULT_RANDOM); \
-#define MDRV_NVRAM_REPLACE_CUSTOM(_tag, _class, _method) \
- MDRV_DEVICE_REPLACE(_tag, NVRAM, 0) \
+#define MCFG_NVRAM_REPLACE_CUSTOM(_tag, _class, _method) \
+ MCFG_DEVICE_REPLACE(_tag, NVRAM, 0) \
nvram_device_config::static_set_custom_handler(device, nvram_init_proto_delegate::_create_member<_class, &_class::_method>(#_class "::" #_method)); \
diff --git a/src/emu/machine/pci.h b/src/emu/machine/pci.h
index 705a07ced35..6ca63042024 100644
--- a/src/emu/machine/pci.h
+++ b/src/emu/machine/pci.h
@@ -41,17 +41,17 @@ struct _pci_bus_config
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PCI_BUS_ADD(_tag, _busnum) \
- MDRV_DEVICE_ADD(_tag, PCI_BUS, 0) \
- MDRV_DEVICE_CONFIG_DATA32(pci_bus_config, busnum, _busnum)
+#define MCFG_PCI_BUS_ADD(_tag, _busnum) \
+ MCFG_DEVICE_ADD(_tag, PCI_BUS, 0) \
+ MCFG_DEVICE_CONFIG_DATA32(pci_bus_config, busnum, _busnum)
-#define MDRV_PCI_BUS_DEVICE(_devnum, _devtag, _configread, _configwrite) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, devtag, _devtag) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, read_callback, _configread) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, write_callback, _configwrite)
+#define MCFG_PCI_BUS_DEVICE(_devnum, _devtag, _configread, _configwrite) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, devtag, _devtag) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, read_callback, _configread) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY_MEMBER(pci_bus_config, device, _devnum, pci_device_entry, write_callback, _configwrite)
-#define MDRV_PCI_BUS_SIBLING(_father_tag) \
- MDRV_DEVICE_CONFIG_DATAPTR(pci_bus_config, father, _father_tag)
+#define MCFG_PCI_BUS_SIBLING(_father_tag) \
+ MCFG_DEVICE_CONFIG_DATAPTR(pci_bus_config, father, _father_tag)
/***************************************************************************
diff --git a/src/emu/machine/pd4990a.h b/src/emu/machine/pd4990a.h
index 21ea810e028..a7d0815521b 100644
--- a/src/emu/machine/pd4990a.h
+++ b/src/emu/machine/pd4990a.h
@@ -18,8 +18,8 @@
DECLARE_LEGACY_DEVICE(UPD4990A, upd4990a);
-#define MDRV_UPD4990A_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, UPD4990A, 0)
+#define MCFG_UPD4990A_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, UPD4990A, 0)
/***************************************************************************
diff --git a/src/emu/machine/pic8259.h b/src/emu/machine/pic8259.h
index 43a7627297c..5a14622652f 100644
--- a/src/emu/machine/pic8259.h
+++ b/src/emu/machine/pic8259.h
@@ -45,9 +45,9 @@ struct pic8259_interface
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PIC8259_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PIC8259, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIC8259_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PIC8259, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
/* device interface */
diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h
index 26ab9ad7096..41445f1429d 100644
--- a/src/emu/machine/pit8253.h
+++ b/src/emu/machine/pit8253.h
@@ -45,14 +45,14 @@ DECLARE_LEGACY_DEVICE(PIT8254, pit8254);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_PIT8253_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PIT8253, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIT8253_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PIT8253, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
-#define MDRV_PIT8254_ADD(_tag, _intrf) \
- MDRV_DEVICE_ADD(_tag, PIT8254, 0) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_PIT8254_ADD(_tag, _intrf) \
+ MCFG_DEVICE_ADD(_tag, PIT8254, 0) \
+ MCFG_DEVICE_CONFIG(_intrf)
READ8_DEVICE_HANDLER( pit8253_r );
diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h
index 9b201269d34..6bca1a2250c 100644
--- a/src/emu/machine/rp5h01.h
+++ b/src/emu/machine/rp5h01.h
@@ -16,8 +16,8 @@
DECLARE_LEGACY_DEVICE(RP5H01, rp5h01);
-#define MDRV_RP5H01_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, RP5H01, 0)
+#define MCFG_RP5H01_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, RP5H01, 0)
/*
* Device uses memory region
diff --git a/src/emu/machine/rtc65271.h b/src/emu/machine/rtc65271.h
index f2095acdefa..5572d91f785 100644
--- a/src/emu/machine/rtc65271.h
+++ b/src/emu/machine/rtc65271.h
@@ -14,9 +14,9 @@ struct _rtc65271_config
};
-#define MDRV_RTC65271_ADD(_tag, _callback) \
- MDRV_DEVICE_ADD(_tag, RTC65271, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(rtc65271_config, interrupt_callback, _callback)
+#define MCFG_RTC65271_ADD(_tag, _callback) \
+ MCFG_DEVICE_ADD(_tag, RTC65271, 0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(rtc65271_config, interrupt_callback, _callback)
UINT8 rtc65271_r(running_device *device, int xramsel, offs_t offset);
diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h
index 1f2080964f8..e1d7ef93d5b 100644
--- a/src/emu/machine/s3c2400.h
+++ b/src/emu/machine/s3c2400.h
@@ -15,9 +15,9 @@
#define S3C2400_TAG "s3c2400"
-#define MDRV_S3C2400_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, S3C2400, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_S3C2400_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, S3C2400, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define S3C2400_INTERFACE(name) \
const s3c2400_interface(name) =
diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h
index 622d4de5e91..4fcb0923a67 100644
--- a/src/emu/machine/s3c2410.h
+++ b/src/emu/machine/s3c2410.h
@@ -15,9 +15,9 @@
#define S3C2410_TAG "s3c2410"
-#define MDRV_S3C2410_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, S3C2410, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_S3C2410_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, S3C2410, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define S3C2410_INTERFACE(name) \
const s3c2410_interface(name) =
diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h
index 236883023b5..ede452120c2 100644
--- a/src/emu/machine/s3c2440.h
+++ b/src/emu/machine/s3c2440.h
@@ -13,9 +13,9 @@
#define S3C2440_TAG "s3c2440"
-#define MDRV_S3C2440_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, S3C2440, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_S3C2440_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, S3C2440, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define S3C2440_INTERFACE(name) \
const s3c2440_interface(name) =
diff --git a/src/emu/machine/smc91c9x.h b/src/emu/machine/smc91c9x.h
index 157202418ce..7fe418d9120 100644
--- a/src/emu/machine/smc91c9x.h
+++ b/src/emu/machine/smc91c9x.h
@@ -31,13 +31,13 @@ struct _smc91c9x_config
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_SMC91C94_ADD(_tag, _callback) \
- MDRV_DEVICE_ADD(_tag, SMC91C94, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback)
+#define MCFG_SMC91C94_ADD(_tag, _callback) \
+ MCFG_DEVICE_ADD(_tag, SMC91C94, 0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback)
-#define MDRV_SMC91C96_ADD(_tag, _callback) \
- MDRV_DEVICE_ADD(_tag, SMC91C96, 0) \
- MDRV_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback)
+#define MCFG_SMC91C96_ADD(_tag, _callback) \
+ MCFG_DEVICE_ADD(_tag, SMC91C96, 0) \
+ MCFG_DEVICE_CONFIG_DATAPTR(smc91c9x_config, interrupt, _callback)
diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h
index ad9df486356..09374ab73db 100644
--- a/src/emu/machine/timekpr.h
+++ b/src/emu/machine/timekpr.h
@@ -24,17 +24,17 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_M48T02_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, M48T02, 0)
+#define MCFG_M48T02_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, M48T02, 0)
-#define MDRV_M48T35_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, M48T35, 0)
+#define MCFG_M48T35_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, M48T35, 0)
-#define MDRV_M48T58_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, M48T58, 0)
+#define MCFG_M48T58_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, M48T58, 0)
-#define MDRV_MK48T08_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, MK48T08, 0)
+#define MCFG_MK48T08_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, MK48T08, 0)
diff --git a/src/emu/machine/upd4701.h b/src/emu/machine/upd4701.h
index 834aa06fc73..fd4059fd983 100644
--- a/src/emu/machine/upd4701.h
+++ b/src/emu/machine/upd4701.h
@@ -17,8 +17,8 @@
DECLARE_LEGACY_DEVICE(UPD4701, upd4701);
-#define MDRV_UPD4701_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, UPD4701, 0)
+#define MCFG_UPD4701_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, UPD4701, 0)
/***************************************************************************
diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h
index e5ad95bacc0..aa47e398057 100644
--- a/src/emu/machine/x2212.h
+++ b/src/emu/machine/x2212.h
@@ -17,13 +17,13 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_X2212_ADD(_tag) \
- MDRV_DEVICE_ADD(_tag, X2212, 0) \
+#define MCFG_X2212_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, X2212, 0) \
// some systems (like many early Atari games) wire up the /STORE signal
// to fire on power-down, effectively creating an "auto-save" functionality
-#define MDRV_X2212_ADD_AUTOSAVE(_tag) \
- MDRV_DEVICE_ADD(_tag, X2212, 0) \
+#define MCFG_X2212_ADD_AUTOSAVE(_tag) \
+ MCFG_DEVICE_ADD(_tag, X2212, 0) \
x2212_device_config::static_set_auto_save(device); \
diff --git a/src/emu/machine/z80ctc.h b/src/emu/machine/z80ctc.h
index 405ddd0ed02..543295f4346 100644
--- a/src/emu/machine/z80ctc.h
+++ b/src/emu/machine/z80ctc.h
@@ -49,9 +49,9 @@ const int NOTIMER_3 = (1<<3);
const z80ctc_interface (name)=
-#define MDRV_Z80CTC_ADD(_tag, _clock, _intrf) \
- MDRV_DEVICE_ADD(_tag, Z80CTC, _clock) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_Z80CTC_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, Z80CTC, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
diff --git a/src/emu/machine/z80dart.h b/src/emu/machine/z80dart.h
index e8e78dfa2a3..00b3557e2e6 100644
--- a/src/emu/machine/z80dart.h
+++ b/src/emu/machine/z80dart.h
@@ -107,32 +107,32 @@
// DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_Z80DART_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80DART, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80DART_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80DART, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_Z80SIO0_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80SIO0, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80SIO0_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80SIO0, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_Z80SIO1_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80SIO1, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80SIO1_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80SIO1, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_Z80SIO2_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80SIO2, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80SIO2_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80SIO2, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_Z80SIO3_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80SIO3, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80SIO3_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80SIO3, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_Z80SIO4_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80SIO4, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80SIO4_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80SIO4, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
-#define MDRV_Z80DART_REMOVE(_tag) \
- MDRV_DEVICE_REMOVE(_tag)
+#define MCFG_Z80DART_REMOVE(_tag) \
+ MCFG_DEVICE_REMOVE(_tag)
#define Z80DART_INTERFACE(_name) \
const z80dart_interface (_name) =
diff --git a/src/emu/machine/z80dma.h b/src/emu/machine/z80dma.h
index efe15ff78ef..47643814d42 100644
--- a/src/emu/machine/z80dma.h
+++ b/src/emu/machine/z80dma.h
@@ -40,9 +40,9 @@
// DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_Z80DMA_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, Z80DMA, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80DMA_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, Z80DMA, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define Z80DMA_INTERFACE(_name) \
const z80dma_interface (_name) =
diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h
index 3c5e5c493fb..26762e153b1 100644
--- a/src/emu/machine/z80pio.h
+++ b/src/emu/machine/z80pio.h
@@ -40,9 +40,9 @@
// DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_Z80PIO_ADD(_tag, _clock, _intrf) \
- MDRV_DEVICE_ADD(_tag, Z80PIO, _clock) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_Z80PIO_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, Z80PIO, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
#define Z80PIO_INTERFACE(_name) \
const z80pio_interface (_name) =
diff --git a/src/emu/machine/z80sio.h b/src/emu/machine/z80sio.h
index b4c8f9bcfac..b50cf583c57 100644
--- a/src/emu/machine/z80sio.h
+++ b/src/emu/machine/z80sio.h
@@ -17,9 +17,9 @@
// DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_Z80SIO_ADD(_tag, _clock, _intrf) \
- MDRV_DEVICE_ADD(_tag, Z80SIO, _clock) \
- MDRV_DEVICE_CONFIG(_intrf)
+#define MCFG_Z80SIO_ADD(_tag, _clock, _intrf) \
+ MCFG_DEVICE_ADD(_tag, Z80SIO, _clock) \
+ MCFG_DEVICE_CONFIG(_intrf)
diff --git a/src/emu/machine/z80sti.h b/src/emu/machine/z80sti.h
index fe3f1fa13a6..0a413a31cfc 100644
--- a/src/emu/machine/z80sti.h
+++ b/src/emu/machine/z80sti.h
@@ -40,9 +40,9 @@
// DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_Z80STI_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD((_tag), Z80STI, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_Z80STI_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD((_tag), Z80STI, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
#define Z80STI_INTERFACE(name) const z80sti_interface (name) =
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h
index 2bcdc4fcd44..2ef4f8dd6ee 100644
--- a/src/emu/mconfig.h
+++ b/src/emu/mconfig.h
@@ -211,90 +211,90 @@ device_config *MACHINE_CONFIG_NAME(_name)(machine_config &config, device_config
// importing data from other machine drivers
-#define MDRV_FRAGMENT_ADD(_name) \
+#define MCFG_FRAGMENT_ADD(_name) \
MACHINE_CONFIG_NAME(_name)(config, owner);
// core parameters
-#define MDRV_QUANTUM_TIME(_time) \
+#define MCFG_QUANTUM_TIME(_time) \
config.m_minimum_quantum = ATTOTIME_IN_##_time; \
-#define MDRV_QUANTUM_PERFECT_CPU(_cputag) \
+#define MCFG_QUANTUM_PERFECT_CPU(_cputag) \
config.m_perfect_cpu_quantum = _cputag; \
-#define MDRV_WATCHDOG_VBLANK_INIT(_count) \
+#define MCFG_WATCHDOG_VBLANK_INIT(_count) \
config.m_watchdog_vblank_count = _count; \
-#define MDRV_WATCHDOG_TIME_INIT(_time) \
+#define MCFG_WATCHDOG_TIME_INIT(_time) \
config.m_watchdog_time = ATTOTIME_IN_##_time; \
// core functions
-#define MDRV_NVRAM_HANDLER(_func) \
+#define MCFG_NVRAM_HANDLER(_func) \
config.m_nvram_handler = NVRAM_HANDLER_NAME(_func); \
-#define MDRV_MEMCARD_HANDLER(_func) \
+#define MCFG_MEMCARD_HANDLER(_func) \
config.m_memcard_handler = MEMCARD_HANDLER_NAME(_func); \
// core video parameters
-#define MDRV_VIDEO_ATTRIBUTES(_flags) \
+#define MCFG_VIDEO_ATTRIBUTES(_flags) \
config.m_video_attributes = _flags; \
-#define MDRV_GFXDECODE(_gfx) \
+#define MCFG_GFXDECODE(_gfx) \
config.m_gfxdecodeinfo = GFXDECODE_NAME(_gfx); \
-#define MDRV_PALETTE_LENGTH(_length) \
+#define MCFG_PALETTE_LENGTH(_length) \
config.m_total_colors = _length; \
-#define MDRV_DEFAULT_LAYOUT(_layout) \
+#define MCFG_DEFAULT_LAYOUT(_layout) \
config.m_default_layout = &(_layout)[0]; \
// core machine functions
-#define MDRV_MACHINE_START(_func) \
+#define MCFG_MACHINE_START(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_MACHINE_START, MACHINE_START_NAME(_func)); \
-#define MDRV_MACHINE_RESET(_func) \
+#define MCFG_MACHINE_RESET(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_MACHINE_RESET, MACHINE_RESET_NAME(_func)); \
// core sound functions
-#define MDRV_SOUND_START(_func) \
+#define MCFG_SOUND_START(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_SOUND_START, SOUND_START_NAME(_func)); \
-#define MDRV_SOUND_RESET(_func) \
+#define MCFG_SOUND_RESET(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_SOUND_RESET, SOUND_RESET_NAME(_func)); \
// core video functions
-#define MDRV_PALETTE_INIT(_func) \
+#define MCFG_PALETTE_INIT(_func) \
driver_device_config_base::static_set_palette_init(owner, PALETTE_INIT_NAME(_func)); \
-#define MDRV_VIDEO_START(_func) \
+#define MCFG_VIDEO_START(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_START, VIDEO_START_NAME(_func)); \
-#define MDRV_VIDEO_RESET(_func) \
+#define MCFG_VIDEO_RESET(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_RESET, VIDEO_RESET_NAME(_func)); \
-#define MDRV_VIDEO_EOF(_func) \
+#define MCFG_VIDEO_EOF(_func) \
driver_device_config_base::static_set_callback(owner, driver_device_config_base::CB_VIDEO_EOF, VIDEO_EOF_NAME(_func)); \
-#define MDRV_VIDEO_UPDATE(_func) \
+#define MCFG_VIDEO_UPDATE(_func) \
driver_device_config_base::static_set_video_update(owner, VIDEO_UPDATE_NAME(_func)); \
// add/remove devices
-#define MDRV_DEVICE_ADD(_tag, _type, _clock) \
+#define MCFG_DEVICE_ADD(_tag, _type, _clock) \
device = config.device_add(owner, _tag, _type, _clock); \
-#define MDRV_DEVICE_REPLACE(_tag, _type, _clock) \
+#define MCFG_DEVICE_REPLACE(_tag, _type, _clock) \
device = config.device_replace(owner, _tag, _type, _clock); \
-#define MDRV_DEVICE_REMOVE(_tag) \
+#define MCFG_DEVICE_REMOVE(_tag) \
device = config.device_remove(owner, _tag); \
-#define MDRV_DEVICE_MODIFY(_tag) \
+#define MCFG_DEVICE_MODIFY(_tag) \
device = config.device_find(owner, _tag); \
diff --git a/src/emu/screen.h b/src/emu/screen.h
index 4e61e71afa6..4b053cd8e4c 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -126,7 +126,7 @@ private:
screen_type_enum m_type; // type of screen
int m_width, m_height; // default total width/height (HTOTAL, VTOTAL)
rectangle m_visarea; // default visible area (HBLANK end/start, VBLANK end/start)
- bool m_oldstyle_vblank_supplied; // MDRV_SCREEN_VBLANK_TIME macro used
+ bool m_oldstyle_vblank_supplied; // MCFG_SCREEN_VBLANK_TIME macro used
attoseconds_t m_refresh; // default refresh period
attoseconds_t m_vblank; // duration of a VBLANK
bitmap_format m_format; // bitmap format
@@ -270,35 +270,35 @@ private:
// SCREEN DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_SCREEN_ADD(_tag, _type) \
- MDRV_DEVICE_ADD(_tag, SCREEN, 0) \
- MDRV_SCREEN_TYPE(_type) \
+#define MCFG_SCREEN_ADD(_tag, _type) \
+ MCFG_DEVICE_ADD(_tag, SCREEN, 0) \
+ MCFG_SCREEN_TYPE(_type) \
-#define MDRV_SCREEN_MODIFY(_tag) \
- MDRV_DEVICE_MODIFY(_tag)
+#define MCFG_SCREEN_MODIFY(_tag) \
+ MCFG_DEVICE_MODIFY(_tag)
-#define MDRV_SCREEN_FORMAT(_format) \
+#define MCFG_SCREEN_FORMAT(_format) \
screen_device_config::static_set_format(device, _format); \
-#define MDRV_SCREEN_TYPE(_type) \
+#define MCFG_SCREEN_TYPE(_type) \
screen_device_config::static_set_type(device, SCREEN_TYPE_##_type); \
-#define MDRV_SCREEN_RAW_PARAMS(_pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart) \
+#define MCFG_SCREEN_RAW_PARAMS(_pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart) \
screen_device_config::static_set_raw(device, _pixclock, _htotal, _hbend, _hbstart, _vtotal, _vbend, _vbstart);
-#define MDRV_SCREEN_REFRESH_RATE(_rate) \
+#define MCFG_SCREEN_REFRESH_RATE(_rate) \
screen_device_config::static_set_refresh(device, HZ_TO_ATTOSECONDS(_rate)); \
-#define MDRV_SCREEN_VBLANK_TIME(_time) \
+#define MCFG_SCREEN_VBLANK_TIME(_time) \
screen_device_config::static_set_vblank_time(device, _time); \
-#define MDRV_SCREEN_SIZE(_width, _height) \
+#define MCFG_SCREEN_SIZE(_width, _height) \
screen_device_config::static_set_size(device, _width, _height); \
-#define MDRV_SCREEN_VISIBLE_AREA(_minx, _maxx, _miny, _maxy) \
+#define MCFG_SCREEN_VISIBLE_AREA(_minx, _maxx, _miny, _maxy) \
screen_device_config::static_set_visarea(device, _minx, _maxx, _miny, _maxy); \
-#define MDRV_SCREEN_DEFAULT_POSITION(_xscale, _xoffs, _yscale, _yoffs) \
+#define MCFG_SCREEN_DEFAULT_POSITION(_xscale, _xoffs, _yscale, _yoffs) \
screen_device_config::static_set_default_position(device, _xscale, _xoffs, _yscale, _yoffs); \
diff --git a/src/emu/softlist.h b/src/emu/softlist.h
index adf2cdda21a..ed4cefe8b14 100644
--- a/src/emu/softlist.h
+++ b/src/emu/softlist.h
@@ -97,26 +97,26 @@ struct _software_list_config
#define SOFTWARE_LIST_ORIGINAL_SYSTEM 0
#define SOFTWARE_LIST_COMPATIBLE_SYSTEM 1
-#define MDRV_SOFTWARE_LIST_CONFIG(_idx,_list,_list_type) \
- MDRV_DEVICE_CONFIG_DATAPTR_ARRAY(software_list_config, list_name, _idx, _list) \
- MDRV_DEVICE_CONFIG_DATA32(software_list_config, list_type, _list_type)
+#define MCFG_SOFTWARE_LIST_CONFIG(_idx,_list,_list_type) \
+ MCFG_DEVICE_CONFIG_DATAPTR_ARRAY(software_list_config, list_name, _idx, _list) \
+ MCFG_DEVICE_CONFIG_DATA32(software_list_config, list_type, _list_type)
-#define MDRV_SOFTWARE_LIST_ADD( _tag, _list ) \
- MDRV_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \
- MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM)
+#define MCFG_SOFTWARE_LIST_ADD( _tag, _list ) \
+ MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \
+ MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM)
-#define MDRV_SOFTWARE_LIST_COMPATIBLE_ADD( _tag, _list ) \
- MDRV_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \
- MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM)
+#define MCFG_SOFTWARE_LIST_COMPATIBLE_ADD( _tag, _list ) \
+ MCFG_DEVICE_ADD( _tag, SOFTWARE_LIST, 0 ) \
+ MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM)
-#define MDRV_SOFTWARE_LIST_MODIFY( _tag, _list ) \
- MDRV_DEVICE_MODIFY( _tag ) \
- MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM)
+#define MCFG_SOFTWARE_LIST_MODIFY( _tag, _list ) \
+ MCFG_DEVICE_MODIFY( _tag ) \
+ MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_ORIGINAL_SYSTEM)
-#define MDRV_SOFTWARE_LIST_COMPATIBLE_MODIFY( _tag, _list ) \
- MDRV_DEVICE_MODIFY( _tag ) \
- MDRV_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM)
+#define MCFG_SOFTWARE_LIST_COMPATIBLE_MODIFY( _tag, _list ) \
+ MCFG_DEVICE_MODIFY( _tag ) \
+ MCFG_SOFTWARE_LIST_CONFIG(0,_list, SOFTWARE_LIST_COMPATIBLE_SYSTEM)
#endif
diff --git a/src/emu/sound.h b/src/emu/sound.h
index b50539d7195..2ccee378dae 100644
--- a/src/emu/sound.h
+++ b/src/emu/sound.h
@@ -123,16 +123,16 @@ extern const device_type SPEAKER;
***************************************************************************/
/* add/remove speakers */
-#define MDRV_SPEAKER_ADD(_tag, _x, _y, _z) \
- MDRV_DEVICE_ADD(_tag, SPEAKER, 0) \
+#define MCFG_SPEAKER_ADD(_tag, _x, _y, _z) \
+ MCFG_DEVICE_ADD(_tag, SPEAKER, 0) \
speaker_device_config::static_set_position(device, _x, _y, _z); \
-#define MDRV_SPEAKER_STANDARD_MONO(_tag) \
- MDRV_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0)
+#define MCFG_SPEAKER_STANDARD_MONO(_tag) \
+ MCFG_SPEAKER_ADD(_tag, 0.0, 0.0, 1.0)
-#define MDRV_SPEAKER_STANDARD_STEREO(_tagl, _tagr) \
- MDRV_SPEAKER_ADD(_tagl, -0.2, 0.0, 1.0) \
- MDRV_SPEAKER_ADD(_tagr, 0.2, 0.0, 1.0)
+#define MCFG_SPEAKER_STANDARD_STEREO(_tagl, _tagr) \
+ MCFG_SPEAKER_ADD(_tagl, -0.2, 0.0, 1.0) \
+ MCFG_SPEAKER_ADD(_tagr, 0.2, 0.0, 1.0)
diff --git a/src/emu/sound/asc.h b/src/emu/sound/asc.h
index b074494e8c8..93c1a95cce5 100644
--- a/src/emu/sound/asc.h
+++ b/src/emu/sound/asc.h
@@ -39,20 +39,20 @@ enum
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_ASC_ADD(_tag, _clock, _type, _irqf) \
- MDRV_DEVICE_ADD(_tag, ASC, _clock) \
- MDRV_ASC_TYPE(_type) \
- MDRV_IRQ_FUNC(_irqf)
+#define MCFG_ASC_ADD(_tag, _clock, _type, _irqf) \
+ MCFG_DEVICE_ADD(_tag, ASC, _clock) \
+ MCFG_ASC_TYPE(_type) \
+ MCFG_IRQ_FUNC(_irqf)
-#define MDRV_ASC_REPLACE(_tag, _clock, _type, _irqf) \
- MDRV_DEVICE_REPLACE(_tag, ASC, _clock) \
- MDRV_ASC_TYPE(_type) \
- MDRV_IRQ_FUNC(_irqf)
+#define MCFG_ASC_REPLACE(_tag, _clock, _type, _irqf) \
+ MCFG_DEVICE_REPLACE(_tag, ASC, _clock) \
+ MCFG_ASC_TYPE(_type) \
+ MCFG_IRQ_FUNC(_irqf)
-#define MDRV_ASC_TYPE(_type) \
+#define MCFG_ASC_TYPE(_type) \
asc_device_config::static_set_type(device, _type); \
-#define MDRV_IRQ_FUNC(_irqf) \
+#define MCFG_IRQ_FUNC(_irqf) \
asc_device_config::static_set_irqf(device, _irqf); \
diff --git a/src/emu/sound/cdp1863.h b/src/emu/sound/cdp1863.h
index 5557cb2c8d4..db00349c809 100644
--- a/src/emu/sound/cdp1863.h
+++ b/src/emu/sound/cdp1863.h
@@ -29,9 +29,9 @@
DECLARE_LEGACY_SOUND_DEVICE(CDP1863, cdp1863);
-#define MDRV_CDP1863_ADD(_tag, _clock1, _clock2) \
- MDRV_SOUND_ADD(_tag, CDP1863, _clock1) \
- MDRV_DEVICE_CONFIG_DATA32(cdp1863_config, clock2, _clock2)
+#define MCFG_CDP1863_ADD(_tag, _clock1, _clock2) \
+ MCFG_SOUND_ADD(_tag, CDP1863, _clock1) \
+ MCFG_DEVICE_CONFIG_DATA32(cdp1863_config, clock2, _clock2)
#define CDP1863_INTERFACE(name) \
const cdp1863_interface (name) =
diff --git a/src/emu/sound/cdp1864.h b/src/emu/sound/cdp1864.h
index 990da43cc9e..d85a4fd5541 100644
--- a/src/emu/sound/cdp1864.h
+++ b/src/emu/sound/cdp1864.h
@@ -77,14 +77,14 @@
DECLARE_LEGACY_SOUND_DEVICE(CDP1864, cdp1864);
-#define MDRV_CDP1864_ADD(_tag, _clock, _config) \
- MDRV_SOUND_ADD(_tag, CDP1864, _clock) \
- MDRV_DEVICE_CONFIG(_config)
-
-#define MDRV_CDP1864_SCREEN_ADD(_tag, _clock) \
- MDRV_SCREEN_ADD(_tag, RASTER) \
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \
- MDRV_SCREEN_RAW_PARAMS(_clock, CDP1864_SCREEN_WIDTH, CDP1864_HBLANK_END, CDP1864_HBLANK_START, CDP1864_TOTAL_SCANLINES, CDP1864_SCANLINE_VBLANK_END, CDP1864_SCANLINE_VBLANK_START)
+#define MCFG_CDP1864_ADD(_tag, _clock, _config) \
+ MCFG_SOUND_ADD(_tag, CDP1864, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
+
+#define MCFG_CDP1864_SCREEN_ADD(_tag, _clock) \
+ MCFG_SCREEN_ADD(_tag, RASTER) \
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \
+ MCFG_SCREEN_RAW_PARAMS(_clock, CDP1864_SCREEN_WIDTH, CDP1864_HBLANK_END, CDP1864_HBLANK_START, CDP1864_TOTAL_SCANLINES, CDP1864_SCANLINE_VBLANK_END, CDP1864_SCANLINE_VBLANK_START)
#define CDP1864_INTERFACE(name) \
const cdp1864_interface (name) =
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index d6bcadd6ad4..0248bcdace2 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -137,22 +137,22 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_CDP1869_ADD(_tag, _pixclock, _config, _map) \
- MDRV_DEVICE_ADD(_tag, CDP1869, _pixclock) \
- MDRV_DEVICE_CONFIG(_config) \
- MDRV_DEVICE_ADDRESS_MAP(0, _map)
-
-#define MDRV_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \
- MDRV_SCREEN_ADD(_tag, RASTER) \
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \
- MDRV_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) \
- MDRV_PALETTE_LENGTH(8+64)
-
-#define MDRV_CDP1869_SCREEN_NTSC_ADD(_tag, _clock) \
- MDRV_SCREEN_ADD(_tag, RASTER) \
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \
- MDRV_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_NTSC, CDP1869_SCANLINE_VBLANK_END_NTSC, CDP1869_SCANLINE_VBLANK_START_NTSC) \
- MDRV_PALETTE_LENGTH(8+64)
+#define MCFG_CDP1869_ADD(_tag, _pixclock, _config, _map) \
+ MCFG_DEVICE_ADD(_tag, CDP1869, _pixclock) \
+ MCFG_DEVICE_CONFIG(_config) \
+ MCFG_DEVICE_ADDRESS_MAP(0, _map)
+
+#define MCFG_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \
+ MCFG_SCREEN_ADD(_tag, RASTER) \
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \
+ MCFG_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_PAL, CDP1869_SCANLINE_VBLANK_END_PAL, CDP1869_SCANLINE_VBLANK_START_PAL) \
+ MCFG_PALETTE_LENGTH(8+64)
+
+#define MCFG_CDP1869_SCREEN_NTSC_ADD(_tag, _clock) \
+ MCFG_SCREEN_ADD(_tag, RASTER) \
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) \
+ MCFG_SCREEN_RAW_PARAMS(_clock, CDP1869_SCREEN_WIDTH, CDP1869_HBLANK_END, CDP1869_HBLANK_START, CDP1869_TOTAL_SCANLINES_NTSC, CDP1869_SCANLINE_VBLANK_END_NTSC, CDP1869_SCANLINE_VBLANK_START_NTSC) \
+ MCFG_PALETTE_LENGTH(8+64)
#define CDP1869_INTERFACE(_name) \
const cdp1869_interface (_name) =
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 071ca8e5969..f246d125829 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -4420,7 +4420,7 @@ enum
*
*************************************/
-#define MDRV_SOUND_CONFIG_DISCRETE(name) MDRV_SOUND_CONFIG(name##_discrete_interface)
+#define MCFG_SOUND_CONFIG_DISCRETE(name) MCFG_SOUND_CONFIG(name##_discrete_interface)
#define DISCRETE_SOUND_EXTERN(name) extern const discrete_sound_block name##_discrete_interface[]
#define DISCRETE_SOUND_START(name) const discrete_sound_block name##_discrete_interface[] = {
diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h
index 32b179aa453..56132a5684b 100644
--- a/src/emu/sound/flt_rc.h
+++ b/src/emu/sound/flt_rc.h
@@ -36,12 +36,12 @@
* Same as FLT_RC_HIGHPASS, but with standard frequency of 16 HZ
* This filter may be setup just with
*
- * MDRV_SOUND_ADD("tag", FILTER_RC, 0)
- * MDRV_SOUND_CONFIG(&flt_rc_ac_default)
+ * MCFG_SOUND_ADD("tag", FILTER_RC, 0)
+ * MCFG_SOUND_CONFIG(&flt_rc_ac_default)
*
* Default behaviour:
*
- * Without MDRV_SOUND_CONFIG, a disabled FLT_RC_LOWPASS is created
+ * Without MCFG_SOUND_CONFIG, a disabled FLT_RC_LOWPASS is created
*
*/
diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h
index dbe6b8a5029..adac871d67a 100644
--- a/src/emu/sound/ics2115.h
+++ b/src/emu/sound/ics2115.h
@@ -9,15 +9,15 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_ICS2115_ADD(_tag, _clock, _irqf) \
- MDRV_DEVICE_ADD(_tag, ICS2115, _clock) \
- MDRV_IRQ_FUNC(_irqf) \
+#define MCFG_ICS2115_ADD(_tag, _clock, _irqf) \
+ MCFG_DEVICE_ADD(_tag, ICS2115, _clock) \
+ MCFG_IRQ_FUNC(_irqf) \
-#define MDRV_ICS2115_REPLACE(_tag, _clock, _irqf) \
- MDRV_DEVICE_REPLACE(_tag, ICS2115, _clock) \
- MDRV_IRQ_FUNC(_irqf)
+#define MCFG_ICS2115_REPLACE(_tag, _clock, _irqf) \
+ MCFG_DEVICE_REPLACE(_tag, ICS2115, _clock) \
+ MCFG_IRQ_FUNC(_irqf)
-#define MDRV_IRQ_FUNC(_irqf) \
+#define MCFG_IRQ_FUNC(_irqf) \
ics2115_device_config::static_set_irqf(device, _irqf); \
//**************************************************************************
diff --git a/src/emu/sound/k056800.h b/src/emu/sound/k056800.h
index bef69e59495..57c205b61a7 100644
--- a/src/emu/sound/k056800.h
+++ b/src/emu/sound/k056800.h
@@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(K056800, k056800);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_K056800_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, K056800, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_K056800_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, K056800, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h
index 0203c4cfdc6..89c5fe67c20 100644
--- a/src/emu/sound/mos6560.h
+++ b/src/emu/sound/mos6560.h
@@ -94,9 +94,9 @@ DECLARE_LEGACY_SOUND_DEVICE(MOS656X, mos6560);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_MOS656X_ADD(_tag, _interface) \
- MDRV_SOUND_ADD(_tag, MOS656X, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_MOS656X_ADD(_tag, _interface) \
+ MCFG_SOUND_ADD(_tag, MOS656X, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h
index 8cdb8637271..e0cccc66381 100644
--- a/src/emu/sound/okim6295.h
+++ b/src/emu/sound/okim6295.h
@@ -31,15 +31,15 @@ enum
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_OKIM6295_ADD(_tag, _clock, _pin7) \
- MDRV_DEVICE_ADD(_tag, OKIM6295, _clock) \
- MDRV_OKIM6295_PIN7(_pin7)
+#define MCFG_OKIM6295_ADD(_tag, _clock, _pin7) \
+ MCFG_DEVICE_ADD(_tag, OKIM6295, _clock) \
+ MCFG_OKIM6295_PIN7(_pin7)
-#define MDRV_OKIM6295_REPLACE(_tag, _clock, _pin7) \
- MDRV_DEVICE_REPLACE(_tag, OKIM6295, _clock) \
- MDRV_OKIM6295_PIN7(_pin7)
+#define MCFG_OKIM6295_REPLACE(_tag, _clock, _pin7) \
+ MCFG_DEVICE_REPLACE(_tag, OKIM6295, _clock) \
+ MCFG_OKIM6295_PIN7(_pin7)
-#define MDRV_OKIM6295_PIN7(_pin7) \
+#define MCFG_OKIM6295_PIN7(_pin7) \
okim6295_device_config::static_set_pin7(device, _pin7); \
diff --git a/src/emu/sound/wave.h b/src/emu/sound/wave.h
index 6d27ef62841..8421185d9ac 100644
--- a/src/emu/sound/wave.h
+++ b/src/emu/sound/wave.h
@@ -12,8 +12,8 @@
DECLARE_LEGACY_SOUND_DEVICE(WAVE, wave);
-#define MDRV_SOUND_WAVE_ADD(_tag, _cass_tag) \
- MDRV_SOUND_ADD( _tag, WAVE, 0 ) \
- MDRV_DEVICE_CONFIG( _cass_tag )
+#define MCFG_SOUND_WAVE_ADD(_tag, _cass_tag) \
+ MCFG_SOUND_ADD( _tag, WAVE, 0 ) \
+ MCFG_DEVICE_CONFIG( _cass_tag )
#endif /* __WAVE_H__ */
diff --git a/src/emu/timer.h b/src/emu/timer.h
index 516ceacc1e9..b78a8a7074f 100644
--- a/src/emu/timer.h
+++ b/src/emu/timer.h
@@ -76,31 +76,31 @@ struct timer_execution_state
// TIMER DEVICE CONFIGURATION MACROS
//**************************************************************************
-#define MDRV_TIMER_ADD(_tag, _callback) \
- MDRV_DEVICE_ADD(_tag, TIMER, 0) \
+#define MCFG_TIMER_ADD(_tag, _callback) \
+ MCFG_DEVICE_ADD(_tag, TIMER, 0) \
timer_device_config::static_configure_generic(device, _callback); \
-#define MDRV_TIMER_ADD_PERIODIC(_tag, _callback, _period) \
- MDRV_DEVICE_ADD(_tag, TIMER, 0) \
+#define MCFG_TIMER_ADD_PERIODIC(_tag, _callback, _period) \
+ MCFG_DEVICE_ADD(_tag, TIMER, 0) \
timer_device_config::static_configure_periodic(device, _callback, ATTOTIME_IN_##_period); \
-#define MDRV_TIMER_ADD_SCANLINE(_tag, _callback, _screen, _first_vpos, _increment) \
- MDRV_DEVICE_ADD(_tag, TIMER, 0) \
+#define MCFG_TIMER_ADD_SCANLINE(_tag, _callback, _screen, _first_vpos, _increment) \
+ MCFG_DEVICE_ADD(_tag, TIMER, 0) \
timer_device_config::static_configure_scanline(device, _callback, _screen, _first_vpos, _increment); \
-#define MDRV_TIMER_MODIFY(_tag) \
- MDRV_DEVICE_MODIFY(_tag)
+#define MCFG_TIMER_MODIFY(_tag) \
+ MCFG_DEVICE_MODIFY(_tag)
-#define MDRV_TIMER_CALLBACK(_callback) \
+#define MCFG_TIMER_CALLBACK(_callback) \
timer_device_config::static_set_callback(device, _callback); \
-#define MDRV_TIMER_START_DELAY(_start_delay) \
+#define MCFG_TIMER_START_DELAY(_start_delay) \
timer_device_config::static_set_start_delay(device, ATTOTIME_IN_##_start_delay); \
-#define MDRV_TIMER_PARAM(_param) \
+#define MCFG_TIMER_PARAM(_param) \
timer_device_config::static_set_param(device, _param); \
-#define MDRV_TIMER_PTR(_ptr) \
+#define MCFG_TIMER_PTR(_ptr) \
timer_device_config::static_set_ptr(device, (void *)(_ptr)); \
diff --git a/src/emu/video/hd63484.h b/src/emu/video/hd63484.h
index 206a47f3c53..26a5c742d89 100644
--- a/src/emu/video/hd63484.h
+++ b/src/emu/video/hd63484.h
@@ -28,9 +28,9 @@ struct _hd63484_interface
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_HD63484_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, HD63484, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_HD63484_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, HD63484, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h
index 2fe0d6b5d2d..e65d6e7f5a8 100644
--- a/src/emu/video/mc6845.h
+++ b/src/emu/video/mc6845.h
@@ -22,9 +22,9 @@ DECLARE_LEGACY_DEVICE(SY6545_1, sy6545_1);
DECLARE_LEGACY_DEVICE(SY6845E, sy6845e);
-#define MDRV_MC6845_ADD(_tag, _variant, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, _variant, _clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_MC6845_ADD(_tag, _variant, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, _variant, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
/* callback definitions */
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 4db64fad94f..3d2d1008373 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -180,29 +180,29 @@ static const unsigned short vga_colortable[] =
};
MACHINE_CONFIG_FRAGMENT( pcvideo_vga )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(720, 480)
- MDRV_SCREEN_VISIBLE_AREA(0,720-1, 0,480-1)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(vga)
-
- MDRV_VIDEO_START(vga)
- MDRV_VIDEO_RESET(vga)
- MDRV_VIDEO_UPDATE(pc_video)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(720, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0,720-1, 0,480-1)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(vga)
+
+ MCFG_VIDEO_START(vga)
+ MCFG_VIDEO_RESET(vga)
+ MCFG_VIDEO_UPDATE(pc_video)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( pcvideo_pc1640 )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(720, 350)
- MDRV_SCREEN_VISIBLE_AREA(0,720-1, 0,350-1)
- MDRV_PALETTE_LENGTH(sizeof(ega_palette) / 3)
- MDRV_PALETTE_INIT(ega)
-
- MDRV_VIDEO_START(ega)
- MDRV_VIDEO_RESET(ega)
- MDRV_VIDEO_UPDATE(pc_video)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(720, 350)
+ MCFG_SCREEN_VISIBLE_AREA(0,720-1, 0,350-1)
+ MCFG_PALETTE_LENGTH(sizeof(ega_palette) / 3)
+ MCFG_PALETTE_INIT(ega)
+
+ MCFG_VIDEO_START(ega)
+ MCFG_VIDEO_RESET(ega)
+ MCFG_VIDEO_UPDATE(pc_video)
MACHINE_CONFIG_END
/***************************************************************************/
diff --git a/src/emu/video/s2636.h b/src/emu/video/s2636.h
index fad925f7a22..d46d391a6d8 100644
--- a/src/emu/video/s2636.h
+++ b/src/emu/video/s2636.h
@@ -37,9 +37,9 @@ struct _s2636_interface
DECLARE_LEGACY_DEVICE(S2636, s2636);
-#define MDRV_S2636_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, S2636, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_S2636_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, S2636, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/*************************************
diff --git a/src/emu/video/saa5050.h b/src/emu/video/saa5050.h
index 8426c5a1045..ffedce6046f 100644
--- a/src/emu/video/saa5050.h
+++ b/src/emu/video/saa5050.h
@@ -32,9 +32,9 @@ DECLARE_LEGACY_DEVICE(SAA5050, saa5050);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_SAA5050_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, SAA5050, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_SAA5050_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, SAA5050, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
diff --git a/src/emu/video/tlc34076.h b/src/emu/video/tlc34076.h
index 0e5336cf088..8539b80b06e 100644
--- a/src/emu/video/tlc34076.h
+++ b/src/emu/video/tlc34076.h
@@ -30,9 +30,9 @@ DECLARE_LEGACY_DEVICE(TLC34076, tlc34076);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_TLC34076_ADD(_tag, _res_sel) \
- MDRV_DEVICE_ADD(_tag, TLC34076, 0) \
- MDRV_DEVICE_CONFIG_DATA32(tlc34076_config, res_sel, _res_sel)
+#define MCFG_TLC34076_ADD(_tag, _res_sel) \
+ MCFG_DEVICE_ADD(_tag, TLC34076, 0) \
+ MCFG_DEVICE_CONFIG_DATA32(tlc34076_config, res_sel, _res_sel)
/***************************************************************************
diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h
index 02705e0d943..81ae2da2bb6 100644
--- a/src/emu/video/tms9927.h
+++ b/src/emu/video/tms9927.h
@@ -19,14 +19,14 @@ DECLARE_LEGACY_DEVICE(CRT5037, crt5037);
DECLARE_LEGACY_DEVICE(CRT5057, crt5057);
-#define MDRV_TMS9927_ADD(_tag, _clock, _config) \
- MDRV_DEVICE_ADD(_tag, TMS9927, _clock) \
- MDRV_DEVICE_CONFIG(_config)
-
-#define MDRV_TMS9927_RECONFIG(_tag, _clock, _config) \
- MDRV_DEVICE_MODIFY(_tag) \
- MDRV_DEVICE_CLOCK(_clock) \
- MDRV_DEVICE_CONFIG(_config)
+#define MCFG_TMS9927_ADD(_tag, _clock, _config) \
+ MCFG_DEVICE_ADD(_tag, TMS9927, _clock) \
+ MCFG_DEVICE_CONFIG(_config)
+
+#define MCFG_TMS9927_RECONFIG(_tag, _clock, _config) \
+ MCFG_DEVICE_MODIFY(_tag) \
+ MCFG_DEVICE_CLOCK(_clock) \
+ MCFG_DEVICE_CONFIG(_config)
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index 20ae9ecde1f..380f55c35ff 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -819,17 +819,17 @@ VIDEO_START( tms9928a )
MACHINE_CONFIG_FRAGMENT( tms9928a )
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(LEFT_BORDER+32*8+RIGHT_BORDER, TOP_BORDER_60HZ+24*8+BOTTOM_BORDER_60HZ)
- MDRV_SCREEN_VISIBLE_AREA(LEFT_BORDER-12, LEFT_BORDER+32*8+12-1, TOP_BORDER_60HZ-9, TOP_BORDER_60HZ+24*8+9-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(LEFT_BORDER+32*8+RIGHT_BORDER, TOP_BORDER_60HZ+24*8+BOTTOM_BORDER_60HZ)
+ MCFG_SCREEN_VISIBLE_AREA(LEFT_BORDER-12, LEFT_BORDER+32*8+12-1, TOP_BORDER_60HZ-9, TOP_BORDER_60HZ+24*8+9-1)
- MDRV_PALETTE_LENGTH(TMS9928A_PALETTE_SIZE)
- MDRV_PALETTE_INIT(tms9928a)
+ MCFG_PALETTE_LENGTH(TMS9928A_PALETTE_SIZE)
+ MCFG_PALETTE_INIT(tms9928a)
- MDRV_VIDEO_START(tms9928a)
- MDRV_VIDEO_UPDATE(tms9928a)
+ MCFG_VIDEO_START(tms9928a)
+ MCFG_VIDEO_UPDATE(tms9928a)
MACHINE_CONFIG_END
diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h
index 74a6646066e..5baf04b92ee 100644
--- a/src/emu/video/voodoo.h
+++ b/src/emu/video/voodoo.h
@@ -93,38 +93,38 @@ struct _voodoo_config
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_3DFX_VOODOO_ADD(_tag, _type, _clock, _fbmem, _screen) \
- MDRV_DEVICE_ADD(_tag, VOODOO_GRAPHICS, _clock) \
- MDRV_DEVICE_CONFIG_DATA32(voodoo_config, type, _type) \
- MDRV_DEVICE_CONFIG_DATA32(voodoo_config, fbmem, _fbmem) \
- MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, screen, _screen)
+#define MCFG_3DFX_VOODOO_ADD(_tag, _type, _clock, _fbmem, _screen) \
+ MCFG_DEVICE_ADD(_tag, VOODOO_GRAPHICS, _clock) \
+ MCFG_DEVICE_CONFIG_DATA32(voodoo_config, type, _type) \
+ MCFG_DEVICE_CONFIG_DATA32(voodoo_config, fbmem, _fbmem) \
+ MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, screen, _screen)
-#define MDRV_3DFX_VOODOO_1_ADD(_tag, _clock, _fbmem, _screen) \
- MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_1, _clock, _fbmem, _screen)
+#define MCFG_3DFX_VOODOO_1_ADD(_tag, _clock, _fbmem, _screen) \
+ MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_1, _clock, _fbmem, _screen)
-#define MDRV_3DFX_VOODOO_2_ADD(_tag, _clock, _fbmem, _screen) \
- MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_2, _clock, _fbmem, _screen)
+#define MCFG_3DFX_VOODOO_2_ADD(_tag, _clock, _fbmem, _screen) \
+ MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_2, _clock, _fbmem, _screen)
-#define MDRV_3DFX_VOODOO_BANSHEE_ADD(_tag, _clock, _fbmem, _screen) \
- MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_BANSHEE, _clock, _fbmem, _screen)
+#define MCFG_3DFX_VOODOO_BANSHEE_ADD(_tag, _clock, _fbmem, _screen) \
+ MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_BANSHEE, _clock, _fbmem, _screen)
-#define MDRV_3DFX_VOODOO_3_ADD(_tag, _clock, _fbmem, _screen) \
- MDRV_3DFX_VOODOO_ADD(_tag, VOODOO_3, _clock, _fbmem, _screen)
+#define MCFG_3DFX_VOODOO_3_ADD(_tag, _clock, _fbmem, _screen) \
+ MCFG_3DFX_VOODOO_ADD(_tag, VOODOO_3, _clock, _fbmem, _screen)
-#define MDRV_3DFX_VOODOO_TMU_MEMORY(_tmu, _tmumem) \
- MDRV_DEVICE_CONFIG_DATA32(voodoo_config, tmumem##_tmu, _tmumem)
+#define MCFG_3DFX_VOODOO_TMU_MEMORY(_tmu, _tmumem) \
+ MCFG_DEVICE_CONFIG_DATA32(voodoo_config, tmumem##_tmu, _tmumem)
-#define MDRV_3DFX_VOODOO_VBLANK(_vblank) \
- MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, vblank, _vblank)
+#define MCFG_3DFX_VOODOO_VBLANK(_vblank) \
+ MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, vblank, _vblank)
-#define MDRV_3DFX_VOODOO_STALL(_stall) \
- MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, stall, _stall)
+#define MCFG_3DFX_VOODOO_STALL(_stall) \
+ MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, stall, _stall)
-#define MDRV_3DFX_VOODOO_CPU(_cputag) \
- MDRV_DEVICE_CONFIG_DATAPTR(voodoo_config, cputag, _cputag)
+#define MCFG_3DFX_VOODOO_CPU(_cputag) \
+ MCFG_DEVICE_CONFIG_DATAPTR(voodoo_config, cputag, _cputag)
-#define MDRV_3DFX_VOODOO_MODIFY(_tag) \
- MDRV_DEVICE_MODIFY(_tag)
+#define MCFG_3DFX_VOODOO_MODIFY(_tag) \
+ MCFG_DEVICE_MODIFY(_tag)
diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c
index 8762364625a..0da9410567c 100644
--- a/src/ldplayer/ldplayer.c
+++ b/src/ldplayer/ldplayer.c
@@ -557,34 +557,34 @@ INPUT_PORTS_END
static MACHINE_CONFIG_FRAGMENT( ldplayer_core )
- MDRV_MACHINE_START(ldplayer)
- MDRV_MACHINE_RESET(ldplayer)
+ MCFG_MACHINE_START(ldplayer)
+ MCFG_MACHINE_RESET(ldplayer)
/* audio hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("ldsound", LASERDISC_SOUND, 0)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ldplayer_ntsc, ldplayer_core )
- MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
+ MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( ldv1000, ldplayer_ntsc )
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
- MDRV_LASERDISC_GET_DISC(get_disc)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound")
+ MCFG_LASERDISC_GET_DISC(get_disc)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( pr8210, ldplayer_ntsc )
- MDRV_MACHINE_START(pr8210)
- MDRV_MACHINE_RESET(pr8210)
- MDRV_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
- MDRV_LASERDISC_GET_DISC(get_disc)
+ MCFG_MACHINE_START(pr8210)
+ MCFG_MACHINE_RESET(pr8210)
+ MCFG_LASERDISC_ADD("laserdisc", PIONEER_PR8210, "screen", "ldsound")
+ MCFG_LASERDISC_GET_DISC(get_disc)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c
index a25660796da..7a76fa0ea6d 100644
--- a/src/mame/audio/astrof.c
+++ b/src/mame/audio/astrof.c
@@ -150,10 +150,10 @@ static const samples_interface astrof_samples_interface =
MACHINE_CONFIG_FRAGMENT( astrof_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astrof_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astrof_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -235,8 +235,8 @@ static const sn76477_interface tomahawk_sn76477_interface =
MACHINE_CONFIG_FRAGMENT( tomahawk_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(tomahawk_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(tomahawk_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 88045e784ae..7d3cbbc7daf 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -806,17 +806,17 @@ static const ym2151_interface ym2151_config =
MACHINE_CONFIG_FRAGMENT( jsa_i_stereo )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa1_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MACHINE_CONFIG_END
@@ -826,10 +826,10 @@ MACHINE_CONFIG_DERIVED( jsa_i_stereo_swapped, jsa_i_stereo )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_REPLACE("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.60)
+ MCFG_SOUND_REPLACE("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.60)
MACHINE_CONFIG_END
@@ -839,9 +839,9 @@ MACHINE_CONFIG_DERIVED( jsa_i_stereo_pokey, jsa_i_stereo )
/* basic machine hardware */
/* sound hardware */
- MDRV_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
+ MCFG_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
@@ -849,20 +849,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( jsa_i_mono_speech )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa1_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa1_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_SOUND_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220C, JSA_MASTER_CLOCK*2/11) /* potentially JSA_MASTER_CLOCK/9 as well */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -870,20 +870,20 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( jsa_ii_mono )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa2_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa2_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "mono", 0.60)
- MDRV_SOUND_ROUTE(1, "mono", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "mono", 0.60)
+ MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MDRV_OKIM6295_ADD("adpcm", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_OKIM6295_ADD("adpcm", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -891,11 +891,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( jsa_iii_mono, jsa_ii_mono )
/* basic machine hardware */
- MDRV_CPU_MODIFY("jsa")
- MDRV_CPU_PROGRAM_MAP(atarijsa3_map)
+ MCFG_CPU_MODIFY("jsa")
+ MCFG_CPU_PROGRAM_MAP(atarijsa3_map)
- MDRV_DEVICE_MODIFY("adpcm")
- MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
+ MCFG_DEVICE_MODIFY("adpcm")
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
MACHINE_CONFIG_END
@@ -905,7 +905,7 @@ MACHINE_CONFIG_DERIVED( jsa_iii_mono_noadpcm, jsa_iii_mono )
/* basic machine hardware */
/* sound hardware */
- MDRV_DEVICE_REMOVE("adpcm")
+ MCFG_DEVICE_REMOVE("adpcm")
MACHINE_CONFIG_END
@@ -913,25 +913,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( jsa_iiis_stereo )
/* basic machine hardware */
- MDRV_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(atarijsa3s_map)
- MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
+ MCFG_CPU_ADD("jsa", M6502, JSA_MASTER_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(atarijsa3s_map)
+ MCFG_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(ym2151_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("ymsnd", YM2151, JSA_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(ym2151_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MDRV_OKIM6295_ADD("adpcml", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
+ MCFG_OKIM6295_ADD("adpcml", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
- MDRV_OKIM6295_ADD("adpcmr", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MDRV_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
+ MCFG_OKIM6295_ADD("adpcmr", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
+ MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c
index aa606add98c..ec07873f1b1 100644
--- a/src/mame/audio/bzone.c
+++ b/src/mame/audio/bzone.c
@@ -409,14 +409,14 @@ WRITE8_DEVICE_HANDLER( bzone_sounds_w )
MACHINE_CONFIG_FRAGMENT( bzone_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8)
- MDRV_SOUND_CONFIG(bzone_pokey_interface)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8)
+ MCFG_SOUND_CONFIG(bzone_pokey_interface)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(bzone)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(bzone)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0 / BZ_FINAL_GAIN)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0 / BZ_FINAL_GAIN)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 724bd44fe64..5dd6c45b311 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -650,41 +650,41 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( cage )
/* basic machine hardware */
- MDRV_CPU_ADD("cage", TMS32031, 33868800)
- MDRV_CPU_CONFIG(cage_config)
- MDRV_CPU_PROGRAM_MAP(cage_map)
+ MCFG_CPU_ADD("cage", TMS32031, 33868800)
+ MCFG_CPU_CONFIG(cage_config)
+ MCFG_CPU_PROGRAM_MAP(cage_map)
- MDRV_TIMER_ADD("cage_dma_timer", dma_timer_callback)
- MDRV_TIMER_ADD("cage_timer0", cage_timer_callback)
- MDRV_TIMER_ADD("cage_timer1", cage_timer_callback)
+ MCFG_TIMER_ADD("cage_dma_timer", dma_timer_callback)
+ MCFG_TIMER_ADD("cage_timer0", cage_timer_callback)
+ MCFG_TIMER_ADD("cage_timer1", cage_timer_callback)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
#if (DAC_BUFFER_CHANNELS == 4)
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac3", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("dac4", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
#else
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
#endif
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( cage_seattle, cage )
- MDRV_CPU_MODIFY("cage")
- MDRV_CPU_PROGRAM_MAP(cage_map_seattle)
+ MCFG_CPU_MODIFY("cage")
+ MCFG_CPU_PROGRAM_MAP(cage_map_seattle)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index e27fbccf431..996588bf8d3 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -297,16 +297,16 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( carnival_audio )
- MDRV_CPU_ADD("audiocpu", I8039, 3579545)
- MDRV_CPU_PROGRAM_MAP(carnival_audio_map)
- MDRV_CPU_IO_MAP(carnival_audio_io_map)
+ MCFG_CPU_ADD("audiocpu", I8039, 3579545)
+ MCFG_CPU_PROGRAM_MAP(carnival_audio_map)
+ MCFG_CPU_IO_MAP(carnival_audio_io_map)
- MDRV_QUANTUM_TIME(HZ(600))
+ MCFG_QUANTUM_TIME(HZ(600))
- MDRV_SOUND_ADD("psg", AY8910, PSG_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("psg", AY8910, PSG_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(carnival_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(carnival_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index e4219cbef85..984df30117b 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -210,14 +210,14 @@ static MACHINE_RESET( spacewar )
}
MACHINE_CONFIG_FRAGMENT( spacewar_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(spacewar)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(spacewar)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spacewar_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spacewar_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -266,14 +266,14 @@ static MACHINE_RESET( barrier )
}
MACHINE_CONFIG_FRAGMENT( barrier_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(barrier)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(barrier)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(barrier_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(barrier_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -327,14 +327,14 @@ static MACHINE_RESET( speedfrk )
}
MACHINE_CONFIG_FRAGMENT( speedfrk_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(speedfrk)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(speedfrk)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(speedfrk_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(speedfrk_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -404,14 +404,14 @@ static MACHINE_RESET( starhawk )
}
MACHINE_CONFIG_FRAGMENT( starhawk_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(starhawk)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(starhawk)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(starhawk_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(starhawk_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -475,14 +475,14 @@ static MACHINE_RESET( sundance )
}
MACHINE_CONFIG_FRAGMENT( sundance_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(sundance)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(sundance)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(sundance_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(sundance_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -565,14 +565,14 @@ static MACHINE_RESET( tailg )
}
MACHINE_CONFIG_FRAGMENT( tailg_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(tailg)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(tailg)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(tailg_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(tailg_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -635,14 +635,14 @@ static MACHINE_RESET( warrior )
}
MACHINE_CONFIG_FRAGMENT( warrior_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(warrior)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(warrior)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(warrior_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(warrior_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -731,14 +731,14 @@ static MACHINE_RESET( armora )
}
MACHINE_CONFIG_FRAGMENT( armora_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(armora)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(armora)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(armora_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(armora_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -824,14 +824,14 @@ static MACHINE_RESET( ripoff )
}
MACHINE_CONFIG_FRAGMENT( ripoff_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(ripoff)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(ripoff)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(ripoff_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(ripoff_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -938,14 +938,14 @@ static MACHINE_RESET( starcas )
}
MACHINE_CONFIG_FRAGMENT( starcas_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(starcas)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(starcas)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(starcas_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(starcas_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1075,14 +1075,14 @@ static MACHINE_RESET( solarq )
}
MACHINE_CONFIG_FRAGMENT( solarq_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(solarq)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(solarq)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(solarq_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(solarq_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1211,14 +1211,14 @@ static MACHINE_RESET( boxingb )
}
MACHINE_CONFIG_FRAGMENT( boxingb_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(boxingb)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(boxingb)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(boxingb_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(boxingb_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1325,14 +1325,14 @@ static MACHINE_RESET( wotw )
}
MACHINE_CONFIG_FRAGMENT( wotw_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(wotw)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(wotw)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(wotw_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(wotw_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1439,14 +1439,14 @@ static MACHINE_RESET( wotwc )
}
MACHINE_CONFIG_FRAGMENT( wotwc_sound )
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(wotwc)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(wotwc)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(wotwc_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(wotwc_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1588,29 +1588,29 @@ static const z80_daisy_config daisy_chain[] =
MACHINE_CONFIG_FRAGMENT( demon_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_CONFIG(daisy_chain)
- MDRV_CPU_PROGRAM_MAP(demon_sound_map)
- MDRV_CPU_IO_MAP(demon_sound_ports)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_CONFIG(daisy_chain)
+ MCFG_CPU_PROGRAM_MAP(demon_sound_map)
+ MCFG_CPU_IO_MAP(demon_sound_ports)
- MDRV_Z80CTC_ADD("ctc", 3579545 /* same as "audiocpu" */, demon_z80ctc_interface)
+ MCFG_Z80CTC_ADD("ctc", 3579545 /* same as "audiocpu" */, demon_z80ctc_interface)
- MDRV_MACHINE_START(generic)
- MDRV_MACHINE_RESET(demon_sound)
+ MCFG_MACHINE_START(generic)
+ MCFG_MACHINE_RESET(demon_sound)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 3579545)
- MDRV_SOUND_CONFIG(demon_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(demon_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, 3579545)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 3579545)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay3", AY8910, 3579545)
- MDRV_SOUND_CONFIG(demon_ay8910_interface_3)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay3", AY8910, 3579545)
+ MCFG_SOUND_CONFIG(demon_ay8910_interface_3)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1640,5 +1640,5 @@ static MACHINE_RESET( qb3_sound )
MACHINE_CONFIG_DERIVED( qb3_sound, demon_sound )
- MDRV_MACHINE_RESET(qb3_sound)
+ MCFG_MACHINE_RESET(qb3_sound)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index deccbab5bf7..fe673803223 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -169,13 +169,13 @@ static const sn76477_interface crbaloon_sn76477_interface =
MACHINE_CONFIG_FRAGMENT( crbaloon_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(crbaloon_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(crbaloon_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(crbaloon)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(crbaloon)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index f4a27ee4160..5587ed2e3b1 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -609,35 +609,35 @@ static const adsp21xx_config adsp_config =
/* Basic DCS system with ADSP-2105 and 2k of SRAM (T-unit, V-unit, Killer Instinct) */
MACHINE_CONFIG_FRAGMENT( dcs_audio_2k )
- MDRV_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs_2k_program_map)
- MDRV_CPU_DATA_MAP(dcs_2k_data_map)
+ MCFG_CPU_ADD("dcs", ADSP2105, XTAL_10MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dcs_2k_program_map)
+ MCFG_CPU_DATA_MAP(dcs_2k_data_map)
- MDRV_TIMER_ADD("dcs_reg_timer", dcs_irq)
- MDRV_TIMER_ADD("dcs_int_timer", internal_timer_callback)
+ MCFG_TIMER_ADD("dcs_reg_timer", dcs_irq)
+ MCFG_TIMER_ADD("dcs_int_timer", internal_timer_callback)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
/* Basic DCS system with ADSP-2105 and 2k of SRAM, using a UART for communications (X-unit) */
MACHINE_CONFIG_DERIVED( dcs_audio_2k_uart, dcs_audio_2k )
- MDRV_CPU_MODIFY("dcs")
- MDRV_CPU_DATA_MAP(dcs_2k_uart_data_map)
+ MCFG_CPU_MODIFY("dcs")
+ MCFG_CPU_DATA_MAP(dcs_2k_uart_data_map)
MACHINE_CONFIG_END
/* Basic DCS system with ADSP-2105 and 8k of SRAM (Wolf-unit) */
MACHINE_CONFIG_DERIVED( dcs_audio_8k, dcs_audio_2k )
- MDRV_CPU_MODIFY("dcs")
- MDRV_CPU_PROGRAM_MAP(dcs_8k_program_map)
- MDRV_CPU_DATA_MAP(dcs_8k_data_map)
+ MCFG_CPU_MODIFY("dcs")
+ MCFG_CPU_PROGRAM_MAP(dcs_8k_program_map)
+ MCFG_CPU_DATA_MAP(dcs_8k_data_map)
MACHINE_CONFIG_END
@@ -649,31 +649,31 @@ MACHINE_CONFIG_END
*************************************/
MACHINE_CONFIG_FRAGMENT( dcs2_audio_2115 )
- MDRV_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map)
- MDRV_CPU_DATA_MAP(dcs2_2115_data_map)
+ MCFG_CPU_ADD("dcs2", ADSP2115, XTAL_16MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dcs2_2115_program_map)
+ MCFG_CPU_DATA_MAP(dcs2_2115_data_map)
- MDRV_TIMER_ADD("dcs_reg_timer", dcs_irq)
- MDRV_TIMER_ADD("dcs_sport_timer", sport0_irq)
- MDRV_TIMER_ADD("dcs_int_timer", internal_timer_callback)
- MDRV_TIMER_ADD("dcs_hle_timer", transfer_watchdog_callback)
+ MCFG_TIMER_ADD("dcs_reg_timer", dcs_irq)
+ MCFG_TIMER_ADD("dcs_sport_timer", sport0_irq)
+ MCFG_TIMER_ADD("dcs_int_timer", internal_timer_callback)
+ MCFG_TIMER_ADD("dcs_hle_timer", transfer_watchdog_callback)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( dcs2_audio_2104, dcs2_audio_2115 )
- MDRV_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dcs2_2104_program_map)
- MDRV_CPU_DATA_MAP(dcs2_2104_data_map)
+ MCFG_CPU_REPLACE("dcs2", ADSP2104, XTAL_16MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dcs2_2104_program_map)
+ MCFG_CPU_DATA_MAP(dcs2_2104_data_map)
MACHINE_CONFIG_END
@@ -685,19 +685,19 @@ MACHINE_CONFIG_END
*************************************/
MACHINE_CONFIG_FRAGMENT( dcs2_audio_dsio )
- MDRV_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(dsio_program_map)
- MDRV_CPU_DATA_MAP(dsio_data_map)
- MDRV_CPU_IO_MAP(dsio_io_map)
+ MCFG_CPU_ADD("dsio", ADSP2181, XTAL_32MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(dsio_program_map)
+ MCFG_CPU_DATA_MAP(dsio_data_map)
+ MCFG_CPU_IO_MAP(dsio_io_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
@@ -709,31 +709,31 @@ MACHINE_CONFIG_END
*************************************/
MACHINE_CONFIG_FRAGMENT( dcs2_audio_denver )
- MDRV_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
- MDRV_ADSP21XX_CONFIG(adsp_config)
- MDRV_CPU_PROGRAM_MAP(denver_program_map)
- MDRV_CPU_DATA_MAP(denver_data_map)
- MDRV_CPU_IO_MAP(denver_io_map)
+ MCFG_CPU_ADD("denver", ADSP2181, XTAL_33_333MHz)
+ MCFG_ADSP21XX_CONFIG(adsp_config)
+ MCFG_CPU_PROGRAM_MAP(denver_program_map)
+ MCFG_CPU_DATA_MAP(denver_data_map)
+ MCFG_CPU_IO_MAP(denver_io_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac3", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac3", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac4", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac4", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac5", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac5", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_SOUND_ADD("dac6", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac6", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index 1ab9bf4f051..22e1e0e13d6 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -37,9 +37,9 @@ static const samples_interface depthch_samples_interface =
MACHINE_CONFIG_FRAGMENT( depthch_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(depthch_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(depthch_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index e0d6622b51c..47ef6cdaa72 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1370,20 +1370,20 @@ const tms5110_interface tms_interface = {
MACHINE_CONFIG_FRAGMENT( dkong2b_audio )
- MDRV_SOUND_START( dkong )
+ MCFG_SOUND_START( dkong )
/* sound latches */
- MDRV_LATCH8_ADD("ls175.3d") /* sound cmd latch */
- MDRV_LATCH8_MASKOUT(0xf0)
- MDRV_LATCH8_INVERT(0x0F)
+ MCFG_LATCH8_ADD("ls175.3d") /* sound cmd latch */
+ MCFG_LATCH8_MASKOUT(0xf0)
+ MCFG_LATCH8_INVERT(0x0F)
- MDRV_LATCH8_ADD("ls259.6h")
- MDRV_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 6, DS_SOUND6_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
+ MCFG_LATCH8_ADD("ls259.6h")
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 6, DS_SOUND6_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, 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)
@@ -1392,46 +1392,46 @@ MACHINE_CONFIG_FRAGMENT( dkong2b_audio )
* P2.Bit2-0 -> select the 256 byte bank for external ROM
*/
- MDRV_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
- MDRV_LATCH8_INVERT( 0x20 ) /* signal is inverted */
- MDRV_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
+ MCFG_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
+ MCFG_LATCH8_INVERT( 0x20 ) /* signal is inverted */
+ MCFG_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
- MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong_sound_map)
- MDRV_CPU_IO_MAP(dkong_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong_sound_map)
+ MCFG_CPU_IO_MAP(dkong_sound_io_map)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dkong2b)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dkong2b)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( radarscp_audio, dkong2b_audio )
- MDRV_SOUND_MODIFY("discrete")
- MDRV_SOUND_CONFIG_DISCRETE(radarscp)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7)
+ MCFG_SOUND_MODIFY("discrete")
+ MCFG_SOUND_CONFIG_DISCRETE(radarscp)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( radarscp1_audio, radarscp_audio )
- MDRV_CPU_MODIFY("soundcpu")
- MDRV_CPU_IO_MAP(radarscp1_sound_io_map)
+ MCFG_CPU_MODIFY("soundcpu")
+ MCFG_CPU_IO_MAP(radarscp1_sound_io_map)
/* virtual_p2 is not read -see memory map-, all bits are output bits */
- MDRV_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */
- MDRV_LATCH8_INVERT( 0x80 ) /* signal is inverted */
- MDRV_LATCH8_DEVREAD(7, "ls259.6h", latch8_r, 3)
- MDRV_LATCH8_DEVREAD(6, "tms", m58817_status_r, 0)
+ MCFG_LATCH8_ADD( "virtual_p1" ) /* virtual latch for port A */
+ MCFG_LATCH8_INVERT( 0x80 ) /* signal is inverted */
+ MCFG_LATCH8_DEVREAD(7, "ls259.6h", latch8_r, 3)
+ MCFG_LATCH8_DEVREAD(6, "tms", m58817_status_r, 0)
/* tms memory controller */
- MDRV_DEVICE_ADD("m58819", M58819, 0)
+ MCFG_DEVICE_ADD("m58819", M58819, 0)
- MDRV_SOUND_ADD("tms", M58817, XTAL_640kHz)
- MDRV_DEVICE_CONFIG(tms_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", M58817, XTAL_640kHz)
+ MCFG_DEVICE_CONFIG(tms_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1439,62 +1439,62 @@ MACHINE_CONFIG_FRAGMENT( dkongjr_audio )
/* sound latches */
- MDRV_LATCH8_ADD("ls174.3d")
- MDRV_LATCH8_MASKOUT(0xE0)
+ MCFG_LATCH8_ADD("ls174.3d")
+ MCFG_LATCH8_MASKOUT(0xE0)
- MDRV_LATCH8_ADD( "ls259.6h")
- MDRV_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
+ MCFG_LATCH8_ADD( "ls259.6h")
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 0, DS_SOUND0_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND1_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 2, DS_SOUND2_INP)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_SOUND7_INP)
- MDRV_LATCH8_ADD( "ls259.5h")
- MDRV_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND9_INP)
+ MCFG_LATCH8_ADD( "ls259.5h")
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 1, DS_SOUND9_INP)
- MDRV_LATCH8_ADD( "ls259.4h")
+ MCFG_LATCH8_ADD( "ls259.4h")
- MDRV_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
- MDRV_LATCH8_INVERT( 0x70 ) /* all signals are inverted */
- MDRV_LATCH8_DEVREAD(6, "ls259.4h", latch8_r, 1)
- MDRV_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
- MDRV_LATCH8_DEVREAD(4, "ls259.6h", latch8_r, 6)
- MDRV_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
+ MCFG_LATCH8_ADD( "virtual_p2" ) /* virtual latch for port B */
+ MCFG_LATCH8_INVERT( 0x70 ) /* all signals are inverted */
+ MCFG_LATCH8_DEVREAD(6, "ls259.4h", latch8_r, 1)
+ MCFG_LATCH8_DEVREAD(5, "ls259.6h", latch8_r, 3)
+ MCFG_LATCH8_DEVREAD(4, "ls259.6h", latch8_r, 6)
+ MCFG_LATCH8_DISCRETE_NODE("discrete", 7, DS_DISCHARGE_INV)
- MDRV_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong_sound_map)
- MDRV_CPU_IO_MAP(dkongjr_sound_io_map)
+ MCFG_CPU_ADD("soundcpu", MB8884, I8035_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong_sound_map)
+ MCFG_CPU_IO_MAP(dkongjr_sound_io_map)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dkongjr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dkongjr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( dkong3_audio )
- MDRV_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong3_sound1_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("n2a03a", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong3_sound1_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("n2a03b", N2A03,N2A03_DEFAULTCLOCK)
- MDRV_CPU_PROGRAM_MAP(dkong3_sound2_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("n2a03b", N2A03,N2A03_DEFAULTCLOCK)
+ MCFG_CPU_PROGRAM_MAP(dkong3_sound2_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
/* sound latches */
- MDRV_LATCH8_ADD( "latch1")
- MDRV_LATCH8_ADD( "latch2")
- MDRV_LATCH8_ADD( "latch3")
-
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(nes_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-
- MDRV_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
- MDRV_SOUND_CONFIG(nes_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_LATCH8_ADD( "latch1")
+ MCFG_LATCH8_ADD( "latch2")
+ MCFG_LATCH8_ADD( "latch3")
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("nes1", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MCFG_SOUND_ADD("nes2", NES, N2A03_DEFAULTCLOCK)
+ MCFG_SOUND_CONFIG(nes_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index b863f031152..b38290ac28f 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -882,18 +882,18 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( venture_audio )
- MDRV_CPU_ADD("audiocpu", M6502, 3579545/4)
- MDRV_CPU_PROGRAM_MAP(venture_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, 3579545/4)
+ MCFG_CPU_PROGRAM_MAP(venture_audio_map)
- MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
+ MCFG_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
- MDRV_PIA6821_ADD("pia0", venture_pia0_intf)
- MDRV_PIA6821_ADD("pia1", venture_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", venture_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", venture_pia1_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", EXIDY_VENTURE, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("custom", EXIDY_VENTURE, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -950,13 +950,13 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( mtrap_cvsd_audio )
- MDRV_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
- MDRV_CPU_PROGRAM_MAP(cvsd_map)
- MDRV_CPU_IO_MAP(cvsd_iomap)
+ MCFG_CPU_ADD("cvsdcpu", Z80, CVSD_Z80_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(cvsd_map)
+ MCFG_CPU_IO_MAP(cvsd_iomap)
/* audio hardware */
- MDRV_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("cvsd", MC3417, CVSD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1121,17 +1121,17 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( victory_audio )
- MDRV_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(victory_audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, VICTORY_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(victory_audio_map)
- MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
- MDRV_PIA6821_ADD("pia1", victory_pia1_intf)
+ MCFG_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface)
+ MCFG_PIA6821_ADD("pia1", victory_pia1_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("custom", EXIDY_VICTORY, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("custom", EXIDY_VICTORY, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("tms", TMS5220, 640000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5220, 640000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 9297f231592..3452def8187 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -941,25 +941,25 @@ DEFINE_LEGACY_SOUND_DEVICE(EXIDY440, exidy440_sound);
MACHINE_CONFIG_FRAGMENT( exidy440_audio )
- MDRV_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
- MDRV_CPU_PROGRAM_MAP(exidy440_audio_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_assert)
+ MCFG_CPU_ADD("audiocpu", M6809, EXIDY440_AUDIO_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(exidy440_audio_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_assert)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("custom", EXIDY440, EXIDY440_MASTER_CLOCK/256)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("custom", EXIDY440, EXIDY440_MASTER_CLOCK/256)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
-// MDRV_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+// MCFG_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index 86b2995156c..add7a17c7ee 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -481,20 +481,20 @@ WRITE8_DEVICE_HANDLER( galaxian_sound_w )
MACHINE_CONFIG_FRAGMENT( galaxian_audio )
- MDRV_SOUND_START(galaxian)
+ MCFG_SOUND_START(galaxian)
- MDRV_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(galaxian)
+ MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(galaxian)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( mooncrst_audio )
- MDRV_SOUND_START(galaxian)
+ MCFG_SOUND_START(galaxian)
- MDRV_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(mooncrst)
+ MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(mooncrst)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index cba512b1158..dab2c6d25c5 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -327,16 +327,16 @@ ADDRESS_MAP_END
*************************************/
MACHINE_CONFIG_FRAGMENT( gottlieb_soundrev1 )
- MDRV_SOUND_START(gottlieb1)
+ MCFG_SOUND_START(gottlieb1)
- MDRV_RIOT6532_ADD("riot", SOUND1_CLOCK/4, gottlieb_riot6532_intf)
+ MCFG_RIOT6532_ADD("riot", SOUND1_CLOCK/4, gottlieb_riot6532_intf)
- MDRV_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) /* the board can be set to /2 as well */
- MDRV_CPU_PROGRAM_MAP(gottlieb_sound1_map)
+ MCFG_CPU_ADD("audiocpu", M6502, SOUND1_CLOCK/4) /* the board can be set to /2 as well */
+ MCFG_CPU_PROGRAM_MAP(gottlieb_sound1_map)
/* sound hardware */
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -577,29 +577,29 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( gottlieb_soundrev2 )
/* audio CPUs */
- MDRV_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(gottlieb_audio2_map)
+ MCFG_CPU_ADD("audiocpu", M6502, SOUND2_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(gottlieb_audio2_map)
- MDRV_CPU_ADD("speech", M6502, SOUND2_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(gottlieb_speech2_map)
+ MCFG_CPU_ADD("speech", M6502, SOUND2_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(gottlieb_speech2_map)
/* sound hardware */
- MDRV_SOUND_START( gottlieb2 )
+ MCFG_SOUND_START( gottlieb2 )
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay1", AY8913, SOUND2_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay1", AY8913, SOUND2_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("ay2", AY8913, SOUND2_CLOCK/2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
+ MCFG_SOUND_ADD("ay2", AY8913, SOUND2_CLOCK/2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("spsnd", SP0250, SOUND2_SPEECH_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c
index f17ca509ded..deec070a242 100644
--- a/src/mame/audio/hyprolyb.c
+++ b/src/mame/audio/hyprolyb.c
@@ -126,14 +126,14 @@ static const msm5205_interface hyprolyb_msm5205_config =
};
MACHINE_CONFIG_FRAGMENT( hyprolyb_adpcm )
- MDRV_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */
- MDRV_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
+ MCFG_CPU_ADD("adpcm", M6802, XTAL_14_31818MHz/8) /* unknown clock */
+ MCFG_CPU_PROGRAM_MAP(hyprolyb_adpcm_map)
- MDRV_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
+ MCFG_SOUND_ADD("hyprolyb_adpcm", HYPROLYB_ADPCM, 0)
- MDRV_SOUND_ADD("msm", MSM5205, 384000)
- MDRV_SOUND_CONFIG(hyprolyb_msm5205_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("msm", MSM5205, 384000)
+ MCFG_SOUND_CONFIG(hyprolyb_msm5205_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/*****************************************************************************
diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c
index 961a5cf630b..64703994005 100644
--- a/src/mame/audio/invinco.c
+++ b/src/mame/audio/invinco.c
@@ -43,9 +43,9 @@ static const samples_interface invinco_samples_interface =
MACHINE_CONFIG_FRAGMENT( invinco_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(invinco_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(invinco_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index e9f4e8f67e2..949e52d220b 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -414,74 +414,74 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
/* basic machine hardware */
- MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_IO_MAP(irem_sound_portmap)
+ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_IO_MAP(irem_sound_portmap)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
+ MCFG_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_msm5205_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_msm5205_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MDRV_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_msm5205_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
+ MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_msm5205_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
/* basic machine hardware */
- MDRV_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
- MDRV_CPU_IO_MAP(irem_sound_portmap)
- MDRV_CPU_PROGRAM_MAP(m52_small_sound_map)
+ MCFG_CPU_ADD("iremsound", M6803, XTAL_3_579545MHz) /* verified on pcb */
+ MCFG_CPU_IO_MAP(irem_sound_portmap)
+ MCFG_CPU_PROGRAM_MAP(m52_small_sound_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
+ MCFG_SOUND_ADD("irem_audio", IREM_AUDIO, 0)
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
- MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_1)
+ MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
- MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_ay8910_interface_2)
+ MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
- MDRV_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
- MDRV_SOUND_CONFIG(irem_msm5205_interface_1)
- MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
+ MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
+ MCFG_SOUND_CONFIG(irem_msm5205_interface_1)
+ MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
- MDRV_SOUND_ADD("filtermix", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(m52_sound_c)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filtermix", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(m52_sound_c)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( m52_large_audio, irem_audio_base ) /* 10 yard fight */
/* basic machine hardware */
- MDRV_CPU_MODIFY("iremsound")
- MDRV_CPU_PROGRAM_MAP(m52_large_sound_map)
+ MCFG_CPU_MODIFY("iremsound")
+ MCFG_CPU_PROGRAM_MAP(m52_large_sound_map)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( m62_audio, irem_audio_base )
/* basic machine hardware */
- MDRV_CPU_MODIFY("iremsound")
- MDRV_CPU_PROGRAM_MAP(m62_sound_map)
+ MCFG_CPU_MODIFY("iremsound")
+ MCFG_CPU_PROGRAM_MAP(m62_sound_map)
MACHINE_CONFIG_END
/*****************************************************************************
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index d6196cbc6a3..e256d5b616b 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -202,29 +202,29 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( jedi_audio )
- MDRV_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_SOUND_START(jedi)
- MDRV_SOUND_RESET(jedi)
+ MCFG_SOUND_START(jedi)
+ MCFG_SOUND_RESET(jedi)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
- MDRV_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
+ MCFG_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MDRV_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_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/mario.c b/src/mame/audio/mario.c
index 1c8f90cbd49..f42ff4fe1b7 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -634,36 +634,36 @@ static const ay8910_interface ay8910_config =
MACHINE_CONFIG_FRAGMENT( mario_audio )
#if USE_8039
- MDRV_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
+ MCFG_CPU_ADD("audiocpu", I8039, I8035_CLOCK) /* 730 kHz */
#else
- MDRV_CPU_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
+ MCFG_CPU_ADD("audiocpu", M58715, I8035_CLOCK) /* 730 kHz */
#endif
- MDRV_CPU_PROGRAM_MAP(mario_sound_map)
- MDRV_CPU_IO_MAP(mario_sound_io_map)
+ MCFG_CPU_PROGRAM_MAP(mario_sound_map)
+ MCFG_CPU_IO_MAP(mario_sound_io_map)
- MDRV_SOUND_START(mario)
- MDRV_SOUND_RESET(mario)
+ MCFG_SOUND_START(mario)
+ MCFG_SOUND_RESET(mario)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(mario)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(mario)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( masao_audio )
- MDRV_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
- MDRV_CPU_PROGRAM_MAP(masao_sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 24576000/16) /* ???? */
+ MCFG_CPU_PROGRAM_MAP(masao_sound_map)
- MDRV_SOUND_START(mario)
- MDRV_SOUND_RESET(mario)
+ MCFG_SOUND_START(mario)
+ MCFG_SOUND_RESET(mario)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 14318000/6)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("aysnd", AY8910, 14318000/6)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index dde7699709b..168c8bb62f8 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -463,18 +463,18 @@ ADDRESS_MAP_END
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(mcr_ssio)
- MDRV_CPU_ADD("ssiocpu", Z80, SSIO_CLOCK/2/4)
- MDRV_CPU_PROGRAM_MAP(ssio_map)
- MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ssio.1", AY8910, SSIO_CLOCK/2/4)
- MDRV_SOUND_CONFIG(ssio_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
-
- MDRV_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4)
- MDRV_SOUND_CONFIG(ssio_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
+ MCFG_CPU_ADD("ssiocpu", Z80, SSIO_CLOCK/2/4)
+ MCFG_CPU_PROGRAM_MAP(ssio_map)
+ MCFG_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ssio.1", AY8910, SSIO_CLOCK/2/4)
+ MCFG_SOUND_CONFIG(ssio_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
+
+ MCFG_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4)
+ MCFG_SOUND_CONFIG(ssio_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
MACHINE_CONFIG_END
@@ -594,25 +594,25 @@ static const pia6821_interface csdeluxe_pia_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(chip_squeak_deluxe)
- MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
+ MCFG_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
- MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
+ MCFG_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("csddac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("csddac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT(chip_squeak_deluxe_stereo)
- MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(csdeluxe_map)
+ MCFG_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(csdeluxe_map)
- MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
+ MCFG_PIA6821_ADD("csdpia", csdeluxe_pia_intf)
- MDRV_SOUND_ADD("csddac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("csddac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -713,14 +713,14 @@ static const pia6821_interface soundsgood_pia_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(sounds_good)
- MDRV_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(soundsgood_map)
+ MCFG_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2)
+ MCFG_CPU_PROGRAM_MAP(soundsgood_map)
- MDRV_PIA6821_ADD("sgpia", soundsgood_pia_intf)
+ MCFG_PIA6821_ADD("sgpia", soundsgood_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sgdac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("sgdac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -815,14 +815,14 @@ static const pia6821_interface turbocs_pia_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(turbo_chip_squeak)
- MDRV_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK)
- MDRV_CPU_PROGRAM_MAP(turbocs_map)
+ MCFG_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(turbocs_map)
- MDRV_PIA6821_ADD("tcspia", turbocs_pia_intf)
+ MCFG_PIA6821_ADD("tcspia", turbocs_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("tcsdac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("tcsdac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -976,16 +976,16 @@ static const pia6821_interface squawkntalk_pia1_intf =
/********* machine driver ***********/
MACHINE_CONFIG_FRAGMENT(squawk_n_talk)
- MDRV_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK)
- MDRV_CPU_PROGRAM_MAP(squawkntalk_map)
+ MCFG_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(squawkntalk_map)
- MDRV_PIA6821_ADD("sntpia0", squawkntalk_pia0_intf)
- MDRV_PIA6821_ADD("sntpia1", squawkntalk_pia1_intf)
+ MCFG_PIA6821_ADD("sntpia0", squawkntalk_pia0_intf)
+ MCFG_PIA6821_ADD("sntpia1", squawkntalk_pia1_intf)
/* only used on Discs of Tron, which is stereo */
- MDRV_SOUND_ADD("sntspeech", TMS5200, 640000)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("sntspeech", TMS5200, 640000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
/* the board also supports an AY-8912 and/or an 8-bit DAC, neither of */
/* which are populated on the Discs of Tron board */
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index 3e11dafaa0a..77586c18e8c 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -154,12 +154,12 @@ static const samples_interface seawolf_samples_interface =
MACHINE_CONFIG_FRAGMENT( seawolf_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(seawolf_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(seawolf_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MACHINE_CONFIG_END
@@ -215,17 +215,17 @@ static const samples_interface gunfight_samples_interface =
MACHINE_CONFIG_FRAGMENT( gunfight_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples1", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gunfight_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gunfight_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gunfight_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gunfight_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -324,10 +324,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( tornbase_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(tornbase)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(tornbase)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -368,7 +368,7 @@ WRITE8_DEVICE_HANDLER( tornbase_audio_w )
*************************************/
MACHINE_CONFIG_FRAGMENT( zzzap_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
MACHINE_CONFIG_END
@@ -570,10 +570,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( maze_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(maze)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(maze)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -816,11 +816,11 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( boothill_audio )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(boothill)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(boothill)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1046,10 +1046,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( checkmat_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(checkmat)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(checkmat)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
@@ -1257,10 +1257,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( desertgu_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(desertgu)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(desertgu)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1524,10 +1524,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( dplay_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dplay)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dplay)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1573,17 +1573,17 @@ static const samples_interface gmissile_samples_interface =
MACHINE_CONFIG_FRAGMENT( gmissile_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples1", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gmissile_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.9)
+ MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gmissile_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.9)
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(gmissile_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(gmissile_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9)
MACHINE_CONFIG_END
@@ -1672,17 +1672,17 @@ static const samples_interface m4_samples_interface =
MACHINE_CONFIG_FRAGMENT( m4_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples1", SAMPLES, 0)
- MDRV_SOUND_CONFIG(m4_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1)
+ MCFG_SOUND_ADD("samples1", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(m4_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1)
- MDRV_SOUND_ADD("samples2", SAMPLES, 0)
- MDRV_SOUND_CONFIG(m4_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
+ MCFG_SOUND_ADD("samples2", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(m4_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1)
MACHINE_CONFIG_END
@@ -1934,17 +1934,17 @@ static const samples_interface clowns_samples_interface =
MACHINE_CONFIG_FRAGMENT( clowns_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(clowns_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(clowns_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(clowns)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(clowns)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2308,11 +2308,11 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1),
DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( spacwalk_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(spacwalk)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(spacwalk)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
WRITE8_DEVICE_HANDLER( spacwalk_audio_1_w )
@@ -2539,11 +2539,11 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( shuffle_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(shuffle)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(shuffle)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2604,10 +2604,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( dogpatch_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(dogpatch)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.3)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(dogpatch)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.3)
MACHINE_CONFIG_END
@@ -3137,15 +3137,15 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( spcenctr_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(spcenctr_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(spcenctr_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(spcenctr)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(spcenctr)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -3223,12 +3223,12 @@ static const samples_interface phantom2_samples_interface =
MACHINE_CONFIG_FRAGMENT( phantom2_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(phantom2_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(phantom2_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -3353,11 +3353,11 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( bowler_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(bowler)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(bowler)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1)
MACHINE_CONFIG_END
@@ -3504,17 +3504,17 @@ static const samples_interface invaders_samples_interface =
/* left in for all games that hack into invaders samples for audio */
MACHINE_CONFIG_FRAGMENT( invaders_samples_audio )
- MDRV_SOUND_START(samples)
+ MCFG_SOUND_START(samples)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(invaders_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(invaders_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(invaders_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(invaders_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4073,15 +4073,15 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( invaders_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(invaders_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(invaders_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(invaders)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(invaders)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -4483,10 +4483,10 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( blueshrk_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(blueshrk)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(blueshrk)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -4701,20 +4701,20 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( invad2ct_audio )
- MDRV_SPEAKER_STANDARD_STEREO("spk1", "spk2")
+ MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(invad2ct)
- MDRV_SOUND_ROUTE(0, "spk1", 0.5)
- MDRV_SOUND_ROUTE(1, "spk2", 0.5)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(invad2ct)
+ MCFG_SOUND_ROUTE(0, "spk1", 0.5)
+ MCFG_SOUND_ROUTE(1, "spk2", 0.5)
- MDRV_SOUND_ADD("sn1", SN76477, 0)
- MDRV_SOUND_CONFIG(invad2ct_p1_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "spk1", 0.3)
+ MCFG_SOUND_ADD("sn1", SN76477, 0)
+ MCFG_SOUND_CONFIG(invad2ct_p1_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "spk1", 0.3)
- MDRV_SOUND_ADD("sn2", SN76477, 0)
- MDRV_SOUND_CONFIG(invad2ct_p2_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "spk2", 0.3)
+ MCFG_SOUND_ADD("sn2", SN76477, 0)
+ MCFG_SOUND_CONFIG(invad2ct_p2_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "spk2", 0.3)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 9f03e7c13ed..30fcdb78c61 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -588,55 +588,55 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( spacefev_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MDRV_CPU_IO_MAP(n8080_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6000000)
+ MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_CPU_IO_MAP(n8080_sound_io_map)
- MDRV_TIMER_ADD_PERIODIC("vco_timer", spacefev_vco_voltage_timer, HZ(1000))
+ MCFG_TIMER_ADD_PERIODIC("vco_timer", spacefev_vco_voltage_timer, HZ(1000))
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(spacefev_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(spacefev_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( sheriff_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MDRV_CPU_IO_MAP(n8080_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6000000)
+ MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_CPU_IO_MAP(n8080_sound_io_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(sheriff_sn76477_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(sheriff_sn76477_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( helifire_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", I8035, 6000000)
- MDRV_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
- MDRV_CPU_IO_MAP(helifire_sound_io_map)
+ MCFG_CPU_ADD("audiocpu", I8035, 6000000)
+ MCFG_CPU_PROGRAM_MAP(n8080_sound_cpu_map)
+ MCFG_CPU_IO_MAP(helifire_sound_io_map)
- MDRV_TIMER_ADD_PERIODIC("helifire_dac", helifire_dac_volume_timer, HZ(1000) )
+ MCFG_TIMER_ADD_PERIODIC("helifire_dac", helifire_dac_volume_timer, HZ(1000) )
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c
index 804795646db..71a0aaf1f6f 100644
--- a/src/mame/audio/namco52.c
+++ b/src/mame/audio/namco52.c
@@ -183,8 +183,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_52xx )
- MDRV_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_52xx_map_io)
+ MCFG_CPU_ADD("mcu", MB8843, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_52xx_map_io)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h
index 43fa2c1795b..251be86ee96 100644
--- a/src/mame/audio/namco52.h
+++ b/src/mame/audio/namco52.h
@@ -17,9 +17,9 @@ struct _namco_52xx_interface
};
-#define MDRV_NAMCO_52XX_ADD(_tag, _clock, _interface) \
- MDRV_DEVICE_ADD(_tag, NAMCO_52XX, _clock) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_NAMCO_52XX_ADD(_tag, _clock, _interface) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_52XX, _clock) \
+ MCFG_DEVICE_CONFIG(_interface)
WRITE8_DEVICE_HANDLER( namco_52xx_write );
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index d542d1272c0..390fd0a31c0 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -147,8 +147,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( namco_54xx )
- MDRV_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
- MDRV_CPU_IO_MAP(namco_54xx_map_io)
+ MCFG_CPU_ADD("mcu", MB8844, DERIVED_CLOCK(1,1)) /* parent clock, internally divided by 6 */
+ MCFG_CPU_IO_MAP(namco_54xx_map_io)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/namco54.h b/src/mame/audio/namco54.h
index 2343d6b0799..de0e9598552 100644
--- a/src/mame/audio/namco54.h
+++ b/src/mame/audio/namco54.h
@@ -13,10 +13,10 @@ struct _namco_54xx_config
};
-#define MDRV_NAMCO_54XX_ADD(_tag, _clock, _discrete, _firstnode) \
- MDRV_DEVICE_ADD(_tag, NAMCO_54XX, _clock) \
- MDRV_DEVICE_CONFIG_DATAPTR(namco_54xx_config, discrete, _discrete) \
- MDRV_DEVICE_CONFIG_DATA32(namco_54xx_config, firstnode, _firstnode)
+#define MCFG_NAMCO_54XX_ADD(_tag, _clock, _discrete, _firstnode) \
+ MCFG_DEVICE_ADD(_tag, NAMCO_54XX, _clock) \
+ MCFG_DEVICE_CONFIG_DATAPTR(namco_54xx_config, discrete, _discrete) \
+ MCFG_DEVICE_CONFIG_DATA32(namco_54xx_config, firstnode, _firstnode)
WRITE8_DEVICE_HANDLER( namco_54xx_write );
diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h
index c352d94527d..f1ba9d7b915 100644
--- a/src/mame/audio/namcoc7x.h
+++ b/src/mame/audio/namcoc7x.h
@@ -33,22 +33,22 @@ void namcoc7x_set_host_ram(UINT32 *hostram);
ROM_LOAD( "pr1data.8k", 0x80000, 0x80000, BAD_DUMP CRC(2e5767a4) SHA1(390bf05c90044d841fe2dd4a427177fa1570b9a6) )
#define NAMCO_C7X_MCU(clock) \
- MDRV_CPU_ADD("mcu", M37702, clock) \
- MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_map) \
- MDRV_CPU_IO_MAP(namcoc7x_mcu_io) \
- MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
+ MCFG_CPU_ADD("mcu", M37702, clock) \
+ MCFG_CPU_PROGRAM_MAP(namcoc7x_mcu_map) \
+ MCFG_CPU_IO_MAP(namcoc7x_mcu_io) \
+ MCFG_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
#define NAMCO_C7X_MCU_SHARED(clock) \
- MDRV_CPU_ADD("mcu", M37702, clock) \
- MDRV_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map) \
- MDRV_CPU_IO_MAP(namcoc7x_mcu_io) \
- MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
+ MCFG_CPU_ADD("mcu", M37702, clock) \
+ MCFG_CPU_PROGRAM_MAP(namcoc7x_mcu_share_map) \
+ MCFG_CPU_IO_MAP(namcoc7x_mcu_io) \
+ MCFG_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2)
#define NAMCO_C7X_SOUND(clock) \
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
- MDRV_SOUND_ADD("c352", C352, clock) \
- MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) \
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) \
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) \
- MDRV_SOUND_ROUTE(3, "lspeaker", 1.00)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \
+ MCFG_SOUND_ADD("c352", C352, clock) \
+ MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) \
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) \
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) \
+ MCFG_SOUND_ROUTE(3, "lspeaker", 1.00)
diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c
index 4b9a498a729..53ea04bbbd3 100644
--- a/src/mame/audio/pulsar.c
+++ b/src/mame/audio/pulsar.c
@@ -60,9 +60,9 @@ static const samples_interface pulsar_samples_interface =
MACHINE_CONFIG_FRAGMENT( pulsar_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(pulsar_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(pulsar_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index bc973bd5107..1f92bd3e4ef 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -240,30 +240,30 @@ static const pia6821_interface slithersnd_pia_0_intf =
*************************************/
MACHINE_CONFIG_FRAGMENT( qix_audio )
- MDRV_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
- MDRV_CPU_PROGRAM_MAP(audio_map)
+ MCFG_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */
+ MCFG_CPU_PROGRAM_MAP(audio_map)
- MDRV_PIA6821_ADD("sndpia0", qixsnd_pia_0_intf)
- MDRV_PIA6821_ADD("sndpia1", qixsnd_pia_1_intf)
- MDRV_PIA6821_ADD("sndpia2", qixsnd_pia_2_intf)
+ MCFG_PIA6821_ADD("sndpia0", qixsnd_pia_0_intf)
+ MCFG_PIA6821_ADD("sndpia1", qixsnd_pia_1_intf)
+ MCFG_PIA6821_ADD("sndpia2", qixsnd_pia_2_intf)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(qix)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(qix)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( slither_audio )
- MDRV_PIA6821_ADD("sndpia0", slithersnd_pia_0_intf)
+ MCFG_PIA6821_ADD("sndpia0", slithersnd_pia_0_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("sn2", SN76489, SLITHER_CLOCK_OSC/4/4)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_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/redalert.c b/src/mame/audio/redalert.c
index 0a7bc922804..98ef9ba8b75 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -219,14 +219,14 @@ static SOUND_START( redalert )
static MACHINE_CONFIG_FRAGMENT( redalert_audio_m37b )
- MDRV_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(redalert_audio_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
-
- MDRV_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
- MDRV_SOUND_CONFIG(redalert_ay8910_interface)
- MDRV_SOUND_ROUTE(0, "mono", 0.50)
- MDRV_SOUND_ROUTE(1, "mono", 0.50)
+ MCFG_CPU_ADD("audiocpu", M6502, REDALERT_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(redalert_audio_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ)
+
+ MCFG_SOUND_ADD("aysnd", AY8910, REDALERT_AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(redalert_ay8910_interface)
+ 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 */
MACHINE_CONFIG_END
@@ -239,12 +239,12 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( redalert_audio_voice )
- MDRV_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
- MDRV_CPU_CONFIG(redalert_voice_i8085_config)
- MDRV_CPU_PROGRAM_MAP(redalert_voice_map)
+ MCFG_CPU_ADD("voice", I8085A, REDALERT_VOICE_CPU_CLOCK)
+ MCFG_CPU_CONFIG(redalert_voice_i8085_config)
+ MCFG_CPU_PROGRAM_MAP(redalert_voice_map)
- MDRV_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("cvsd", HC55516, REDALERT_HC55516_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
/*************************************
@@ -255,12 +255,12 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( redalert_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD( redalert_audio_m37b )
- MDRV_FRAGMENT_ADD( redalert_audio_voice )
+ MCFG_FRAGMENT_ADD( redalert_audio_m37b )
+ MCFG_FRAGMENT_ADD( redalert_audio_voice )
- MDRV_SOUND_START( redalert )
+ MCFG_SOUND_START( redalert )
MACHINE_CONFIG_END
@@ -272,11 +272,11 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( ww3_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_FRAGMENT_ADD( redalert_audio_m37b )
+ MCFG_FRAGMENT_ADD( redalert_audio_m37b )
- MDRV_SOUND_START( redalert_audio )
+ MCFG_SOUND_START( redalert_audio )
MACHINE_CONFIG_END
@@ -407,20 +407,20 @@ static SOUND_START( demoneye )
MACHINE_CONFIG_FRAGMENT( demoneye_audio )
- MDRV_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(demoneye_audio_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
+ MCFG_CPU_ADD("audiocpu", M6802, DEMONEYE_AUDIO_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(demoneye_audio_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, REDALERT_AUDIO_CPU_IRQ_FREQ) /* guess */
- MDRV_PIA6821_ADD("sndpia", demoneye_pia_intf)
+ MCFG_PIA6821_ADD("sndpia", demoneye_pia_intf)
- MDRV_SOUND_START( demoneye )
+ MCFG_SOUND_START( demoneye )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay1", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
- MDRV_SOUND_CONFIG(demoneye_ay8910_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("ay2", AY8910, DEMONEYE_AY8910_CLOCK)
+ MCFG_SOUND_CONFIG(demoneye_ay8910_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 05e8344db64..c83096b8d20 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -340,25 +340,25 @@ static const tms5110_interface ad2083_tms5110_interface =
MACHINE_CONFIG_FRAGMENT( ad2083_audio )
- MDRV_CPU_ADD("audiocpu", Z80, 14318000/8) /* 1.78975 MHz */
- MDRV_CPU_PROGRAM_MAP(ad2083_sound_map)
- MDRV_CPU_IO_MAP(ad2083_sound_io_map)
+ 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)
- MDRV_DEVICE_ADD("tmsprom", TMSPROM, AD2083_TMS5110_CLOCK / 2) /* rom clock */
- MDRV_DEVICE_CONFIG(prom_intf)
+ MCFG_DEVICE_ADD("tmsprom", TMSPROM, AD2083_TMS5110_CLOCK / 2) /* rom clock */
+ MCFG_DEVICE_CONFIG(prom_intf)
- MDRV_SOUND_START(ad2083)
+ MCFG_SOUND_START(ad2083)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(ad2083_ay8910_interface_1)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("ay1", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(ad2083_ay8910_interface_1)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("ay2", AY8910, 14318000/8)
- MDRV_SOUND_CONFIG(ad2083_ay8910_interface_2)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ay2", AY8910, 14318000/8)
+ MCFG_SOUND_CONFIG(ad2083_ay8910_interface_2)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
- MDRV_SOUND_CONFIG(ad2083_tms5110_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("tms", TMS5110A, AD2083_TMS5110_CLOCK)
+ MCFG_SOUND_CONFIG(ad2083_tms5110_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 90bf06ac5ba..ca641101270 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -210,12 +210,12 @@ static const samples_interface astrob_samples_interface =
MACHINE_CONFIG_FRAGMENT( astrob_sound_board )
- MDRV_SOUND_START(astrob)
+ MCFG_SOUND_START(astrob)
/* sound hardware */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(astrob_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(astrob_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -438,17 +438,17 @@ static const ppi8255_interface ppi8255_005_intf =
MACHINE_CONFIG_FRAGMENT( 005_sound_board )
- MDRV_PPI8255_ADD( "ppi8255", ppi8255_005_intf )
+ MCFG_PPI8255_ADD( "ppi8255", ppi8255_005_intf )
/* sound hardware */
- MDRV_SOUND_START(sega005)
+ MCFG_SOUND_START(sega005)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(sega005_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(sega005_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("005", SEGA005, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("005", SEGA005, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -676,11 +676,11 @@ static const samples_interface spaceod_samples_interface =
MACHINE_CONFIG_FRAGMENT( spaceod_sound_board )
/* sound hardware */
- MDRV_SOUND_START(spaceod)
+ MCFG_SOUND_START(spaceod)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spaceod_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spaceod_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -842,27 +842,27 @@ static const ppi8255_interface monsterb_ppi_intf =
MACHINE_CONFIG_FRAGMENT( monsterb_sound_board )
- MDRV_PPI8255_ADD( "ppi8255", monsterb_ppi_intf )
+ MCFG_PPI8255_ADD( "ppi8255", monsterb_ppi_intf )
/* basic machine hardware */
- MDRV_CPU_ADD("audiocpu", N7751, 6000000)
- MDRV_CPU_IO_MAP(monsterb_7751_portmap)
+ MCFG_CPU_ADD("audiocpu", N7751, 6000000)
+ MCFG_CPU_IO_MAP(monsterb_7751_portmap)
- MDRV_I8243_ADD("audio_8243", NULL, n7751_rom_control_w)
+ MCFG_I8243_ADD("audio_8243", NULL, n7751_rom_control_w)
/* sound hardware */
- MDRV_SOUND_START(monsterb)
+ MCFG_SOUND_START(monsterb)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(monsterb_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(monsterb_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("music", TMS36XX, 247)
- MDRV_SOUND_CONFIG(monsterb_tms3617_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("music", TMS36XX, 247)
+ MCFG_SOUND_CONFIG(monsterb_tms3617_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index 567e9f01ea6..2dac64ebc8f 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -278,14 +278,14 @@ static const struct sp0250_interface sp0250_interface =
MACHINE_CONFIG_FRAGMENT( sega_speech_board )
/* CPU for the speech board */
- MDRV_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */
- MDRV_CPU_PROGRAM_MAP(speech_map)
- MDRV_CPU_IO_MAP(speech_portmap)
+ 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)
/* sound hardware */
- MDRV_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
- MDRV_SOUND_CONFIG(sp0250_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK)
+ MCFG_SOUND_CONFIG(sp0250_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -918,21 +918,21 @@ ADDRESS_MAP_END
MACHINE_CONFIG_FRAGMENT( sega_universal_sound_board )
/* CPU for the usb board */
- MDRV_CPU_ADD("usbcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
- MDRV_CPU_PROGRAM_MAP(usb_map)
- MDRV_CPU_IO_MAP(usb_portmap)
+ MCFG_CPU_ADD("usbcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */
+ MCFG_CPU_PROGRAM_MAP(usb_map)
+ MCFG_CPU_IO_MAP(usb_portmap)
- MDRV_TIMER_ADD_PERIODIC("usb_timer", increment_t1_clock, HZ(USB_2MHZ_CLOCK / 256))
+ MCFG_TIMER_ADD_PERIODIC("usb_timer", increment_t1_clock, HZ(USB_2MHZ_CLOCK / 256))
/* sound hardware */
- MDRV_SOUND_ADD("usbsnd", USB, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("usbsnd", USB, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( sega_universal_sound_board_rom, sega_universal_sound_board )
/* CPU for the usb board */
- MDRV_CPU_MODIFY("usbcpu")
- MDRV_CPU_PROGRAM_MAP(usb_map_rom)
+ MCFG_CPU_MODIFY("usbcpu")
+ MCFG_CPU_PROGRAM_MAP(usb_map_rom)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index cbac677df5c..bc7f035205b 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -77,92 +77,92 @@ extern const ym2203_interface seibu_ym2203_interface;
#define SEIBU_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu_sound_map) \
#define SEIBU2_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu2_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu2_sound_map) \
#define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \
#define SEIBU_NEWZEROTEAM_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) \
#define SEIBU3_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu3_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu3_sound_map) \
#define SEIBU3A_SOUND_SYSTEM_CPU(freq) \
- MDRV_CPU_ADD("audiocpu", Z80, freq) \
- MDRV_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \
+ MCFG_CPU_ADD("audiocpu", Z80, freq) \
+ MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \
#define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM3812, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym3812_interface) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
+ MCFG_SOUND_ADD("ymsnd", YM3812, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym3812_interface) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
- MDRV_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM3812, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym3812_interface) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
+ MCFG_SOUND_ADD("ymsnd", YM3812, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym3812_interface) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
\
- MDRV_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
+ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \
#define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM2151, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym2151_interface) \
- MDRV_SOUND_ROUTE(0, "mono", 0.50) \
- MDRV_SOUND_ROUTE(1, "mono", 0.50) \
+ MCFG_SOUND_ADD("ymsnd", YM2151, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym2151_interface) \
+ MCFG_SOUND_ROUTE(0, "mono", 0.50) \
+ MCFG_SOUND_ROUTE(1, "mono", 0.50) \
\
- MDRV_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ymsnd", YM2151, freq1) \
- MDRV_SOUND_CONFIG(seibu_ym2151_interface) \
- MDRV_SOUND_ROUTE(0, "mono", 0.50) \
- MDRV_SOUND_ROUTE(1, "mono", 0.50) \
+ MCFG_SOUND_ADD("ymsnd", YM2151, freq1) \
+ MCFG_SOUND_CONFIG(seibu_ym2151_interface) \
+ MCFG_SOUND_ROUTE(0, "mono", 0.50) \
+ MCFG_SOUND_ROUTE(1, "mono", 0.50) \
\
- MDRV_OKIM6295_ADD("oki1", freq2, OKIM6295_PIN7_HIGH) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki1", freq2, OKIM6295_PIN7_HIGH) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
\
- MDRV_OKIM6295_ADD("oki2", freq2, OKIM6295_PIN7_HIGH) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_OKIM6295_ADD("oki2", freq2, OKIM6295_PIN7_HIGH) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
#define SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(freq) \
- MDRV_SPEAKER_STANDARD_MONO("mono") \
+ MCFG_SPEAKER_STANDARD_MONO("mono") \
\
- MDRV_SOUND_ADD("ym1", YM2203, freq) \
- MDRV_SOUND_CONFIG(seibu_ym2203_interface) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
+ MCFG_SOUND_ADD("ym1", YM2203, freq) \
+ MCFG_SOUND_CONFIG(seibu_ym2203_interface) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
\
- MDRV_SOUND_ADD("ym2", YM2203, freq) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
+ MCFG_SOUND_ADD("ym2", YM2203, freq) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \
#define SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE \
- MDRV_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
\
- MDRV_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) \
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
+ MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) \
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \
/**************************************************************************/
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index d0231b445bf..1d3e1e97300 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -87,12 +87,12 @@ static const samples_interface spacefb_samples_interface =
MACHINE_CONFIG_FRAGMENT( spacefb_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spacefb_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spacefb_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c
index ef8fcb5c9a9..533dc222d34 100644
--- a/src/mame/audio/spiders.c
+++ b/src/mame/audio/spiders.c
@@ -202,8 +202,8 @@ WRITE8_DEVICE_HANDLER( spiders_audio_ctrl_w )
MACHINE_CONFIG_FRAGMENT( spiders_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(spiders)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(spiders)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index b9957a95686..5865615734e 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -272,16 +272,16 @@ static const es5505_interface es5505_taito_f3_config =
};
MACHINE_CONFIG_FRAGMENT( taito_f3_sound )
- MDRV_TIMER_ADD("timer_68681", taito_en_timer_callback)
+ MCFG_TIMER_ADD("timer_68681", taito_en_timer_callback)
- MDRV_SOUND_RESET( taito_f3_soundsystem_reset )
+ MCFG_SOUND_RESET( taito_f3_soundsystem_reset )
- MDRV_CPU_ADD("audiocpu", M68000, 16000000)
- MDRV_CPU_PROGRAM_MAP(f3_sound_map)
+ MCFG_CPU_ADD("audiocpu", M68000, 16000000)
+ MCFG_CPU_PROGRAM_MAP(f3_sound_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ensoniq", ES5505, 30476100/2)
- MDRV_SOUND_CONFIG(es5505_taito_f3_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SOUND_ADD("ensoniq", ES5505, 30476100/2)
+ MCFG_SOUND_CONFIG(es5505_taito_f3_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taito_zm.c b/src/mame/audio/taito_zm.c
index 28c7f6a58b4..11db7a0044e 100644
--- a/src/mame/audio/taito_zm.c
+++ b/src/mame/audio/taito_zm.c
@@ -51,14 +51,14 @@ static const zsg2_interface zsg2_taito_config =
};
MACHINE_CONFIG_FRAGMENT( taito_zoom_sound )
- MDRV_CPU_ADD("mn10200", MN10200, 25000000/2)
- MDRV_CPU_PROGRAM_MAP(taitozoom_map)
- MDRV_CPU_IO_MAP(taitozoom_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_pulse)
+ MCFG_CPU_ADD("mn10200", MN10200, 25000000/2)
+ MCFG_CPU_PROGRAM_MAP(taitozoom_map)
+ MCFG_CPU_IO_MAP(taitozoom_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_pulse)
// we assume the parent machine has created lspeaker/rspeaker
- MDRV_SOUND_ADD("zsg2", ZSG2, 25000000/2)
- MDRV_SOUND_CONFIG(zsg2_taito_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(1, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("zsg2", ZSG2, 25000000/2)
+ MCFG_SOUND_CONFIG(zsg2_taito_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h
index 5e593ed37c1..8d4c0969a25 100644
--- a/src/mame/audio/taitosnd.h
+++ b/src/mame/audio/taitosnd.h
@@ -21,9 +21,9 @@ DECLARE_LEGACY_DEVICE(TC0140SYT, tc0140syt);
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MDRV_TC0140SYT_ADD(_tag, _interface) \
- MDRV_DEVICE_ADD(_tag, TC0140SYT, 0) \
- MDRV_DEVICE_CONFIG(_interface)
+#define MCFG_TC0140SYT_ADD(_tag, _interface) \
+ MCFG_DEVICE_ADD(_tag, TC0140SYT, 0) \
+ MCFG_DEVICE_CONFIG(_interface)
/***************************************************************************
DEVICE I/O FUNCTIONS
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index 01236dfd187..611057478d1 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -199,25 +199,25 @@ static const samples_interface targ_samples_interface =
MACHINE_CONFIG_FRAGMENT( spectar_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(spectar_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(spectar_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( targ_audio )
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(targ_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(targ_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index 926efbe6bbd..77ccdd89ddf 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -215,46 +215,46 @@ static const ay8910_interface timeplt_ay8910_interface =
MACHINE_CONFIG_FRAGMENT( timeplt_sound )
/* basic machine hardware */
- MDRV_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8)
- MDRV_CPU_PROGRAM_MAP(timeplt_sound_map)
+ MCFG_CPU_ADD("tpsound",Z80,MASTER_CLOCK/8)
+ MCFG_CPU_PROGRAM_MAP(timeplt_sound_map)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
-
- MDRV_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_CONFIG(timeplt_ay8910_interface)
- MDRV_SOUND_ROUTE(0, "filter.0.0", 0.60)
- MDRV_SOUND_ROUTE(1, "filter.0.1", 0.60)
- MDRV_SOUND_ROUTE(2, "filter.0.2", 0.60)
-
- MDRV_SOUND_ADD("ay2", AY8910, MASTER_CLOCK/8)
- MDRV_SOUND_ROUTE(0, "filter.1.0", 0.60)
- MDRV_SOUND_ROUTE(1, "filter.1.1", 0.60)
- MDRV_SOUND_ROUTE(2, "filter.1.2", 0.60)
-
- MDRV_SOUND_ADD("filter.0.0", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.0.1", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.0.2", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
-
- MDRV_SOUND_ADD("filter.1.0", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.1.1", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("filter.1.2", FILTER_RC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("timeplt_audio", TIMEPLT_AUDIO, 0)
+
+ MCFG_SOUND_ADD("ay1", AY8910, MASTER_CLOCK/8)
+ MCFG_SOUND_CONFIG(timeplt_ay8910_interface)
+ 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_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_SOUND_ADD("filter.0.0", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.0.1", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.0.2", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+
+ MCFG_SOUND_ADD("filter.1.0", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.1.1", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("filter.1.2", FILTER_RC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( locomotn_sound, timeplt_sound )
/* basic machine hardware */
- MDRV_CPU_MODIFY("tpsound")
- MDRV_CPU_PROGRAM_MAP(locomotn_sound_map)
+ MCFG_CPU_MODIFY("tpsound")
+ MCFG_CPU_PROGRAM_MAP(locomotn_sound_map)
MACHINE_CONFIG_END
/*****************************************************************************
diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c
index 61ed9df4af7..5e09357bc82 100644
--- a/src/mame/audio/turbo.c
+++ b/src/mame/audio/turbo.c
@@ -196,48 +196,48 @@ static const samples_interface turbo_samples_interface =
MACHINE_CONFIG_FRAGMENT( turbo_samples )
/* this is the cockpit speaker configuration */
- MDRV_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */
- MDRV_SPEAKER_ADD("bspeaker", 0.0, 0.0, -0.5) /* back */
- MDRV_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */
- MDRV_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */
+ MCFG_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */
+ MCFG_SPEAKER_ADD("bspeaker", 0.0, 0.0, -0.5) /* back */
+ MCFG_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */
+ MCFG_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(turbo_samples_interface)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(turbo_samples_interface)
/* channel 0 = CRASH.S -> CRASH.S/SM */
- MDRV_SOUND_ROUTE(0, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "fspeaker", 0.25)
/* channel 1 = TRIG1-4 -> ALARM.M/F/R/L */
- MDRV_SOUND_ROUTE(1, "fspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 0.25)
/* channel 2 = SLIP/SPIN -> SKID.F/R/L/M */
- MDRV_SOUND_ROUTE(2, "fspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
/* channel 3 = CRASH.L -> CRASH.L/LM */
- MDRV_SOUND_ROUTE(3, "bspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "bspeaker", 0.25)
/* channel 4 = AMBU -> AMBULANCE/AMBULANCE.M */
- MDRV_SOUND_ROUTE(4, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(4, "fspeaker", 0.25)
/* channel 5 = ACCEL+BSEL -> MYCAR.F/W/M + MYCAR0.F/M + MYCAR1.F/M */
- MDRV_SOUND_ROUTE(5, "fspeaker", 0.25)
- MDRV_SOUND_ROUTE(5, "bspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "bspeaker", 0.25)
/* channel 6 = OSEL -> OCAR.F/FM */
- MDRV_SOUND_ROUTE(6, "fspeaker", 0.25)
+ MCFG_SOUND_ROUTE(6, "fspeaker", 0.25)
/* channel 7 = OSEL -> OCAR.L/LM */
- MDRV_SOUND_ROUTE(7, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(7, "lspeaker", 0.25)
/* channel 8 = OSEL -> OCAR.R/RM */
- MDRV_SOUND_ROUTE(8, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "rspeaker", 0.25)
/* channel 9 = OSEL -> OCAR.W/WM */
- MDRV_SOUND_ROUTE(9, "bspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "bspeaker", 0.25)
MACHINE_CONFIG_END
/*
@@ -452,42 +452,42 @@ static const samples_interface subroc3d_samples_interface =
MACHINE_CONFIG_FRAGMENT( subroc3d_samples )
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(subroc3d_samples_interface)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(subroc3d_samples_interface)
/* MISSILE in channels 0 and 1 */
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "rspeaker", 0.25)
/* TORPEDO in channels 2 and 3 */
- MDRV_SOUND_ROUTE(2, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(3, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(2, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(3, "rspeaker", 0.25)
/* FIGHTER in channels 4 and 5 */
- MDRV_SOUND_ROUTE(4, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(5, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(4, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(5, "rspeaker", 0.25)
/* HIT in channels 6 and 7 */
- MDRV_SOUND_ROUTE(6, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(7, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(6, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(7, "rspeaker", 0.25)
/* FIRE sound in channel 8 */
- MDRV_SOUND_ROUTE(8, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(8, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(8, "rspeaker", 0.25)
/* SHIP EXP sound in channel 9 */
- MDRV_SOUND_ROUTE(9, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(9, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(9, "rspeaker", 0.25)
/* ALARM TRIG sound in channel 10 */
- MDRV_SOUND_ROUTE(10, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(10, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(10, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(10, "rspeaker", 0.25)
/* PROLOGUE sound in channel 11 */
- MDRV_SOUND_ROUTE(11, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(11, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(11, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(11, "rspeaker", 0.25)
MACHINE_CONFIG_END
@@ -607,10 +607,10 @@ static const samples_interface buckrog_samples_interface =
MACHINE_CONFIG_FRAGMENT( buckrog_samples )
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(buckrog_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(buckrog_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index 20934a59a16..3bf7960bb1d 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -120,13 +120,13 @@ static const samples_interface frogs_samples_interface =
MACHINE_CONFIG_FRAGMENT( frogs_audio )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(frogs_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(frogs_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(frogs)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(frogs)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -455,9 +455,9 @@ DISCRETE_SOUND_END
MACHINE_CONFIG_FRAGMENT( headon_audio )
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(headon)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(headon)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
WRITE8_HANDLER( headon_audio_w )
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 720730b1456..2a3eff21327 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -194,68 +194,68 @@ static const ym2151_interface adpcm_ym2151_interface =
****************************************************************************/
MACHINE_CONFIG_FRAGMENT( williams_cvsd_sound )
- MDRV_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_cvsd_map)
+ MCFG_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_cvsd_map)
- MDRV_PIA6821_ADD("cvsdpia", cvsd_pia_intf)
+ MCFG_PIA6821_ADD("cvsdpia", cvsd_pia_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, CVSD_FM_CLOCK)
- MDRV_SOUND_CONFIG(cvsd_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, CVSD_FM_CLOCK)
+ MCFG_SOUND_CONFIG(cvsd_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD("cvsd", HC55516, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
+ MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( williams_narc_sound )
- MDRV_CPU_ADD("narc1cpu", M6809E, NARC_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_narc_master_map)
+ MCFG_CPU_ADD("narc1cpu", M6809E, NARC_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_narc_master_map)
- MDRV_CPU_ADD("narc2cpu", M6809E, NARC_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_narc_slave_map)
+ MCFG_CPU_ADD("narc2cpu", M6809E, NARC_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_narc_slave_map)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("ymsnd", YM2151, NARC_FM_CLOCK)
- MDRV_SOUND_CONFIG(adpcm_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, NARC_FM_CLOCK)
+ MCFG_SOUND_CONFIG(adpcm_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
- MDRV_SOUND_ADD("dac1", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac1", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("dac2", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
+ MCFG_SOUND_ADD("dac2", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MDRV_SOUND_ADD("cvsd", HC55516, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
+ MCFG_SOUND_ADD("cvsd", HC55516, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound )
- MDRV_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(williams_adpcm_map)
+ MCFG_CPU_ADD("adpcm", M6809E, ADPCM_MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(williams_adpcm_map)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, ADPCM_FM_CLOCK)
- MDRV_SOUND_CONFIG(adpcm_ym2151_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SOUND_ADD("ymsnd", YM2151, ADPCM_FM_CLOCK)
+ MCFG_SOUND_CONFIG(adpcm_ym2151_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c
index 4f5d98c4e39..8f5c05c7e8b 100644
--- a/src/mame/audio/zaxxon.c
+++ b/src/mame/audio/zaxxon.c
@@ -98,9 +98,9 @@ static const samples_interface zaxxon_samples_interface =
MACHINE_CONFIG_FRAGMENT( zaxxon_samples )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(zaxxon_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(zaxxon_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -210,9 +210,9 @@ static const samples_interface congo_samples_interface =
MACHINE_CONFIG_FRAGMENT( congo_samples )
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(congo_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(congo_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 1534f6b7323..831804e8e3a 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -258,39 +258,39 @@ static MACHINE_RESET( 1942 )
static MACHINE_CONFIG_START( 1942, _1942_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(c1942_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", c1942_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(c1942_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", c1942_scanline, "screen", 0, 1)
- MDRV_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60)
+ MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60)
- MDRV_MACHINE_START(1942)
- MDRV_MACHINE_RESET(1942)
+ MCFG_MACHINE_START(1942)
+ MCFG_MACHINE_RESET(1942)
/* video hardware */
- MDRV_GFXDECODE(1942)
- MDRV_PALETTE_LENGTH(64*4+4*32*8+16*16)
+ MCFG_GFXDECODE(1942)
+ MCFG_PALETTE_LENGTH(64*4+4*32*8+16*16)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_PALETTE_INIT(1942)
- MDRV_VIDEO_START(1942)
- MDRV_VIDEO_UPDATE(1942)
+ MCFG_PALETTE_INIT(1942)
+ MCFG_VIDEO_START(1942)
+ MCFG_VIDEO_UPDATE(1942)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index da0ef4d2e4d..e04a741de7b 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -259,44 +259,44 @@ static MACHINE_RESET( 1943 )
static MACHINE_CONFIG_START( 1943, _1943_state )
// basic machine hardware
- MDRV_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(c1943_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(c1943_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold, 4*60)
+ MCFG_CPU_ADD("audiocpu", Z80, XTAL_24MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold, 4*60)
- MDRV_MACHINE_RESET(1943)
+ MCFG_MACHINE_RESET(1943)
// video hardware
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(1943)
- MDRV_PALETTE_LENGTH(32*4+16*16+16*16+16*16)
-
- MDRV_PALETTE_INIT(1943)
- MDRV_VIDEO_START(1943)
- MDRV_VIDEO_UPDATE(1943)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(1943)
+ MCFG_PALETTE_LENGTH(32*4+16*16+16*16+16*16)
+
+ MCFG_PALETTE_INIT(1943)
+ MCFG_VIDEO_START(1943)
+ MCFG_VIDEO_UPDATE(1943)
// sound hardware
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.10)
-
- MDRV_SOUND_ADD("ym2", YM2203, XTAL_24MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.15)
- MDRV_SOUND_ROUTE(1, "mono", 0.15)
- MDRV_SOUND_ROUTE(2, "mono", 0.15)
- MDRV_SOUND_ROUTE(3, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_24MHz/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_24MHz/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)
MACHINE_CONFIG_END
/* ROMs */
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 76da29bd405..b50fe5ff369 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -251,32 +251,32 @@ static MACHINE_START( 1945kiii )
static MACHINE_CONFIG_START( k3, k3_state )
- MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
- MDRV_CPU_PROGRAM_MAP(k3_map)
- MDRV_CPU_VBLANK_INT("screen", irq4_line_hold)
+ MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(k3_map)
+ MCFG_CPU_VBLANK_INT("screen", irq4_line_hold)
- MDRV_MACHINE_START(1945kiii)
+ MCFG_MACHINE_START(1945kiii)
- MDRV_GFXDECODE(1945kiii)
+ MCFG_GFXDECODE(1945kiii)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
- MDRV_PALETTE_LENGTH(0x800)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1)
+ MCFG_PALETTE_LENGTH(0x800)
- MDRV_VIDEO_START(k3)
- MDRV_VIDEO_UPDATE(k3)
+ MCFG_VIDEO_START(k3)
+ MCFG_VIDEO_UPDATE(k3)
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki1", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki1", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_OKIM6295_ADD("oki2", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 6ee0bdeb8c4..9d49c9a83ba 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -351,28 +351,28 @@ static MACHINE_RESET( 20pacgal )
static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
- MDRV_CPU_PROGRAM_MAP(20pacgal_map)
- MDRV_CPU_IO_MAP(20pacgal_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) // assert breaks the inputs in 25pacman test mode
+ MCFG_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
+ MCFG_CPU_PROGRAM_MAP(20pacgal_map)
+ MCFG_CPU_IO_MAP(20pacgal_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) // assert breaks the inputs in 25pacman test mode
- MDRV_MACHINE_START(20pacgal)
- MDRV_MACHINE_RESET(20pacgal)
+ MCFG_MACHINE_START(20pacgal)
+ MCFG_MACHINE_RESET(20pacgal)
- MDRV_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf)
+ MCFG_EEPROM_ADD("eeprom", _20pacgal_eeprom_intf)
/* video hardware */
- MDRV_FRAGMENT_ADD(20pacgal_video)
+ MCFG_FRAGMENT_ADD(20pacgal_video)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("namco", NAMCO, NAMCO_AUDIO_CLOCK)
- MDRV_SOUND_CONFIG(namco_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("namco", NAMCO, NAMCO_AUDIO_CLOCK)
+ MCFG_SOUND_CONFIG(namco_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 23f4d540870..8a06246a2c6 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -444,33 +444,33 @@ static MACHINE_RESET( drill )
static MACHINE_CONFIG_START( drill, _2mindril_state )
- MDRV_CPU_ADD("maincpu", M68000, 16000000 )
- MDRV_CPU_PROGRAM_MAP(drill_map)
- MDRV_CPU_VBLANK_INT("screen", drill_interrupt)
- MDRV_GFXDECODE(2mindril)
-
- MDRV_MACHINE_START(drill)
- MDRV_MACHINE_RESET(drill)
-
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(128*16, 64*8)
- MDRV_SCREEN_VISIBLE_AREA(0, 319, 0, 239-16)
- MDRV_PALETTE_LENGTH(0x1000)
-
- MDRV_VIDEO_START(drill)
- MDRV_VIDEO_UPDATE(drill)
-
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 16000000/2)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_CPU_ADD("maincpu", M68000, 16000000 )
+ MCFG_CPU_PROGRAM_MAP(drill_map)
+ MCFG_CPU_VBLANK_INT("screen", drill_interrupt)
+ MCFG_GFXDECODE(2mindril)
+
+ MCFG_MACHINE_START(drill)
+ MCFG_MACHINE_RESET(drill)
+
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(128*16, 64*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 319, 0, 239-16)
+ MCFG_PALETTE_LENGTH(0x1000)
+
+ MCFG_VIDEO_START(drill)
+ MCFG_VIDEO_UPDATE(drill)
+
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 16000000/2)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index dd2b3ebd3cc..40505c07c28 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -1584,31 +1584,31 @@ static MACHINE_START(39in1)
static MACHINE_CONFIG_START( 39in1, _39in1_state )
- MDRV_CPU_ADD("maincpu", PXA255, 200000000)
- MDRV_CPU_PROGRAM_MAP(39in1_map)
- MDRV_CPU_VBLANK_INT("screen", pxa255_vblank_start)
+ MCFG_CPU_ADD("maincpu", PXA255, 200000000)
+ MCFG_CPU_PROGRAM_MAP(39in1_map)
+ MCFG_CPU_VBLANK_INT("screen", pxa255_vblank_start)
- MDRV_PALETTE_LENGTH(32768)
+ MCFG_PALETTE_LENGTH(32768)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
- MDRV_SCREEN_SIZE(1024, 1024)
- MDRV_SCREEN_VISIBLE_AREA(0, 295, 0, 479)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
+ MCFG_SCREEN_SIZE(1024, 1024)
+ MCFG_SCREEN_VISIBLE_AREA(0, 295, 0, 479)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_MACHINE_START(39in1)
- MDRV_EEPROM_93C66B_ADD("eeprom")
+ MCFG_MACHINE_START(39in1)
+ MCFG_EEPROM_93C66B_ADD("eeprom")
- MDRV_VIDEO_UPDATE(39in1)
+ MCFG_VIDEO_UPDATE(39in1)
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_SOUND_ADD("dac1", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ADD("dac2", DMADAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_SOUND_ADD("dac1", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ADD("dac2", DMADAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
ROM_START( 39in1 )
diff --git a/src/mame/drivers/3super8.c b/src/mame/drivers/3super8.c
index 4c75b0224e4..4b8a394dca0 100644
--- a/src/mame/drivers/3super8.c
+++ b/src/mame/drivers/3super8.c
@@ -66,29 +66,29 @@ GFXDECODE_END
static MACHINE_CONFIG_START( 3super8, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80,24000000/4) /* 6 MHz */
- MDRV_CPU_PROGRAM_MAP(map)
- //MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu", Z80,24000000/4) /* 6 MHz */
+ MCFG_CPU_PROGRAM_MAP(map)
+ //MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-0-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-0-1)
- MDRV_GFXDECODE(3super8)
- MDRV_PALETTE_LENGTH(0x100)
+ MCFG_GFXDECODE(3super8)
+ MCFG_PALETTE_LENGTH(0x100)
- MDRV_VIDEO_START(3super8)
- MDRV_VIDEO_UPDATE(3super8)
+ MCFG_VIDEO_START(3super8)
+ MCFG_VIDEO_UPDATE(3super8)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 330809f7666..81ea89ff02b 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1065,116 +1065,116 @@ static MACHINE_RESET( undoukai )
static MACHINE_CONFIG_START( 40love, fortyl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
- MDRV_CPU_PROGRAM_MAP(40love_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
+ MCFG_CPU_PROGRAM_MAP(40love_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2) /* OK */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
- MDRV_CPU_ADD("mcu",M68705,18432000/6) /* OK */
- MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
- MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+ MCFG_CPU_ADD("mcu",M68705,18432000/6) /* OK */
+ MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+ MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
- MDRV_QUANTUM_TIME(HZ(6000)) /* high interleave to ensure proper synchronization of CPUs */
- MDRV_MACHINE_START(40love)
- MDRV_MACHINE_RESET(40love)
+ MCFG_QUANTUM_TIME(HZ(6000)) /* high interleave to ensure proper synchronization of CPUs */
+ MCFG_MACHINE_START(40love)
+ MCFG_MACHINE_RESET(40love)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
- MDRV_GFXDECODE(40love)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_PALETTE_INIT(fortyl)
- MDRV_VIDEO_START(fortyl)
- MDRV_VIDEO_UPDATE(fortyl)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
+ MCFG_GFXDECODE(40love)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_PALETTE_INIT(fortyl)
+ MCFG_VIDEO_START(fortyl)
+ MCFG_VIDEO_UPDATE(fortyl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
-
- MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
- MDRV_SOUND_CONFIG(msm5232_config)
- MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
- MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
- MDRV_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
- MDRV_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
- MDRV_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
- MDRV_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
- MDRV_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
- MDRV_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_SOUND_CONFIG(msm5232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
+ MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
+ MCFG_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
+ MCFG_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
+ MCFG_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
+ MCFG_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
+ MCFG_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
+ MCFG_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
// pin 1 SOLO 8' not mapped
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( undoukai, fortyl_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(undoukai_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(undoukai_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
+ MCFG_CPU_ADD("audiocpu",Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,2*60) /* source/number of IRQs is unknown */
-// MDRV_CPU_ADD("mcu",M68705,18432000/6)
-// MDRV_CPU_PROGRAM_MAP(buggychl_mcu_map)
-// MDRV_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
+// MCFG_CPU_ADD("mcu",M68705,18432000/6)
+// MCFG_CPU_PROGRAM_MAP(buggychl_mcu_map)
+// MCFG_DEVICE_ADD("bmcu", BUGGYCHL_MCU, 0)
- MDRV_MACHINE_START(undoukai)
- MDRV_MACHINE_RESET(undoukai) /* init machine */
+ MCFG_MACHINE_START(undoukai)
+ MCFG_MACHINE_RESET(undoukai) /* init machine */
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
- MDRV_GFXDECODE(40love)
- MDRV_PALETTE_LENGTH(1024)
-
- MDRV_PALETTE_INIT(fortyl)
- MDRV_VIDEO_START(fortyl)
- MDRV_VIDEO_UPDATE(fortyl)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(128,128+255, 2*8, 30*8-1)
+ MCFG_GFXDECODE(40love)
+ MCFG_PALETTE_LENGTH(1024)
+
+ MCFG_PALETTE_INIT(fortyl)
+ MCFG_VIDEO_START(fortyl)
+ MCFG_VIDEO_UPDATE(fortyl)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
-
- MDRV_SOUND_ADD("aysnd", AY8910, 2000000)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
-
- MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
- MDRV_SOUND_CONFIG(msm5232_config)
- MDRV_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
- MDRV_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
- MDRV_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
- MDRV_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
- MDRV_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
- MDRV_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
- MDRV_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
- MDRV_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("aysnd", AY8910, 2000000)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+
+ MCFG_SOUND_ADD("msm", MSM5232, 8000000/4)
+ MCFG_SOUND_CONFIG(msm5232_config)
+ MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1
+ MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1
+ MCFG_SOUND_ROUTE(2, "mono", 1.0) // pin 30 8'-1
+ MCFG_SOUND_ROUTE(3, "mono", 1.0) // pin 31 16'-1
+ MCFG_SOUND_ROUTE(4, "mono", 1.0) // pin 36 2'-2
+ MCFG_SOUND_ROUTE(5, "mono", 1.0) // pin 35 4'-2
+ MCFG_SOUND_ROUTE(6, "mono", 1.0) // pin 34 8'-2
+ MCFG_SOUND_ROUTE(7, "mono", 1.0) // pin 33 16'-2
// pin 1 SOLO 8' not mapped
// pin 2 SOLO 16' not mapped
// pin 22 Noise Output not mapped
- MDRV_SOUND_ADD("dac", DAC, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
+ MCFG_SOUND_ADD("dac", DAC, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
/*******************************************************************************/
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index a1e7b3fea5e..ff982ef806d 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -176,33 +176,33 @@ static PALETTE_INIT( 4enraya )
static MACHINE_CONFIG_START( 4enraya, _4enraya_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",Z80,8000000/2)
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_IO_MAP(main_portmap)
- MDRV_CPU_PERIODIC_INT(irq0_line_hold,4*60) // unknown timing
+ MCFG_CPU_ADD("maincpu",Z80,8000000/2)
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_IO_MAP(main_portmap)
+ MCFG_CPU_PERIODIC_INT(irq0_line_hold,4*60) // unknown timing
- MDRV_MACHINE_START(4enraya)
- MDRV_MACHINE_RESET(4enraya)
+ MCFG_MACHINE_START(4enraya)
+ MCFG_MACHINE_RESET(4enraya)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(4enraya)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(4enraya)
- MDRV_PALETTE_INIT(4enraya)
- MDRV_PALETTE_LENGTH(8)
+ MCFG_PALETTE_INIT(4enraya)
+ MCFG_PALETTE_LENGTH(8)
- MDRV_VIDEO_START(4enraya)
- MDRV_VIDEO_UPDATE(4enraya)
+ MCFG_VIDEO_START(4enraya)
+ MCFG_VIDEO_UPDATE(4enraya)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4) /* guess */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 8000000/4) /* guess */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
/***************************************************************************
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index d400ee3da66..0ddc36f686a 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -372,36 +372,36 @@ static const mc6845_interface mc6845_intf =
static MACHINE_CONFIG_START( 4roses, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
- MDRV_CPU_PROGRAM_MAP(4roses_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_CPU_PROGRAM_MAP(4roses_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
-// MDRV_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((124+1)*4, (30+1)*8) /* guess. taken from funworld games */
- MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* guess. taken from funworld games */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((124+1)*4, (30+1)*8) /* guess. taken from funworld games */
+ MCFG_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1) /* guess. taken from funworld games */
- MDRV_GFXDECODE(4roses)
+ MCFG_GFXDECODE(4roses)
- MDRV_PALETTE_LENGTH(0x1000)
- MDRV_PALETTE_INIT(funworld)
- MDRV_VIDEO_START(funworld)
- MDRV_VIDEO_UPDATE(funworld)
+ MCFG_PALETTE_LENGTH(0x1000)
+ MCFG_PALETTE_INIT(funworld)
+ MCFG_VIDEO_START(funworld)
+ MCFG_VIDEO_UPDATE(funworld)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, guess */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/8, mc6845_intf) /* 2MHz, guess */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
- MDRV_SOUND_CONFIG(ay8910_intf)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* 2MHz, guess */
+ MCFG_SOUND_CONFIG(ay8910_intf)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c
index 1c7e5a310f7..c6c2601401a 100644
--- a/src/mame/drivers/5clown.c
+++ b/src/mame/drivers/5clown.c
@@ -1031,44 +1031,44 @@ static const ay8910_interface ay8910_config =
static MACHINE_CONFIG_START( fclown, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
- MDRV_CPU_PROGRAM_MAP(fclown_map)
- MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse)
+ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_CPU_PROGRAM_MAP(fclown_map)
+ MCFG_CPU_VBLANK_INT("screen", nmi_line_pulse)
- MDRV_CPU_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
- MDRV_CPU_PROGRAM_MAP(fcaudio_map)
+ MCFG_CPU_ADD("audiocpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_CPU_PROGRAM_MAP(fcaudio_map)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
- MDRV_PIA6821_ADD("pia0", fclown_pia0_intf)
- MDRV_PIA6821_ADD("pia1", fclown_pia1_intf)
+ MCFG_PIA6821_ADD("pia0", fclown_pia0_intf)
+ MCFG_PIA6821_ADD("pia1", fclown_pia1_intf)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE((39+1)*8, (31+1)*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE((39+1)*8, (31+1)*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1)
- MDRV_GFXDECODE(fclown)
- MDRV_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(fclown)
+ MCFG_GFXDECODE(fclown)
+ MCFG_PALETTE_LENGTH(256)
+ MCFG_PALETTE_INIT(fclown)
- MDRV_VIDEO_START(fclown)
- MDRV_VIDEO_UPDATE(fclown)
+ MCFG_VIDEO_START(fclown)
+ MCFG_VIDEO_UPDATE(fclown)
- MDRV_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */
+ MCFG_MC6845_ADD("crtc", MC6845, MASTER_CLOCK/16, mc6845_intf) /* guess */
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MDRV_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, OKIM6295_PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
+ MCFG_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, OKIM6295_PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index af31c3269d3..3ac8711580d 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -382,22 +382,22 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( invadpt2, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invadpt2_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invadpt2_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* 60 Hz signal clocks two LS161. Ripple carry will */
/* reset circuit, if LS161 not cleared before. */
- MDRV_WATCHDOG_VBLANK_INIT(255)
+ MCFG_WATCHDOG_VBLANK_INIT(255)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(invadpt2)
+ MCFG_VIDEO_UPDATE(invadpt2)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -440,19 +440,19 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( spcewars, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(spcewars_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(spcewars_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
/* extra audio channel */
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -514,8 +514,8 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( astropal, invaders )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(astropal_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(astropal_io_map)
MACHINE_CONFIG_END
@@ -563,16 +563,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( cosmo, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(cosmo_map)
- MDRV_CPU_IO_MAP(cosmo_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(cosmo_map)
+ MCFG_CPU_IO_MAP(cosmo_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* video hardware */
- MDRV_VIDEO_UPDATE(cosmo)
+ MCFG_VIDEO_UPDATE(cosmo)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -685,14 +685,14 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( invrvnge, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(invrvnge_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(invrvnge_io_map)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -790,26 +790,26 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(lrescue_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(lrescue_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(invadpt2)
+ MCFG_VIDEO_UPDATE(invadpt2)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
- MDRV_SOUND_CONFIG(lrescue_samples_interface)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
+ MCFG_SOUND_ADD("samples", SAMPLES, 0)
+ MCFG_SOUND_CONFIG(lrescue_samples_interface)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
/* extra audio channel */
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -938,18 +938,18 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( rollingc, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(rollingc_map)
- MDRV_CPU_IO_MAP(rollingc_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(rollingc_map)
+ MCFG_CPU_IO_MAP(rollingc_io_map)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(rollingc)
+ MCFG_VIDEO_UPDATE(rollingc)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1052,29 +1052,29 @@ static MACHINE_RESET( schaser )
static MACHINE_CONFIG_DERIVED( schaser, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(schaser_io_map)
- MDRV_WATCHDOG_VBLANK_INIT(255)
- MDRV_MACHINE_START(schaser)
- MDRV_MACHINE_RESET(schaser)
+ MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(schaser_io_map)
+ MCFG_WATCHDOG_VBLANK_INIT(255)
+ MCFG_MACHINE_START(schaser)
+ MCFG_MACHINE_RESET(schaser)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(schaser)
+ MCFG_VIDEO_UPDATE(schaser)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("snsnd", SN76477, 0)
- MDRV_SOUND_CONFIG(schaser_sn76477_interface)
- MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
+ MCFG_SOUND_ADD("snsnd", SN76477, 0)
+ MCFG_SOUND_CONFIG(schaser_sn76477_interface)
+ MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(schaser)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(schaser)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1122,22 +1122,22 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(schasercv_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(schasercv_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(schasercv)
+ MCFG_VIDEO_UPDATE(schasercv)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
- MDRV_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1213,16 +1213,16 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( sflush, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",M6800,2000000) /* ?? */
- MDRV_CPU_PROGRAM_MAP(sflush_map)
- MDRV_CPU_VBLANK_INT_HACK(irq0_line_pulse,2)
- MDRV_MACHINE_START(sflush)
+ MCFG_CPU_REPLACE("maincpu",M6800,2000000) /* ?? */
+ MCFG_CPU_PROGRAM_MAP(sflush_map)
+ MCFG_CPU_VBLANK_INT_HACK(irq0_line_pulse,2)
+ MCFG_MACHINE_START(sflush)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(sflush)
+ MCFG_VIDEO_UPDATE(sflush)
MACHINE_CONFIG_END
@@ -1320,37 +1320,37 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(lupin3_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(lupin3_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(indianbt)
+ MCFG_VIDEO_UPDATE(indianbt)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( lupin3a, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(lupin3_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(lupin3_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(lupin3)
+ MCFG_VIDEO_UPDATE(lupin3)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1456,25 +1456,25 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( polaris, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
- MDRV_CPU_PROGRAM_MAP(schaser_map)
- MDRV_CPU_IO_MAP(polaris_io_map)
- MDRV_WATCHDOG_VBLANK_INIT(255)
- MDRV_CPU_VBLANK_INT("screen", polaris_interrupt)
- MDRV_MACHINE_START(polaris)
+ MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
+ MCFG_CPU_PROGRAM_MAP(schaser_map)
+ MCFG_CPU_IO_MAP(polaris_io_map)
+ MCFG_WATCHDOG_VBLANK_INIT(255)
+ MCFG_CPU_VBLANK_INT("screen", polaris_interrupt)
+ MCFG_MACHINE_START(polaris)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(polaris)
+ MCFG_VIDEO_UPDATE(polaris)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(polaris)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(polaris)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1581,18 +1581,18 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( ballbomb, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(ballbomb_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(ballbomb_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(ballbomb)
+ MCFG_VIDEO_UPDATE(ballbomb)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1657,13 +1657,13 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( yosakdon, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(yosakdon_map)
- MDRV_CPU_IO_MAP(yosakdon_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(yosakdon_map)
+ MCFG_CPU_IO_MAP(yosakdon_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1754,22 +1754,22 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(indianbt_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(indianbt_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(indianbt)
+ MCFG_VIDEO_UPDATE(indianbt)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
- MDRV_SOUND_ADD("discrete", DISCRETE, 0)
- MDRV_SOUND_CONFIG_DISCRETE(indianbt)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("discrete", DISCRETE, 0)
+ MCFG_SOUND_CONFIG_DISCRETE(indianbt)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1827,18 +1827,18 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( steelwkr, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(steelwkr_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(steelwkr_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* video hardware */
- MDRV_VIDEO_UPDATE(invadpt2)
+ MCFG_VIDEO_UPDATE(invadpt2)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -1962,18 +1962,18 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( shuttlei, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(shuttlei_map)
- MDRV_CPU_IO_MAP(shuttlei_io_map)
- MDRV_MACHINE_START(extra_8080bw)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(shuttlei_map)
+ MCFG_CPU_IO_MAP(shuttlei_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
/* video hardware */
- MDRV_SCREEN_MODIFY("screen")
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
- MDRV_VIDEO_UPDATE(shuttlei)
+ MCFG_SCREEN_MODIFY("screen")
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 24*8-1)
+ MCFG_VIDEO_UPDATE(shuttlei)
/* sound hardware */
- MDRV_FRAGMENT_ADD(invaders_samples_audio)
+ MCFG_FRAGMENT_ADD(invaders_samples_audio)
MACHINE_CONFIG_END
@@ -2071,13 +2071,13 @@ INPUT_PORTS_END
static MACHINE_CONFIG_DERIVED( darthvdr, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(darthvdr_map)
- MDRV_CPU_IO_MAP(darthvdr_io_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(darthvdr_map)
+ MCFG_CPU_IO_MAP(darthvdr_io_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(darthvdr)
- MDRV_MACHINE_RESET(darthvdr)
+ MCFG_MACHINE_START(darthvdr)
+ MCFG_MACHINE_RESET(darthvdr)
MACHINE_CONFIG_END
@@ -2143,20 +2143,20 @@ INPUT_PORTS_END
MACHINE_CONFIG_DERIVED( vortex, mw8080bw_root )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(vortex_io_map)
- MDRV_MACHINE_START(extra_8080bw)
- MDRV_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(vortex_io_map)
+ MCFG_MACHINE_START(extra_8080bw)
+ MCFG_WATCHDOG_TIME_INIT(USEC(255000000 / (MW8080BW_PIXEL_CLOCK / MW8080BW_HTOTAL / MW8080BW_VTOTAL)))
/* video hardware */
// TODO: replace with modified invaders color renderer code allowing midscanline color writes
- MDRV_VIDEO_UPDATE(invaders)
+ MCFG_VIDEO_UPDATE(invaders)
/* add shifter */
- MDRV_MB14241_ADD("mb14241")
+ MCFG_MB14241_ADD("mb14241")
/* audio hardware */
- MDRV_FRAGMENT_ADD(invaders_audio)
+ MCFG_FRAGMENT_ADD(invaders_audio)
MACHINE_CONFIG_END
@@ -2349,8 +2349,8 @@ ADDRESS_MAP_END
MACHINE_CONFIG_DERIVED( modelr, invaders )
/* basic machine hardware */
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_IO_MAP(modelr_io_map)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_IO_MAP(modelr_io_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c
index b4ec94182e5..51f8c86ab27 100644
--- a/src/mame/drivers/86lions.c
+++ b/src/mame/drivers/86lions.c
@@ -342,34 +342,34 @@ static PALETTE_INIT( lions )
static MACHINE_CONFIG_START( lions, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, MAIN_CLOCK/4) /* 3 MHz.(guess) */
- MDRV_CPU_PROGRAM_MAP(lions_map)
- MDRV_CPU_VBLANK_INT("screen", lions_irq )
+ MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/4) /* 3 MHz.(guess) */
+ MCFG_CPU_PROGRAM_MAP(lions_map)
+ MCFG_CPU_VBLANK_INT("screen", lions_irq )
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(304, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(304, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 216-1) /* from the crtc registers... updated by crtc */
- MDRV_GFXDECODE(lions)
- MDRV_PALETTE_LENGTH(64)
- MDRV_PALETTE_INIT(lions)
+ MCFG_GFXDECODE(lions)
+ MCFG_PALETTE_LENGTH(64)
+ MCFG_PALETTE_INIT(lions)
- MDRV_VIDEO_START(lions)
- MDRV_VIDEO_UPDATE(lions)
+ MCFG_VIDEO_START(lions)
+ MCFG_VIDEO_UPDATE(lions)
- MDRV_VIA6522_ADD("via6522_0", MAIN_CLOCK/12, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
+ MCFG_VIA6522_ADD("via6522_0", MAIN_CLOCK/12, via_interface) /* 1 MHz.(only 1 or 2 MHz.are valid) */
- MDRV_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf) /* 1.5 MHz.(logical guess to get a decent 59.6374 Hz.) */
+ MCFG_MC6845_ADD("crtc", MC6845, MAIN_CLOCK/8, mc6845_intf) /* 1.5 MHz.(logical guess to get a decent 59.6374 Hz.) */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
+ MCFG_SOUND_ADD("aysnd", AY8910, MAIN_CLOCK/8) /* 1.5 MHz.(guess) */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index d2aa97c5dc5..7fa42a1aa57 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -379,47 +379,47 @@ static const k051316_interface _88games_k051316_intf =
static MACHINE_CONFIG_START( 88games, _88games_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", k88games_interrupt)
+ MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", k88games_interrupt)
- MDRV_CPU_ADD("audiocpu", Z80, 3579545)
- MDRV_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_ADD("audiocpu", Z80, 3579545)
+ MCFG_CPU_PROGRAM_MAP(sound_map)
- MDRV_MACHINE_START(88games)
- MDRV_MACHINE_RESET(88games)
+ MCFG_MACHINE_START(88games)
+ MCFG_MACHINE_RESET(88games)
- MDRV_NVRAM_ADD_0FILL("nvram")
+ MCFG_NVRAM_ADD_0FILL("nvram")
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_HAS_SHADOWS)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 )
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(13*8, (64-13)*8-1, 2*8, 30*8-1 )
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_K052109_ADD("k052109", _88games_k052109_intf)
- MDRV_K051960_ADD("k051960", _88games_k051960_intf)
- MDRV_K051316_ADD("k051316", _88games_k051316_intf)
+ MCFG_K052109_ADD("k052109", _88games_k052109_intf)
+ MCFG_K051960_ADD("k051960", _88games_k051960_intf)
+ MCFG_K051316_ADD("k051316", _88games_k051316_intf)
- MDRV_VIDEO_UPDATE(88games)
+ MCFG_VIDEO_UPDATE(88games)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ymsnd", YM2151, 3579545)
- MDRV_SOUND_ROUTE(0, "mono", 0.75)
- MDRV_SOUND_ROUTE(1, "mono", 0.75)
+ MCFG_SOUND_ADD("ymsnd", YM2151, 3579545)
+ MCFG_SOUND_ROUTE(0, "mono", 0.75)
+ MCFG_SOUND_ROUTE(1, "mono", 0.75)
- MDRV_SOUND_ADD("upd1", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("upd1", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MDRV_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+ MCFG_SOUND_ADD("upd2", UPD7759, UPD7759_STANDARD_CLOCK)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index aaeb497a189..78743edd2fc 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -344,25 +344,25 @@ static MACHINE_RESET( ace )
static MACHINE_CONFIG_START( ace, ace_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
- MDRV_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
+ MCFG_CPU_PROGRAM_MAP(main_map)
- MDRV_MACHINE_START(ace)
- MDRV_MACHINE_RESET(ace)
+ MCFG_MACHINE_START(ace)
+ MCFG_MACHINE_RESET(ace)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(4*8, 32*8-1, 2*8, 32*8-1)
- MDRV_GFXDECODE(ace)
- MDRV_PALETTE_LENGTH(2)
-
- MDRV_PALETTE_INIT(ace)
- MDRV_VIDEO_START(ace)
- MDRV_VIDEO_UPDATE(ace)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(4*8, 32*8-1, 2*8, 32*8-1)
+ MCFG_GFXDECODE(ace)
+ MCFG_PALETTE_LENGTH(2)
+
+ MCFG_PALETTE_INIT(ace)
+ MCFG_VIDEO_START(ace)
+ MCFG_VIDEO_UPDATE(ace)
/* sound hardware */
/* ???? */
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index ec4b8f52687..c9f7e9979a9 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -551,26 +551,26 @@ GFXDECODE_END
static MACHINE_CONFIG_START( acefruit, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
- MDRV_CPU_PROGRAM_MAP(acefruit_map)
- MDRV_CPU_IO_MAP(acefruit_io)
- MDRV_GFXDECODE(acefruit)
- MDRV_CPU_VBLANK_INT("screen", acefruit_vblank)
+ MCFG_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
+ MCFG_CPU_PROGRAM_MAP(acefruit_map)
+ MCFG_CPU_IO_MAP(acefruit_io)
+ MCFG_GFXDECODE(acefruit)
+ MCFG_CPU_VBLANK_INT("screen", acefruit_vblank)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(512, 256)
- MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
- MDRV_PALETTE_LENGTH(16)
-
- MDRV_NVRAM_ADD_0FILL("nvram")
-
- MDRV_PALETTE_INIT(acefruit)
- MDRV_VIDEO_START(acefruit)
- MDRV_VIDEO_UPDATE(acefruit)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(512, 256)
+ MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
+ MCFG_PALETTE_LENGTH(16)
+
+ MCFG_NVRAM_ADD_0FILL("nvram")
+
+ MCFG_PALETTE_INIT(acefruit)
+ MCFG_VIDEO_START(acefruit)
+ MCFG_VIDEO_UPDATE(acefruit)
/* sound hardware */
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index fde0c9ea8a9..c2e38a3b00a 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -568,33 +568,33 @@ static TIMER_DEVICE_CALLBACK( acommand_scanline )
static MACHINE_CONFIG_START( acommand, driver_device )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,12000000)
- MDRV_CPU_PROGRAM_MAP(acommand_map)
- MDRV_TIMER_ADD_SCANLINE("scantimer", acommand_scanline, "screen", 0, 1)
+ MCFG_CPU_ADD("maincpu",M68000,12000000)
+ MCFG_CPU_PROGRAM_MAP(acommand_map)
+ MCFG_TIMER_ADD_SCANLINE("scantimer", acommand_scanline, "screen", 0, 1)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(acommand)
- MDRV_PALETTE_LENGTH(0x4000)
-
- MDRV_VIDEO_START(acommand)
- MDRV_VIDEO_UPDATE(acommand)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
+ MCFG_GFXDECODE(acommand)
+ MCFG_PALETTE_LENGTH(0x4000)
+
+ MCFG_VIDEO_START(acommand)
+ MCFG_VIDEO_UPDATE(acommand)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MDRV_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MDRV_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
+ MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ 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/actfancr.c b/src/mame/drivers/actfancr.c
index 110fcdbd560..fd5927b4252 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -319,91 +319,91 @@ static MACHINE_RESET( triothep )
static MACHINE_CONFIG_START( actfancr, actfancr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",H6280,21477200/3) /* Should be accurate */
- MDRV_CPU_PROGRAM_MAP(actfan_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
+ MCFG_CPU_ADD("maincpu",H6280,21477200/3) /* Should be accurate */
+ MCFG_CPU_PROGRAM_MAP(actfan_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
- MDRV_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_MACHINE_START(actfancr)
- MDRV_MACHINE_RESET(actfancr)
+ MCFG_MACHINE_START(actfancr)
+ MCFG_MACHINE_RESET(actfancr)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(actfan)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(actfan)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(actfancr)
- MDRV_VIDEO_UPDATE(actfancr)
+ MCFG_VIDEO_START(actfancr)
+ MCFG_VIDEO_UPDATE(actfancr)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, 1500000)
- MDRV_SOUND_ROUTE(0, "mono", 0.90)
- MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ROUTE(2, "mono", 0.90)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_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)
- MDRV_SOUND_ADD("ym2", YM3812, 3000000)
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ym2", YM3812, 3000000)
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
+ MCFG_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( triothep, actfancr_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
- MDRV_CPU_PROGRAM_MAP(triothep_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
+ MCFG_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(triothep_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold) /* VBL */
- MDRV_CPU_ADD("audiocpu",M6502, XTAL_12MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(dec0_s_map)
+ MCFG_CPU_ADD("audiocpu",M6502, XTAL_12MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(dec0_s_map)
- MDRV_MACHINE_START(triothep)
- MDRV_MACHINE_RESET(triothep)
+ MCFG_MACHINE_START(triothep)
+ MCFG_MACHINE_RESET(triothep)
/* video hardware */
- MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
+ MCFG_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
- MDRV_GFXDECODE(triothep)
- MDRV_PALETTE_LENGTH(768)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(529))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 1*8, 31*8-1)
+ MCFG_GFXDECODE(triothep)
+ MCFG_PALETTE_LENGTH(768)
- MDRV_VIDEO_START(triothep)
- MDRV_VIDEO_UPDATE(triothep)
+ MCFG_VIDEO_START(triothep)
+ MCFG_VIDEO_UPDATE(triothep)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
- MDRV_SOUND_ROUTE(0, "mono", 0.90)
- MDRV_SOUND_ROUTE(1, "mono", 0.90)
- MDRV_SOUND_ROUTE(2, "mono", 0.90)
- MDRV_SOUND_ROUTE(3, "mono", 0.50)
+ MCFG_SOUND_ADD("ym1", YM2203, XTAL_12MHz/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)
- MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
- MDRV_SOUND_CONFIG(ym3812_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
+ MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ym3812_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
/******************************************************************************/
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index ba32dac2c51..f895b88d4d2 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -632,116 +632,116 @@ static const hd63484_interface skattva_hd63484_intf = { 1 }; // skattva hd63484
static MACHINE_CONFIG_START( quickjac, adp_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(quickjac_mem)
-// MDRV_CPU_VBLANK_INT("screen", adp_int)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(quickjac_mem)
+// MCFG_CPU_VBLANK_INT("screen", adp_int)
- MDRV_MACHINE_START(skattv)
- MDRV_MACHINE_RESET(skattv)
+ MCFG_MACHINE_START(skattv)
+ MCFG_MACHINE_RESET(skattv)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
+ MCFG_PALETTE_LENGTH(0x10)
- MDRV_PALETTE_INIT(adp)
- MDRV_VIDEO_START(adp)
- MDRV_VIDEO_UPDATE(adp)
+ MCFG_PALETTE_INIT(adp)
+ MCFG_VIDEO_START(adp)
+ MCFG_VIDEO_UPDATE(adp)
- MDRV_HD63484_ADD("hd63484", adp_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", adp_hd63484_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( skattv, adp_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(skattv_mem)
-// MDRV_CPU_VBLANK_INT("screen", adp_int)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(skattv_mem)
+// MCFG_CPU_VBLANK_INT("screen", adp_int)
- MDRV_MACHINE_START(skattv)
- MDRV_MACHINE_RESET(skattv)
+ MCFG_MACHINE_START(skattv)
+ MCFG_MACHINE_RESET(skattv)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(384, 280)
- MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(384, 280)
+ MCFG_SCREEN_VISIBLE_AREA(0, 384-1, 0, 280-1)
+ MCFG_PALETTE_LENGTH(0x10)
- MDRV_PALETTE_INIT(adp)
- MDRV_VIDEO_START(adp)
- MDRV_VIDEO_UPDATE(adp)
+ MCFG_PALETTE_INIT(adp)
+ MCFG_VIDEO_START(adp)
+ MCFG_VIDEO_UPDATE(adp)
- MDRV_HD63484_ADD("hd63484", adp_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", adp_hd63484_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( skattva, skattv )
- MDRV_DEVICE_REMOVE("hd63484")
- MDRV_HD63484_ADD("hd63484", skattva_hd63484_intf)
+ MCFG_DEVICE_REMOVE("hd63484")
+ MCFG_HD63484_ADD("hd63484", skattva_hd63484_intf)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( backgamn, adp_state )
- MDRV_CPU_ADD("maincpu", M68000, 8000000)
- MDRV_CPU_PROGRAM_MAP(backgamn_mem)
+ MCFG_CPU_ADD("maincpu", M68000, 8000000)
+ MCFG_CPU_PROGRAM_MAP(backgamn_mem)
- MDRV_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
+ MCFG_DUART68681_ADD( "duart68681", XTAL_8_664MHz / 2, skattv_duart68681_config )
- MDRV_MACHINE_START(skattv)
- MDRV_MACHINE_RESET(skattv)
+ MCFG_MACHINE_START(skattv)
+ MCFG_MACHINE_RESET(skattv)
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(640, 480)
- MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
- MDRV_PALETTE_LENGTH(0x10)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(640, 480)
+ MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
+ MCFG_PALETTE_LENGTH(0x10)
-// MDRV_PALETTE_INIT(adp)
- MDRV_VIDEO_START(adp)
- MDRV_VIDEO_UPDATE(adp)
+// MCFG_PALETTE_INIT(adp)
+ MCFG_VIDEO_START(adp)
+ MCFG_VIDEO_UPDATE(adp)
- MDRV_HD63484_ADD("hd63484", adp_hd63484_intf)
+ MCFG_HD63484_ADD("hd63484", adp_hd63484_intf)
- MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("aysnd", AY8910, 3686400/2)
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("aysnd", AY8910, 3686400/2)
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( funland, skattv )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(funland_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(funland_mem)
- MDRV_PALETTE_LENGTH(0x100)
- MDRV_PALETTE_INIT(all_black)
+ MCFG_PALETTE_LENGTH(0x100)
+ MCFG_PALETTE_INIT(all_black)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( fstation, skattv )
- MDRV_CPU_MODIFY("maincpu")
- MDRV_CPU_PROGRAM_MAP(fstation_mem)
+ MCFG_CPU_MODIFY("maincpu")
+ MCFG_CPU_PROGRAM_MAP(fstation_mem)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index f70afcd48ff..86ae9443862 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -255,42 +255,42 @@ static MACHINE_RESET( formatz )
static MACHINE_CONFIG_START( formatz, aeroboto_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(main_map)
- MDRV_CPU_VBLANK_INT("screen", aeroboto_interrupt)
+ MCFG_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(main_map)
+ MCFG_CPU_VBLANK_INT("screen", aeroboto_interrupt)
- MDRV_CPU_ADD("audiocpu", M6809, XTAL_10MHz/16) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_VBLANK_INT("screen", irq0_line_hold)
+ MCFG_CPU_ADD("audiocpu", M6809, XTAL_10MHz/16) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_VBLANK_INT("screen", irq0_line_hold)
- MDRV_MACHINE_START(formatz)
- MDRV_MACHINE_RESET(formatz)
+ MCFG_MACHINE_START(formatz)
+ MCFG_MACHINE_RESET(formatz)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(32*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 2*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(32*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 31*8-1, 2*8, 30*8-1)
- MDRV_GFXDECODE(aeroboto)
+ MCFG_GFXDECODE(aeroboto)
- MDRV_PALETTE_LENGTH(256)
+ MCFG_PALETTE_LENGTH(256)
- MDRV_PALETTE_INIT(RRRR_GGGG_BBBB)
- MDRV_VIDEO_START(aeroboto)
- MDRV_VIDEO_UPDATE(aeroboto)
+ MCFG_PALETTE_INIT(RRRR_GGGG_BBBB)
+ MCFG_VIDEO_START(aeroboto)
+ MCFG_VIDEO_UPDATE(aeroboto)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
- MDRV_SOUND_CONFIG(ay8910_config)
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
+ MCFG_SOUND_CONFIG(ay8910_config)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MDRV_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 4a218105d2f..eac311fe459 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -1330,67 +1330,67 @@ static MACHINE_RESET( aerofgt )
static MACHINE_CONFIG_START( pspikes, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(pspikes_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(pspikes_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */
- MDRV_CPU_PROGRAM_MAP(sound_map)
- MDRV_CPU_IO_MAP(turbofrc_sound_portmap)
+ MCFG_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */
+ MCFG_CPU_PROGRAM_MAP(sound_map)
+ MCFG_CPU_IO_MAP(turbofrc_sound_portmap)
/* IRQs are triggered by the YM2610 */
- MDRV_MACHINE_START(aerofgt)
- MDRV_MACHINE_RESET(aerofgt)
+ MCFG_MACHINE_START(aerofgt)
+ MCFG_MACHINE_RESET(aerofgt)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pspikes)
- MDRV_PALETTE_LENGTH(2048)
+ MCFG_GFXDECODE(pspikes)
+ MCFG_PALETTE_LENGTH(2048)
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(pspikes)
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(pspikes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
-
- MDRV_SOUND_ADD("ymsnd", YM2610, 8000000)
- MDRV_SOUND_CONFIG(ym2610_config)
- MDRV_SOUND_ROUTE(0, "lspeaker", 0.25)
- MDRV_SOUND_ROUTE(0, "rspeaker", 0.25)
- MDRV_SOUND_ROUTE(1, "lspeaker", 1.0)
- MDRV_SOUND_ROUTE(2, "rspeaker", 1.0)
+ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
+
+ MCFG_SOUND_ADD("ymsnd", YM2610, 8000000)
+ MCFG_SOUND_CONFIG(ym2610_config)
+ MCFG_SOUND_ROUTE(0, "lspeaker", 0.25)
+ MCFG_SOUND_ROUTE(0, "rspeaker", 0.25)
+ MCFG_SOUND_ROUTE(1, "lspeaker", 1.0)
+ MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( spikes91, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(spikes91_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(spikes91_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
/* + Z80 for sound */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8+4, 224+4-1)
- MDRV_GFXDECODE(spikes91)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(spikes91)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8, 320-1, 0*8+4, 224+4-1)
+ MCFG_GFXDECODE(spikes91)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(spikes91)
/* sound hardware */
/* the sound hardware is completely different on this:
@@ -1404,361 +1404,361 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pspikesb, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikesb_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(pspikesb_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pspikesb)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(pspikesb)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(pspikesb)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(pspikesb)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( pspikesc, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(pspikesc_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(pspikesc_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */
- MDRV_MACHINE_START(common)
- MDRV_MACHINE_RESET(common)
+ MCFG_MACHINE_START(common)
+ MCFG_MACHINE_RESET(common)
/* video hardware */
- MDRV_SCREEN_ADD("screen", RASTER)
- MDRV_SCREEN_REFRESH_RATE(60)
- MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
- MDRV_SCREEN_SIZE(64*8, 32*8)
- MDRV_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
- MDRV_GFXDECODE(pspikes)
- MDRV_PALETTE_LENGTH(2048)
-
- MDRV_VIDEO_START(pspikes)
- MDRV_VIDEO_UPDATE(pspikes)
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
+ MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA(0*8+4, 44*8+4-1, 0*8, 30*8-1)
+ MCFG_GFXDECODE(pspikes)
+ MCFG_PALETTE_LENGTH(2048)
+
+ MCFG_VIDEO_START(pspikes)
+ MCFG_VIDEO_UPDATE(pspikes)
/* sound hardware */
- MDRV_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SPEAKER_STANDARD_MONO("mono")
- MDRV_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
- MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
+ MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_START( karatblz, aerofgt_state )
/* basic machine hardware */
- MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
- MDRV_CPU_PROGRAM_MAP(karatblz_map)
- MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
+ MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
+ MCFG_CPU_PROGRAM_MAP(karatblz_map)
+ MCFG_CPU_VBLANK_INT("screen", irq1_line_hold)
- MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */</